X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=2d47fd328a09c55ec9f2a3f01a5e398cd8fba2ee;hb=3fcba81510c98ac517afbab0ba60ced3d30f202f;hp=52747d3fb8adffd0461c611255f4bf0ca2afa552;hpb=77062863f32a8a83ff941eef5fe313170538fbcd;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 52747d3f..2d47fd32 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "openbox.h" #include "dock.h" #include "client.h" @@ -7,13 +8,15 @@ #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 "stacking.h" #include "extensions.h" -#include "timer.h" -#include "dispatch.h" #include "event.h" #include @@ -21,10 +24,6 @@ #include #include -#ifdef USE_LIBSN -# include -#endif - #ifdef HAVE_SYS_SELECT_H # include #endif @@ -36,18 +35,15 @@ #include #endif -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_dock(Dock *s, XEvent *e); -static void event_handle_dockapp(DockApp *app, XEvent *e); -static void event_handle_client(Client *c, XEvent *e); -static void event_handle_menu(Menu *menu, Client *c, XEvent *e); -static void fd_event_handle(); -#ifdef USE_SM -static void ice_watch(IceConn conn, IcePointer data, Bool opening, - IcePointer *watch_data); -#endif -static void find_max_fd(); +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 gboolean focus_delay_func(gpointer data); +static void focus_delay_client_dest(gpointer data); #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \ (e)->xfocus.detail == NotifyAncestor || \ @@ -72,34 +68,34 @@ static const int mask_table[] = { }; static int mask_table_size; -static fd_set selset, allset; -#ifdef USE_SM -static IceConn ice_conn; -static int ice_fd; -#endif -static int max_fd, x_fd; -static GData *fd_handler_list; - +static ObClient *focus_delay_client; #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) { - g_assert (ice_fd < 0); - ice_conn = conn; - ice_fd = IceConnectionNumber(conn); - FD_SET(ice_fd, &allset); + fd = IceConnectionNumber(conn); + ob_main_loop_fd_add(ob_main_loop, fd, ice_handler, conn, NULL); } else { - FD_CLR(ice_fd, &allset); - ice_fd = -1; + ob_main_loop_fd_remove(ob_main_loop, fd); + fd = -1; } - find_max_fd(); } #endif -void event_startup() +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) */ @@ -125,80 +121,21 @@ void event_startup() } } - FD_ZERO(&allset); - max_fd = x_fd = ConnectionNumber(ob_display); - FD_SET(x_fd, &allset); + ob_main_loop_x_add(ob_main_loop, event_process, NULL, NULL); #ifdef USE_SM - ice_fd = -1; IceAddConnectionWatch(ice_watch, NULL); #endif - g_datalist_init(&fd_handler_list); -} - -void event_shutdown() -{ - XFreeModifiermap(modmap); - g_datalist_clear(&fd_handler_list); + client_add_destructor(focus_delay_client_dest); } -void event_loop() +void event_shutdown(gboolean reconfig) { - XEvent e; - struct timeval *wait; - gboolean had_event = FALSE; - - 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_LIBSN - sn_display_process_event(ob_sn_display, &e); -#endif - - event_process(&e); - had_event = TRUE; - } - - if (!had_event) { - timer_dispatch((GTimeVal**)&wait); - selset = allset; - select(max_fd + 1, &selset, NULL, NULL, wait); - - /* handle the X events as soon as possible? */ - if (FD_ISSET(x_fd, &selset)) - return; + if (reconfig) return; -#ifdef USE_SM - if (ice_fd >= 0 && FD_ISSET(ice_fd, &selset)) { - Bool b; - IceProcessMessages(ice_conn, NULL, &b); - } -#endif - - fd_event_handle(); - } + client_remove_destructor(focus_delay_client_dest); + XFreeModifiermap(modmap); } static Window event_get_window(XEvent *e) @@ -207,6 +144,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; @@ -225,9 +165,9 @@ static Window event_get_window(XEvent *e) 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; } @@ -240,32 +180,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) \ @@ -320,7 +266,7 @@ 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: @@ -333,8 +279,8 @@ static gboolean event_ignore(XEvent *e, Client *client) if (INVALID_FOCUSIN(e) || client == NULL) { #ifdef DEBUG_FOCUS - g_message("FocusIn on %lx mode %d detail %d IGNORED", e->xfocus.window, - e->xfocus.mode, e->xfocus.detail); + 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. @@ -344,22 +290,22 @@ static gboolean event_ignore(XEvent *e, Client *client) } #ifdef DEBUG_FOCUS - g_message("FocusIn on %lx mode %d detail %d", e->xfocus.window, - e->xfocus.mode, e->xfocus.detail); + 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 IGNORED", - e->xfocus.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 return TRUE; } #ifdef DEBUG_FOCUS - g_message("FocusOut on %lx mode %d detail %d", - e->xfocus.window, e->xfocus.mode, e->xfocus.detail); + ob_debug("FocusOut on %lx mode %d detail %d\n", + e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif { @@ -367,13 +313,13 @@ static gboolean event_ignore(XEvent *e, Client *client) gboolean fallback = TRUE; while (TRUE) { - if (!XCheckTypedWindowEvent(ob_display, FocusOut, - e->xfocus.window,&fe)) + if (!XCheckTypedWindowEvent(ob_display, e->xfocus.window, + FocusOut, &fe)) if (!XCheckTypedEvent(ob_display, FocusIn, &fe)) break; if (fe.type == FocusOut) { #ifdef DEBUG_FOCUS - g_message("found pending FocusOut"); + ob_debug("found pending FocusOut\n"); #endif if (!INVALID_FOCUSOUT(&fe)) { /* if there is a VALID FocusOut still coming, don't @@ -384,7 +330,7 @@ static gboolean event_ignore(XEvent *e, Client *client) } } else { #ifdef DEBUG_FOCUS - g_message("found pending FocusIn"); + ob_debug("found pending FocusIn\n"); #endif /* is the focused window getting a FocusOut/In back to itself? @@ -401,16 +347,16 @@ static gboolean event_ignore(XEvent *e, Client *client) */ if (focus_client) { #ifdef DEBUG_FOCUS - g_message("focused window got an Out/In back to " - "itself IGNORED both"); + ob_debug("focused window got an Out/In back to " + "itself IGNORED both\n"); #endif return TRUE; } else { - event_process(&fe); + event_process(&fe, NULL); #ifdef DEBUG_FOCUS - g_message("focused window got an Out/In back to " - "itself but focus_client was null " - "IGNORED just the Out"); + ob_debug("focused window got an Out/In back to " + "itself but focus_client was null " + "IGNORED just the Out\n"); #endif return TRUE; } @@ -418,7 +364,7 @@ static gboolean event_ignore(XEvent *e, Client *client) /* 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); + event_process(&fe, NULL); /* secret magic way of event_process telling us that no client was found for the FocusIn event. ^_^ */ if (fe.xfocus.window != None) { @@ -429,10 +375,10 @@ static gboolean event_ignore(XEvent *e, Client *client) } if (fallback) { #ifdef DEBUG_FOCUS - g_message("no valid FocusIn and no FocusOut events found, " - "falling back"); + ob_debug("no valid FocusIn and no FocusOut events found, " + "falling back\n"); #endif - focus_fallback(Fallback_NoFocus); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } } break; @@ -446,32 +392,36 @@ static gboolean event_ignore(XEvent *e, Client *client) (e->xcrossing.mode == NotifyUngrab && e->xcrossing.detail == NotifyVirtual)) { #ifdef DEBUG_FOCUS - g_message("%sNotify mode %d detail %d on %lx IGNORED", - (e->type == EnterNotify ? "Enter" : "Leave"), - e->xcrossing.mode, - e->xcrossing.detail, client?client->window:0); + 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 return TRUE; } #ifdef DEBUG_FOCUS - g_message("%sNotify mode %d detail %d on %lx", - (e->type == EnterNotify ? "Enter" : "Leave"), - e->xcrossing.mode, - e->xcrossing.detail, client?client->window:0); + ob_debug("%sNotify mode %d detail %d on %lx\n", + (e->type == EnterNotify ? "Enter" : "Leave"), + e->xcrossing.mode, + e->xcrossing.detail, client?client->window:0); #endif break; } return FALSE; } -static void event_process(XEvent *e) +static void event_process(const XEvent *ec, gpointer data) { Window window; - Client *client = NULL; - Dock *dock = NULL; - DockApp *dockapp = NULL; - Menu *menu = NULL; + ObClient *client = NULL; + ObDock *dock = NULL; + ObDockApp *dockapp = NULL; ObWindow *obwin = NULL; + XEvent ee, *e; + + /* make a copy we can mangle */ + ee = *ec; + e = ⅇ window = event_get_window(e); if ((obwin = g_hash_table_lookup(window_map, &window))) { @@ -482,12 +432,10 @@ static void event_process(XEvent *e) case Window_DockApp: dockapp = WINDOW_AS_DOCKAPP(obwin); break; - case Window_Menu: - menu = WINDOW_AS_MENU(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(); @@ -501,16 +449,13 @@ static void event_process(XEvent *e) return; /* deal with it in the kernel */ - if (menu) { - event_handle_menu(menu, client, e); - return; - } else if (client) + if (client) event_handle_client(client, e); else if (dockapp) event_handle_dockapp(dockapp, e); else if (dock) event_handle_dock(dock, e); - else if (window == ob_root) + else if (window == RootWindow(ob_display, ob_screen)) event_handle_root(e); else if (e->type == MapRequest) client_manage(window); @@ -535,27 +480,30 @@ static void event_process(XEvent *e) xerror_set_ignore(FALSE); } - if (moveresize_in_progress) - if (e->type == MotionNotify || e->type == ButtonRelease || - e->type == ButtonPress || - e->type == KeyPress || e->type == KeyRelease) { - moveresize_event(e); - - return; /* no dispatch! */ - - } - /* 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) - ; - */ - - /* dispatch the event to registered handlers */ - dispatch_x(e, client); + 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); + + 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) @@ -563,6 +511,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(); + break; + case ClientMessage: if (e->xclient.format != 32) break; @@ -589,50 +542,52 @@ static void event_handle_root(XEvent *e) #ifdef XRANDR XRRUpdateConfiguration(e); #endif - if (e->xconfigure.width != screen_physical_size.width || - e->xconfigure.height != screen_physical_size.height) - screen_resize(e->xconfigure.width, e->xconfigure.height); + screen_resize(); break; default: ; #ifdef VIDMODE if (extensions_vidmode && e->type == extensions_vidmode_event_basep) { - g_message("VIDMODE EVENT"); + ob_debug("VIDMODE EVENT\n"); } #endif } } -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: /* 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)) { switch (frame_context(client, e->xbutton.window)) { - case Context_Maximize: + case OB_FRAME_CONTEXT_MAXIMIZE: client->frame->max_press = (e->type == ButtonPress); framerender_frame(client->frame); break; - case Context_Close: + case OB_FRAME_CONTEXT_CLOSE: client->frame->close_press = (e->type == ButtonPress); framerender_frame(client->frame); break; - case Context_Iconify: + case OB_FRAME_CONTEXT_ICONIFY: client->frame->iconify_press = (e->type == ButtonPress); framerender_frame(client->frame); break; - case Context_AllDesktops: + case OB_FRAME_CONTEXT_ALLDESKTOPS: client->frame->desk_press = (e->type == ButtonPress); framerender_frame(client->frame); break; - case Context_Shade: + case OB_FRAME_CONTEXT_SHADE: client->frame->shade_press = (e->type == ButtonPress); framerender_frame(client->frame); break; @@ -644,7 +599,7 @@ static void event_handle_client(Client *client, XEvent *e) break; case FocusIn: #ifdef DEBUG_FOCUS - g_message("FocusIn on client for %lx", client->window); + ob_debug("FocusIn on client for %lx\n", client->window); #endif if (client != focus_client) { focus_set_client(client); @@ -653,35 +608,105 @@ static void event_handle_client(Client *client, XEvent *e) break; case FocusOut: #ifdef DEBUG_FOCUS - g_message("FocusOut on client for %lx", client->window); + 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 == Layer_Fullscreen && !client->iconic && + 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 OB_FRAME_CONTEXT_SHADE: + client->frame->shade_hover = FALSE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_ICONIFY: + client->frame->iconify_hover = FALSE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_CLOSE: + client->frame->close_hover = FALSE; + frame_adjust_state(client->frame); + break; + case OB_FRAME_CONTEXT_FRAME: + /* XXX if doing a 'reconfigure' make sure you kill this timer, + maybe all timers.. */ + if (config_focus_delay && client == focus_delay_client) { + ob_main_loop_timeout_remove_data(ob_main_loop, + focus_delay_func, + focus_delay_client); + focus_delay_client = NULL; + } + default: + break; + } + 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) { + 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 (client_normal(client)) { + if (ob_state() == OB_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) { #ifdef DEBUG_FOCUS - g_message("EnterNotify on %lx, focusing window", - client->window); + ob_debug("EnterNotify on %lx, focusing window\n", + client->window); #endif - client_focus(client); + if (config_focus_delay) { + ob_main_loop_timeout_add(ob_main_loop, + config_focus_delay, + focus_delay_func, + client, NULL); + focus_delay_client = client; + } else + client_focus(client); + } } + break; + default: + break; } break; case ConfigureRequest: @@ -711,15 +736,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) ? @@ -728,24 +754,40 @@ 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, TRUE); + client_configure_full(client, corner, x, y, w, h, FALSE, TRUE, + TRUE); } if (e->xconfigurerequest.value_mask & CWStackMode) { @@ -791,7 +833,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) @@ -814,8 +856,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. */ @@ -828,8 +870,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. */ @@ -845,22 +887,22 @@ 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); - client_activate(client); + ob_debug("net_active_window for 0x%lx\n", client->window); + client_activate(client, FALSE); } else if (msgtype == prop_atoms.net_wm_moveresize) { - g_message("net_wm_moveresize for 0x%lx", client->window); + 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] == @@ -910,13 +952,31 @@ static void event_handle_client(Client *client, XEvent *e) if (e->xclient.data.l[0] & 1 << 10) w = e->xclient.data.l[3]; else - w = client->area.y; + w = client->area.width; if (e->xclient.data.l[0] & 1 << 11) h = e->xclient.data.l[4]; else - h = client->area.y; + h = client->area.height; client->gravity = tmpg; - client_configure(client, Corner_TopLeft, x, y, w, h, FALSE, TRUE); + + { + 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; @@ -925,14 +985,38 @@ static void event_handle_client(Client *client, XEvent *e) 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; @@ -940,32 +1024,32 @@ 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 || - msgtype == prop_atoms.net_wm_icon_name || - msgtype == prop_atoms.wm_icon_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.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 || - msgtype == prop_atoms.kwm_win_icon) + msgtype == prop_atoms.kwm_win_icon) { client_update_icons(client); + } default: ; #ifdef SHAPE @@ -977,105 +1061,7 @@ static void event_handle_client(Client *client, XEvent *e) } } -static void event_handle_menu(Menu *menu, Client *client, XEvent *e) -{ - MenuEntry *entry; - - g_message("EVENT %d", e->type); - switch (e->type) { - case ButtonPress: - g_message("BUTTON PRESS"); - if (e->xbutton.button == 3) - menu_hide(menu); - else if (e->xbutton.button == 1) { - entry = menu_find_entry(menu, e->xbutton.window); - if (!entry) - stacking_raise(MENU_AS_WINDOW(menu)); - } - break; - case ButtonRelease: - g_message("BUTTON RELEASED"); - if (!menu->shown) break; - -/* grab_pointer_window(FALSE, None, menu->frame);*/ - - if (e->xbutton.button == 1) { - entry = menu_find_entry(menu, e->xbutton.window); - if (entry) { - int junk; - Window wjunk; - guint ujunk, b, w, h; - XGetGeometry(ob_display, e->xbutton.window, - &wjunk, &junk, &junk, &w, &h, &b, &ujunk); - if (e->xbutton.x >= (signed)-b && - e->xbutton.y >= (signed)-b && - e->xbutton.x < (signed)(w+b) && - e->xbutton.y < (signed)(h+b)) { - menu_entry_fire(entry); - } - } - } - - break; - case EnterNotify: - case LeaveNotify: - g_message("enter/leave"); - entry = menu_find_entry(menu, e->xcrossing.window); - if (entry) { - if (menu->mouseover) - menu->mouseover(entry, e->type == EnterNotify); - else - menu_control_mouseover(entry, e->type == EnterNotify); - - menu_entry_render(entry); - } - break; - } -} - -void event_add_fd_handler(event_fd_handler *h) { - g_datalist_id_set_data(&fd_handler_list, h->fd, h); - FD_SET(h->fd, &allset); - max_fd = MAX(max_fd, h->fd); -} - -static void find_max_fd_foreach(GQuark n, gpointer data, gpointer max) -{ - *((unsigned int *)max) = MAX(*((unsigned int *)max), n); -} - -static void find_max_fd() -{ - int tmpmax = -1; - g_datalist_foreach(&fd_handler_list, find_max_fd_foreach, (gpointer)&tmpmax); - max_fd = MAX(x_fd, tmpmax); -#ifdef USE_SM - max_fd = MAX(ice_fd, tmpmax); -#endif -} - -void event_remove_fd(int n) -{ - FD_CLR(n, &allset); - g_datalist_id_remove_data(&fd_handler_list, (GQuark)n); - find_max_fd(); -} - -static void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data) -{ - if (FD_ISSET( (int)n, &selset)) { - event_fd_handler *h = (event_fd_handler *)data; - g_assert(h->fd == (int)n); - h->handler(h->fd, h->data); - } -} - -static void fd_event_handle() -{ - g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL); -} - -static void event_handle_dock(Dock *s, XEvent *e) +static void event_handle_dock(ObDock *s, XEvent *e) { switch (e->type) { case ButtonPress: @@ -1090,7 +1076,7 @@ static void event_handle_dock(Dock *s, XEvent *e) } } -static void event_handle_dockapp(DockApp *app, XEvent *e) +static void event_handle_dockapp(ObDockApp *app, XEvent *e) { switch (e->type) { case MotionNotify: @@ -1114,3 +1100,85 @@ static void event_handle_dockapp(DockApp *app, XEvent *e) 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 (!(f = menu_frame_under(ev->xbutton.x_root, + ev->xbutton.y_root))) + menu_frame_hide_all(); + else { + if ((e = menu_entry_frame_under(ev->xbutton.x_root, + ev->xbutton.y_root))) + menu_entry_frame_execute(e, ev->xbutton.state); + } + 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); + } + 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 focus_delay_func(gpointer data) +{ + client_focus(focus_delay_client); + return FALSE; /* no repeat */ +} + +static void focus_delay_client_dest(gpointer data) +{ + ObClient *c = data; + if (c == focus_delay_client) { + ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, + focus_delay_client); + focus_delay_client = NULL; + } +}