revert r6029, as it didnt fix anything. however this patch does fix the aforementioned problem. actions need some reworking... yeah... later...
Dana Jansens danakj@orodu.net
3 files changed,
15 insertions(+),
2 deletions(-)
M
openbox/action.c
→
openbox/action.c
@@ -1098,6 +1098,17 @@ moveresize starts. UGLY HACK XXX */
if (a->data.any.interactive || a->func == action_moveresize) { /* interactive actions are not queued */ a->func(&a->data); + } else if (context == OB_FRAME_CONTEXT_CLIENT || + (c && c->type == OB_CLIENT_TYPE_DESKTOP && + context == OB_FRAME_CONTEXT_DESKTOP)) { + /* XXX MORE UGLY HACK + actions from clicks on client windows are NOT queued. + this solves the mysterious click-and-drag-doesnt-work + problem. it was because the window gets focused and stuff + after the button event has already been passed through. i + dont really know why it should care but it does and it makes + a difference. */ + a->func(&a->data); } else ob_main_loop_queue_action(ob_main_loop, a); }
M
openbox/client.c
→
openbox/client.c
@@ -262,7 +262,9 @@ ob_debug("Managing window: %lx\n", window);
/* choose the events we want to receive on the CLIENT window */ attrib_set.event_mask = CLIENT_EVENTMASK; - XChangeWindowAttributes(ob_display, window, CWEventMask, &attrib_set); + attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK; + XChangeWindowAttributes(ob_display, window, + CWEventMask|CWDontPropagate, &attrib_set); /* create the ObClient struct, and populate it from the hints on the
M
openbox/mouse.c
→
openbox/mouse.c
@@ -108,7 +108,7 @@ win = client->frame->window;
mode = GrabModeAsync; mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; } else if (CLIENT_CONTEXT(i, client)) { - win = client->window; + win = client->frame->plate; mode = GrabModeSync; /* this is handled in event */ mask = ButtonPressMask; /* can't catch more than this with Sync mode the release event is