#include <glib.h>
-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)
-{
- if (config_focus_follow)
- if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
- if (!data->any.button && data->any.c && !allow_enters) {
- event_end_ignore_all_enters(ignore_start);
- } else {
- ObClient *c;
-
- /* usually this is sorta redundant, but with a press action
- that moves windows our from under the cursor, the enter
- 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) {
- ob_debug_type(OB_DEBUG_FOCUS,
- "Generating fake enter because we did a "
- "mouse-event action");
- event_enter_client(c);
- }
- }
- }
-}
typedef struct
{
(*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact)
-{
- (*a)->data.cycle.inter.any.interactive = TRUE;
- (*a)->data.cycle.linear = FALSE;
- (*a)->data.cycle.forward = TRUE;
- (*a)->data.cycle.dialog = TRUE;
- (*a)->data.cycle.dock_windows = FALSE;
- (*a)->data.cycle.desktop_windows = FALSE;
- (*a)->data.cycle.all_desktops = FALSE;
-}
-
-void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
-{
- (*a)->data.cycle.inter.any.interactive = TRUE;
- (*a)->data.cycle.linear = FALSE;
- (*a)->data.cycle.forward = FALSE;
- (*a)->data.cycle.dialog = TRUE;
- (*a)->data.cycle.dock_windows = FALSE;
- (*a)->data.cycle.desktop_windows = FALSE;
- (*a)->data.cycle.all_desktops = FALSE;
-}
-
void setup_action_movefromedge_north(ObAction **a, ObUserAction uact)
{
(*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.layer.layer = -1;
}
-void setup_action_move(ObAction **a, ObUserAction uact)
-{
- (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
- (*a)->data.moveresize.keyboard =
- (uact == OB_USER_ACTION_NONE ||
- uact == OB_USER_ACTION_KEYBOARD_KEY ||
- uact == OB_USER_ACTION_MENU_SELECTION);
- (*a)->data.moveresize.corner = 0;
-}
-
void setup_action_resize(ObAction **a, ObUserAction uact)
{
(*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.moveresize.corner = 0;
}
-void setup_action_showmenu(ObAction **a, ObUserAction uact)
+void setup_action_addremove_desktop_current(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;
- }
+ (*a)->data.addremovedesktop.current = TRUE;
}
-void setup_action_focus(ObAction **a, ObUserAction uact)
+void setup_action_addremove_desktop_last(ObAction **a, ObUserAction uact)
{
- (*a)->data.any.client_action = OB_CLIENT_ACTION_OPTIONAL;
+ (*a)->data.addremovedesktop.current = FALSE;
}
void setup_client_action(ObAction **a, ObUserAction uact)
ActionString actionstrings[] =
{
{
- "debug",
- action_debug,
- NULL
- },
- {
- "execute",
- action_execute,
- NULL
- },
- {
"directionalfocusnorth",
action_directional_focus,
setup_action_directional_focus_north
setup_action_directional_focus_northwest
},
{
- "activate",
- action_activate,
- setup_action_focus
- },
- {
- "focus",
- action_focus,
- setup_action_focus
- },
- {
- "unfocus",
- action_unfocus,
- setup_client_action
- },
- {
- "iconify",
- action_iconify,
- setup_client_action
- },
- {
- "focustobottom",
- action_focus_order_to_bottom,
- setup_client_action
- },
- {
- "raiselower",
- action_raiselower,
- setup_client_action
- },
- {
- "raise",
- action_raise,
- setup_client_action
- },
- {
- "lower",
- action_lower,
- setup_client_action
- },
- {
- "close",
- action_close,
- setup_client_action
- },
- {
"kill",
action_kill,
setup_client_action
setup_client_action
},
{
- "maximizefull",
- action_maximize_full,
- setup_client_action
- },
- {
- "unmaximizefull",
- action_unmaximize_full,
- setup_client_action
- },
- {
- "togglemaximizefull",
- action_toggle_maximize_full,
- setup_client_action
- },
- {
"maximizehorz",
action_maximize_horz,
setup_client_action
setup_client_action
},
{
- "togglefullscreen",
- action_toggle_fullscreen,
- setup_client_action
- },
- {
"sendtodesktop",
action_send_to_desktop,
setup_action_send_to_desktop
setup_client_action
},
{
- "move",
- action_move,
- setup_action_move
- },
- {
"resize",
action_resize,
setup_action_resize
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
setup_action_bottom_layer
},
{
- "nextwindow",
- action_cycle_windows,
- setup_action_cycle_windows_next
- },
- {
- "previouswindow",
- action_cycle_windows,
- setup_action_cycle_windows_previous
- },
- {
"movefromedgenorth",
action_movetoedge,
setup_action_movefromedge_north
setup_action_growtoedge_east
},
{
- "breakchroot",
- 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,
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 ||
if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
act->data.sendtodir.inter.any.interactive =
parse_bool(doc, n);
- } else if (act->func == action_activate) {
- if ((n = parse_find_node("here", node->xmlChildrenNode)))
- act->data.activate.here = parse_bool(doc, n);
- } else if (act->func == action_cycle_windows) {
- if ((n = parse_find_node("linear", node->xmlChildrenNode)))
- act->data.cycle.linear = parse_bool(doc, n);
- if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
- act->data.cycle.dialog = parse_bool(doc, n);
- if ((n = parse_find_node("panels", node->xmlChildrenNode)))
- act->data.cycle.dock_windows = parse_bool(doc, n);
- if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
- act->data.cycle.desktop_windows = parse_bool(doc, n);
- if ((n = parse_find_node("allDesktops",
- node->xmlChildrenNode)))
- act->data.cycle.all_desktops = parse_bool(doc, n);
} else if (act->func == action_directional_focus) {
if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
act->data.interdiraction.dialog = parse_bool(doc, n);
prop_atoms.net_wm_moveresize_size_bottomright;
g_free(s);
}
- } else if (act->func == action_raise ||
- act->func == action_lower ||
- act->func == action_raiselower ||
- act->func == action_shadelower ||
- act->func == action_unshaderaise) {
- }
INTERACTIVE_LIMIT(act, uact);
}
g_free(actname);
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) {
- if (!data->any.button || client_mouse_focusable(data->client.any.c) ||
- (data->any.context != OB_FRAME_CONTEXT_CLIENT &&
- data->any.context != OB_FRAME_CONTEXT_FRAME))
- {
- /* if using focus_delay, stop the timer now so that focus doesn't
- go moving on us */
- event_halt_focus_delay();
-
- client_activate(data->activate.any.c, data->activate.here, TRUE);
- }
- } else {
- /* focus action on something other than a client, make keybindings
- work for this openbox instance, but don't focus any specific client
- */
- focus_nothing();
- }
-}
-
-void action_focus(union ActionData *data)
-{
- if (data->client.any.c) {
- if (!data->any.button || client_mouse_focusable(data->client.any.c) ||
- (data->any.context != OB_FRAME_CONTEXT_CLIENT &&
- data->any.context != OB_FRAME_CONTEXT_FRAME))
- {
- /* if using focus_delay, stop the timer now so that focus doesn't
- go moving on us */
- event_halt_focus_delay();
-
- client_focus(data->client.any.c);
- }
- } else {
- /* focus action on something other than a client, make keybindings
- work for this openbox instance, but don't focus any specific client
- */
- focus_nothing();
- }
-}
-
-void action_unfocus (union ActionData *data)
-{
- if (data->client.any.c == focus_client)
- focus_fallback(FALSE, FALSE, TRUE);
-}
-
-void action_iconify(union ActionData *data)
-{
- client_action_start(data);
- client_iconify(data->client.any.c, TRUE, TRUE, FALSE);
- client_action_end(data, config_focus_under_mouse);
-}
-
-void action_focus_order_to_bottom(union ActionData *data)
-{
- focus_order_to_bottom(data->client.any.c);
-}
-
-void action_raiselower(union ActionData *data)
-{
- ObClient *c = data->client.any.c;
-
- client_action_start(data);
- stacking_restack_request(c, NULL, Opposite, FALSE);
- client_action_end(data, config_focus_under_mouse);
-}
-
-void action_raise(union ActionData *data)
-{
- client_action_start(data);
- stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
- client_action_end(data, config_focus_under_mouse);
-}
-
void action_unshaderaise(union ActionData *data)
{
if (data->client.any.c->shaded)
action_shade(data);
}
-void action_lower(union ActionData *data)
-{
- client_action_start(data);
- stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
- client_action_end(data, config_focus_under_mouse);
-}
-
-void action_close(union ActionData *data)
-{
- client_close(data->client.any.c);
-}
-
void action_kill(union ActionData *data)
{
client_kill(data->client.any.c);
{
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)
{
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)
client_action_end(data, FALSE);
}
-void action_maximize_full(union ActionData *data)
-{
- client_action_start(data);
- client_maximize(data->client.any.c, TRUE, 0);
- client_action_end(data, config_focus_under_mouse);
-}
-
-void action_unmaximize_full(union ActionData *data)
-{
- client_action_start(data);
- client_maximize(data->client.any.c, FALSE, 0);
- client_action_end(data, config_focus_under_mouse);
-}
-
-void action_toggle_maximize_full(union ActionData *data)
-{
- client_action_start(data);
- client_maximize(data->client.any.c,
- !(data->client.any.c->max_horz ||
- data->client.any.c->max_vert),
- 0);
- client_action_end(data, config_focus_under_mouse);
-}
-
void action_maximize_horz(union ActionData *data)
{
client_action_start(data);
client_action_end(data, config_focus_under_mouse);
}
-void action_toggle_fullscreen(union ActionData *data)
-{
- client_action_start(data);
- client_fullscreen(data->client.any.c, !(data->client.any.c->fullscreen));
- client_action_end(data, config_focus_under_mouse);
-}
-
void action_send_to_desktop(union ActionData *data)
{
ObClient *c = data->sendto.any.c;
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);
}
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);
}
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)
#undef d
}
-void action_move(union ActionData *data)
-{
- ObClient *c = data->moveresize.any.c;
- guint32 corner;
-
- if (data->moveresize.keyboard)
- corner = prop_atoms.net_wm_moveresize_move_keyboard;
- else
- corner = prop_atoms.net_wm_moveresize_move;
-
- moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
-}
-
void action_resize(union ActionData *data)
{
ObClient *c = data->moveresize.any.c;
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
- on us */
- event_halt_focus_delay();
-
- focus_cycle(data->cycle.forward,
- data->cycle.all_desktops,
- data->cycle.dock_windows,
- data->cycle.desktop_windows,
- data->cycle.linear, data->any.interactive,
- data->cycle.dialog,
- data->cycle.inter.final, data->cycle.inter.cancel);
-}
-
void action_directional_focus(union ActionData *data)
{
/* if using focus_delay, stop the timer now so that focus doesn't go moving
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 */
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)
dock_configure();
}
-void action_toggle_show_desktop(union ActionData *data)
+void action_add_desktop(union ActionData *data)
{
- screen_show_desktop(!screen_showing_desktop, NULL);
-}
+ client_action_start(data);
+ screen_set_num_desktops(screen_num_desktops+1);
-void action_show_desktop(union ActionData *data)
-{
- screen_show_desktop(TRUE, NULL);
-}
+ /* move all the clients over */
+ if (data->addremovedesktop.current) {
+ GList *it;
-void action_unshow_desktop(union ActionData *data)
-{
- screen_show_desktop(FALSE, NULL);
+ 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_break_chroot(union ActionData *data)
+void action_remove_desktop(union ActionData *data)
{
- /* break out of one chroot */
- keyboard_reset_chains(1);
+ 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);
}
projects / dana / openbox-history.git / blobdiff