|
@@ -16,10 +16,10 @@
|
|
|
|
|
|
#define EVDPY(e) (e)->xany.display
|
|
#define EVDPY(e) (e)->xany.display
|
|
|
|
|
|
-#define MOUSE_CHECK_BIND(m) \
|
|
|
|
- if(m->button == ev->button) \
|
|
|
|
- if(!m->use_area || (m->use_area && INAREA(ev->x, ev->y, m->area))) \
|
|
|
|
- if(m->func) \
|
|
|
|
|
|
+#define MOUSE_DO_BIND(m) \
|
|
|
|
+ if(m->button == ev->button) \
|
|
|
|
+ if(!m->use_area || (m->use_area && INAREA(ev->x, ev->y, m->area))) \
|
|
|
|
+ if(m->func) \
|
|
m->func(m->cmd);
|
|
m->func(m->cmd);
|
|
static void
|
|
static void
|
|
event_buttonpress(XEvent *e)
|
|
event_buttonpress(XEvent *e)
|
|
@@ -36,10 +36,10 @@ event_buttonpress(XEvent *e)
|
|
W->last_clicked_barwin = b;
|
|
W->last_clicked_barwin = b;
|
|
|
|
|
|
SLIST_FOREACH(m, &b->mousebinds, next)
|
|
SLIST_FOREACH(m, &b->mousebinds, next)
|
|
- MOUSE_CHECK_BIND(m);
|
|
|
|
|
|
+ MOUSE_DO_BIND(m);
|
|
|
|
|
|
SLIST_FOREACH(m, &b->statusmousebinds, next)
|
|
SLIST_FOREACH(m, &b->statusmousebinds, next)
|
|
- MOUSE_CHECK_BIND(m);
|
|
|
|
|
|
+ MOUSE_DO_BIND(m);
|
|
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -98,7 +98,6 @@ event_clientmessageevent(XEvent *e)
|
|
if((sy = systray_find(ev->data.l[2])))
|
|
if((sy = systray_find(ev->data.l[2])))
|
|
ewmh_send_message(sy->win, sy->win, "_XEMBED", XEMBED_FOCUS_IN,
|
|
ewmh_send_message(sy->win, sy->win, "_XEMBED", XEMBED_FOCUS_IN,
|
|
XEMBED_FOCUS_CURRENT, 0, 0, 0);
|
|
XEMBED_FOCUS_CURRENT, 0, 0, 0);
|
|
-
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if(ev->window == W->root)
|
|
else if(ev->window == W->root)
|