X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=868712c1fe53209ea28322b007e22315251a4a36;hb=7cf4c970ae89f06aa77345900f96a310400c8595;hp=af239d23887f2f957d75d1772cb584e44a9ce69f;hpb=e043faec9e073c8f5599a72b4f8b87160a3fbaa0;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index af239d23..868712c1 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -265,6 +265,15 @@ static void event_hack_mods(XEvent *e) break; case MotionNotify: e->xmotion.state = modkeys_only_modifier_masks(e->xmotion.state); + /* compress events */ + { + XEvent ce; + while (XCheckTypedWindowEvent(ob_display, e->xmotion.window, + e->type, &ce)) { + e->xmotion.x_root = ce.xmotion.x_root; + e->xmotion.y_root = ce.xmotion.y_root; + } + } break; } } @@ -310,6 +319,12 @@ static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only) if (!w || !WINDOW_IS_CLIENT(w)) return FALSE; } + else { + /* This means focus reverted to parent from the client (this + happens often during iconify animation) */ + if (detail == NotifyInferior) + return TRUE; + } /* This means focus moved from the root window to a client */ if (detail == NotifyVirtual) @@ -471,7 +486,8 @@ static void event_process(const XEvent *ec, gpointer data) { XEvent ce; - ob_debug_type(OB_DEBUG_FOCUS, "Focus went to pointer root/none\n"); + ob_debug_type(OB_DEBUG_FOCUS, "Focus went to pointer root/none or" + " the frame window\n"); /* If another FocusIn is in the queue then don't fallback yet. This fixes the fun case of: @@ -493,7 +509,7 @@ static void event_process(const XEvent *ec, gpointer data) ob_debug_type(OB_DEBUG_FOCUS, " but another FocusIn is coming\n"); } else { - /* Focus has been reverted to the root window or nothing. + /* Focus has been reverted. FocusOut events come after UnmapNotify, so we don't need to worry about focusing an invalid window @@ -510,7 +526,10 @@ static void event_process(const XEvent *ec, gpointer data) /* If you send focus to a window and then it disappears, you can get the FocusIn for it, after it is unmanaged. - Just wait for the next FocusOut/FocusIn pair. */ + Just wait for the next FocusOut/FocusIn pair, but note that + nothing is focused now. + */ + focus_set_client(NULL); } else if (client != focus_client) { focus_left_screen = FALSE; @@ -523,6 +542,13 @@ static void event_process(const XEvent *ec, gpointer data) gboolean nomove = FALSE; XEvent ce; + if (client) { + frame_adjust_focus(client->frame, FALSE); + /* focus_set_client(NULL) has already been called in this + section or by focus_fallback */ + client_calc_layer(client); + } + /* Look for the followup FocusIn */ if (!XCheckIfEvent(ob_display, &ce, event_look_for_focusin, NULL)) { /* There is no FocusIn, this means focus went to a window that @@ -545,12 +571,8 @@ static void event_process(const XEvent *ec, gpointer data) xerror_set_ignore(FALSE); /* nothing is focused */ focus_set_client(NULL); - } else if (ce.xany.window == e->xany.window) { - ob_debug_type(OB_DEBUG_FOCUS, "Focus didn't go anywhere\n"); - /* If focus didn't actually move anywhere, there is nothing to do*/ - nomove = TRUE; } else { - /* Focus did move, so process the FocusIn event */ + /* Focus moved, so process the FocusIn event */ ObEventData ed = { .ignored = FALSE }; event_process(&ce, &ed); if (ed.ignored) { @@ -562,13 +584,6 @@ static void event_process(const XEvent *ec, gpointer data) focus_fallback(TRUE); } } - - if (client && !nomove) { - frame_adjust_focus(client->frame, FALSE); - if (client == focus_client) - focus_set_client(NULL); - client_calc_layer(client); - } } else if (timewinclients) event_handle_user_time_window_clients(timewinclients, e); else if (client) @@ -670,7 +685,7 @@ static void event_handle_root(XEvent *e) } } else if (msgtype == prop_atoms.net_number_of_desktops) { guint d = e->xclient.data.l[0]; - if (d > 0) + if (d > 0 && d <= 1000) screen_set_num_desktops(d); } else if (msgtype == prop_atoms.net_showing_desktop) { screen_show_desktop(e->xclient.data.l[0] != 0, NULL); @@ -1026,38 +1041,43 @@ static void event_handle_client(ObClient *client, XEvent *e) move = TRUE; } - /* don't allow clients to move shaded windows (fvwm does this) */ - if (client->shaded && (e->xconfigurerequest.value_mask & CWX || - e->xconfigurerequest.value_mask & CWY)) - { - e->xconfigurerequest.value_mask &= ~CWX; - e->xconfigurerequest.value_mask &= ~CWY; - - /* if the client tried to move and we aren't letting it then a - synthetic event is needed */ - move = TRUE; - } - if (e->xconfigurerequest.value_mask & CWX || e->xconfigurerequest.value_mask & CWY || e->xconfigurerequest.value_mask & CWWidth || e->xconfigurerequest.value_mask & CWHeight) { if (e->xconfigurerequest.value_mask & CWX) { - x = e->xconfigurerequest.x; + /* don't allow clients to move shaded windows (fvwm does this) + */ + if (!client->shaded) + x = e->xconfigurerequest.x; move = TRUE; } if (e->xconfigurerequest.value_mask & CWY) { - y = e->xconfigurerequest.y; + /* don't allow clients to move shaded windows (fvwm does this) + */ + if (!client->shaded) + y = e->xconfigurerequest.y; move = TRUE; } + if (e->xconfigurerequest.value_mask & CWWidth) { w = e->xconfigurerequest.width; resize = TRUE; + + /* if x was not given, then use gravity to figure out the new + x. the reference point should not be moved */ + if (!(e->xconfigurerequest.value_mask & CWX)) + client_gravity_resize_w(client, &x, client->area.width, w); } if (e->xconfigurerequest.value_mask & CWHeight) { h = e->xconfigurerequest.height; resize = TRUE; + + /* if y was not given, then use gravity to figure out the new + y. the reference point should not be moved */ + if (!(e->xconfigurerequest.value_mask & CWY)) + client_gravity_resize_h(client, &y, client->area.height,h); } } @@ -1267,12 +1287,12 @@ static void event_handle_client(ObClient *client, XEvent *e) prop_atoms.net_wm_moveresize_cancel) moveresize_end(TRUE); } else if (msgtype == prop_atoms.net_moveresize_window) { - gint grav, x, y, w, h; + gint ograv, x, y, w, h; + + ograv = client->gravity; if (e->xclient.data.l[0] & 0xff) - grav = e->xclient.data.l[0] & 0xff; - else - grav = client->gravity; + client->gravity = e->xclient.data.l[0] & 0xff; if (e->xclient.data.l[0] & 1 << 8) x = e->xclient.data.l[1]; @@ -1282,23 +1302,40 @@ static void event_handle_client(ObClient *client, XEvent *e) y = e->xclient.data.l[2]; else y = client->area.y; - if (e->xclient.data.l[0] & 1 << 10) + + if (e->xclient.data.l[0] & 1 << 10) { w = e->xclient.data.l[3]; + + /* if x was not given, then use gravity to figure out the new + x. the reference point should not be moved */ + if (!(e->xclient.data.l[0] & 1 << 8)) + client_gravity_resize_w(client, &x, client->area.width, w); + } else w = client->area.width; - if (e->xclient.data.l[0] & 1 << 11) + + if (e->xclient.data.l[0] & 1 << 11) { h = e->xclient.data.l[4]; + + /* if y was not given, then use gravity to figure out the new + y. the reference point should not be moved */ + if (!(e->xclient.data.l[0] & 1 << 9)) + client_gravity_resize_h(client, &y, client->area.height,h); + } else h = client->area.height; - ob_debug("MOVERESIZE x %d %d y %d %d\n", + ob_debug("MOVERESIZE x %d %d y %d %d (gravity %d)\n", e->xclient.data.l[0] & 1 << 8, x, - e->xclient.data.l[0] & 1 << 9, y); - client_convert_gravity(client, grav, &x, &y, w, h); + e->xclient.data.l[0] & 1 << 9, y, + client->gravity); + client_find_onscreen(client, &x, &y, w, h, FALSE); client_configure(client, x, y, w, h, FALSE, TRUE); + client->gravity = ograv; + /* ignore enter events caused by these like ob actions do */ event_ignore_all_queued_enters(); } else if (msgtype == prop_atoms.net_restack_window) {