X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=68d511352201e9afe33b584ed4168be7bd558666;hb=ebf24d5224781e47b62cf20fb3852ef9782f200b;hp=dbb4ec68eb0b91874309d2ec4712618bf296743c;hpb=9e746b64390277e06c4be0b6afd863841cebed3e;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index dbb4ec68..68d51135 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -36,7 +36,13 @@ #include #endif +typedef struct +{ + gboolean ignored; +} ObEventData; + static void event_process(const XEvent *e, gpointer data); +static void event_done(gpointer data); static void event_handle_root(XEvent *e); static void event_handle_menu(XEvent *e); static void event_handle_dock(ObDock *s, XEvent *e); @@ -127,7 +133,7 @@ void event_startup(gboolean reconfig) } } - ob_main_loop_x_add(ob_main_loop, event_process, NULL, NULL); + ob_main_loop_x_add(ob_main_loop, event_process, event_done, NULL, NULL); #ifdef USE_SM IceAddConnectionWatch(ice_watch, NULL); @@ -278,24 +284,32 @@ static void event_hack_mods(XEvent *e) static gboolean event_ignore(XEvent *e, ObClient *client) { + gboolean ignore = FALSE; + XEvent ce; + switch(e->type) { case FocusIn: + while (XCheckTypedWindowEvent(ob_display, e->xfocus.window, + FocusIn, &ce)) + { + if (!INVALID_FOCUSIN(&ce)) { + XPutBackEvent(ob_display, &ce); + ignore = TRUE; + break; + } + } + /* NotifyAncestor is not ignored in FocusIn like it is in FocusOut because of RevertToPointerRoot. If the focus ends up reverting to pointer root on a workspace change, then the FocusIn event that we want will be of type NotifyAncestor. This situation does not occur for FocusOut, so it is safely ignored there. */ - if (INVALID_FOCUSIN(e) || - client == NULL) { + if (ignore || INVALID_FOCUSIN(e) || client == NULL) { #ifdef DEBUG_FOCUS - ob_debug("FocusIn on %lx mode %d detail %d IGNORED\n", - e->xfocus.window, e->xfocus.mode, e->xfocus.detail); + ob_debug("FocusIn on %lx mode %d detail %d IGNORED\n", + e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif - /* says a client was not found for the event (or a valid FocusIn - event was not found. - */ - e->xfocus.window = None; return TRUE; } @@ -305,10 +319,20 @@ static gboolean event_ignore(XEvent *e, ObClient *client) #endif break; case FocusOut: - if (INVALID_FOCUSOUT(e)) { + while (XCheckTypedWindowEvent(ob_display, e->xfocus.window, + FocusOut, &ce)) + { + if (!INVALID_FOCUSOUT(&ce)) { + XPutBackEvent(ob_display, &ce); + ignore = TRUE; + break; + } + } + + if (ignore || INVALID_FOCUSOUT(e)) { #ifdef DEBUG_FOCUS - ob_debug("FocusOut on %lx mode %d detail %d IGNORED\n", - e->xfocus.window, e->xfocus.mode, e->xfocus.detail); + ob_debug("FocusOut on %lx mode %d detail %d IGNORED\n", + e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif return TRUE; } @@ -317,80 +341,6 @@ static gboolean event_ignore(XEvent *e, ObClient *client) ob_debug("FocusOut on %lx mode %d detail %d\n", e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif - - { - XEvent fe; - gboolean fallback = TRUE; - - while (TRUE) { - if (!XCheckTypedWindowEvent(ob_display, e->xfocus.window, - FocusOut, &fe)) - if (!XCheckTypedEvent(ob_display, FocusIn, &fe)) - break; - if (fe.type == FocusOut) { -#ifdef DEBUG_FOCUS - ob_debug("found pending FocusOut\n"); -#endif - if (!INVALID_FOCUSOUT(&fe)) { - /* if there is a VALID FocusOut still coming, don't - fallback focus yet, we'll deal with it then */ - XPutBackEvent(ob_display, &fe); - fallback = FALSE; - break; - } - } else { -#ifdef DEBUG_FOCUS - ob_debug("found pending FocusIn\n"); -#endif - /* is the focused window getting a FocusOut/In back to - itself? - */ - if (fe.xfocus.window == e->xfocus.window && - !event_ignore(&fe, client)) { - /* - if focus_client is not set, then we can't do - this. we need the FocusIn. This happens in the - case when the set_focus_client(NULL) in the - focus_fallback function fires and then - focus_fallback picks the currently focused - window (such as on a SendToDesktop-esque action. - */ - if (focus_client) { -#ifdef DEBUG_FOCUS - ob_debug("focused window got an Out/In back to " - "itself IGNORED both\n"); -#endif - return TRUE; - } else { - event_process(&fe, NULL); -#ifdef DEBUG_FOCUS - ob_debug("focused window got an Out/In back to " - "itself but focus_client was null " - "IGNORED just the Out\n"); -#endif - return TRUE; - } - } - - /* once all the FocusOut's have been dealt with, if there - is a FocusIn still left and it is valid, then use it */ - event_process(&fe, NULL); - /* secret magic way of event_process telling us that no - client was found for the FocusIn event. ^_^ */ - if (fe.xfocus.window != None) { - fallback = FALSE; - break; - } - } - } - if (fallback) { -#ifdef DEBUG_FOCUS - ob_debug("no valid FocusIn and no FocusOut events found, " - "falling back\n"); -#endif - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); - } - } break; case EnterNotify: case LeaveNotify: @@ -404,7 +354,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) (e->xcrossing.detail == NotifyAncestor || e->xcrossing.detail == NotifyNonlinearVirtual || e->xcrossing.detail == NotifyVirtual))) { -#ifdef DEBUG_FOCUS +#ifdef aDEBUG_FOCUS ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n", (e->type == EnterNotify ? "Enter" : "Leave"), e->xcrossing.mode, @@ -412,7 +362,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) #endif return TRUE; } -#ifdef DEBUG_FOCUS +#ifdef aDEBUG_FOCUS ob_debug("%sNotify mode %d detail %d on %lx\n", (e->type == EnterNotify ? "Enter" : "Leave"), e->xcrossing.mode, @@ -432,6 +382,7 @@ static void event_process(const XEvent *ec, gpointer data) ObDockApp *dockapp = NULL; ObWindow *obwin = NULL; XEvent ee, *e; + ObEventData *ed = data; /* make a copy we can mangle */ ee = *ec; @@ -461,8 +412,12 @@ static void event_process(const XEvent *ec, gpointer data) event_set_lasttime(e); event_hack_mods(e); - if (event_ignore(e, client)) + if (event_ignore(e, client)) { + if (ed) + ed->ignored = TRUE; return; + } else if (ed) + ed->ignored = FALSE; /* deal with it in the kernel */ if (group) @@ -531,6 +486,12 @@ static void event_process(const XEvent *ec, gpointer data) } } +static void event_done(gpointer data) +{ + if (!focus_client) + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); +} + static void event_handle_root(XEvent *e) { Atom msgtype; @@ -636,27 +597,22 @@ static void event_handle_client(ObClient *client, XEvent *e) break; case FocusIn: #ifdef DEBUG_FOCUS - ob_debug("FocusIn on client for %lx\n", client->window); + ob_debug("Focus%s on client for %lx\n", (e->type==FocusIn?"In":"Out"), + client->window); #endif - if (client != focus_client) { + if (client != focus_client) focus_set_client(client); - frame_adjust_focus(client->frame, TRUE); - } + frame_adjust_focus(client->frame, e->type == FocusIn); break; case FocusOut: #ifdef DEBUG_FOCUS - ob_debug("FocusOut on client for %lx\n", client->window); + ob_debug("Focus%s on client for %lx\n", (e->type==FocusIn?"In":"Out"), + client->window); #endif - /* are we a fullscreen window or a transient of one? (checks layer) - if we are then we need to be iconified since we are losing focus - */ - if (client->layer == OB_STACKING_LAYER_FULLSCREEN && !client->iconic && - !client_search_focus_tree_full(client)) - /* iconify fullscreen windows when they and their transients - aren't focused */ - client_iconify(client, TRUE, TRUE); - frame_adjust_focus(client->frame, FALSE); - break; + if (client == focus_client) + focus_client = NULL; + frame_adjust_focus(client->frame, e->type == FocusIn); + break; case LeaveNotify: con = frame_context(client, e->xcrossing.window); switch (con) { @@ -719,7 +675,7 @@ static void event_handle_client(ObClient *client, XEvent *e) case OB_FRAME_CONTEXT_FRAME: if (client_normal(client)) { if (config_focus_follow) { -#ifdef DEBUG_FOCUS +#ifdef aDEBUG_FOCUS ob_debug("EnterNotify on %lx, focusing window\n", client->window); #endif @@ -1167,6 +1123,16 @@ static void event_handle_menu(XEvent *ev) ev->xmotion.y_root))) menu_frame_select(f, e); } + { + ObMenuFrame *a; + + a = find_active_menu(); + if (a && a != f && + a->selected->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU) + { + menu_frame_select(a, NULL); + } + } break; case KeyPress: if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))