don't activate on raise
Dana Jansens danakj@orodu.net
4 files changed,
8 insertions(+),
27 deletions(-)
M
openbox/action.c
→
openbox/action.c
@@ -1368,7 +1368,7 @@ {
ObClient *c = data->client.any.c; client_action_start(data); - stacking_restack_request(c, NULL, Opposite, FALSE); + stacking_restack_request(c, NULL, Opposite); client_action_end(data, config_focus_under_mouse); }
M
openbox/event.c
→
openbox/event.c
@@ -1077,12 +1077,10 @@ if (WINDOW_IS_CLIENT(win) && WINDOW_AS_CLIENT(win) != client)
sibling = WINDOW_AS_CLIENT(win); } - /* activate it rather than just focus it */ if (!config_focus_under_mouse) ignore_start = event_start_ignore_all_enters(); stacking_restack_request(client, sibling, - e->xconfigurerequest.detail, - TRUE); + e->xconfigurerequest.detail); if (!config_focus_under_mouse) event_end_ignore_all_enters(ignore_start);@@ -1420,7 +1418,7 @@ if (!config_focus_under_mouse)
ignore_start = event_start_ignore_all_enters(); /* just raise, don't activate */ stacking_restack_request(client, sibling, - e->xclient.data.l[2], FALSE); + e->xclient.data.l[2]); if (!config_focus_under_mouse) event_end_ignore_all_enters(ignore_start);
M
openbox/stacking.c
→
openbox/stacking.c
@@ -559,7 +559,7 @@ return occludes;
} gboolean stacking_restack_request(ObClient *client, ObClient *sibling, - gint detail, gboolean activate) + gint detail) { gboolean ret = FALSE;@@ -595,24 +595,14 @@ break;
case Above: ob_debug("Restack request Above for client %s sibling %s\n", client->title, sibling ? sibling->title : "(all)"); - if (activate && !client->iconic && client_normal(client)) - /* use user=TRUE because it is impossible to get a timestamp - for this */ - client_activate(client, FALSE, TRUE); - else - stacking_raise(CLIENT_AS_WINDOW(client)); + stacking_raise(CLIENT_AS_WINDOW(client)); ret = TRUE; break; case TopIf: ob_debug("Restack request TopIf for client %s sibling %s\n", client->title, sibling ? sibling->title : "(all)"); if (stacking_occluded(client, sibling)) { - if (activate && !client->iconic && client_normal(client)) - /* use user=TRUE because it is impossible to get a timestamp - for this */ - client_activate(client, FALSE, TRUE); - else - stacking_raise(CLIENT_AS_WINDOW(client)); + stacking_raise(CLIENT_AS_WINDOW(client)); ret = TRUE; } break;@@ -621,12 +611,7 @@ ob_debug("Restack request Opposite for client %s sibling "
"%s\n", client->title, sibling ? sibling->title : "(all)"); if (stacking_occluded(client, sibling)) { - if (activate && !client->iconic && client_normal(client)) - /* use user=TRUE because it is impossible to get a timestamp - for this */ - client_activate(client, FALSE, TRUE); - else - stacking_raise(CLIENT_AS_WINDOW(client)); + stacking_raise(CLIENT_AS_WINDOW(client)); ret = TRUE; } else if (stacking_occludes(client, sibling)) {
M
openbox/stacking.h
→
openbox/stacking.h
@@ -65,14 +65,12 @@ @param client The client to be restacked
@param sibling Another client to compare to, or NULL to compare to all windows @param detail One of Above, Below, TopIf, BottomIf, Opposite - @param activate If TRUE, and if the window is going to be raised, it will - be activated instead @return TRUE if the client was restacked See http://tronche.com/gui/x/xlib/window/configure.html for details on how each detail works with and without a sibling. */ gboolean stacking_restack_request(struct _ObClient *client, struct _ObClient *sibling, - gint detail, gboolean activate); + gint detail); #endif