X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=2d548d9e6d018fac18ee93bf82a727344f355966;hb=3cbf5bfa7c42c8dace6ca3f31fe48078eeb66382;hp=0c2b4c394984b107dcf6213f2274f80ac89f6d66;hpb=059fa15ae1ae564607e1d4b01559487dcf25b13a;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 0c2b4c39..2d548d9e 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -148,6 +148,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: @@ -220,27 +222,66 @@ void event_process(XEvent *e) event_lasttime = e->xproperty.time; break; case FocusIn: - if (e->xfocus.mode == NotifyGrab || - !(e->xfocus.detail == NotifyNonlinearVirtual || - e->xfocus.detail == NotifyNonlinear)) +#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 > 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); +#endif if (e->xfocus.mode == NotifyGrab || - !(e->xfocus.detail == NotifyNonlinearVirtual || - e->xfocus.detail == NotifyNonlinear)) - return; - - /* FocusOut events just make us look for FocusIn events. They - are mostly ignored otherwise. */ + e->xfocus.detail == NotifyInferior || + e->xfocus.detail == NotifyAncestor || + e->xfocus.detail > NotifyNonlinearVirtual) return; + +#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(FALSE); if (fi.xfocus.window == e->xfocus.window) return; - } + } else + focus_fallback(FALSE); } break; case EnterNotify: @@ -250,10 +291,11 @@ void event_process(XEvent *e) caused, like when lowering a window */ if (e->xcrossing.mode == NotifyGrab) 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); @@ -297,7 +339,7 @@ static void event_handle_root(XEvent *e) msgtype = e->xclient.message_type; if (msgtype == prop_atoms.net_current_desktop) { unsigned int d = e->xclient.data.l[0]; - if (d <= screen_num_desktops) + if (d < screen_num_desktops) screen_set_desktop(d); } else if (msgtype == prop_atoms.net_number_of_desktops) { unsigned int d = e->xclient.data.l[0]; @@ -320,13 +362,34 @@ static void event_handle_client(Client *client, XEvent *e) { XEvent ce; Atom msgtype; - int i=0; + int i=0; switch (e->type) { case FocusIn: + focus_set_client(client); case FocusOut: - client_set_focused(client, e->type == FocusIn); +#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 (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 (focus_follow) + client_focus(client); + } + break; case ConfigureRequest: /* compress these */ while (XCheckTypedWindowEvent(ob_display, client->window, @@ -412,11 +475,9 @@ static void event_handle_client(Client *client, XEvent *e) client->ignore_unmaps--; break; } - g_message("UnmapNotify for %lx", client->window); client_unmanage(client); break; case DestroyNotify: - g_message("DestroyNotify for %lx", client->window); client_unmanage(client); break; case ReparentNotify: @@ -484,8 +545,10 @@ static void event_handle_client(Client *client, XEvent *e) } e->xclient = ce.xclient; } - if ((unsigned)e->xclient.data.l[0] < screen_num_desktops) - client_set_desktop(client, (unsigned)e->xclient.data.l[0]); + 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], + FALSE); } else if (msgtype == prop_atoms.net_wm_state) { /* can't compress these */ g_message("net_wm_state %s %ld %ld for 0x%lx",