X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=7473ab59cea21ea8d8943473137a83f1af776560;hb=e9d875cf832f01b60be51270c7a95f2394924f52;hp=d1611f9e351bccd0fafc74a2a2d4e2f6a1856022;hpb=3139c3c7132e326e82183feb6fcea8dd38e6b41e;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index d1611f9e..7473ab59 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,8 +1,8 @@ #include "openbox.h" #include "client.h" -#include "config.h" #include "xerror.h" #include "prop.h" +#include "config.h" #include "screen.h" #include "frame.h" #include "engine.h" @@ -149,6 +149,8 @@ void event_process(XEvent *e) window = e->xany.window; } + client = g_hash_table_lookup(client_map, &window); + /* grab the lasttime and hack up the state */ switch (e->type) { case ButtonPress: @@ -221,32 +223,66 @@ void event_process(XEvent *e) event_lasttime = e->xproperty.time; break; case FocusIn: +#ifdef DEBUG_FOCUS g_message("FocusIn on %lx mode %d detail %d", window, e->xfocus.mode, e->xfocus.detail); +#endif + /* 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 (e->xfocus.detail == NotifyInferior || - e->xfocus.detail == NotifyAncestor || - e->xfocus.detail > NotifyNonlinearVirtual) return; - g_message("FocusIn on %lx", window); + e->xfocus.detail > NotifyNonlinearVirtual || + client == NULL) { + /* says a client was not found for the event (or a valid FocusIn + event was not found. + */ + e->xfocus.window = None; + return; + } + +#ifdef DEBUG_FOCUS + g_message("FocusIn on %lx", window); +#endif break; case FocusOut: +#ifdef DEBUG_FOCUS g_message("FocusOut on %lx mode %d detail %d", window, e->xfocus.mode, e->xfocus.detail); - if (e->xfocus.detail == NotifyInferior || +#endif + if (e->xfocus.mode == NotifyGrab || + e->xfocus.detail == NotifyInferior || e->xfocus.detail == NotifyAncestor || e->xfocus.detail > NotifyNonlinearVirtual) return; - - g_message("FocusOut on %lx", window); - /* FocusOut events just make us look for FocusIn events. They - are mostly ignored otherwise. */ + +#ifdef DEBUG_FOCUS + g_message("FocusOut on %lx", window); +#endif + /* Try process a FocusIn first, and if a legit one isn't found, then + do the fallback shiznit. */ { - XEvent fi; + XEvent fi, fo; + gboolean isfo = FALSE; + if (XCheckTypedEvent(ob_display, FocusIn, &fi)) { event_process(&fi); + /* when we have gotten a fi/fo pair, then see if there are any + more fo's coming. if there are, then don't fallback just yet + */ + if ((isfo = XCheckTypedEvent(ob_display, FocusOut, &fo))) + XPutBackEvent(ob_display, &fo); + + /* secret magic way of event_process telling us that no client + was found for the FocusIn event. ^_^ */ + if (!isfo && fi.xfocus.window == None) + focus_fallback(Fallback_NoFocus); if (fi.xfocus.window == e->xfocus.window) return; } else - focus_set_client(NULL); + focus_fallback(Fallback_NoFocus); } break; case EnterNotify: @@ -254,15 +290,15 @@ void event_process(XEvent *e) event_lasttime = e->xcrossing.time; /* NotifyUngrab occurs when a mouse button is released and the event is caused, like when lowering a window */ - if (e->xcrossing.mode == NotifyGrab) return; + if (e->xcrossing.mode == NotifyGrab || + e->xcrossing.detail == NotifyInferior) + return; break; default: event_lasttime = CurrentTime; break; } - client = g_hash_table_lookup(client_map, &window); - /* deal with it in the kernel */ if (client) event_handle_client(client, e); @@ -330,30 +366,36 @@ static void event_handle_client(Client *client, XEvent *e) XEvent ce; Atom msgtype; int i=0; - ConfigValue focus_follow; switch (e->type) { case FocusIn: focus_set_client(client); case FocusOut: +#ifdef DEBUG_FOCUS g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"), client->window); +#endif /* focus state can affect the stacking layer */ client_calc_layer(client); engine_frame_adjust_focus(client->frame); break; case EnterNotify: - if (ob_state == State_Starting) { - /* move it to the top of the focus order */ - guint desktop = client->desktop; - if (desktop == DESKTOP_ALL) desktop = screen_desktop; - focus_order[desktop] = g_list_remove(focus_order[desktop], client); - focus_order[desktop] = g_list_prepend(focus_order[desktop],client); - } else { - if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow)) - g_assert_not_reached(); - if (focus_follow.bool) + if (client_normal(client)) { + if (ob_state == State_Starting) { + /* move it to the top of the focus order */ + guint desktop = client->desktop; + if (desktop == DESKTOP_ALL) desktop = screen_desktop; + focus_order[desktop] = g_list_remove(focus_order[desktop], + client); + focus_order[desktop] = g_list_prepend(focus_order[desktop], + client); + } else if (config_focus_follow) { +#ifdef DEBUG_FOCUS + g_message("EnterNotify on %lx, focusing window", + client->window); +#endif client_focus(client); + } } break; case ConfigureRequest: @@ -379,7 +421,6 @@ static void event_handle_client(Client *client, XEvent *e) if (ce.xconfigurerequest.value_mask & CWStackMode) e->xconfigurerequest.detail = ce.xconfigurerequest.detail; } - if (i) g_message("Compressed %d Configures", i); /* if we are iconic (or shaded (fvwm does this)) ignore the event */ if (client->iconic || client->shaded) return; @@ -513,7 +554,8 @@ static void event_handle_client(Client *client, XEvent *e) } if ((unsigned)e->xclient.data.l[0] < screen_num_desktops || (unsigned)e->xclient.data.l[0] == DESKTOP_ALL) - client_set_desktop(client, (unsigned)e->xclient.data.l[0]); + client_set_desktop(client, (unsigned)e->xclient.data.l[0], + FALSE); } else if (msgtype == prop_atoms.net_wm_state) { /* can't compress these */ g_message("net_wm_state %s %ld %ld for 0x%lx",