X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=2d1445192df91a2d2373e56ca88172906670bbda;hb=d447dc0f59619d26073699d9f81d7de77c200be4;hp=88db5e9e5e4fa417f11313efdf985823e3b57356;hpb=3b14b587ef8131cbeb2afb2c11240f50c5f5d02b;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 88db5e9e..2d144519 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,5 +1,6 @@ #include "openbox.h" #include "client.h" +#include "config.h" #include "xerror.h" #include "prop.h" #include "screen.h" @@ -135,18 +136,21 @@ void event_process(XEvent *e) window = e->xconfigurerequest.window; break; default: - /* XKB events */ - if (e->type == extensions_xkb_event_basep) { +#ifdef XKB + if (extensions_xkb && e->type == extensions_xkb_event_basep) { switch (((XkbAnyEvent*)&e)->xkb_type) { case XkbBellNotify: window = ((XkbBellNotifyEvent*)&e)->window; default: window = None; } - } else - window = e->xany.window; + } else +#endif + 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: @@ -219,45 +223,72 @@ 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)) + g_message("FocusIn on %lx mode %d detail %d", window, + e->xfocus.mode, e->xfocus.detail); + /* 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; - g_message("FOCUS IN %lx", window); + } + + g_message("FocusIn on %lx", window); break; case FocusOut: + g_message("FocusOut on %lx mode %d detail %d", window, + e->xfocus.mode, e->xfocus.detail); if (e->xfocus.mode == NotifyGrab || - !(e->xfocus.detail == NotifyNonlinearVirtual || - e->xfocus.detail == NotifyNonlinear)) - return; + e->xfocus.detail == NotifyInferior || + e->xfocus.detail == NotifyAncestor || + e->xfocus.detail > NotifyNonlinearVirtual) return; - /* FocusOut events just make us look for FocusIn events. They - are mostly ignored otherwise. */ + g_message("FocusOut on %lx", window); + /* 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)) { - g_message("FOCUS OUT %lx IN %lx", e->xfocus.window, fi.xfocus.window); 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 { - g_message("FOCUS OUT %lx IN 0x0", e->xfocus.window); - } + } else + focus_fallback(FALSE); } break; case EnterNotify: case LeaveNotify: event_lasttime = e->xcrossing.time; - /* XXX this caused problems before... but i don't remember why. hah. - so back it is. if problems arise again, then try filtering on the - detail instead of the mode. */ - if (e->xcrossing.mode != NotifyNormal) return; + /* NotifyUngrab occurs when a mouse button is released and the event is + 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, (gpointer)window); - /* deal with it in the kernel */ if (client) event_handle_client(client, e); @@ -278,8 +309,6 @@ void event_process(XEvent *e) xwc.sibling = e->xconfigurerequest.above; xwc.stack_mode = e->xconfigurerequest.detail; - g_message("Proxying configure event for 0x%lx", window); - /* we are not to be held responsible if someone sends us an invalid request! */ xerror_set_ignore(TRUE); @@ -303,7 +332,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]; @@ -326,17 +355,42 @@ 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: - client_set_focused(client, e->type == FocusIn); + g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"), + client->window); + /* 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 (!config_get("focusFollowsMouse",Config_Bool,&focus_follow)) + g_assert_not_reached(); + if (focus_follow.bool) + client_focus(client); + } + } + break; case ConfigureRequest: - g_message("ConfigureRequest for window %lx", client->window); /* compress these */ while (XCheckTypedWindowEvent(ob_display, client->window, ConfigureRequest, &ce)) { + ++i; /* XXX if this causes bad things.. we can compress config req's with the same mask. */ e->xconfigurerequest.value_mask |= @@ -355,6 +409,7 @@ 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; @@ -416,11 +471,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: @@ -441,6 +494,8 @@ static void event_handle_client(Client *client, XEvent *e) client_unmanage(client); break; case MapRequest: + if (!client->iconic) break; /* this normally doesn't happen, but if it + does, we don't want it! */ if (screen_showing_desktop) screen_show_desktop(FALSE); client_iconify(client, FALSE, TRUE); @@ -486,7 +541,10 @@ static void event_handle_client(Client *client, XEvent *e) } e->xclient = ce.xclient; } - client_set_desktop(client, 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", @@ -564,5 +622,13 @@ static void event_handle_client(Client *client, XEvent *e) client_update_icons(client); else if (msgtype == prop_atoms.kwm_win_icon) client_update_kwm_icon(client); + default: + ; +#ifdef SHAPE + if (extensions_shape && e->type == extensions_shape_event_basep) { + client->shaped = ((XShapeEvent*)e)->shaped; + engine_frame_adjust_shape(client->frame); + } +#endif } }