X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=df3037daba95f377a55dad17152bdf24ff70b437;hb=b76ec18d1c8857cf32598c822364298fc535c84e;hp=de5f9a8a089682b0c96bd842f8766d840c444455;hpb=097d02d9d3d4b2eeea11084c54812de9cd7d14c0;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index de5f9a8a..df3037da 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -39,8 +39,11 @@ #include +static gulong ignore_start = 0; + static void client_action_start(union ActionData *data) { + ignore_start = event_start_ignore_all_enters(); } static void client_action_end(union ActionData *data, gboolean allow_enters) @@ -48,7 +51,7 @@ static void client_action_end(union ActionData *data, gboolean allow_enters) if (config_focus_follow) if (data->any.context != OB_FRAME_CONTEXT_CLIENT) { if (!data->any.button && data->any.c && !allow_enters) { - event_ignore_all_queued_enters(); + event_end_ignore_all_enters(ignore_start); } else { ObClient *c; @@ -57,8 +60,12 @@ static void client_action_end(union ActionData *data, gboolean allow_enters) event will come as a GrabNotify which is ignored, so this makes a fake enter event */ - if ((c = client_under_pointer()) && c != data->any.c) + if ((c = client_under_pointer()) && c != data->any.c) { + ob_debug_type(OB_DEBUG_FOCUS, + "Generating fake enter because we did a " + "mouse-event action"); event_enter_client(c); + } } } } @@ -463,6 +470,16 @@ void setup_action_showmenu(ObAction **a, ObUserAction uact) } } +void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact) +{ + (*a)->data.addremovedesktop.current = TRUE; +} + +void setup_action_addremove_desktop_last(ObAction **a, ObUserAction uact) +{ + (*a)->data.addremovedesktop.current = FALSE; +} + void setup_action_focus(ObAction **a, ObUserAction uact) { (*a)->data.any.client_action = OB_CLIENT_ACTION_OPTIONAL; @@ -920,6 +937,26 @@ ActionString actionstrings[] = action_break_chroot, NULL }, + { + "adddesktoplast", + action_add_desktop, + setup_action_addremove_desktop_last + }, + { + "removedesktoplast", + action_remove_desktop, + setup_action_addremove_desktop_last + }, + { + "adddesktopcurrent", + action_add_desktop, + setup_action_addremove_desktop_current + }, + { + "removedesktopcurrent", + action_remove_desktop, + setup_action_addremove_desktop_current + }, { NULL, NULL, @@ -1211,59 +1248,6 @@ void action_debug(union ActionData *data) void action_execute(union ActionData *data) { - GError *e = NULL; - gchar *cmd, **argv = 0; - if (data->execute.path) { - cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL); - if (cmd) { - /* If there is a keyboard grab going on then we need to cancel - it so the application can grab things */ - event_cancel_all_key_grabs(); - - if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) { - g_message(_("Failed to execute '%s': %s"), - cmd, e->message); - g_error_free(e); - } else if (data->execute.startupnotify) { - gchar *program; - - program = g_path_get_basename(argv[0]); - /* sets up the environment */ - sn_setup_spawn_environment(program, - data->execute.name, - data->execute.icon_name, - /* launch it on the current - desktop */ - screen_desktop, - data->execute.any.time); - if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | - G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, NULL, &e)) { - g_message(_("Failed to execute '%s': %s"), - cmd, e->message); - g_error_free(e); - sn_spawn_cancel(); - } - unsetenv("DESKTOP_STARTUP_ID"); - g_free(program); - g_strfreev(argv); - } else { - if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | - G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, NULL, &e)) - { - g_message(_("Failed to execute '%s': %s"), - cmd, e->message); - g_error_free(e); - } - g_strfreev(argv); - } - g_free(cmd); - } else { - g_message(_("Failed to convert the path '%s' from utf8"), - data->execute.path); - } - } } void action_activate(union ActionData *data) @@ -1311,7 +1295,7 @@ void action_focus(union ActionData *data) void action_unfocus (union ActionData *data) { if (data->client.any.c == focus_client) - focus_fallback(FALSE, FALSE); + focus_fallback(FALSE, FALSE, TRUE); } void action_iconify(union ActionData *data) @@ -1331,7 +1315,7 @@ void action_raiselower(union ActionData *data) 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); } @@ -1400,7 +1384,7 @@ void action_toggle_omnipresent(union ActionData *data) { client_set_desktop(data->client.any.c, data->client.any.c->desktop == DESKTOP_ALL ? - screen_desktop : DESKTOP_ALL, FALSE); + screen_desktop : DESKTOP_ALL, FALSE, TRUE); } void action_move_relative_horz(union ActionData *data) @@ -1423,11 +1407,12 @@ void action_move_to_center(union ActionData *data) { ObClient *c = data->client.any.c; Rect *area; - area = screen_area_monitor(c->desktop, 0); + area = screen_area(c->desktop, client_monitor(c), NULL); client_action_start(data); - client_move(c, area->width / 2 - c->area.width / 2, - area->height / 2 - c->area.height / 2); + client_move(c, area->x + area->width / 2 - c->area.width / 2, + area->y + area->height / 2 - c->area.height / 2); client_action_end(data, FALSE); + g_free(area); } void action_resize_relative_horz(union ActionData *data) @@ -1463,21 +1448,30 @@ void action_move_relative(union ActionData *data) void action_resize_relative(union ActionData *data) { ObClient *c = data->relative.any.c; - gint x, y, ow, w, oh, h, lw, lh; + gint x, y, ow, xoff, nw, oh, yoff, nh, lw, lh; client_action_start(data); x = c->area.x; y = c->area.y; ow = c->area.width; - w = ow + data->relative.deltax * c->size_inc.width + xoff = -data->relative.deltaxl * c->size_inc.width; + nw = ow + data->relative.deltax * c->size_inc.width + data->relative.deltaxl * c->size_inc.width; oh = c->area.height; - h = oh + data->relative.deltay * c->size_inc.height + yoff = -data->relative.deltayu * c->size_inc.height; + nh = oh + data->relative.deltay * c->size_inc.height + data->relative.deltayu * c->size_inc.height; + + g_print("deltax %d %d x %d ow %d xoff %d nw %d\n", + data->relative.deltax, + data->relative.deltaxl, + x, ow, xoff, nw); - client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE); - client_move_resize(c, x + (ow - w), y + (oh - h), w, h); + client_try_configure(c, &x, &y, &nw, &nh, &lw, &lh, TRUE); + xoff = xoff == 0 ? 0 : (xoff < 0 ? MAX(xoff, ow-nw) : MIN(xoff, ow-nw)); + yoff = yoff == 0 ? 0 : (yoff < 0 ? MAX(yoff, oh-nh) : MIN(yoff, oh-nh)); + client_move_resize(c, x + xoff, y + yoff, nw, nh); client_action_end(data, FALSE); } @@ -1564,7 +1558,7 @@ void action_send_to_desktop(union ActionData *data) if (data->sendto.desk < screen_num_desktops || data->sendto.desk == DESKTOP_ALL) { - client_set_desktop(c, data->sendto.desk, data->sendto.follow); + client_set_desktop(c, data->sendto.desk, data->sendto.follow, FALSE); if (data->sendto.follow && data->sendto.desk != screen_desktop) screen_set_desktop(data->sendto.desk, TRUE); } @@ -1622,7 +1616,7 @@ void action_send_to_desktop_dir(union ActionData *data) if (!data->sendtodir.inter.any.interactive || (data->sendtodir.inter.final && !data->sendtodir.inter.cancel)) { - client_set_desktop(c, d, data->sendtodir.follow); + client_set_desktop(c, d, data->sendtodir.follow, FALSE); if (data->sendtodir.follow && d != screen_desktop) screen_set_desktop(d, TRUE); } @@ -1630,7 +1624,8 @@ void action_send_to_desktop_dir(union ActionData *data) void action_desktop_last(union ActionData *data) { - screen_set_desktop(screen_last_desktop, TRUE); + if (screen_last_desktop < screen_num_desktops) + screen_set_desktop(screen_last_desktop, TRUE); } void action_toggle_decorations(union ActionData *data) @@ -1881,7 +1876,7 @@ void action_growtoedge(union ActionData *data) ObClient *c = data->diraction.any.c; Rect *a; - a = screen_area(c->desktop); + a = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS, &c->frame->area); x = c->frame->area.x; y = c->frame->area.y; /* get the unshaded frame's dimensions..if it is shaded */ @@ -1940,6 +1935,7 @@ void action_growtoedge(union ActionData *data) client_action_start(data); client_move_resize(c, x, y, width, height); client_action_end(data, FALSE); + g_free(a); } void action_send_to_layer(union ActionData *data) @@ -1985,3 +1981,76 @@ void action_break_chroot(union ActionData *data) /* break out of one chroot */ keyboard_reset_chains(1); } + +void action_add_desktop(union ActionData *data) +{ + client_action_start(data); + screen_set_num_desktops(screen_num_desktops+1); + + /* move all the clients over */ + if (data->addremovedesktop.current) { + GList *it; + + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + if (c->desktop != DESKTOP_ALL && c->desktop >= screen_desktop) + client_set_desktop(c, c->desktop+1, FALSE, TRUE); + } + } + + client_action_end(data, config_focus_under_mouse); +} + +void action_remove_desktop(union ActionData *data) +{ + guint rmdesktop, movedesktop; + GList *it, *stacking_copy; + + if (screen_num_desktops < 2) return; + + client_action_start(data); + + /* what desktop are we removing and moving to? */ + if (data->addremovedesktop.current) + rmdesktop = screen_desktop; + else + rmdesktop = screen_num_desktops - 1; + if (rmdesktop < screen_num_desktops - 1) + movedesktop = rmdesktop + 1; + else + movedesktop = rmdesktop; + + /* make a copy of the list cuz we're changing it */ + stacking_copy = g_list_copy(stacking_list); + for (it = g_list_last(stacking_copy); it; it = g_list_previous(it)) { + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *c = it->data; + guint d = c->desktop; + if (d != DESKTOP_ALL && d >= movedesktop) { + client_set_desktop(c, c->desktop - 1, TRUE, TRUE); + ob_debug("moving window %s\n", c->title); + } + /* raise all the windows that are on the current desktop which + is being merged */ + if ((screen_desktop == rmdesktop - 1 || + screen_desktop == rmdesktop) && + (d == DESKTOP_ALL || d == screen_desktop)) + { + stacking_raise(CLIENT_AS_WINDOW(c)); + ob_debug("raising window %s\n", c->title); + } + } + } + + /* act like we're changing desktops */ + if (screen_desktop < screen_num_desktops - 1) { + gint d = screen_desktop; + screen_desktop = screen_last_desktop; + screen_set_desktop(d, TRUE); + ob_debug("fake desktop change\n"); + } + + screen_set_num_desktops(screen_num_desktops-1); + + client_action_end(data, config_focus_under_mouse); +}