X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=fa5f29ffdd3e18cfba2770b52307d850f4525d98;hb=106d5630bfac19eaa5b402bd1ee06d4d41cf7f28;hp=ab0f8d8b3945563b5e2e0dd73c64b182a94b2b0a;hpb=137efd1367704aa39d139b59930c3d103ca7143f;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index ab0f8d8b..fa5f29ff 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -135,16 +135,17 @@ 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; } /* grab the lasttime and hack up the state */ @@ -219,25 +220,16 @@ void event_process(XEvent *e) event_lasttime = e->xproperty.time; break; case FocusIn: - if (e->xfocus.mode == NotifyGrab) return; -/* if (e->type == FocusIn && window == focus_backup && focus_client != NULL) { -*/ - /* Something's focused but we got a focus event for the backup - window. this means that something unfocused before we received - the new FocusIn. Just ignore it, and refocus what should be - focused! */ -/* client_focus(focus_client); + if (e->xfocus.mode == NotifyGrab || + !(e->xfocus.detail == NotifyNonlinearVirtual || + e->xfocus.detail == NotifyNonlinear)) return; - } -*/ break; case FocusOut: - if (e->xfocus.mode == NotifyGrab) return; - /*|| e.xfocus.mode == NotifyUngrab ||*/ - /* From Metacity, from WindowMaker, ignore all funky pointer - root events. Its commented out cuz I don't think we need this - at all. If problems arise we can look into it */ - /*e.xfocus.detail > NotifyNonlinearVirtual) */ + 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. */ @@ -245,23 +237,22 @@ void event_process(XEvent *e) XEvent fi; if (XCheckTypedEvent(ob_display, FocusIn, &fi)) { event_process(&fi); - /* dont unfocus the window we just focused! */ - if (fi.xfocus.window == e->xfocus.window) - return; - } + + if (fi.xfocus.window == e->xfocus.window) + return; + } } 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; } - client = g_hash_table_lookup(client_map, (gpointer)window); + client = g_hash_table_lookup(client_map, &window); /* deal with it in the kernel */ if (client) @@ -283,8 +274,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); @@ -308,7 +297,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]; @@ -331,31 +320,18 @@ static void event_handle_client(Client *client, XEvent *e) { XEvent ce; Atom msgtype; + int i=0; switch (e->type) { case FocusIn: - if (focus_client != client) - focus_set_client(client); - - /* focus state can affect the stacking layer */ - client_calc_layer(client); - - engine_frame_adjust_focus(client->frame); - break; case FocusOut: - if (focus_client == client) - focus_set_client(NULL); - - /* focus state can affect the stacking layer */ - client_calc_layer(client); - - engine_frame_adjust_focus(client->frame); + client_set_focused(client, e->type == FocusIn); 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 |= @@ -374,6 +350,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; @@ -435,11 +412,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: @@ -460,6 +435,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); @@ -505,10 +482,12 @@ 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]); } else if (msgtype == prop_atoms.net_wm_state) { /* can't compress these */ - g_message("net_wm_state %s %ld %ld for 0x%lx\n", + g_message("net_wm_state %s %ld %ld for 0x%lx", (e->xclient.data.l[0] == 0 ? "Remove" : e->xclient.data.l[0] == 1 ? "Add" : e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"), @@ -517,10 +496,10 @@ static void event_handle_client(Client *client, XEvent *e) client_set_state(client, e->xclient.data.l[0], e->xclient.data.l[1], e->xclient.data.l[2]); } else if (msgtype == prop_atoms.net_close_window) { - g_message("net_close_window for 0x%lx\n", client->window); + g_message("net_close_window for 0x%lx", client->window); client_close(client); } else if (msgtype == prop_atoms.net_active_window) { - g_message("net_active_window for 0x%lx\n", client->window); + g_message("net_active_window for 0x%lx", client->window); if (screen_showing_desktop) screen_show_desktop(FALSE); if (client->iconic) @@ -583,5 +562,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 } }