(*a)->data.moveresize.corner = 0;
}
-void setup_action_showmenu(ObAction **a, ObUserAction uact)
-{
- (*a)->data.showmenu.any.client_action = OB_CLIENT_ACTION_OPTIONAL;
- /* you cannot call ShowMenu from inside a menu, cuz the menu code makes
- assumptions that there is only one menu (and submenus) open at
- a time! */
- if (uact == OB_USER_ACTION_MENU_SELECTION) {
- action_unref(*a);
- *a = NULL;
- }
-}
-
void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact)
{
(*a)->data.addremovedesktop.current = TRUE;
ActionString actionstrings[] =
{
{
- "debug",
- action_debug,
- NULL
- },
- {
- "execute",
- action_execute,
- NULL
- },
- {
"directionalfocusnorth",
action_directional_focus,
setup_action_directional_focus_north
NULL
},
{
- "toggleshowdesktop",
- action_toggle_show_desktop,
- NULL
- },
- {
- "showdesktop",
- action_show_desktop,
- NULL
- },
- {
- "unshowdesktop",
- action_unshow_desktop,
- NULL
- },
- {
"desktoplast",
action_desktop_last,
NULL
},
{
- "reconfigure",
- action_reconfigure,
- NULL
- },
- {
- "restart",
- action_restart,
- NULL
- },
- {
- "exit",
- action_exit,
- NULL
- },
- {
- "showmenu",
- action_showmenu,
- setup_action_showmenu
- },
- {
"sendtotoplayer",
action_send_to_layer,
setup_action_top_layer
if (parse_attr_string("name", node, &actname)) {
if ((act = action_from_string(actname, uact))) {
- if (act->func == action_execute || act->func == action_restart) {
- if ((n = parse_find_node("execute", node->xmlChildrenNode))) {
- gchar *s = parse_string(doc, n);
- act->data.execute.path = parse_expand_tilde(s);
- g_free(s);
- }
- if ((n = parse_find_node("startupnotify", node->xmlChildrenNode))) {
- xmlNodePtr m;
- if ((m = parse_find_node("enabled", n->xmlChildrenNode)))
- act->data.execute.startupnotify = parse_bool(doc, m);
- if ((m = parse_find_node("name", n->xmlChildrenNode)))
- act->data.execute.name = parse_string(doc, m);
- if ((m = parse_find_node("icon", n->xmlChildrenNode)))
- act->data.execute.icon_name = parse_string(doc, m);
- }
- } else if (act->func == action_debug) {
- if ((n = parse_find_node("string", node->xmlChildrenNode)))
- act->data.debug.string = parse_string(doc, n);
- } else if (act->func == action_showmenu) {
- if ((n = parse_find_node("menu", node->xmlChildrenNode)))
- act->data.showmenu.name = parse_string(doc, n);
} else if (act->func == action_move_relative_horz ||
act->func == action_move_relative_vert ||
act->func == action_resize_relative_horz ||
action_run(l, c, 0, time);
}
-void action_debug(union ActionData *data)
-{
- if (data->debug.string)
- g_print("%s\n", data->debug.string);
-}
-
-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)
{
if (data->client.any.c) {
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);
}
Rect *area;
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);
}
moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
}
-void action_reconfigure(union ActionData *data)
-{
- ob_reconfigure();
-}
-
-void action_restart(union ActionData *data)
-{
- ob_restart_other(data->execute.path);
-}
-
-void action_exit(union ActionData *data)
-{
- ob_exit(0);
-}
-
-void action_showmenu(union ActionData *data)
-{
- if (data->showmenu.name) {
- menu_show(data->showmenu.name, data->any.x, data->any.y,
- data->any.button, data->showmenu.any.c);
- }
-}
-
void action_cycle_windows(union ActionData *data)
{
/* if using focus_delay, stop the timer now so that focus doesn't go moving
dock_configure();
}
-void action_toggle_show_desktop(union ActionData *data)
-{
- screen_show_desktop(!screen_showing_desktop, NULL);
-}
-
-void action_show_desktop(union ActionData *data)
-{
- screen_show_desktop(TRUE, NULL);
-}
-
-void action_unshow_desktop(union ActionData *data)
-{
- screen_show_desktop(FALSE, NULL);
-}
-
void action_break_chroot(union ActionData *data)
{
/* break out of one chroot */
void action_remove_desktop(union ActionData *data)
{
+ guint rmdesktop, movedesktop;
+ GList *it, *stacking_copy;
+
if (screen_num_desktops < 2) return;
client_action_start(data);
- if (screen_desktop == screen_num_desktops - 1)
- data->addremovedesktop.current = FALSE;
+ /* 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;
- /* move all the clients over */
- if (data->addremovedesktop.current) {
- GList *it, *stacking_copy;
-
- /* 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;
- if (c->desktop != DESKTOP_ALL && c->desktop > screen_desktop)
- client_set_desktop(c, c->desktop - 1, TRUE, TRUE);
- /* raise all the windows that are on the current desktop which
- is being merged */
- else if (c->desktop == DESKTOP_ALL ||
- c->desktop == screen_desktop)
- stacking_raise(CLIENT_AS_WINDOW(c));
+ /* 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);
}
}
}
projects / dana / openbox-history.git / blobdiff