X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=05024e72a9a59eaffc83debe8ef1461ebab86654;hb=055aa5cd7411c4563956e376523219afc6198ce1;hp=6503ba0af288e058c8b99ff1b7246d186ac5490d;hpb=43dabc2b9b54de4e76b9c96c6a36e3e0cf6b4ce6;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 6503ba0a..05024e72 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,19 +1,19 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - event.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens +event.c for the Openbox window manager +Copyright (c) 2003 Ben Jansens - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - See the COPYING file for a copy of the GNU General Public License. +See the COPYING file for a copy of the GNU General Public License. */ #include "event.h" @@ -55,12 +55,9 @@ #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_client_dest(ObClient *client, 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); @@ -73,14 +70,6 @@ static void focus_delay_client_dest(ObClient *client, gpointer data); static gboolean menu_hide_delay_func(gpointer data); -#define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \ - (e)->xfocus.detail == NotifyAncestor || \ - (e)->xfocus.detail > NotifyNonlinearVirtual) -#define INVALID_FOCUSOUT(e) ((e)->xfocus.mode == NotifyGrab || \ - (e)->xfocus.detail == NotifyInferior || \ - (e)->xfocus.detail == NotifyAncestor || \ - (e)->xfocus.detail > NotifyNonlinearVirtual) - Time event_lasttime = 0; /*! The value of the mask for the NumLock modifier */ @@ -100,6 +89,8 @@ static guint ignore_enter_focus = 0; static gboolean menu_can_hide; +static ObClient *focus_in, *focus_out; + #ifdef USE_SM static void ice_handler(int fd, gpointer conn) { @@ -132,32 +123,33 @@ void event_startup(gboolean reconfig) modmap = XGetModifierMapping(ob_display); g_assert(modmap); if (modmap && modmap->max_keypermod > 0) { - size_t cnt; - const size_t size = mask_table_size * modmap->max_keypermod; - /* get the values of the keyboard lock modifiers - Note: Caps lock is not retrieved the same way as Scroll and Num - lock since it doesn't need to be. */ - const KeyCode num_lock = XKeysymToKeycode(ob_display, XK_Num_Lock); - const KeyCode scroll_lock = XKeysymToKeycode(ob_display, - XK_Scroll_Lock); + size_t cnt; + const size_t size = mask_table_size * modmap->max_keypermod; + /* get the values of the keyboard lock modifiers + Note: Caps lock is not retrieved the same way as Scroll and Num + lock since it doesn't need to be. */ + const KeyCode num_lock = XKeysymToKeycode(ob_display, XK_Num_Lock); + const KeyCode scroll_lock = XKeysymToKeycode(ob_display, + XK_Scroll_Lock); - for (cnt = 0; cnt < size; ++cnt) { - if (! modmap->modifiermap[cnt]) continue; + for (cnt = 0; cnt < size; ++cnt) { + if (! modmap->modifiermap[cnt]) continue; - if (num_lock == modmap->modifiermap[cnt]) - NumLockMask = mask_table[cnt / modmap->max_keypermod]; - if (scroll_lock == modmap->modifiermap[cnt]) - ScrollLockMask = mask_table[cnt / modmap->max_keypermod]; - } + if (num_lock == modmap->modifiermap[cnt]) + NumLockMask = mask_table[cnt / modmap->max_keypermod]; + if (scroll_lock == modmap->modifiermap[cnt]) + ScrollLockMask = mask_table[cnt / modmap->max_keypermod]; + } } - 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); #endif client_add_destructor(focus_delay_client_dest, NULL); + client_add_destructor(event_client_dest, NULL); } void event_shutdown(gboolean reconfig) @@ -182,29 +174,29 @@ static Window event_get_window(XEvent *e) window = RootWindow(ob_display, ob_screen); break; case MapRequest: - window = e->xmap.window; - break; + window = e->xmap.window; + break; case UnmapNotify: - window = e->xunmap.window; - break; + window = e->xunmap.window; + break; case DestroyNotify: - window = e->xdestroywindow.window; - break; + window = e->xdestroywindow.window; + break; case ConfigureRequest: - window = e->xconfigurerequest.window; - break; + window = e->xconfigurerequest.window; + break; case ConfigureNotify: window = e->xconfigure.window; break; default: #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; - } + if (extensions_xkb && e->type == extensions_xkb_event_basep) { + switch (((XkbAnyEvent*)e)->xkb_type) { + case XkbBellNotify: + window = ((XkbBellNotifyEvent*)e)->window; + default: + window = None; + } } else #endif window = e->xany.window; @@ -220,24 +212,24 @@ static void event_set_lasttime(XEvent *e) switch (e->type) { case ButtonPress: case ButtonRelease: - t = e->xbutton.time; - break; + t = e->xbutton.time; + break; case KeyPress: - t = e->xkey.time; - break; + t = e->xkey.time; + break; case KeyRelease: - t = e->xkey.time; - break; + t = e->xkey.time; + break; case MotionNotify: - t = e->xmotion.time; - break; + t = e->xmotion.time; + break; case PropertyNotify: - t = e->xproperty.time; - break; + t = e->xproperty.time; + break; case EnterNotify: case LeaveNotify: - t = e->xcrossing.time; - break; + t = e->xcrossing.time; + break; default: /* if more event types are anticipated, get their timestamp explicitly */ @@ -263,31 +255,31 @@ static void event_hack_mods(XEvent *e) case ButtonPress: case ButtonRelease: STRIP_MODS(e->xbutton.state); - break; + break; case KeyPress: STRIP_MODS(e->xkey.state); - break; + break; case KeyRelease: STRIP_MODS(e->xkey.state); - /* remove from the state the mask of the modifier being released, if - it is a modifier key being released (this is a little ugly..) */ - kp = modmap->modifiermap; - for (i = 0; i < mask_table_size; ++i) { - for (k = 0; k < modmap->max_keypermod; ++k) { - if (*kp == e->xkey.keycode) { /* found the keycode */ - /* remove the mask for it */ - e->xkey.state &= ~mask_table[i]; - /* cause the first loop to break; */ - i = mask_table_size; - break; /* get outta here! */ - } - ++kp; - } - } - break; + /* remove from the state the mask of the modifier being released, if + it is a modifier key being released (this is a little ugly..) */ + kp = modmap->modifiermap; + for (i = 0; i < mask_table_size; ++i) { + for (k = 0; k < modmap->max_keypermod; ++k) { + if (*kp == e->xkey.keycode) { /* found the keycode */ + /* remove the mask for it */ + e->xkey.state &= ~mask_table[i]; + /* cause the first loop to break; */ + i = mask_table_size; + break; /* get outta here! */ + } + ++kp; + } + } + break; case MotionNotify: STRIP_MODS(e->xmotion.state); - /* compress events */ + /* compress events */ { XEvent ce; while (XCheckTypedWindowEvent(ob_display, e->xmotion.window, @@ -295,8 +287,8 @@ static void event_hack_mods(XEvent *e) e->xmotion.x_root = ce.xmotion.x_root; e->xmotion.y_root = ce.xmotion.y_root; } - } - break; + } + break; } } @@ -309,126 +301,66 @@ static gboolean event_ignore(XEvent *e, ObClient *client) return TRUE; break; case FocusIn: - /* 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) { -#ifdef DEBUG_FOCUS - 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; + if (e->xfocus.detail > NotifyNonlinearVirtual) return TRUE; - } - -#ifdef DEBUG_FOCUS - ob_debug("FocusIn on %lx mode %d detail %d\n", e->xfocus.window, - e->xfocus.mode, e->xfocus.detail); -#endif break; case FocusOut: - if (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); -#endif + if (e->xfocus.detail > NotifyNonlinearVirtual) return TRUE; - } + if (e->xfocus.detail == NotifyInferior || + e->xfocus.mode == NotifyGrab) + return TRUE; + break; + } + return FALSE; +} -#ifdef DEBUG_FOCUS - ob_debug("FocusOut on %lx mode %d detail %d\n", - e->xfocus.window, e->xfocus.mode, e->xfocus.detail); -#endif +static void event_client_dest(ObClient *client, gpointer data) +{ + if (client == focus_in) + focus_in = NULL; + if (client == focus_out) + focus_out = NULL; + if (client == focus_hilite) + focus_hilite = NULL; +} - { - 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; - } - } - - { - ObEventData d; - - /* 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, &d); - if (!d.ignored) { -#ifdef DEBUG_FOCUS - ob_debug("FocusIn was OK, so don't fallback\n"); -#endif - 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); - } +static void event_done(gpointer data) +{ + static ObClient *last = NULL; + + /* sometimes focus_hilite can be on an unfocused window, this make sure + it loses its focus hilite when focus moves */ + if (focus_hilite && + (focus_in && focus_hilite != focus_in) && + (focus_out && focus_hilite != focus_out)) + { + frame_adjust_focus(focus_hilite->frame, FALSE); + } + + if (focus_in) { + if (focus_in != focus_client) { + focus_set_client(focus_in); + frame_adjust_focus(focus_in->frame, TRUE); + client_calc_layer(focus_in); } - break; + } + if (focus_out) { + if (focus_out == focus_client) + focus_set_client(NULL); + frame_adjust_focus(focus_out->frame, FALSE); + client_calc_layer(focus_out); } - return FALSE; + + focus_hilite = focus_in; + + if (focus_client != last) { + if (!focus_client) + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + last = focus_client; + } + + focus_in = focus_out = NULL; } static void event_process(const XEvent *ec, gpointer data) @@ -440,7 +372,6 @@ 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; @@ -470,45 +401,41 @@ static void event_process(const XEvent *ec, gpointer data) event_set_lasttime(e); event_hack_mods(e); - if (event_ignore(e, client)) { - if (ed) - ed->ignored = TRUE; + if (event_ignore(e, client)) return; - } else if (ed) - ed->ignored = FALSE; /* deal with it in the kernel */ if (group) - event_handle_group(group, e); + event_handle_group(group, e); else if (client) - event_handle_client(client, e); + event_handle_client(client, e); else if (dockapp) - event_handle_dockapp(dockapp, e); + event_handle_dockapp(dockapp, e); else if (dock) - event_handle_dock(dock, e); + event_handle_dock(dock, e); else if (window == RootWindow(ob_display, ob_screen)) - event_handle_root(e); + event_handle_root(e); else if (e->type == MapRequest) - client_manage(window); + client_manage(window); else if (e->type == ConfigureRequest) { - /* unhandled configure requests must be used to configure the - window directly */ - XWindowChanges xwc; + /* unhandled configure requests must be used to configure the + window directly */ + XWindowChanges xwc; - xwc.x = e->xconfigurerequest.x; - xwc.y = e->xconfigurerequest.y; - xwc.width = e->xconfigurerequest.width; - xwc.height = e->xconfigurerequest.height; - xwc.border_width = e->xconfigurerequest.border_width; - xwc.sibling = e->xconfigurerequest.above; - xwc.stack_mode = e->xconfigurerequest.detail; + xwc.x = e->xconfigurerequest.x; + xwc.y = e->xconfigurerequest.y; + xwc.width = e->xconfigurerequest.width; + xwc.height = e->xconfigurerequest.height; + xwc.border_width = e->xconfigurerequest.border_width; + xwc.sibling = e->xconfigurerequest.above; + xwc.stack_mode = e->xconfigurerequest.detail; - /* we are not to be held responsible if someone sends us an - invalid request! */ - xerror_set_ignore(TRUE); - XConfigureWindow(ob_display, window, - e->xconfigurerequest.value_mask, &xwc); - xerror_set_ignore(FALSE); + /* we are not to be held responsible if someone sends us an + invalid request! */ + xerror_set_ignore(TRUE); + XConfigureWindow(ob_display, window, + e->xconfigurerequest.value_mask, &xwc); + xerror_set_ignore(FALSE); } /* user input (action-bound) events */ @@ -538,11 +465,9 @@ static void event_process(const XEvent *ec, gpointer data) e->type == MotionNotify) mouse_event(client, e); else if (e->type == KeyPress) - /* when in the middle of a focus cycling action, this - causes the window which appears to be focused to be - the one on which the actions will be executed */ - keyboard_event((focus_cycle_target ? - focus_cycle_target : client), e); + keyboard_event((focus_cycle_target ? focus_cycle_target : + (focus_hilite ? focus_hilite : client)), + e); } } } @@ -559,27 +484,27 @@ static void event_handle_root(XEvent *e) break; case ClientMessage: - if (e->xclient.format != 32) break; - - 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) - screen_set_desktop(d); - } else if (msgtype == prop_atoms.net_number_of_desktops) { - unsigned int d = e->xclient.data.l[0]; - if (d > 0) - screen_set_num_desktops(d); - } else if (msgtype == prop_atoms.net_showing_desktop) { - screen_show_desktop(e->xclient.data.l[0] != 0); - } - break; + if (e->xclient.format != 32) break; + + 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) + screen_set_desktop(d); + } else if (msgtype == prop_atoms.net_number_of_desktops) { + unsigned int d = e->xclient.data.l[0]; + if (d > 0) + screen_set_num_desktops(d); + } else if (msgtype == prop_atoms.net_showing_desktop) { + screen_show_desktop(e->xclient.data.l[0] != 0); + } + break; case PropertyNotify: - if (e->xproperty.atom == prop_atoms.net_desktop_names) - screen_update_desktop_names(); - else if (e->xproperty.atom == prop_atoms.net_desktop_layout) - screen_update_layout(); - break; + if (e->xproperty.atom == prop_atoms.net_desktop_names) + screen_update_desktop_names(); + else if (e->xproperty.atom == prop_atoms.net_desktop_layout) + screen_update_layout(); + break; case ConfigureNotify: #ifdef XRANDR XRRUpdateConfiguration(e); @@ -669,20 +594,23 @@ 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("FocusIn on client for %lx (client %lx) mode %d detail %d\n", + e->xfocus.window, client->window, + e->xfocus.mode, e->xfocus.detail); #endif - if (client != focus_client) { - focus_set_client(client); - frame_adjust_focus(client->frame, TRUE); - client_calc_layer(client); - } + focus_in = client; + if (focus_out == client) + focus_out = NULL; break; case FocusOut: #ifdef DEBUG_FOCUS - ob_debug("FocusOut on client for %lx\n", client->window); + ob_debug("FocusOut on client for %lx (client %lx) mode %d detail %d\n", + e->xfocus.window, client->window, + e->xfocus.mode, e->xfocus.detail); #endif - frame_adjust_focus(client->frame, FALSE); - client_calc_layer(client); + focus_out = client; + if (focus_in == client) + focus_in = NULL; break; case LeaveNotify: con = frame_context(client, e->xcrossing.window); @@ -708,12 +636,10 @@ static void event_handle_client(ObClient *client, XEvent *e) frame_adjust_state(client->frame); break; case OB_FRAME_CONTEXT_FRAME: - /* if (config_focus_follow && config_focus_delay) ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, client); - */ break; default: break; @@ -763,10 +689,11 @@ static void event_handle_client(ObClient *client, XEvent *e) } else { #ifdef DEBUG_FOCUS ob_debug("%sNotify mode %d detail %d on %lx, " - "focusing window\n", + "focusing window: %d\n", (e->type == EnterNotify ? "Enter" : "Leave"), e->xcrossing.mode, - e->xcrossing.detail, client?client->window:0); + e->xcrossing.detail, (client?client->window:0), + !nofocus); #endif if (!nofocus && config_focus_follow) event_enter_client(client); @@ -778,50 +705,50 @@ static void event_handle_client(ObClient *client, XEvent *e) break; } case ConfigureRequest: - /* compress these */ - while (XCheckTypedWindowEvent(ob_display, client->window, - ConfigureRequest, &ce)) { + /* 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 |= - ce.xconfigurerequest.value_mask; - if (ce.xconfigurerequest.value_mask & CWX) - e->xconfigurerequest.x = ce.xconfigurerequest.x; - if (ce.xconfigurerequest.value_mask & CWY) - e->xconfigurerequest.y = ce.xconfigurerequest.y; - if (ce.xconfigurerequest.value_mask & CWWidth) - e->xconfigurerequest.width = ce.xconfigurerequest.width; - if (ce.xconfigurerequest.value_mask & CWHeight) - e->xconfigurerequest.height = ce.xconfigurerequest.height; - if (ce.xconfigurerequest.value_mask & CWBorderWidth) - e->xconfigurerequest.border_width = - ce.xconfigurerequest.border_width; - if (ce.xconfigurerequest.value_mask & CWStackMode) - e->xconfigurerequest.detail = ce.xconfigurerequest.detail; - } - - /* if we are iconic (or shaded (fvwm does this)) ignore the event */ - if (client->iconic || client->shaded) return; - - /* resize, then move, as specified in the EWMH section 7.7 */ - if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight | - CWX | CWY | + /* XXX if this causes bad things.. we can compress config req's + with the same mask. */ + e->xconfigurerequest.value_mask |= + ce.xconfigurerequest.value_mask; + if (ce.xconfigurerequest.value_mask & CWX) + e->xconfigurerequest.x = ce.xconfigurerequest.x; + if (ce.xconfigurerequest.value_mask & CWY) + e->xconfigurerequest.y = ce.xconfigurerequest.y; + if (ce.xconfigurerequest.value_mask & CWWidth) + e->xconfigurerequest.width = ce.xconfigurerequest.width; + if (ce.xconfigurerequest.value_mask & CWHeight) + e->xconfigurerequest.height = ce.xconfigurerequest.height; + if (ce.xconfigurerequest.value_mask & CWBorderWidth) + e->xconfigurerequest.border_width = + ce.xconfigurerequest.border_width; + if (ce.xconfigurerequest.value_mask & CWStackMode) + e->xconfigurerequest.detail = ce.xconfigurerequest.detail; + } + + /* if we are iconic (or shaded (fvwm does this)) ignore the event */ + if (client->iconic || client->shaded) return; + + /* resize, then move, as specified in the EWMH section 7.7 */ + if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight | + CWX | CWY | CWBorderWidth)) { - int x, y, w, h; - ObCorner corner; + int x, y, w, h; + ObCorner corner; if (e->xconfigurerequest.value_mask & CWBorderWidth) client->border_width = e->xconfigurerequest.border_width; - x = (e->xconfigurerequest.value_mask & CWX) ? - e->xconfigurerequest.x : client->area.x; - y = (e->xconfigurerequest.value_mask & CWY) ? - e->xconfigurerequest.y : client->area.y; - w = (e->xconfigurerequest.value_mask & CWWidth) ? - e->xconfigurerequest.width : client->area.width; - h = (e->xconfigurerequest.value_mask & CWHeight) ? - e->xconfigurerequest.height : client->area.height; + x = (e->xconfigurerequest.value_mask & CWX) ? + e->xconfigurerequest.x : client->area.x; + y = (e->xconfigurerequest.value_mask & CWY) ? + e->xconfigurerequest.y : client->area.y; + w = (e->xconfigurerequest.value_mask & CWWidth) ? + e->xconfigurerequest.width : client->area.width; + h = (e->xconfigurerequest.value_mask & CWHeight) ? + e->xconfigurerequest.height : client->area.height; { int newx = x; @@ -838,68 +765,68 @@ static void event_handle_client(ObClient *client, XEvent *e) y = newy; } - switch (client->gravity) { - case NorthEastGravity: - case EastGravity: - corner = OB_CORNER_TOPRIGHT; - break; - case SouthWestGravity: - case SouthGravity: - corner = OB_CORNER_BOTTOMLEFT; - break; - case SouthEastGravity: - corner = OB_CORNER_BOTTOMRIGHT; - break; - default: /* NorthWest, Static, etc */ - corner = OB_CORNER_TOPLEFT; - } - - client_configure_full(client, corner, x, y, w, h, FALSE, TRUE, + switch (client->gravity) { + case NorthEastGravity: + case EastGravity: + corner = OB_CORNER_TOPRIGHT; + break; + case SouthWestGravity: + case SouthGravity: + corner = OB_CORNER_BOTTOMLEFT; + break; + case SouthEastGravity: + corner = OB_CORNER_BOTTOMRIGHT; + break; + default: /* NorthWest, Static, etc */ + corner = OB_CORNER_TOPLEFT; + } + + client_configure_full(client, corner, x, y, w, h, FALSE, TRUE, TRUE); - } + } - if (e->xconfigurerequest.value_mask & CWStackMode) { - switch (e->xconfigurerequest.detail) { - case Below: - case BottomIf: - client_lower(client); - break; + if (e->xconfigurerequest.value_mask & CWStackMode) { + switch (e->xconfigurerequest.detail) { + case Below: + case BottomIf: + client_lower(client); + break; - case Above: - case TopIf: - default: - client_raise(client); - break; - } - } - break; + case Above: + case TopIf: + default: + client_raise(client); + break; + } + } + break; case UnmapNotify: - if (client->ignore_unmaps) { - client->ignore_unmaps--; - break; - } - client_unmanage(client); - break; + if (client->ignore_unmaps) { + client->ignore_unmaps--; + break; + } + client_unmanage(client); + break; case DestroyNotify: - client_unmanage(client); - break; + client_unmanage(client); + break; case ReparentNotify: - /* this is when the client is first taken captive in the frame */ - if (e->xreparent.parent == client->frame->plate) break; - - /* - This event is quite rare and is usually handled in unmapHandler. - However, if the window is unmapped when the reparent event occurs, - the window manager never sees it because an unmap event is not sent - to an already unmapped window. - */ - - /* we don't want the reparent event, put it back on the stack for the - X server to deal with after we unmanage the window */ - XPutBackEvent(ob_display, e); + /* this is when the client is first taken captive in the frame */ + if (e->xreparent.parent == client->frame->plate) break; + + /* + This event is quite rare and is usually handled in unmapHandler. + However, if the window is unmapped when the reparent event occurs, + the window manager never sees it because an unmap event is not sent + to an already unmapped window. + */ + + /* we don't want the reparent event, put it back on the stack for the + X server to deal with after we unmanage the window */ + XPutBackEvent(ob_display, e); - client_unmanage(client); - break; + client_unmanage(client); + break; case MapRequest: ob_debug("MapRequest for 0x%lx\n", client->window); if (!client->iconic) break; /* this normally doesn't happen, but if it @@ -1259,9 +1186,11 @@ static gboolean focus_delay_func(gpointer data) { ObClient *c = data; - client_focus(c); - if (config_focus_raise) - client_raise(c); + if (focus_client != c) { + client_focus(c); + if (config_focus_raise) + client_raise(c); + } return FALSE; /* no repeat */ } @@ -1270,6 +1199,11 @@ static void focus_delay_client_dest(ObClient *client, gpointer data) ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, client); } +void event_halt_focus_delay() +{ + ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func); +} + void event_ignore_queued_enters() { GSList *saved = NULL, *it; @@ -1281,8 +1215,13 @@ void event_ignore_queued_enters() while (TRUE) { e = g_new(XEvent, 1); if (XCheckTypedEvent(ob_display, EnterNotify, e)) { + ObWindow *win; + + win = g_hash_table_lookup(window_map, &e->xany.window); + if (win && WINDOW_IS_CLIENT(win)) + ++ignore_enter_focus; + saved = g_slist_append(saved, e); - ++ignore_enter_focus; } else { g_free(e); break;