X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=24f4b36f7d91e6e6113234e149f8d9d710d99346;hb=c62fefb0677aaf4dd5f13fc91a0261711507fab8;hp=50b1e54556f9e76e0714361b4c8fb18d5548bab6;hpb=0272ef26e719b2b817b21afaaed1bb7331942eac;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 50b1e545..24f4b36f 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,755 +1,936 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + action.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#include "debug.h" #include "client.h" #include "focus.h" +#include "focus_cycle.h" +#include "moveresize.h" +#include "menu.h" +#include "prop.h" #include "stacking.h" -#include "frame.h" #include "screen.h" #include "action.h" -#include "dispatch.h" #include "openbox.h" -#include "engine.h" -#include "render/render.h" +#include "grab.h" +#include "keyboard.h" +#include "event.h" +#include "dock.h" +#include "config.h" +#include "mainloop.h" +#include "startupnotify.h" +#include "gettext.h" #include -Action *action_new(void (*func)(union ActionData *data)) + + +typedef struct { - Action *a = g_new0(Action, 1); - a->func = func; + const gchar *name; + void (*func)(union ActionData *); + void (*setup)(ObAction **, ObUserAction uact); +} ActionString; - /* deal with pointers */ - if (func == action_execute) - a->data.execute.path = NULL; +static ObAction *action_new(void (*func)(union ActionData *data)) +{ + ObAction *a = g_new0(ObAction, 1); + a->ref = 1; + a->func = func; return a; } -void action_free(Action *a) +void action_ref(ObAction *a) +{ + ++a->ref; +} + +void action_unref(ObAction *a) { if (a == NULL) return; + if (--a->ref > 0) return; + /* deal with pointers */ if (a->func == action_execute || a->func == action_restart) g_free(a->data.execute.path); + else if (a->func == action_debug) + g_free(a->data.debug.string); + else if (a->func == action_showmenu) + g_free(a->data.showmenu.name); g_free(a); } -Action *action_from_string(char *name) -{ - Action *a = NULL; - if (!g_ascii_strcasecmp(name, "execute")) { - a = action_new(action_execute); - } else if (!g_ascii_strcasecmp(name, "focus")) { - a = action_new(action_focus); - } else if (!g_ascii_strcasecmp(name, "unfocus")) { - a = action_new(action_unfocus); - } else if (!g_ascii_strcasecmp(name, "iconify")) { - a = action_new(action_iconify); - } else if (!g_ascii_strcasecmp(name, "raise")) { - a = action_new(action_raise); - } else if (!g_ascii_strcasecmp(name, "lower")) { - a = action_new(action_lower); - } else if (!g_ascii_strcasecmp(name, "focusraise")) { - a = action_new(action_focusraise); - } else if (!g_ascii_strcasecmp(name, "close")) { - a = action_new(action_close); - } else if (!g_ascii_strcasecmp(name, "kill")) { - a = action_new(action_kill); - } else if (!g_ascii_strcasecmp(name, "shadelower")) { - a = action_new(action_shadelower); - } else if (!g_ascii_strcasecmp(name, "unshaderaise")) { - a = action_new(action_unshaderaise); - } else if (!g_ascii_strcasecmp(name, "shade")) { - a = action_new(action_shade); - } else if (!g_ascii_strcasecmp(name, "unshade")) { - a = action_new(action_unshade); - } else if (!g_ascii_strcasecmp(name, "toggleshade")) { - a = action_new(action_toggle_shade); - } else if (!g_ascii_strcasecmp(name, "toggleomnipresent")) { - a = action_new(action_toggle_omnipresent); - } else if (!g_ascii_strcasecmp(name, "moverelativehorz")) { - a = action_new(action_move_relative_horz); - } else if (!g_ascii_strcasecmp(name, "moverelativevert")) { - a = action_new(action_move_relative_vert); - } else if (!g_ascii_strcasecmp(name, "resizerelativehorz")) { - a = action_new(action_resize_relative_horz); - } else if (!g_ascii_strcasecmp(name, "resizerelativevert")) { - a = action_new(action_resize_relative_vert); - } else if (!g_ascii_strcasecmp(name, "maximizefull")) { - a = action_new(action_maximize_full); - } else if (!g_ascii_strcasecmp(name, "unmaximizefull")) { - a = action_new(action_unmaximize_full); - } else if (!g_ascii_strcasecmp(name, "togglemaximizefull")) { - a = action_new(action_toggle_maximize_full); - } else if (!g_ascii_strcasecmp(name, "maximizehorz")) { - a = action_new(action_maximize_horz); - } else if (!g_ascii_strcasecmp(name, "unmaximizehorz")) { - a = action_new(action_unmaximize_horz); - } else if (!g_ascii_strcasecmp(name, "togglemaximizehorz")) { - a = action_new(action_toggle_maximize_horz); - } else if (!g_ascii_strcasecmp(name, "maximizevert")) { - a = action_new(action_maximize_vert); - } else if (!g_ascii_strcasecmp(name, "unmaximizevert")) { - a = action_new(action_unmaximize_vert); - } else if (!g_ascii_strcasecmp(name, "togglemaximizevert")) { - a = action_new(action_toggle_maximize_vert); - } else if (!g_ascii_strcasecmp(name, "sendtodesktop")) { - a = action_new(action_send_to_desktop); - a->data.sendto.follow = TRUE; - } else if (!g_ascii_strcasecmp(name, "sendtonextdesktop")) { - a = action_new(action_send_to_next_desktop); - a->data.sendtonextprev.wrap = FALSE; - a->data.sendtonextprev.follow = TRUE; - } else if (!g_ascii_strcasecmp(name, "sendtonextdesktopwrap")) { - a = action_new(action_send_to_next_desktop); - a->data.sendtonextprev.wrap = TRUE; - a->data.sendtonextprev.follow = TRUE; - } else if (!g_ascii_strcasecmp(name, "sendtopreviousdesktop")) { - a = action_new(action_send_to_previous_desktop); - a->data.sendtonextprev.wrap = FALSE; - a->data.sendtonextprev.follow = TRUE; - } else if (!g_ascii_strcasecmp(name, "sendtopreviousdesktopwrap")) { - a = action_new(action_send_to_previous_desktop); - a->data.sendtonextprev.wrap = TRUE; - a->data.sendtonextprev.follow = TRUE; - } else if (!g_ascii_strcasecmp(name, "desktop")) { - a = action_new(action_desktop); - } else if (!g_ascii_strcasecmp(name, "nextdesktop")) { - a = action_new(action_next_desktop); - a->data.nextprevdesktop.wrap = FALSE; - } else if (!g_ascii_strcasecmp(name, "nextdesktopwrap")) { - a = action_new(action_next_desktop); - a->data.nextprevdesktop.wrap = TRUE; - } else if (!g_ascii_strcasecmp(name, "previousdesktop")) { - a = action_new(action_previous_desktop); - a->data.nextprevdesktop.wrap = FALSE; - } else if (!g_ascii_strcasecmp(name, "previousdesktopwrap")) { - a = action_new(action_previous_desktop); - a->data.nextprevdesktop.wrap = TRUE; - } else if (!g_ascii_strcasecmp(name, "nextdesktopcolumn")) { - a = action_new(action_next_desktop_column); - a->data.nextprevdesktop.wrap = FALSE; - } else if (!g_ascii_strcasecmp(name, "nextdesktopcolumnwrap")) { - a = action_new(action_next_desktop_column); - a->data.nextprevdesktop.wrap = TRUE; - } else if (!g_ascii_strcasecmp(name, "previousdesktopcolumn")) { - a = action_new(action_previous_desktop_column); - a->data.nextprevdesktop.wrap = FALSE; - } else if (!g_ascii_strcasecmp(name, "previousdesktopcolumnwrap")) { - a = action_new(action_previous_desktop_column); - a->data.nextprevdesktop.wrap = TRUE; - } else if (!g_ascii_strcasecmp(name, "nextdesktoprow")) { - a = action_new(action_next_desktop_row); - a->data.nextprevdesktop.wrap = FALSE; - } else if (!g_ascii_strcasecmp(name, "nextdesktoprowwrap")) { - a = action_new(action_next_desktop_row); - a->data.nextprevdesktop.wrap = TRUE; - } else if (!g_ascii_strcasecmp(name, "previousdesktoprow")) { - a = action_new(action_previous_desktop_row); - a->data.nextprevdesktop.wrap = FALSE; - } else if (!g_ascii_strcasecmp(name, "previousdesktoprowwrap")) { - a = action_new(action_previous_desktop_row); - a->data.nextprevdesktop.wrap = TRUE; - } else if (!g_ascii_strcasecmp(name, "toggledecorations")) { - a = action_new(action_toggle_decorations); - } else if (!g_ascii_strcasecmp(name, "move")) { - a = action_new(action_move); - } else if (!g_ascii_strcasecmp(name, "resize")) { - a = action_new(action_resize); - } else if (!g_ascii_strcasecmp(name, "restart")) { - a = action_new(action_restart); - } else if (!g_ascii_strcasecmp(name, "exit")) { - a = action_new(action_exit); - } else if (!g_ascii_strcasecmp(name, "showmenu")) { - a = action_new(action_showmenu); - } else if (!g_ascii_strcasecmp(name, "nextwindowlinear")) { - a = action_new(action_cycle_windows); - a->data.cycle.linear = TRUE; - a->data.cycle.forward = TRUE; - } else if (!g_ascii_strcasecmp(name, "previouswindowlinear")) { - a = action_new(action_cycle_windows); - a->data.cycle.linear = TRUE; - a->data.cycle.forward = FALSE; - } else if (!g_ascii_strcasecmp(name, "nextwindow")) { - a = action_new(action_cycle_windows); - a->data.cycle.linear = FALSE; - a->data.cycle.forward = TRUE; - } else if (!g_ascii_strcasecmp(name, "previouswindow")) { - a = action_new(action_cycle_windows); - a->data.cycle.linear = FALSE; - a->data.cycle.forward = FALSE; - } - - return a; -} - -void action_execute(union ActionData *data) +ObAction* action_copy(const ObAction *src) { - GError *e = NULL; - if (data->execute.path) - if (!g_spawn_command_line_async(data->execute.path, &e)) { - g_warning("failed to execute '%s': %s", - data->execute.path, e->message); - } -} + ObAction *a = action_new(src->func); -void action_focus(union ActionData *data) -{ - if (data->client.c) - client_focus(data->client.c); -} + a->data = src->data; -void action_unfocus (union ActionData *data) -{ - if (data->client.c) - client_unfocus(data->client.c); + /* deal with pointers */ + if (a->func == action_execute || a->func == action_restart) + a->data.execute.path = g_strdup(a->data.execute.path); + else if (a->func == action_debug) + a->data.debug.string = g_strdup(a->data.debug.string); + else if (a->func == action_showmenu) + a->data.showmenu.name = g_strdup(a->data.showmenu.name); + + return a; } -void action_iconify(union ActionData *data) +void setup_action_send_to_desktop(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_iconify(data->client.c, TRUE, TRUE); + (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendto.follow = TRUE; } -void action_focusraise(union ActionData *data) +void setup_action_send_to_desktop_prev(ObAction **a, ObUserAction uact) { - if (data->client.c) { - client_focus(data->client.c); - stacking_raise(data->client.c); - } + (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendtodir.inter.any.interactive = TRUE; + (*a)->data.sendtodir.dir = OB_DIRECTION_WEST; + (*a)->data.sendtodir.linear = TRUE; + (*a)->data.sendtodir.wrap = TRUE; + (*a)->data.sendtodir.follow = TRUE; } -void action_raise(union ActionData *data) +void setup_action_send_to_desktop_next(ObAction **a, ObUserAction uact) { - if (data->client.c) - stacking_raise(data->client.c); + (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendtodir.inter.any.interactive = TRUE; + (*a)->data.sendtodir.dir = OB_DIRECTION_EAST; + (*a)->data.sendtodir.linear = TRUE; + (*a)->data.sendtodir.wrap = TRUE; + (*a)->data.sendtodir.follow = TRUE; } -void action_unshaderaise(union ActionData *data) +void setup_action_send_to_desktop_left(ObAction **a, ObUserAction uact) { - if (data->client.c) { - if (data->client.c->shaded) - client_shade(data->client.c, FALSE); - else - stacking_raise(data->client.c); - } + (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendtodir.inter.any.interactive = TRUE; + (*a)->data.sendtodir.dir = OB_DIRECTION_WEST; + (*a)->data.sendtodir.linear = FALSE; + (*a)->data.sendtodir.wrap = TRUE; + (*a)->data.sendtodir.follow = TRUE; } -void action_shadelower(union ActionData *data) +void setup_action_send_to_desktop_right(ObAction **a, ObUserAction uact) { - if (data->client.c) { - if (data->client.c->shaded) - stacking_lower(data->client.c); - else - client_shade(data->client.c, TRUE); - } + (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendtodir.inter.any.interactive = TRUE; + (*a)->data.sendtodir.dir = OB_DIRECTION_EAST; + (*a)->data.sendtodir.linear = FALSE; + (*a)->data.sendtodir.wrap = TRUE; + (*a)->data.sendtodir.follow = TRUE; } -void action_lower(union ActionData *data) +void setup_action_send_to_desktop_up(ObAction **a, ObUserAction uact) { - if (data->client.c) - stacking_lower(data->client.c); + (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendtodir.inter.any.interactive = TRUE; + (*a)->data.sendtodir.dir = OB_DIRECTION_NORTH; + (*a)->data.sendtodir.linear = FALSE; + (*a)->data.sendtodir.wrap = TRUE; + (*a)->data.sendtodir.follow = TRUE; } -void action_close(union ActionData *data) +void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_close(data->client.c); + (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendtodir.inter.any.interactive = TRUE; + (*a)->data.sendtodir.dir = OB_DIRECTION_SOUTH; + (*a)->data.sendtodir.linear = FALSE; + (*a)->data.sendtodir.wrap = TRUE; + (*a)->data.sendtodir.follow = TRUE; } -void action_kill(union ActionData *data) +void setup_action_desktop_prev(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_kill(data->client.c); + (*a)->data.desktopdir.inter.any.interactive = TRUE; + (*a)->data.desktopdir.dir = OB_DIRECTION_WEST; + (*a)->data.desktopdir.linear = TRUE; + (*a)->data.desktopdir.wrap = TRUE; } -void action_shade(union ActionData *data) +void setup_action_desktop_next(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_shade(data->client.c, TRUE); + (*a)->data.desktopdir.inter.any.interactive = TRUE; + (*a)->data.desktopdir.dir = OB_DIRECTION_EAST; + (*a)->data.desktopdir.linear = TRUE; + (*a)->data.desktopdir.wrap = TRUE; } -void action_unshade(union ActionData *data) +void setup_action_desktop_left(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_shade(data->client.c, FALSE); + (*a)->data.desktopdir.inter.any.interactive = TRUE; + (*a)->data.desktopdir.dir = OB_DIRECTION_WEST; + (*a)->data.desktopdir.linear = FALSE; + (*a)->data.desktopdir.wrap = TRUE; } -void action_toggle_shade(union ActionData *data) +void setup_action_desktop_right(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_shade(data->client.c, !data->client.c->shaded); + (*a)->data.desktopdir.inter.any.interactive = TRUE; + (*a)->data.desktopdir.dir = OB_DIRECTION_EAST; + (*a)->data.desktopdir.linear = FALSE; + (*a)->data.desktopdir.wrap = TRUE; } -void action_toggle_omnipresent(union ActionData *data) -{ - if (data->client.c) - client_set_desktop(data->client.c, - data->client.c->desktop == DESKTOP_ALL ? - screen_desktop : DESKTOP_ALL, FALSE); +void setup_action_desktop_up(ObAction **a, ObUserAction uact) +{ + (*a)->data.desktopdir.inter.any.interactive = TRUE; + (*a)->data.desktopdir.dir = OB_DIRECTION_NORTH; + (*a)->data.desktopdir.linear = FALSE; + (*a)->data.desktopdir.wrap = TRUE; } -void action_move_relative_horz(union ActionData *data) +void setup_action_desktop_down(ObAction **a, ObUserAction uact) { - Client *c = data->relative.c; - if (c) - client_configure(c, Corner_TopLeft, - c->area.x + data->relative.delta, c->area.y, - c->area.width, c->area.height, TRUE, TRUE); + (*a)->data.desktopdir.inter.any.interactive = TRUE; + (*a)->data.desktopdir.dir = OB_DIRECTION_SOUTH; + (*a)->data.desktopdir.linear = FALSE; + (*a)->data.desktopdir.wrap = TRUE; } -void action_move_relative_vert(union ActionData *data) +void setup_action_movefromedge_north(ObAction **a, ObUserAction uact) { - Client *c = data->relative.c; - if (c) - client_configure(c, Corner_TopLeft, - c->area.x, c->area.y + data->relative.delta, - c->area.width, c->area.height, TRUE, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; + (*a)->data.diraction.hang = TRUE; } -void action_resize_relative_horz(union ActionData *data) +void setup_action_movefromedge_south(ObAction **a, ObUserAction uact) { - Client *c = data->relative.c; - if (c) - client_configure(c, Corner_TopLeft, c->area.x, c->area.y, - c->area.width + data->relative.delta, - c->area.height, TRUE, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; + (*a)->data.diraction.hang = TRUE; } -void action_resize_relative_vert(union ActionData *data) +void setup_action_movefromedge_east(ObAction **a, ObUserAction uact) { - Client *c = data->relative.c; - if (c && !c->shaded) - client_configure(c, Corner_TopLeft, c->area.x, c->area.y, - c->area.width, c->area.height + data->relative.delta, - TRUE, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; + (*a)->data.diraction.hang = TRUE; } -void action_maximize_full(union ActionData *data) +void setup_action_movefromedge_west(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 0, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; + (*a)->data.diraction.hang = TRUE; } -void action_unmaximize_full(union ActionData *data) +void setup_action_movetoedge_north(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 0, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; + (*a)->data.diraction.hang = FALSE; } -void action_toggle_maximize_full(union ActionData *data) +void setup_action_movetoedge_south(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, - !(data->client.c->max_horz || - data->client.c->max_vert), - 0, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; + (*a)->data.diraction.hang = FALSE; } -void action_maximize_horz(union ActionData *data) +void setup_action_movetoedge_east(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 1, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; + (*a)->data.diraction.hang = FALSE; } -void action_unmaximize_horz(union ActionData *data) +void setup_action_movetoedge_west(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 1, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; + (*a)->data.diraction.hang = FALSE; } -void action_toggle_maximize_horz(union ActionData *data) +void setup_action_growtoedge_north(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; } -void action_maximize_vert(union ActionData *data) +void setup_action_growtoedge_south(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 2, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; } -void action_unmaximize_vert(union ActionData *data) +void setup_action_growtoedge_east(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 2, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; } -void action_toggle_maximize_vert(union ActionData *data) +void setup_action_growtoedge_west(ObAction **a, ObUserAction uact) { - if (data->client.c) - client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE); + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; } -void action_send_to_desktop(union ActionData *data) +void setup_action_top_layer(ObAction **a, ObUserAction uact) { - if (data->sendto.c) { - if (data->sendto.desk < screen_num_desktops || - data->sendto.desk == DESKTOP_ALL) { - client_set_desktop(data->desktop.c, - data->sendto.desk, data->sendto.follow); - if (data->sendto.follow) screen_set_desktop(data->sendto.desk); - } - } + (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.layer.layer = 1; } -void action_send_to_next_desktop(union ActionData *data) +void setup_action_normal_layer(ObAction **a, ObUserAction uact) { - guint d; - - if (!data->sendtonextprev.c) return; - - d = screen_desktop + 1; - if (d >= screen_num_desktops) { - if (!data->sendtonextprev.wrap) return; - d = 0; - } - client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow); - if (data->sendtonextprev.follow) screen_set_desktop(d); + (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.layer.layer = 0; } -void action_send_to_previous_desktop(union ActionData *data) +void setup_action_bottom_layer(ObAction **a, ObUserAction uact) { - guint d; - - if (!data->sendtonextprev.c) return; - - d = screen_desktop - 1; - if (d >= screen_num_desktops) { - if (!data->sendtonextprev.wrap) return; - d = screen_num_desktops - 1; - } - client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow); - if (data->sendtonextprev.follow) screen_set_desktop(d); + (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.layer.layer = -1; } -void action_desktop(union ActionData *data) +void setup_action_resize(ObAction **a, ObUserAction uact) { - if (data->desktop.desk < screen_num_desktops || - data->desktop.desk == DESKTOP_ALL) - screen_set_desktop(data->desktop.desk); + (*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 action_next_desktop(union ActionData *data) +void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact) { - guint d; - - d = screen_desktop + 1; - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - d = 0; - } - screen_set_desktop(d); + (*a)->data.addremovedesktop.current = TRUE; } -void action_previous_desktop(union ActionData *data) +void setup_action_addremove_desktop_last(ObAction **a, ObUserAction uact) { - guint d; - - d = screen_desktop - 1; - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - d = screen_num_desktops - 1; - } - screen_set_desktop(d); + (*a)->data.addremovedesktop.current = FALSE; } -static void cur_row_col(guint *r, guint *c) +void setup_client_action(ObAction **a, ObUserAction uact) { - switch (screen_desktop_layout.orientation) { - case Orientation_Horz: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - *r = screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop % screen_desktop_layout.columns; - break; - case Corner_BottomLeft: - *r = screen_desktop_layout.rows - 1 - - screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop % screen_desktop_layout.columns; - break; - case Corner_TopRight: - *r = screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop_layout.columns - 1 - - screen_desktop % screen_desktop_layout.columns; - break; - case Corner_BottomRight: - *r = screen_desktop_layout.rows - 1 - - screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop_layout.columns - 1 - - screen_desktop % screen_desktop_layout.columns; - break; - } - break; - case Orientation_Vert: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - *r = screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop / screen_desktop_layout.rows; - break; - case Corner_BottomLeft: - *r = screen_desktop_layout.rows - 1 - - screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop / screen_desktop_layout.rows; - break; - case Corner_TopRight: - *r = screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop_layout.columns - 1 - - screen_desktop / screen_desktop_layout.rows; - break; - case Corner_BottomRight: - *r = screen_desktop_layout.rows - 1 - - screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop_layout.columns - 1 - - screen_desktop / screen_desktop_layout.rows; + (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS; +} + +ActionString actionstrings[] = +{ + { + "shadelower", + action_shadelower, + setup_client_action + }, + { + "unshaderaise", + action_unshaderaise, + setup_client_action + }, + { + "sendtodesktop", + action_send_to_desktop, + setup_action_send_to_desktop + }, + { + "sendtodesktopnext", + action_send_to_desktop_dir, + setup_action_send_to_desktop_next + }, + { + "sendtodesktopprevious", + action_send_to_desktop_dir, + setup_action_send_to_desktop_prev + }, + { + "sendtodesktopright", + action_send_to_desktop_dir, + setup_action_send_to_desktop_right + }, + { + "sendtodesktopleft", + action_send_to_desktop_dir, + setup_action_send_to_desktop_left + }, + { + "sendtodesktopup", + action_send_to_desktop_dir, + setup_action_send_to_desktop_up + }, + { + "sendtodesktopdown", + action_send_to_desktop_dir, + setup_action_send_to_desktop_down + }, + { + "toggledockautohide", + action_toggle_dockautohide, + NULL + }, + { + "sendtotoplayer", + action_send_to_layer, + setup_action_top_layer + }, + { + "togglealwaysontop", + action_toggle_layer, + setup_action_top_layer + }, + { + "sendtonormallayer", + action_send_to_layer, + setup_action_normal_layer + }, + { + "sendtobottomlayer", + action_send_to_layer, + setup_action_bottom_layer + }, + { + "togglealwaysonbottom", + action_toggle_layer, + setup_action_bottom_layer + }, + { + "movefromedgenorth", + action_movetoedge, + setup_action_movefromedge_north + }, + { + "movefromedgesouth", + action_movetoedge, + setup_action_movefromedge_south + }, + { + "movefromedgewest", + action_movetoedge, + setup_action_movefromedge_west + }, + { + "movefromedgeeast", + action_movetoedge, + setup_action_movefromedge_east + }, + { + "movetoedgenorth", + action_movetoedge, + setup_action_movetoedge_north + }, + { + "movetoedgesouth", + action_movetoedge, + setup_action_movetoedge_south + }, + { + "movetoedgewest", + action_movetoedge, + setup_action_movetoedge_west + }, + { + "movetoedgeeast", + action_movetoedge, + setup_action_movetoedge_east + }, + { + "growtoedgenorth", + action_growtoedge, + setup_action_growtoedge_north + }, + { + "growtoedgesouth", + action_growtoedge, + setup_action_growtoedge_south + }, + { + "growtoedgewest", + action_growtoedge, + setup_action_growtoedge_west + }, + { + "growtoedgeeast", + action_growtoedge, + setup_action_growtoedge_east + }, + { + "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, + NULL + } +}; + +/* only key bindings can be interactive. thus saith the xor. + because of how the mouse is grabbed, mouse events dont even get + read during interactive events, so no dice! >:) */ +#define INTERACTIVE_LIMIT(a, uact) \ + if (uact != OB_USER_ACTION_KEYBOARD_KEY) \ + a->data.any.interactive = FALSE; + +ObAction *action_from_string(const gchar *name, ObUserAction uact) +{ + ObAction *a = NULL; + gboolean exist = FALSE; + gint i; + + for (i = 0; actionstrings[i].name; i++) + if (!g_ascii_strcasecmp(name, actionstrings[i].name)) { + exist = TRUE; + a = action_new(actionstrings[i].func); + if (actionstrings[i].setup) + actionstrings[i].setup(&a, uact); + if (a) + INTERACTIVE_LIMIT(a, uact); break; } - break; - } + if (!exist) + g_message(_("Invalid action '%s' requested. No such action exists."), + name); + if (!a) + g_message(_("Invalid use of action '%s'. Action will be ignored."), + name); + return a; } -static guint translate_row_col(guint r, guint c) -{ - switch (screen_desktop_layout.orientation) { - case Orientation_Horz: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - return r * screen_desktop_layout.columns + c; - case Corner_BottomLeft: - return (screen_desktop_layout.rows - 1 - r) * - screen_desktop_layout.columns + c; - case Corner_TopRight: - return r * screen_desktop_layout.columns + - (screen_desktop_layout.columns - 1 - c); - case Corner_BottomRight: - return (screen_desktop_layout.rows - 1 - r) * - screen_desktop_layout.columns + - (screen_desktop_layout.columns - 1 - c); +ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + ObUserAction uact) +{ + gchar *actname; + ObAction *act = NULL; + xmlNodePtr n; + + if (parse_attr_string("name", node, &actname)) { + if ((act = action_from_string(actname, uact))) { + } else if (act->func == action_desktop) { + } else if (act->func == action_send_to_desktop) { + if ((n = parse_find_node("desktop", node->xmlChildrenNode))) + act->data.sendto.desk = parse_int(doc, n); + if (act->data.sendto.desk > 0) act->data.sendto.desk--; + if ((n = parse_find_node("follow", node->xmlChildrenNode))) + act->data.sendto.follow = parse_bool(doc, n); + } else if (act->func == action_send_to_desktop_dir) { + if ((n = parse_find_node("wrap", node->xmlChildrenNode))) + act->data.sendtodir.wrap = parse_bool(doc, n); + if ((n = parse_find_node("follow", node->xmlChildrenNode))) + act->data.sendtodir.follow = parse_bool(doc, n); + if ((n = parse_find_node("dialog", node->xmlChildrenNode))) + act->data.sendtodir.inter.any.interactive = + parse_bool(doc, n); + INTERACTIVE_LIMIT(act, uact); } - case Orientation_Vert: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - return c * screen_desktop_layout.rows + r; - case Corner_BottomLeft: - return c * screen_desktop_layout.rows + - (screen_desktop_layout.rows - 1 - r); - case Corner_TopRight: - return (screen_desktop_layout.columns - 1 - c) * - screen_desktop_layout.rows + r; - case Corner_BottomRight: - return (screen_desktop_layout.columns - 1 - c) * - screen_desktop_layout.rows + - (screen_desktop_layout.rows - 1 - r); + g_free(actname); + } + return act; +} + +void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, + guint state, guint button, gint x, gint y, Time time, + gboolean cancel, gboolean done) +{ + GSList *it; + ObAction *a; + + if (!acts) + return; + + if (x < 0 && y < 0) + screen_pointer_pos(&x, &y); + + for (it = acts; it; it = g_slist_next(it)) { + a = it->data; + + if (!(a->data.any.client_action == OB_CLIENT_ACTION_ALWAYS && !c)) { + a->data.any.c = a->data.any.client_action ? c : NULL; + a->data.any.context = context; + a->data.any.x = x; + a->data.any.y = y; + + a->data.any.button = button; + + a->data.any.time = time; + + if (a->data.any.interactive) { + a->data.inter.cancel = cancel; + a->data.inter.final = done; + if (!(cancel || done)) + if (!keyboard_interactive_grab(state, a->data.any.c, a)) + continue; + } + + /* XXX UGLY HACK race with motion event starting a move and the + button release gettnig processed first. answer: don't queue + moveresize starts. UGLY HACK XXX + + XXX ALSO don't queue showmenu events, because on button press + events we need to know if a mouse grab is going to take place, + and set the button to 0, so that later motion events don't think + that a drag is going on. since showmenu grabs the pointer.. + */ + if (a->data.any.interactive || a->func == action_move || + a->func == action_resize || a->func == action_showmenu) + { + /* interactive actions are not queued */ + a->func(&a->data); + } else if (a->func == action_focus || + a->func == action_activate || + a->func == action_showmenu) + { + /* XXX MORE UGLY HACK + actions from clicks on client windows are NOT queued. + this solves the mysterious click-and-drag-doesnt-work + problem. it was because the window gets focused and stuff + after the button event has already been passed through. i + dont really know why it should care but it does and it makes + a difference. + + however this very bogus ! ! + we want to send the button press to the window BEFORE + we do the action because the action might move the windows + (eg change desktops) and then the button press ends up on + the completely wrong window ! + so, this is just for that bug, and it will only NOT queue it + if it is a focusing action that can be used with the mouse + pointer. ugh. + + also with the menus, there is a race going on. if the + desktop wants to pop up a menu, and we do too, we send them + the button before we pop up the menu, so they pop up their + menu first. but not always. if we pop up our menu before + sending them the button press, then the result is + deterministic. yay. + + XXX further more. focus actions are not queued at all, + because if you bind focus->showmenu, the menu will get + hidden to do the focusing + */ + a->func(&a->data); + } else + ob_main_loop_queue_action(ob_main_loop, a); } } - g_assert_not_reached(); - return 0; } -void action_next_desktop_column(union ActionData *data) +void action_run_string(const gchar *name, struct _ObClient *c, Time time) { - guint r, c, d; + ObAction *a; + GSList *l; - cur_row_col(&r, &c); - ++c; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - c = 0; - } - if (d >= screen_num_desktops) - ++c; - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); -} + a = action_from_string(name, OB_USER_ACTION_NONE); + g_assert(a); -void action_previous_desktop_column(union ActionData *data) -{ - guint r, c, d; + l = g_slist_append(NULL, a); - cur_row_col(&r, &c); - --c; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - c = screen_desktop_layout.columns - 1; - } - if (d >= screen_num_desktops) - --c; - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + action_run(l, c, 0, time); } -void action_next_desktop_row(union ActionData *data) +void action_unshaderaise(union ActionData *data) { - guint r, c, d; - - cur_row_col(&r, &c); - ++r; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - r = 0; - } - if (d >= screen_num_desktops) - ++r; - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + if (data->client.any.c->shaded) + action_unshade(data); + else + action_raise(data); } -void action_previous_desktop_row(union ActionData *data) +void action_shadelower(union ActionData *data) { - guint r, c, d; - - cur_row_col(&r, &c); - --r; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - c = screen_desktop_layout.rows - 1; - } - if (d >= screen_num_desktops) - --r; - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + if (data->client.any.c->shaded) + action_lower(data); + else + action_shade(data); } -void action_toggle_decorations(union ActionData *data) +void action_resize_relative(union ActionData *data) { - Client *c = data->client.c;; - - if (!c) return; - - c->disabled_decorations = c->disabled_decorations ? 0 : ~0; - client_setup_decor_and_functions(c); } -static void popup_coords(char *format, int a, int b, gboolean hide) +void action_send_to_desktop(union ActionData *data) { - XSetWindowAttributes attrib; - static Window coords = None; + ObClient *c = data->sendto.any.c; - if (coords == None) { - attrib.override_redirect = TRUE; - coords = XCreateWindow(ob_display, ob_root, - 0, 0, 1, 1, 0, render_depth, InputOutput, - render_visual, CWOverrideRedirect, &attrib); - g_assert(coords != None); - } - - if (hide) - XUnmapWindow(ob_display, coords); - else { - Size s; - char *text; + if (!client_normal(c)) return; - text = g_strdup_printf(format, a, b); - engine_size_label(text, TRUE, TRUE, &s); - XMoveResizeWindow(ob_display, coords, - 10, 10, s.width, s.height); - engine_render_label(coords, &s, text, TRUE, TRUE); - g_free(text); - - XMapWindow(ob_display, coords); + if (data->sendto.desk < screen_num_desktops || + data->sendto.desk == DESKTOP_ALL) { + 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); } } -void action_move(union ActionData *data) +void action_send_to_desktop_dir(union ActionData *data) { - Client *c = data->move.c; - int x = data->move.x; - int y = data->move.y; - - if (!c || !client_normal(c)) return; + ObClient *c = data->sendtodir.inter.any.c; + guint d; - dispatch_move(c, &x, &y); + if (!client_normal(c)) return; + + d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap, + data->sendtodir.linear, + data->sendtodir.inter.any.interactive, + data->sendtodir.inter.final, + data->sendtodir.inter.cancel); + /* only move the desktop when the action is complete. if we switch + desktops during the interactive action, focus will move but with + NotifyWhileGrabbed and applications don't like that. */ + if (!data->sendtodir.inter.any.interactive || + (data->sendtodir.inter.final && !data->sendtodir.inter.cancel)) + { + client_set_desktop(c, d, data->sendtodir.follow, FALSE); + if (data->sendtodir.follow && d != screen_desktop) + screen_set_desktop(d, TRUE); + } +} - popup_coords("X: %d Y: %d", x, y, data->move.final); +void action_directional_focus(union ActionData *data) +{ + /* if using focus_delay, stop the timer now so that focus doesn't go moving + on us */ + event_halt_focus_delay(); - frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */ - client_configure(c, Corner_TopLeft, x, y, c->area.width, c->area.height, - TRUE, data->move.final); + focus_directional_cycle(data->interdiraction.direction, + data->interdiraction.dock_windows, + data->interdiraction.desktop_windows, + data->any.interactive, + data->interdiraction.dialog, + data->interdiraction.inter.final, + data->interdiraction.inter.cancel); } -void action_resize(union ActionData *data) +void action_movetoedge(union ActionData *data) { - Client *c = data->resize.c; - int w = data->resize.x; - int h = data->resize.y; - - if (!c || c->shaded || !client_normal(c)) return; - - dispatch_resize(c, &w, &h, data->resize.corner); + gint x, y; + ObClient *c = data->diraction.any.c; - w -= c->frame->size.left + c->frame->size.right; - h -= c->frame->size.top + c->frame->size.bottom; + x = c->frame->area.x; + y = c->frame->area.y; - client_configure(c, data->resize.corner, c->area.x, c->area.y, w, h, - TRUE, data->resize.final); - - popup_coords("W: %d H: %d", c->logical_size.width, - c->logical_size.height, data->move.final); + switch(data->diraction.direction) { + case OB_DIRECTION_NORTH: + y = client_directional_edge_search(c, OB_DIRECTION_NORTH, + data->diraction.hang) + - (data->diraction.hang ? c->frame->area.height : 0); + break; + case OB_DIRECTION_WEST: + x = client_directional_edge_search(c, OB_DIRECTION_WEST, + data->diraction.hang) + - (data->diraction.hang ? c->frame->area.width : 0); + break; + case OB_DIRECTION_SOUTH: + y = client_directional_edge_search(c, OB_DIRECTION_SOUTH, + data->diraction.hang) + - (data->diraction.hang ? 0 : c->frame->area.height); + break; + case OB_DIRECTION_EAST: + x = client_directional_edge_search(c, OB_DIRECTION_EAST, + data->diraction.hang) + - (data->diraction.hang ? 0 : c->frame->area.width); + break; + default: + g_assert_not_reached(); + } + frame_frame_gravity(c->frame, &x, &y, c->area.width, c->area.height); + client_action_start(data); + client_move(c, x, y); + client_action_end(data, FALSE); +} + +void action_growtoedge(union ActionData *data) +{ + gint x, y, width, height, dest; + ObClient *c = data->diraction.any.c; + Rect *a; + + 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 */ + width = c->area.width + c->frame->size.left + c->frame->size.right; + height = c->area.height + c->frame->size.top + c->frame->size.bottom; + + switch(data->diraction.direction) { + case OB_DIRECTION_NORTH: + if (c->shaded) break; /* don't allow vertical resize if shaded */ + + dest = client_directional_edge_search(c, OB_DIRECTION_NORTH, FALSE); + if (a->y == y) + height = height / 2; + else { + height = c->frame->area.y + height - dest; + y = dest; + } + break; + case OB_DIRECTION_WEST: + dest = client_directional_edge_search(c, OB_DIRECTION_WEST, FALSE); + if (a->x == x) + width = width / 2; + else { + width = c->frame->area.x + width - dest; + x = dest; + } + break; + case OB_DIRECTION_SOUTH: + if (c->shaded) break; /* don't allow vertical resize if shaded */ + + dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH, FALSE); + if (a->y + a->height == y + c->frame->area.height) { + height = c->frame->area.height / 2; + y = a->y + a->height - height; + } else + height = dest - c->frame->area.y; + y += (height - c->frame->area.height) % c->size_inc.height; + height -= (height - c->frame->area.height) % c->size_inc.height; + break; + case OB_DIRECTION_EAST: + dest = client_directional_edge_search(c, OB_DIRECTION_EAST, FALSE); + if (a->x + a->width == x + c->frame->area.width) { + width = c->frame->area.width / 2; + x = a->x + a->width - width; + } else + width = dest - c->frame->area.x; + x += (width - c->frame->area.width) % c->size_inc.width; + width -= (width - c->frame->area.width) % c->size_inc.width; + break; + default: + g_assert_not_reached(); + } + width -= c->frame->size.left + c->frame->size.right; + height -= c->frame->size.top + c->frame->size.bottom; + frame_frame_gravity(c->frame, &x, &y, width, height); + client_action_start(data); + client_move_resize(c, x, y, width, height); + client_action_end(data, FALSE); + g_free(a); } -void action_restart(union ActionData *data) +void action_send_to_layer(union ActionData *data) { - ob_restart_path = data->execute.path; - ob_shutdown = ob_restart = TRUE; + client_set_layer(data->layer.any.c, data->layer.layer); } -void action_exit(union ActionData *data) +void action_toggle_layer(union ActionData *data) { - ob_shutdown = TRUE; + ObClient *c = data->layer.any.c; + + client_action_start(data); + if (data->layer.layer < 0) + client_set_layer(c, c->below ? 0 : -1); + else if (data->layer.layer > 0) + client_set_layer(c, c->above ? 0 : 1); + client_action_end(data, config_focus_under_mouse); } -void action_showmenu(union ActionData *data) +void action_toggle_dockautohide(union ActionData *data) { - g_message(__FUNCTION__); + config_dock_hide = !config_dock_hide; + dock_configure(); } -static void popup_cycle(Client *c, gboolean hide) +void action_add_desktop(union ActionData *data) { - XSetWindowAttributes attrib; - static Window coords = None; + client_action_start(data); + screen_set_num_desktops(screen_num_desktops+1); - if (coords == None) { - attrib.override_redirect = TRUE; - coords = XCreateWindow(ob_display, ob_root, - 0, 0, 1, 1, 0, render_depth, InputOutput, - render_visual, CWOverrideRedirect, &attrib); - g_assert(coords != None); - } + /* move all the clients over */ + if (data->addremovedesktop.current) { + GList *it; - if (hide) - XUnmapWindow(ob_display, coords); - else { - Rect *a; - Size s; - - a = screen_area(c->desktop); + 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); + } + } - engine_size_label(c->title, TRUE, TRUE, &s); - XMoveResizeWindow(ob_display, coords, - a->x + (a->width - s.width) / 2, - a->y + (a->height - s.height) / 2, - s.width, s.height); - engine_render_label(coords, &s, c->title, TRUE, 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); + } + } + } - XMapWindow(ob_display, coords); + /* 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"); } -} -void action_cycle_windows(union ActionData *data) -{ - Client *c; - - c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final, - data->cycle.cancel); - popup_cycle(c, !c && (data->cycle.final||data->cycle.cancel)); -} + screen_set_num_desktops(screen_num_desktops-1); + client_action_end(data, config_focus_under_mouse); +}