X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=2d47fd328a09c55ec9f2a3f01a5e398cd8fba2ee;hb=3fcba81510c98ac517afbab0ba60ced3d30f202f;hp=88294cc7b3550cfa5178b94a3d4a69c910a8a31f;hpb=3f372aaebfb4d40947a25a6727559aac7e18e113;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 88294cc7..2d47fd32 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -24,10 +24,6 @@ #include #include -#ifdef USE_LIBSN -# include -#endif - #ifdef HAVE_SYS_SELECT_H # include #endif @@ -96,18 +92,10 @@ static void ice_watch(IceConn conn, IcePointer data, Bool opening, } #endif -#ifdef USE_LIBSN -static void sn_handler(const XEvent *e, gpointer display) +void event_startup(gboolean reconfig) { - XEvent ec; - ec = *e; - sn_display_process_event(display, &ec); -} -#endif - + if (reconfig) return; -void event_startup() -{ mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]); /* get lock masks that are defined by the display (not constant) */ @@ -139,15 +127,13 @@ void event_startup() IceAddConnectionWatch(ice_watch, NULL); #endif -#ifdef USE_LIBSN - ob_main_loop_x_add(ob_main_loop, sn_handler, ob_sn_display, NULL); -#endif - client_add_destructor(focus_delay_client_dest); } -void event_shutdown() +void event_shutdown(gboolean reconfig) { + if (reconfig) return; + client_remove_destructor(focus_delay_client_dest); XFreeModifiermap(modmap); } @@ -333,7 +319,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) break; if (fe.type == FocusOut) { #ifdef DEBUG_FOCUS - ob_debug("found pending FocusOut"); + ob_debug("found pending FocusOut\n"); #endif if (!INVALID_FOCUSOUT(&fe)) { /* if there is a VALID FocusOut still coming, don't @@ -344,7 +330,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) } } else { #ifdef DEBUG_FOCUS - ob_debug("found pending FocusIn"); + ob_debug("found pending FocusIn\n"); #endif /* is the focused window getting a FocusOut/In back to itself? @@ -362,7 +348,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) if (focus_client) { #ifdef DEBUG_FOCUS ob_debug("focused window got an Out/In back to " - "itself IGNORED both"); + "itself IGNORED both\n"); #endif return TRUE; } else { @@ -370,7 +356,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) #ifdef DEBUG_FOCUS ob_debug("focused window got an Out/In back to " "itself but focus_client was null " - "IGNORED just the Out"); + "IGNORED just the Out\n"); #endif return TRUE; } @@ -390,7 +376,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) if (fallback) { #ifdef DEBUG_FOCUS ob_debug("no valid FocusIn and no FocusOut events found, " - "falling back"); + "falling back\n"); #endif focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } @@ -406,7 +392,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) (e->xcrossing.mode == NotifyUngrab && e->xcrossing.detail == NotifyVirtual)) { #ifdef DEBUG_FOCUS - ob_debug("%sNotify mode %d detail %d on %lx IGNORED", + 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); @@ -414,7 +400,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client) return TRUE; } #ifdef DEBUG_FOCUS - ob_debug("%sNotify mode %d detail %d on %lx", + 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); @@ -501,19 +487,20 @@ static void event_process(const XEvent *ec, gpointer data) { if (menu_frame_visible) event_handle_menu(e); - else if (moveresize_in_progress) - moveresize_event(e); else { - ObFrameContext context; + if (!keyboard_process_interactive_grab(e, &client)) { + if (moveresize_in_progress) + moveresize_event(e); - context = frame_context(client, e->xany.window); - - if (!keyboard_process_interactive_grab(e, &client, &context)) { if (e->type == ButtonPress || e->type == ButtonRelease || e->type == MotionNotify) - mouse_event(client, context, e); + mouse_event(client, e); else if (e->type == KeyPress) - keyboard_event(client, e); + /* 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); } } } @@ -659,9 +646,11 @@ static void event_handle_client(ObClient *client, XEvent *e) case OB_FRAME_CONTEXT_FRAME: /* XXX if doing a 'reconfigure' make sure you kill this timer, maybe all timers.. */ - if (config_focus_delay) { + 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; - ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func); } default: break; @@ -709,7 +698,7 @@ static void event_handle_client(ObClient *client, XEvent *e) ob_main_loop_timeout_add(ob_main_loop, config_focus_delay, focus_delay_func, - NULL, NULL); + client, NULL); focus_delay_client = client; } else client_focus(client); @@ -1138,8 +1127,7 @@ static void event_handle_menu(XEvent *ev) else { if ((e = menu_entry_frame_under(ev->xbutton.x_root, ev->xbutton.y_root))) - menu_entry_frame_execute(e, - !(ev->xbutton.state & ControlMask)); + menu_entry_frame_execute(e, ev->xbutton.state); } break; case MotionNotify: @@ -1157,8 +1145,7 @@ static void event_handle_menu(XEvent *ev) 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 & ControlMask)); + 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) @@ -1190,7 +1177,8 @@ 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; - ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func); } }