X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=f55950b527562b7a308fe90e73bfb00de63c19dc;hb=d5f9df0845eb28dee542a789e43ca4cc1b6d0a4f;hp=a9112fdb6c57b4b0896c5deff11516c493ccdb51;hpb=677bc6ed2db3448bd2bee48fd4598079b27b18c1;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index a9112fdb..5388e227 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,27 +1,85 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + 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 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. +*/ + +#include "event.h" +#include "debug.h" +#include "window.h" #include "openbox.h" +#include "dock.h" #include "client.h" #include "xerror.h" #include "prop.h" #include "config.h" #include "screen.h" #include "frame.h" +#include "menu.h" +#include "menuframe.h" +#include "keyboard.h" +#include "mouse.h" +#include "mainloop.h" #include "framerender.h" #include "focus.h" +#include "moveresize.h" +#include "group.h" #include "stacking.h" #include "extensions.h" -#include "timer.h" -#include "dispatch.h" #include #include #include +#include + #ifdef HAVE_SYS_SELECT_H # include #endif +#ifdef HAVE_SIGNAL_H +# include +#endif + +#ifdef USE_SM +#include +#endif + +typedef struct +{ + gboolean ignored; +} ObEventData; -static void event_process(XEvent *e); +static void event_process(const XEvent *e, gpointer data); static void event_handle_root(XEvent *e); -static void event_handle_client(Client *c, XEvent *e); +static void event_handle_menu(XEvent *e); +static void event_handle_dock(ObDock *s, XEvent *e); +static void event_handle_dockapp(ObDockApp *app, XEvent *e); +static void event_handle_client(ObClient *c, XEvent *e); +static void event_handle_group(ObGroup *g, XEvent *e); + +static gboolean focus_delay_func(gpointer data); +static void focus_delay_client_dest(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; @@ -38,8 +96,36 @@ static const int mask_table[] = { }; static int mask_table_size; -void event_startup() +static guint ignore_enter_focus = 0; + +static gboolean menu_can_hide; + +#ifdef USE_SM +static void ice_handler(int fd, gpointer conn) { + Bool b; + IceProcessMessages(conn, NULL, &b); +} + +static void ice_watch(IceConn conn, IcePointer data, Bool opening, + IcePointer *watch_data) +{ + static gint fd = -1; + + if (opening) { + fd = IceConnectionNumber(conn); + ob_main_loop_fd_add(ob_main_loop, fd, ice_handler, conn, NULL); + } else { + ob_main_loop_fd_remove(ob_main_loop, fd); + fd = -1; + } +} +#endif + +void event_startup(gboolean reconfig) +{ + if (reconfig) return; + mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]); /* get lock masks that are defined by the display (not constant) */ @@ -64,52 +150,26 @@ void event_startup() ScrollLockMask = mask_table[cnt / modmap->max_keypermod]; } } -} -void event_shutdown() -{ - XFreeModifiermap(modmap); + ob_main_loop_x_add(ob_main_loop, event_process, NULL, NULL); + +#ifdef USE_SM + IceAddConnectionWatch(ice_watch, NULL); +#endif + + client_add_destructor(focus_delay_client_dest); } -void event_loop() +void event_shutdown(gboolean reconfig) { - fd_set selset; - XEvent e; - int x_fd; - struct timeval *wait; + if (reconfig) return; - while (TRUE) { - /* - There are slightly different event retrieval semantics here for - local (or high bandwidth) versus remote (or low bandwidth) - connections to the display/Xserver. - */ - if (ob_remote) { - if (!XPending(ob_display)) - break; - } else { - /* - This XSync allows for far more compression of events, which - makes things like Motion events perform far far better. Since - it also means network traffic for every event instead of every - X events (where X is the number retrieved at a time), it - probably should not be used for setups where Openbox is - running on a remote/low bandwidth display/Xserver. - */ - XSync(ob_display, FALSE); - if (!XEventsQueued(ob_display, QueuedAlready)) - break; - } - XNextEvent(ob_display, &e); +#ifdef USE_SM + IceRemoveConnectionWatch(ice_watch, NULL); +#endif - event_process(&e); - } - - timer_dispatch((GTimeVal**)&wait); - x_fd = ConnectionNumber(ob_display); - FD_ZERO(&selset); - FD_SET(x_fd, &selset); - select(x_fd + 1, &selset, NULL, NULL, wait); + client_remove_destructor(focus_delay_client_dest); + XFreeModifiermap(modmap); } static Window event_get_window(XEvent *e) @@ -118,6 +178,9 @@ static Window event_get_window(XEvent *e) /* pick a window */ switch (e->type) { + case SelectionClear: + window = RootWindow(ob_display, ob_screen); + break; case MapRequest: window = e->xmap.window; break; @@ -130,12 +193,15 @@ static Window event_get_window(XEvent *e) case ConfigureRequest: 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) { + switch (((XkbAnyEvent*)e)->xkb_type) { case XkbBellNotify: - window = ((XkbBellNotifyEvent*)&e)->window; + window = ((XkbBellNotifyEvent*)e)->window; default: window = None; } @@ -148,32 +214,38 @@ static Window event_get_window(XEvent *e) static void event_set_lasttime(XEvent *e) { + Time t = 0; + /* grab the lasttime and hack up the state */ switch (e->type) { case ButtonPress: case ButtonRelease: - event_lasttime = e->xbutton.time; + t = e->xbutton.time; break; case KeyPress: - event_lasttime = e->xkey.time; + t = e->xkey.time; break; case KeyRelease: - event_lasttime = e->xkey.time; + t = e->xkey.time; break; case MotionNotify: - event_lasttime = e->xmotion.time; + t = e->xmotion.time; break; case PropertyNotify: - event_lasttime = e->xproperty.time; + t = e->xproperty.time; break; case EnterNotify: case LeaveNotify: - event_lasttime = e->xcrossing.time; + t = e->xcrossing.time; break; default: - event_lasttime = CurrentTime; + /* if more event types are anticipated, get their timestamp + explicitly */ break; } + + if (t > event_lasttime) + event_lasttime = t; } #define STRIP_MODS(s) \ @@ -228,23 +300,22 @@ static void event_hack_mods(XEvent *e) } } -static gboolean event_ignore(XEvent *e, Client *client) +static gboolean event_ignore(XEvent *e, ObClient *client) { switch(e->type) { 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 > NotifyNonlinearVirtual || + 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. */ @@ -253,75 +324,164 @@ static gboolean event_ignore(XEvent *e, Client *client) } #ifdef DEBUG_FOCUS - g_message("FocusIn on %lx", window); + 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 - g_message("FocusOut on %lx mode %d detail %d", window, - e->xfocus.mode, e->xfocus.detail); + ob_debug("FocusOut on %lx mode %d detail %d IGNORED\n", + e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif - if (e->xfocus.mode == NotifyGrab || - e->xfocus.detail == NotifyInferior || - e->xfocus.detail == NotifyAncestor || - e->xfocus.detail > NotifyNonlinearVirtual) return TRUE; - + return TRUE; + } + #ifdef DEBUG_FOCUS - g_message("FocusOut on %lx", window); + ob_debug("FocusOut on %lx mode %d detail %d\n", + e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif - /* Try process a FocusIn first, and if a legit one isn't found, then - do the fallback shiznit. */ + { - 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 TRUE; - } else - focus_fallback(Fallback_NoFocus); + 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); + } } - break; - case EnterNotify: - case LeaveNotify: - /* NotifyUngrab occurs when a mouse button is released and the event is - caused, like when lowering a window */ - if (e->xcrossing.mode == NotifyGrab || - e->xcrossing.detail == NotifyInferior) - return TRUE; - break; + break; } return FALSE; } -static void event_process(XEvent *e) +static void event_process(const XEvent *ec, gpointer data) { Window window; - Client *client; + ObGroup *group = NULL; + ObClient *client = NULL; + ObDock *dock = NULL; + ObDockApp *dockapp = NULL; + ObWindow *obwin = NULL; + XEvent ee, *e; + ObEventData *ed = data; + + /* make a copy we can mangle */ + ee = *ec; + e = ⅇ window = event_get_window(e); - client = g_hash_table_lookup(client_map, &window); + if (!(e->type == PropertyNotify && + (group = g_hash_table_lookup(group_map, &window)))) + if ((obwin = g_hash_table_lookup(window_map, &window))) { + switch (obwin->type) { + case Window_Dock: + dock = WINDOW_AS_DOCK(obwin); + break; + case Window_DockApp: + dockapp = WINDOW_AS_DOCKAPP(obwin); + break; + case Window_Client: + client = WINDOW_AS_CLIENT(obwin); + break; + case Window_Menu: + case Window_Internal: + /* not to be used for events */ + g_assert_not_reached(); + break; + } + } + event_set_lasttime(e); event_hack_mods(e); - if (event_ignore(e, client)) + if (event_ignore(e, client)) { + if (ed) + ed->ignored = TRUE; return; + } else if (ed) + ed->ignored = FALSE; /* deal with it in the kernel */ - if (client) + if (group) + event_handle_group(group, e); + else if (client) event_handle_client(client, e); - else if (window == ob_root) + else if (dockapp) + event_handle_dockapp(dockapp, e); + else if (dock) + event_handle_dock(dock, e); + else if (window == RootWindow(ob_display, ob_screen)) event_handle_root(e); else if (e->type == MapRequest) client_manage(window); @@ -347,16 +507,40 @@ static void event_process(XEvent *e) } /* user input (action-bound) events */ - /* if (e->type == ButtonPress || e->type == ButtonRelease || - e->type == MotionNotify) - mouse_event(e, client); - else if (e->type == KeyPress || e->type == KeyRelease) - ; - */ + e->type == MotionNotify || e->type == KeyPress || + e->type == KeyRelease) + { + if (menu_frame_visible) + event_handle_menu(e); + else { + if (!keyboard_process_interactive_grab(e, &client)) { + if (moveresize_in_progress) { + moveresize_event(e); + + /* make further actions work on the client being + moved/resized */ + client = moveresize_client; + } + + menu_can_hide = FALSE; + ob_main_loop_timeout_add(ob_main_loop, + G_USEC_PER_SEC / 4, + menu_hide_delay_func, + NULL, NULL); - /* dispatch the event to registered handlers */ - dispatch_x(e, client); + if (e->type == ButtonPress || e->type == ButtonRelease || + 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); + } + } + } } static void event_handle_root(XEvent *e) @@ -364,6 +548,11 @@ static void event_handle_root(XEvent *e) Atom msgtype; switch(e->type) { + case SelectionClear: + ob_debug("Another WM has requested to replace us. Exiting.\n"); + ob_exit(0); + break; + case ClientMessage: if (e->xclient.format != 32) break; @@ -386,74 +575,210 @@ static void event_handle_root(XEvent *e) else if (e->xproperty.atom == prop_atoms.net_desktop_layout) screen_update_layout(); break; + case ConfigureNotify: +#ifdef XRANDR + XRRUpdateConfiguration(e); +#endif + screen_resize(); + break; + default: + ; +#ifdef VIDMODE + if (extensions_vidmode && e->type == extensions_vidmode_event_basep) { + ob_debug("VIDMODE EVENT\n"); + } +#endif + } +} + +static void event_handle_group(ObGroup *group, XEvent *e) +{ + GSList *it; + + g_assert(e->type == PropertyNotify); + + for (it = group->members; it; it = g_slist_next(it)) + event_handle_client(it->data, e); +} + +void event_enter_client(ObClient *client) +{ + g_assert(config_focus_follow); + + if (client_normal(client) && client_can_focus(client)) { + if (config_focus_delay) { + ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func); + ob_main_loop_timeout_add(ob_main_loop, + config_focus_delay, + focus_delay_func, + client, NULL); + } else + focus_delay_func(client); } } -static void event_handle_client(Client *client, XEvent *e) +static void event_handle_client(ObClient *client, XEvent *e) { XEvent ce; Atom msgtype; int i=0; + ObFrameContext con; switch (e->type) { + case VisibilityNotify: + client->frame->obscured = e->xvisibility.state != VisibilityUnobscured; + break; case ButtonPress: case ButtonRelease: - switch (frame_context(client, e->xbutton.window)) { - case Context_Maximize: - client->frame->max_press = (e->type == ButtonPress); - framerender_frame(client->frame); + /* Wheel buttons don't draw because they are an instant click, so it + is a waste of resources to go drawing it. */ + if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) { + con = frame_context(client, e->xbutton.window); + con = mouse_button_frame_context(con, e->xbutton.button); + switch (con) { + case OB_FRAME_CONTEXT_MAXIMIZE: + client->frame->max_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_CLOSE: + client->frame->close_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_ICONIFY: + client->frame->iconify_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_ALLDESKTOPS: + client->frame->desk_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_SHADE: + client->frame->shade_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + default: + /* nothing changes with clicks for any other contexts */ + break; + } + } + break; + case FocusIn: +#ifdef DEBUG_FOCUS + ob_debug("FocusIn on client for %lx\n", client->window); +#endif + if (client != focus_client) { + focus_set_client(client); + frame_adjust_focus(client->frame, TRUE); + } + break; + case FocusOut: +#ifdef DEBUG_FOCUS + ob_debug("FocusOut on client for %lx\n", client->window); +#endif + /* are we a fullscreen window or a transient of one? (checks layer) + if we are then we need to be iconified since we are losing focus + */ + if (client->layer == OB_STACKING_LAYER_FULLSCREEN && !client->iconic && + !client_search_focus_tree_full(client)) + /* iconify fullscreen windows when they and their transients + aren't focused */ + client_iconify(client, TRUE, TRUE); + frame_adjust_focus(client->frame, FALSE); + break; + case LeaveNotify: + con = frame_context(client, e->xcrossing.window); + switch (con) { + case OB_FRAME_CONTEXT_MAXIMIZE: + client->frame->max_hover = FALSE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_ALLDESKTOPS: + client->frame->desk_hover = FALSE; + frame_adjust_state(client->frame); break; - case Context_Close: - client->frame->close_press = (e->type == ButtonPress); - framerender_frame(client->frame); + case OB_FRAME_CONTEXT_SHADE: + client->frame->shade_hover = FALSE; + frame_adjust_state(client->frame); break; - case Context_Iconify: - client->frame->iconify_press = (e->type == ButtonPress); - framerender_frame(client->frame); + case OB_FRAME_CONTEXT_ICONIFY: + client->frame->iconify_hover = FALSE; + frame_adjust_state(client->frame); break; - case Context_AllDesktops: - client->frame->desk_press = (e->type == ButtonPress); - framerender_frame(client->frame); - break; - case Context_Shade: - client->frame->shade_press = (e->type == ButtonPress); - framerender_frame(client->frame); + case OB_FRAME_CONTEXT_CLOSE: + client->frame->close_hover = FALSE; + 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: - /* nothing changes with clicks for any other contexts */ break; } break; - case FocusIn: - focus_set_client(client); - case FocusOut: + case EnterNotify: + { + gboolean nofocus = FALSE; + + if (ignore_enter_focus) { + ignore_enter_focus--; + nofocus = TRUE; + } + + con = frame_context(client, e->xcrossing.window); + switch (con) { + case OB_FRAME_CONTEXT_MAXIMIZE: + client->frame->max_hover = TRUE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_ALLDESKTOPS: + client->frame->desk_hover = TRUE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_SHADE: + client->frame->shade_hover = TRUE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_ICONIFY: + client->frame->iconify_hover = TRUE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_CLOSE: + client->frame->close_hover = TRUE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_FRAME: + if (e->xcrossing.mode == NotifyGrab || + e->xcrossing.detail == NotifyInferior || + e->xcrossing.mode == NotifyUngrab) + { #ifdef DEBUG_FOCUS - g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"), - client->window); + ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n", + (e->type == EnterNotify ? "Enter" : "Leave"), + e->xcrossing.mode, + e->xcrossing.detail, client?client->window:0); #endif - /* focus state can affect the stacking layer */ - client_calc_layer(client); - 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_focus_follow) { + } else { #ifdef DEBUG_FOCUS - g_message("EnterNotify on %lx, focusing window", - client->window); + ob_debug("%sNotify mode %d detail %d on %lx, " + "focusing window\n", + (e->type == EnterNotify ? "Enter" : "Leave"), + e->xcrossing.mode, + e->xcrossing.detail, client?client->window:0); #endif - client_focus(client); + if (!nofocus && config_focus_follow) + event_enter_client(client); } + break; + default: + break; } break; + } case ConfigureRequest: /* compress these */ while (XCheckTypedWindowEvent(ob_display, client->window, @@ -481,15 +806,16 @@ static void event_handle_client(Client *client, XEvent *e) /* if we are iconic (or shaded (fvwm does this)) ignore the event */ if (client->iconic || client->shaded) return; - if (e->xconfigurerequest.value_mask & CWBorderWidth) - client->border_width = e->xconfigurerequest.border_width; - /* resize, then move, as specified in the EWMH section 7.7 */ if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight | - CWX | CWY)) { + CWX | CWY | + CWBorderWidth)) { int x, y, w, h; - Corner corner; - + 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) ? @@ -498,37 +824,53 @@ static void event_handle_client(Client *client, XEvent *e) e->xconfigurerequest.width : client->area.width; h = (e->xconfigurerequest.value_mask & CWHeight) ? e->xconfigurerequest.height : client->area.height; + + { + int newx = x; + int newy = y; + int fw = w + + client->frame->size.left + client->frame->size.right; + int fh = h + + client->frame->size.top + client->frame->size.bottom; + client_find_onscreen(client, &newx, &newy, fw, fh, + client_normal(client)); + if (e->xconfigurerequest.value_mask & CWX) + x = newx; + if (e->xconfigurerequest.value_mask & CWY) + y = newy; + } switch (client->gravity) { case NorthEastGravity: case EastGravity: - corner = Corner_TopRight; + corner = OB_CORNER_TOPRIGHT; break; case SouthWestGravity: case SouthGravity: - corner = Corner_BottomLeft; + corner = OB_CORNER_BOTTOMLEFT; break; case SouthEastGravity: - corner = Corner_BottomRight; + corner = OB_CORNER_BOTTOMRIGHT; break; default: /* NorthWest, Static, etc */ - corner = Corner_TopLeft; + corner = OB_CORNER_TOPLEFT; } - client_configure(client, corner, x, y, w, h, FALSE, FALSE); + 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: - stacking_lower(client); + stacking_lower(CLIENT_AS_WINDOW(client)); break; case Above: case TopIf: default: - stacking_raise(client); + stacking_raise(CLIENT_AS_WINDOW(client)); break; } } @@ -561,7 +903,7 @@ static void event_handle_client(Client *client, XEvent *e) client_unmanage(client); break; case MapRequest: - g_message("MapRequest for 0x%lx", client->window); + ob_debug("MapRequest for 0x%lx\n", client->window); if (!client->iconic) break; /* this normally doesn't happen, but if it does, we don't want it! */ if (screen_showing_desktop) @@ -573,7 +915,7 @@ static void event_handle_client(Client *client, XEvent *e) if (client->shaded) client_shade(client, FALSE); client_focus(client); - stacking_raise(client); + stacking_raise(CLIENT_AS_WINDOW(client)); break; case ClientMessage: /* validate cuz we query stuff off the client here */ @@ -584,8 +926,8 @@ static void event_handle_client(Client *client, XEvent *e) msgtype = e->xclient.message_type; if (msgtype == prop_atoms.wm_change_state) { /* compress changes into a single change */ - while (XCheckTypedWindowEvent(ob_display, e->type, - client->window, &ce)) { + while (XCheckTypedWindowEvent(ob_display, client->window, + e->type, &ce)) { /* XXX: it would be nice to compress ALL messages of a type, not just messages in a row without other message types between. */ @@ -598,8 +940,8 @@ static void event_handle_client(Client *client, XEvent *e) client_set_wm_state(client, e->xclient.data.l[0]); } else if (msgtype == prop_atoms.net_wm_desktop) { /* compress changes into a single change */ - while (XCheckTypedWindowEvent(ob_display, e->type, - client->window, &ce)) { + while (XCheckTypedWindowEvent(ob_display, client->window, + e->type, &ce)) { /* XXX: it would be nice to compress ALL messages of a type, not just messages in a row without other message types between. */ @@ -615,46 +957,136 @@ static void event_handle_client(Client *client, XEvent *e) FALSE); } else if (msgtype == prop_atoms.net_wm_state) { /* can't compress these */ - 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"), - e->xclient.data.l[1], e->xclient.data.l[2], - client->window); + ob_debug("net_wm_state %s %ld %ld for 0x%lx\n", + (e->xclient.data.l[0] == 0 ? "Remove" : + e->xclient.data.l[0] == 1 ? "Add" : + e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"), + e->xclient.data.l[1], e->xclient.data.l[2], + client->window); 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", client->window); + ob_debug("net_close_window for 0x%lx\n", client->window); client_close(client); } else if (msgtype == prop_atoms.net_active_window) { - g_message("net_active_window for 0x%lx", client->window); - if (screen_showing_desktop) - screen_show_desktop(FALSE); - if (client->iconic) - client_iconify(client, FALSE, TRUE); - else if (!client->frame->visible) - /* if its not visible for other reasons, then don't mess - with it */ - break; - if (client->shaded) - client_shade(client, FALSE); - client_focus(client); - stacking_raise(client); - } + ob_debug("net_active_window for 0x%lx\n", client->window); + client_activate(client, FALSE); + } else if (msgtype == prop_atoms.net_wm_moveresize) { + ob_debug("net_wm_moveresize for 0x%lx\n", client->window); + if ((Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_topleft || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_top || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_topright || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_right || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_right || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_bottomright || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_bottom || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_bottomleft || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_left || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_move || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_size_keyboard || + (Atom)e->xclient.data.l[2] == + prop_atoms.net_wm_moveresize_move_keyboard) { + + moveresize_start(client, e->xclient.data.l[0], + e->xclient.data.l[1], e->xclient.data.l[3], + e->xclient.data.l[2]); + } + } else if (msgtype == prop_atoms.net_moveresize_window) { + int oldg = client->gravity; + int tmpg, x, y, w, h; + + if (e->xclient.data.l[0] & 0xff) + tmpg = e->xclient.data.l[0] & 0xff; + else + tmpg = oldg; + + if (e->xclient.data.l[0] & 1 << 8) + x = e->xclient.data.l[1]; + else + x = client->area.x; + if (e->xclient.data.l[0] & 1 << 9) + y = e->xclient.data.l[2]; + else + y = client->area.y; + if (e->xclient.data.l[0] & 1 << 10) + w = e->xclient.data.l[3]; + else + w = client->area.width; + if (e->xclient.data.l[0] & 1 << 11) + h = e->xclient.data.l[4]; + else + h = client->area.height; + client->gravity = tmpg; + + { + int newx = x; + int newy = y; + int fw = w + + client->frame->size.left + client->frame->size.right; + int fh = h + + client->frame->size.top + client->frame->size.bottom; + client_find_onscreen(client, &newx, &newy, fw, fh, + client_normal(client)); + if (e->xclient.data.l[0] & 1 << 8) + x = newx; + if (e->xclient.data.l[0] & 1 << 9) + y = newy; + } + + client_configure(client, OB_CORNER_TOPLEFT, + x, y, w, h, FALSE, TRUE); + + client->gravity = oldg; + } break; case PropertyNotify: /* validate cuz we query stuff off the client here */ if (!client_validate(client)) break; /* compress changes to a single property into a single change */ - while (XCheckTypedWindowEvent(ob_display, e->type, - client->window, &ce)) { - /* XXX: it would be nice to compress ALL changes to a property, + while (XCheckTypedWindowEvent(ob_display, client->window, + e->type, &ce)) { + Atom a, b; + + /* XXX: it would be nice to compress ALL changes to a property, not just changes in a row without other props between. */ - if (ce.xproperty.atom != e->xproperty.atom) { - XPutBackEvent(ob_display, &ce); - break; - } + + a = ce.xproperty.atom; + b = e->xproperty.atom; + + if (a == b) + continue; + if ((a == prop_atoms.net_wm_name || + a == prop_atoms.wm_name || + a == prop_atoms.net_wm_icon_name || + a == prop_atoms.wm_icon_name) + && + (b == prop_atoms.net_wm_name || + b == prop_atoms.wm_name || + b == prop_atoms.net_wm_icon_name || + b == prop_atoms.wm_icon_name)) { + continue; + } + if ((a == prop_atoms.net_wm_icon || + a == prop_atoms.kwm_win_icon) + && + (b == prop_atoms.net_wm_icon || + b == prop_atoms.kwm_win_icon)) + continue; + + XPutBackEvent(ob_display, &ce); + break; } msgtype = e->xproperty.atom; @@ -662,34 +1094,35 @@ static void event_handle_client(Client *client, XEvent *e) client_update_normal_hints(client); /* normal hints can make a window non-resizable */ client_setup_decor_and_functions(client); - } - else if (msgtype == XA_WM_HINTS) + } else if (msgtype == XA_WM_HINTS) { client_update_wmhints(client); - else if (msgtype == XA_WM_TRANSIENT_FOR) { + } else if (msgtype == XA_WM_TRANSIENT_FOR) { client_update_transient_for(client); client_get_type(client); /* type may have changed, so update the layer */ client_calc_layer(client); client_setup_decor_and_functions(client); - } - else if (msgtype == prop_atoms.net_wm_name || - msgtype == prop_atoms.wm_name) + } else if (msgtype == prop_atoms.net_wm_name || + msgtype == prop_atoms.wm_name || + msgtype == prop_atoms.net_wm_icon_name || + msgtype == prop_atoms.wm_icon_name) { client_update_title(client); - else if (msgtype == prop_atoms.net_wm_icon_name || - msgtype == prop_atoms.wm_icon_name) - client_update_icon_title(client); - else if (msgtype == prop_atoms.wm_class) + } else if (msgtype == prop_atoms.wm_class) { client_update_class(client); - else if (msgtype == prop_atoms.wm_protocols) { + } else if (msgtype == prop_atoms.wm_protocols) { client_update_protocols(client); client_setup_decor_and_functions(client); } - else if (msgtype == prop_atoms.net_wm_strut) + else if (msgtype == prop_atoms.net_wm_strut) { client_update_strut(client); - else if (msgtype == prop_atoms.net_wm_icon) + } + else if (msgtype == prop_atoms.net_wm_icon || + msgtype == prop_atoms.kwm_win_icon) { client_update_icons(client); - else if (msgtype == prop_atoms.kwm_win_icon) - client_update_kwm_icon(client); + } + else if (msgtype == prop_atoms.sm_client_id) { + client_update_sm_client_id(client); + } default: ; #ifdef SHAPE @@ -700,3 +1133,165 @@ static void event_handle_client(Client *client, XEvent *e) #endif } } + +static void event_handle_dock(ObDock *s, XEvent *e) +{ + switch (e->type) { + case ButtonPress: + stacking_raise(DOCK_AS_WINDOW(s)); + break; + case EnterNotify: + dock_hide(FALSE); + break; + case LeaveNotify: + dock_hide(TRUE); + break; + } +} + +static void event_handle_dockapp(ObDockApp *app, XEvent *e) +{ + switch (e->type) { + case MotionNotify: + dock_app_drag(app, &e->xmotion); + break; + case UnmapNotify: + if (app->ignore_unmaps) { + app->ignore_unmaps--; + break; + } + dock_remove(app, TRUE); + break; + case DestroyNotify: + dock_remove(app, FALSE); + break; + case ReparentNotify: + dock_remove(app, FALSE); + break; + case ConfigureNotify: + dock_app_configure(app, e->xconfigure.width, e->xconfigure.height); + break; + } +} + +ObMenuFrame* find_active_menu() +{ + GList *it; + ObMenuFrame *f; + + for (it = menu_frame_visible; it; it = g_list_next(it)) { + f = it->data; + if (f->selected) + break; + } + return it ? it->data : NULL; +} + +static void event_handle_menu(XEvent *ev) +{ + ObMenuFrame *f; + ObMenuEntryFrame *e; + + switch (ev->type) { + case ButtonRelease: + if ((e = menu_entry_frame_under(ev->xbutton.x_root, + ev->xbutton.y_root))) + menu_entry_frame_execute(e, ev->xbutton.state); + else if (menu_can_hide) + menu_frame_hide_all(); + break; + case MotionNotify: + if ((f = menu_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root))) { + menu_frame_move_on_screen(f); + if ((e = menu_entry_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root))) + menu_frame_select(f, e); + } + { + ObMenuFrame *a; + + a = find_active_menu(); + if (a && a != f && + a->selected->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU) + { + menu_frame_select(a, NULL); + } + } + break; + case KeyPress: + if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) + menu_frame_hide_all(); + else if (ev->xkey.keycode == ob_keycode(OB_KEY_RETURN)) { + ObMenuFrame *f; + if ((f = find_active_menu())) + menu_entry_frame_execute(f->selected, ev->xkey.state); + } else if (ev->xkey.keycode == ob_keycode(OB_KEY_LEFT)) { + ObMenuFrame *f; + if ((f = find_active_menu()) && f->parent) + menu_frame_select(f, NULL); + } else if (ev->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) { + ObMenuFrame *f; + if ((f = find_active_menu()) && f->child) + menu_frame_select_next(f->child); + } else if (ev->xkey.keycode == ob_keycode(OB_KEY_UP)) { + ObMenuFrame *f; + if ((f = find_active_menu())) + menu_frame_select_previous(f); + } else if (ev->xkey.keycode == ob_keycode(OB_KEY_DOWN)) { + ObMenuFrame *f; + if ((f = find_active_menu())) + menu_frame_select_next(f); + } + break; + } +} + +static gboolean menu_hide_delay_func(gpointer data) +{ + menu_can_hide = TRUE; + return FALSE; /* no repeat */ +} + +static gboolean focus_delay_func(gpointer data) +{ + ObClient *c = data; + + client_focus(c); + if (config_focus_raise) + stacking_raise(CLIENT_AS_WINDOW(c)); + return FALSE; /* no repeat */ +} + +static void focus_delay_client_dest(gpointer data) +{ + ObClient *c = data; + + ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, c); +} + +void event_ignore_queued_enters() +{ + GSList *saved = NULL, *it; + XEvent *e; + + XSync(ob_display, FALSE); + + /* count the events */ + while (TRUE) { + e = g_new(XEvent, 1); + if (XCheckTypedEvent(ob_display, EnterNotify, e)) { + saved = g_slist_append(saved, e); + ++ignore_enter_focus; + } else { + g_free(e); + break; + } + } + /* put the events back */ + for (it = saved; it; it = g_slist_next(it)) { + XPutBackEvent(ob_display, it->data); + g_free(it->data); + } + g_slist_free(saved); +}