X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=3b318b01fc7b622987515c44fa50758912253fa0;hb=cdb108c76d20e8272bfbd15919e32e609d685322;hp=2dcb6af2f220e1811294ae1533273ad0e3bc3935;hpb=a7f65a818c48e272aa9c8c49f2339b46b794078e;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 2dcb6af2..3b318b01 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -43,7 +43,6 @@ #include "translate.h" #include -#include #include #include @@ -82,7 +81,7 @@ static gboolean 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 void event_handle_user_time_window_client(ObClient *c, XEvent *e); static void event_handle_user_input(ObClient *client, XEvent *e); static void focus_delay_dest(gpointer data); @@ -275,14 +274,13 @@ static void event_hack_mods(XEvent *e) } } -static gboolean wanted_focusevent(XEvent *e) +static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only) { gint mode = e->xfocus.mode; gint detail = e->xfocus.detail; Window win = e->xany.window; if (e->type == FocusIn) { - /* These are ones we never want.. */ /* This means focus was given by a keyboard/mouse grab. */ @@ -294,7 +292,7 @@ static gboolean wanted_focusevent(XEvent *e) /* These are the ones we want.. */ - if (win == RootWindow(ob_display, ob_screen)) { + if (win == RootWindow(ob_display, ob_screen) && !in_client_only) { /* This means focus reverted off of a client */ if (detail == NotifyPointerRoot || detail == NotifyDetailNone || detail == NotifyInferior) @@ -310,7 +308,7 @@ static gboolean wanted_focusevent(XEvent *e) if (detail == NotifyNonlinearVirtual) return TRUE; /* This means focus moved to the frame window */ - if (detail == NotifyInferior) + if (detail == NotifyInferior && !in_client_only) return TRUE; /* Otherwise.. */ @@ -318,7 +316,6 @@ static gboolean wanted_focusevent(XEvent *e) } else { g_assert(e->type == FocusOut); - /* These are ones we never want.. */ /* This means focus was taken by a keyboard/mouse grab. */ @@ -348,18 +345,58 @@ static gboolean wanted_focusevent(XEvent *e) static Bool look_for_focusin(Display *d, XEvent *e, XPointer arg) { - return e->type == FocusIn && wanted_focusevent(e); + return e->type == FocusIn && wanted_focusevent(e, FALSE); +} + +static Bool look_for_focusin_client(Display *d, XEvent *e, XPointer arg) +{ + return e->type == FocusIn && wanted_focusevent(e, TRUE); +} + +static void print_focusevent(XEvent *e) +{ + gint mode = e->xfocus.mode; + gint detail = e->xfocus.detail; + Window win = e->xany.window; + const gchar *modestr, *detailstr; + + switch (mode) { + case NotifyNormal: modestr="NotifyNormal"; break; + case NotifyGrab: modestr="NotifyGrab"; break; + case NotifyUngrab: modestr="NotifyUngrab"; break; + case NotifyWhileGrabbed: modestr="NotifyWhileGrabbed"; break; + } + switch (detail) { + case NotifyAncestor: detailstr="NotifyAncestor"; break; + case NotifyVirtual: detailstr="NotifyVirtual"; break; + case NotifyInferior: detailstr="NotifyInferior"; break; + case NotifyNonlinear: detailstr="NotifyNonlinear"; break; + case NotifyNonlinearVirtual: detailstr="NotifyNonlinearVirtual"; break; + case NotifyPointer: detailstr="NotifyPointer"; break; + case NotifyPointerRoot: detailstr="NotifyPointerRoot"; break; + case NotifyDetailNone: detailstr="NotifyDetailNone"; break; + } + + g_assert(modestr); + g_assert(detailstr); + ob_debug_type(OB_DEBUG_FOCUS, "Focus%s 0x%x mode=%s detail=%s\n", + (e->xfocus.type == FocusIn ? "In" : "Out"), + win, + modestr, detailstr); + } static gboolean event_ignore(XEvent *e, ObClient *client) { switch(e->type) { case FocusIn: - if (!wanted_focusevent(e)) + print_focusevent(e); + if (!wanted_focusevent(e, FALSE)) return TRUE; break; case FocusOut: - if (!wanted_focusevent(e)) + print_focusevent(e); + if (!wanted_focusevent(e, FALSE)) return TRUE; break; } @@ -369,11 +406,11 @@ static gboolean event_ignore(XEvent *e, ObClient *client) static void event_process(const XEvent *ec, gpointer data) { Window window; - ObGroup *group = NULL; ObClient *client = NULL; ObDock *dock = NULL; ObDockApp *dockapp = NULL; ObWindow *obwin = NULL; + ObClient *timewinclient = NULL; XEvent ee, *e; ObEventData *ed = data; @@ -382,8 +419,9 @@ static void event_process(const XEvent *ec, gpointer data) e = ⅇ window = event_get_window(e); - if (!(e->type == PropertyNotify && - (group = g_hash_table_lookup(group_map, &window)))) + if (e->type != PropertyNotify || + !(timewinclient = + g_hash_table_lookup(client_user_time_window_map, &window))) if ((obwin = g_hash_table_lookup(window_map, &window))) { switch (obwin->type) { case Window_Dock: @@ -438,8 +476,11 @@ static void event_process(const XEvent *ec, gpointer data) hasn't received focus yet, so something else) -> send focusin which means the "something else" is the last thing to get a focusin sent to it, so the new window doesn't end up with focus. + + But if the other focus in is something like PointerRoot then we + still want to fall back. */ - if (XCheckIfEvent(ob_display, &ce, look_for_focusin, NULL)) { + if (XCheckIfEvent(ob_display, &ce, look_for_focusin_client, NULL)){ XPutBackEvent(ob_display, &ce); ob_debug_type(OB_DEBUG_FOCUS, " but another FocusIn is coming\n"); @@ -463,13 +504,12 @@ static void event_process(const XEvent *ec, gpointer data) frame_adjust_focus(client->frame, TRUE); focus_set_client(client); client_calc_layer(client); + client_bring_helper_windows(client); } } else if (e->type == FocusOut) { gboolean nomove = FALSE; XEvent ce; - ob_debug_type(OB_DEBUG_FOCUS, "FocusOut Event\n"); - /* Look for the followup FocusIn */ if (!XCheckIfEvent(ob_display, &ce, look_for_focusin, NULL)) { /* There is no FocusIn, this means focus went to a window that @@ -515,8 +555,8 @@ static void event_process(const XEvent *ec, gpointer data) /* focus_set_client has already been called for sure */ client_calc_layer(client); } - } else if (group) - event_handle_group(group, e); + } else if (timewinclient) + event_handle_user_time_window_client(timewinclient, e); else if (client) event_handle_client(client, e); else if (dockapp) @@ -623,21 +663,11 @@ static void event_handle_root(XEvent *e) } } -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 (client_enter_focusable(client) && client_can_focus(client)) { if (config_focus_delay) { ObFocusDelayData *data; @@ -660,6 +690,13 @@ void event_enter_client(ObClient *client) } } +static void event_handle_user_time_window_client(ObClient *client, XEvent *e) +{ + g_assert(e->type == PropertyNotify); + if (e->xproperty.atom == prop_atoms.net_wm_user_time) + client_update_user_time(client); +} + static void event_handle_client(ObClient *client, XEvent *e) { XEvent ce; @@ -670,8 +707,15 @@ static void event_handle_client(ObClient *client, XEvent *e) 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)) { + is a waste of resources to go drawing it. + if the user is doing an intereactive thing, or has a menu open then + the mouse is grabbed (possibly) and if we get these events we don't + want to deal with them + */ + if (!(e->xbutton.button == 4 || e->xbutton.button == 5) && + !keyboard_interactively_grabbed() && + !menu_frame_visible) + { con = frame_context(client, e->xbutton.window); con = mouse_button_frame_context(con, e->xbutton.button); switch (con) { @@ -1000,9 +1044,10 @@ static void event_handle_client(ObClient *client, XEvent *e) (e->xclient.data.l[0] == 2 ? "user" : "INVALID")))); /* XXX make use of data.l[2] !? */ event_curtime = e->xclient.data.l[1]; - ob_debug_type(OB_DEBUG_APP_BUGS, - "_NET_ACTIVE_WINDOW message for window %s is " - "missing a timestamp\n", client->title); + if (event_curtime == 0) + ob_debug_type(OB_DEBUG_APP_BUGS, + "_NET_ACTIVE_WINDOW message for window %s is " + "missing a timestamp\n", client->title); client_activate(client, FALSE, (e->xclient.data.l[0] == 0 || e->xclient.data.l[0] == 2)); @@ -1128,8 +1173,6 @@ static void event_handle_client(ObClient *client, XEvent *e) msgtype == prop_atoms.net_wm_icon_name || msgtype == prop_atoms.wm_icon_name) { client_update_title(client); - } else if (msgtype == prop_atoms.wm_class) { - client_update_class(client); } else if (msgtype == prop_atoms.wm_protocols) { client_update_protocols(client); client_setup_decor_and_functions(client); @@ -1146,14 +1189,14 @@ static void event_handle_client(ObClient *client, XEvent *e) else if (msgtype == prop_atoms.net_wm_user_time) { client_update_user_time(client); } + else if (msgtype == prop_atoms.net_wm_user_time_window) { + client_update_user_time_window(client); + } #ifdef SYNC else if (msgtype == prop_atoms.net_wm_sync_request_counter) { client_update_sync_request_counter(client); } #endif - else if (msgtype == prop_atoms.sm_client_id) { - client_update_sm_client_id(client); - } case ColormapNotify: client_update_colormap(client, e->xcolormap.colormap); break;