X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=24f4b36f7d91e6e6113234e149f8d9d710d99346;hb=c62fefb0677aaf4dd5f13fc91a0261711507fab8;hp=9aeeff5800fd2713de32f0124ae2a6a748029ffa;hpb=5a7953b36aa0e23ae21f707d9fb8b6b9e882946d;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 9aeeff58..24f4b36f 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,336 +1,349 @@ +/* -*- 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 "grab.h" +#include "keyboard.h" +#include "event.h" +#include "dock.h" +#include "config.h" +#include "mainloop.h" +#include "startupnotify.h" +#include "gettext.h" #include -typedef struct ActionString { - char *name; + + +typedef struct +{ + const gchar *name; void (*func)(union ActionData *); - void (*setup)(Action *); + void (*setup)(ObAction **, ObUserAction uact); } ActionString; -Action *action_new(void (*func)(union ActionData *data)) +static ObAction *action_new(void (*func)(union ActionData *data)) { - Action *a = g_new0(Action, 1); + 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); } -void setup_action_directional_focus_north(Action *a) +ObAction* action_copy(const ObAction *src) +{ + ObAction *a = action_new(src->func); + + a->data = src->data; + + /* 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 setup_action_send_to_desktop(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_North; + (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.sendto.follow = TRUE; } -void setup_action_directional_focus_east(Action *a) +void setup_action_send_to_desktop_prev(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_East; + (*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 setup_action_directional_focus_south(Action *a) +void setup_action_send_to_desktop_next(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_South; + (*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 setup_action_directional_focus_west(Action *a) +void setup_action_send_to_desktop_left(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_West; + (*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 setup_action_directional_focus_northeast(Action *a) +void setup_action_send_to_desktop_right(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_NorthEast; + (*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 setup_action_directional_focus_southeast(Action *a) +void setup_action_send_to_desktop_up(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_SouthEast; + (*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 setup_action_directional_focus_southwest(Action *a) +void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_SouthWest; + (*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 setup_action_directional_focus_northwest(Action *a) +void setup_action_desktop_prev(ObAction **a, ObUserAction uact) { - a->data.dfocus.direction = Direction_NorthWest; + (*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 setup_action_send_to_desktop(Action *a) +void setup_action_desktop_next(ObAction **a, ObUserAction uact) { - a->data.sendto.follow = 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 setup_action_send_to_np_desktop(Action *a) +void setup_action_desktop_left(ObAction **a, ObUserAction uact) { - a->data.sendtonextprev.wrap = FALSE; - a->data.sendtonextprev.follow = TRUE; + (*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 setup_action_send_to_np_desktop_wrap(Action *a) +void setup_action_desktop_right(ObAction **a, ObUserAction uact) { - a->data.sendtonextprev.wrap = TRUE; - a->data.sendtonextprev.follow = TRUE; + (*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 setup_action_np_desktop(Action *a) +void setup_action_desktop_up(ObAction **a, ObUserAction uact) { - a->data.nextprevdesktop.wrap = FALSE; + (*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 setup_action_np_desktop_wrap(Action *a) +void setup_action_desktop_down(ObAction **a, ObUserAction uact) { - a->data.nextprevdesktop.wrap = 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 setup_action_move_keyboard(Action *a) +void setup_action_movefromedge_north(ObAction **a, ObUserAction uact) { - a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; + (*a)->data.diraction.hang = TRUE; } -void setup_action_move(Action *a) +void setup_action_movefromedge_south(ObAction **a, ObUserAction uact) { - a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; + (*a)->data.diraction.hang = TRUE; } -void setup_action_resize(Action *a) +void setup_action_movefromedge_east(ObAction **a, ObUserAction uact) { - a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; + (*a)->data.diraction.hang = TRUE; } -void setup_action_resize_keyboard(Action *a) +void setup_action_movefromedge_west(ObAction **a, ObUserAction uact) { - a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; + (*a)->data.diraction.hang = TRUE; } -void setup_action_cycle_windows_linear_next(Action *a) +void setup_action_movetoedge_north(ObAction **a, ObUserAction uact) { - a->data.cycle.linear = TRUE; - a->data.cycle.forward = TRUE; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; + (*a)->data.diraction.hang = FALSE; } -void setup_action_cycle_windows_linear_previous(Action *a) +void setup_action_movetoedge_south(ObAction **a, ObUserAction uact) { - a->data.cycle.linear = TRUE; - a->data.cycle.forward = FALSE; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; + (*a)->data.diraction.hang = FALSE; } -void setup_action_cycle_windows_next(Action *a) +void setup_action_movetoedge_east(ObAction **a, ObUserAction uact) { - a->data.cycle.linear = FALSE; - a->data.cycle.forward = TRUE; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; + (*a)->data.diraction.hang = FALSE; } -void setup_action_cycle_windows_previous(Action *a) +void setup_action_movetoedge_west(ObAction **a, ObUserAction uact) { - a->data.cycle.linear = FALSE; - a->data.cycle.forward = FALSE; + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; + (*a)->data.diraction.hang = FALSE; } - + +void setup_action_growtoedge_north(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; +} + +void setup_action_growtoedge_south(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; +} + +void setup_action_growtoedge_east(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; +} + +void setup_action_growtoedge_west(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; +} + +void setup_action_top_layer(ObAction **a, ObUserAction uact) +{ + (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.layer.layer = 1; +} + +void setup_action_normal_layer(ObAction **a, ObUserAction uact) +{ + (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.layer.layer = 0; +} + +void setup_action_bottom_layer(ObAction **a, ObUserAction uact) +{ + (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.layer.layer = -1; +} + +void setup_action_resize(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_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_client_action(ObAction **a, ObUserAction uact) +{ + (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS; +} + ActionString actionstrings[] = { - { - "execute", - action_execute, - NULL - }, - { - "directionalfocusnorth", - action_directional_focus, - setup_action_directional_focus_north - }, - { - "directionalfocuseast", - action_directional_focus, - setup_action_directional_focus_east - }, - { - "directionalfocussouth", - action_directional_focus, - setup_action_directional_focus_south - }, - { - "directionalfocuswest", - action_directional_focus, - setup_action_directional_focus_west - }, - { - "directionalfocusnortheast", - action_directional_focus, - setup_action_directional_focus_northeast - }, - { - "directionalfocussoutheast", - action_directional_focus, - setup_action_directional_focus_southeast - }, - { - "directionalfocussouthwest", - action_directional_focus, - setup_action_directional_focus_southwest - }, - { - "directionalfocusnorthwest", - action_directional_focus, - setup_action_directional_focus_northwest - }, - { - "focus", - action_focus, - NULL, - }, - { - "unfocus", - action_unfocus, - NULL - }, - { - "iconify", - action_iconify, - NULL - }, - { - "raise", - action_raise, - NULL - }, - { - "lower", - action_lower, - NULL - }, - { - "focusraise", - action_focusraise, - NULL - }, - { - "close", - action_close, - NULL - }, - { - "kill", - action_kill, - NULL - }, { "shadelower", action_shadelower, - NULL + setup_client_action }, { "unshaderaise", action_unshaderaise, - NULL - }, - { - "shade", - action_shade, - NULL - }, - { - "unshade", - action_unshade, - NULL - }, - { - "toggleshade", - action_toggle_shade, - NULL - }, - { - "toggleomnipresent", - action_toggle_omnipresent, - NULL - }, - { - "moverelativehorz", - action_move_relative_horz, - NULL - }, - { - "moverelativevert", - action_move_relative_vert, - NULL - }, - { - "resizerelativehorz", - action_resize_relative_horz, - NULL - }, - { - "resizerelativevert", - action_resize_relative_vert, - NULL - }, - { - "maximizefull", - action_maximize_full, - NULL - }, - { - "unmaximizefull", - action_unmaximize_full, - NULL - }, - { - "togglemaximizefull", - action_toggle_maximize_full, - NULL - }, - { - "maximizehorz", - action_maximize_horz, - NULL - }, - { - "unmaximizehorz", - action_unmaximize_horz, - NULL - }, - { - "togglemaximizehorz", - action_toggle_maximize_horz, - NULL - }, - { - "maximizevert", - action_maximize_vert, - NULL - }, - { - "unmaximizevert", - action_unmaximize_vert, - NULL - }, - { - "togglemaximizevert", - action_toggle_maximize_vert, - NULL + setup_client_action }, { "sendtodesktop", @@ -338,149 +351,144 @@ ActionString actionstrings[] = setup_action_send_to_desktop }, { - "sendtonextdesktop", - action_send_to_next_desktop, - setup_action_send_to_np_desktop + "sendtodesktopnext", + action_send_to_desktop_dir, + setup_action_send_to_desktop_next }, { - "sendtonextdesktopwrap", - action_send_to_next_desktop, - setup_action_send_to_np_desktop_wrap + "sendtodesktopprevious", + action_send_to_desktop_dir, + setup_action_send_to_desktop_prev }, { - "sendtopreviousdesktop", - action_send_to_previous_desktop, - setup_action_send_to_np_desktop + "sendtodesktopright", + action_send_to_desktop_dir, + setup_action_send_to_desktop_right }, { - "sendtopreviousdesktopwrap", - action_send_to_previous_desktop, - setup_action_send_to_np_desktop_wrap - }, - { - "desktop", - action_desktop, - NULL + "sendtodesktopleft", + action_send_to_desktop_dir, + setup_action_send_to_desktop_left }, { - "nextdesktop", - action_next_desktop, - setup_action_np_desktop + "sendtodesktopup", + action_send_to_desktop_dir, + setup_action_send_to_desktop_up }, { - "nextdesktopwrap", - action_next_desktop, - setup_action_np_desktop_wrap + "sendtodesktopdown", + action_send_to_desktop_dir, + setup_action_send_to_desktop_down }, { - "previousdesktop", - action_previous_desktop, - setup_action_np_desktop + "toggledockautohide", + action_toggle_dockautohide, + NULL }, { - "previousdesktopwrap", - action_previous_desktop, - setup_action_np_desktop_wrap + "sendtotoplayer", + action_send_to_layer, + setup_action_top_layer }, { - "nextdesktopcolumn", - action_next_desktop_column, - setup_action_np_desktop + "togglealwaysontop", + action_toggle_layer, + setup_action_top_layer }, { - "nextdesktopcolumnwrap", - action_next_desktop_column, - setup_action_np_desktop_wrap + "sendtonormallayer", + action_send_to_layer, + setup_action_normal_layer }, { - "previousdesktopcolumn", - action_previous_desktop_column, - setup_action_np_desktop + "sendtobottomlayer", + action_send_to_layer, + setup_action_bottom_layer }, { - "previousdesktopcolumnwrap", - action_previous_desktop_column, - setup_action_np_desktop_wrap + "togglealwaysonbottom", + action_toggle_layer, + setup_action_bottom_layer }, { - "nextdesktoprow", - action_next_desktop_row, - setup_action_np_desktop + "movefromedgenorth", + action_movetoedge, + setup_action_movefromedge_north }, { - "nextdesktoprowwrap", - action_next_desktop_row, - setup_action_np_desktop_wrap + "movefromedgesouth", + action_movetoedge, + setup_action_movefromedge_south }, { - "previousdesktoprow", - action_previous_desktop_row, - setup_action_np_desktop + "movefromedgewest", + action_movetoedge, + setup_action_movefromedge_west }, { - "previousdesktoprowwrap", - action_previous_desktop_row, - setup_action_np_desktop_wrap + "movefromedgeeast", + action_movetoedge, + setup_action_movefromedge_east }, { - "toggledecorations", - action_toggle_decorations, - NULL + "movetoedgenorth", + action_movetoedge, + setup_action_movetoedge_north }, { - "keyboardmove", - action_moveresize, - setup_action_move_keyboard + "movetoedgesouth", + action_movetoedge, + setup_action_movetoedge_south }, { - "move", - action_moveresize, - setup_action_move + "movetoedgewest", + action_movetoedge, + setup_action_movetoedge_west }, { - "resize", - action_moveresize, - setup_action_resize + "movetoedgeeast", + action_movetoedge, + setup_action_movetoedge_east }, { - "keyboardresize", - action_moveresize, - setup_action_resize_keyboard + "growtoedgenorth", + action_growtoedge, + setup_action_growtoedge_north }, { - "restart", - action_restart, - NULL + "growtoedgesouth", + action_growtoedge, + setup_action_growtoedge_south }, { - "exit", - action_exit, - NULL + "growtoedgewest", + action_growtoedge, + setup_action_growtoedge_west }, { - "showmenu", - action_showmenu, - NULL + "growtoedgeeast", + action_growtoedge, + setup_action_growtoedge_east }, { - "nextwindowlinear", - action_cycle_windows, - setup_action_cycle_windows_linear_next + "adddesktoplast", + action_add_desktop, + setup_action_addremove_desktop_last }, { - "previouswindowlinear", - action_cycle_windows, - setup_action_cycle_windows_linear_previous + "removedesktoplast", + action_remove_desktop, + setup_action_addremove_desktop_last }, { - "nextwindow", - action_cycle_windows, - setup_action_cycle_windows_next + "adddesktopcurrent", + action_add_desktop, + setup_action_addremove_desktop_current }, { - "previouswindow", - action_cycle_windows, - setup_action_cycle_windows_previous + "removedesktopcurrent", + action_remove_desktop, + setup_action_addremove_desktop_current }, { NULL, @@ -489,526 +497,440 @@ ActionString actionstrings[] = } }; -Action *action_from_string(char *name) +/* 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) { - Action *a = NULL; - int i; + 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); + actionstrings[i].setup(&a, uact); + if (a) + INTERACTIVE_LIMIT(a, uact); 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; } -void action_execute(union ActionData *data) -{ - 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 *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); } -} - -void action_focus(union ActionData *data) -{ - if (data->client.c) - client_focus(data->client.c); -} - -void action_unfocus (union ActionData *data) -{ - if (data->client.c) - client_unfocus(data->client.c); -} - -void action_iconify(union ActionData *data) -{ - if (data->client.c) - client_iconify(data->client.c, TRUE, TRUE); -} - -void action_focusraise(union ActionData *data) -{ - if (data->client.c) { - client_focus(data->client.c); - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); + g_free(actname); } + return act; } -void action_raise(union ActionData *data) +void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, + guint state, guint button, gint x, gint y, Time time, + gboolean cancel, gboolean done) { - if (data->client.c) - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); -} + GSList *it; + ObAction *a; -void action_unshaderaise(union ActionData *data) -{ - if (data->client.c) { - if (data->client.c->shaded) - client_shade(data->client.c, FALSE); - else - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); - } -} + if (!acts) + return; -void action_shadelower(union ActionData *data) -{ - if (data->client.c) { - if (data->client.c->shaded) - stacking_lower(CLIENT_AS_WINDOW(data->client.c)); - else - client_shade(data->client.c, TRUE); + 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); + } } } -void action_lower(union ActionData *data) -{ - if (data->client.c) - stacking_lower(CLIENT_AS_WINDOW(data->client.c)); -} - -void action_close(union ActionData *data) -{ - if (data->client.c) - client_close(data->client.c); -} - -void action_kill(union ActionData *data) -{ - if (data->client.c) - client_kill(data->client.c); -} - -void action_shade(union ActionData *data) -{ - if (data->client.c) - client_shade(data->client.c, TRUE); -} - -void action_unshade(union ActionData *data) -{ - if (data->client.c) - client_shade(data->client.c, FALSE); -} - -void action_toggle_shade(union ActionData *data) -{ - if (data->client.c) - client_shade(data->client.c, !data->client.c->shaded); -} - -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 action_move_relative_horz(union ActionData *data) -{ - 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); -} - -void action_move_relative_vert(union ActionData *data) -{ - 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); -} - -void action_resize_relative_horz(union ActionData *data) +void action_run_string(const gchar *name, struct _ObClient *c, Time time) { - 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); -} + ObAction *a; + GSList *l; -void action_resize_relative_vert(union ActionData *data) -{ - 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 = action_from_string(name, OB_USER_ACTION_NONE); + g_assert(a); -void action_maximize_full(union ActionData *data) -{ - if (data->client.c) - client_maximize(data->client.c, TRUE, 0, TRUE); -} + l = g_slist_append(NULL, a); -void action_unmaximize_full(union ActionData *data) -{ - if (data->client.c) - client_maximize(data->client.c, FALSE, 0, TRUE); + action_run(l, c, 0, time); } -void action_toggle_maximize_full(union ActionData *data) -{ - if (data->client.c) - client_maximize(data->client.c, - !(data->client.c->max_horz || - data->client.c->max_vert), - 0, TRUE); -} - -void action_maximize_horz(union ActionData *data) -{ - if (data->client.c) - client_maximize(data->client.c, TRUE, 1, TRUE); -} - -void action_unmaximize_horz(union ActionData *data) -{ - if (data->client.c) - client_maximize(data->client.c, FALSE, 1, TRUE); -} - -void action_toggle_maximize_horz(union ActionData *data) -{ - if (data->client.c) - client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE); -} - -void action_maximize_vert(union ActionData *data) +void action_unshaderaise(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 2, TRUE); + if (data->client.any.c->shaded) + action_unshade(data); + else + action_raise(data); } -void action_unmaximize_vert(union ActionData *data) +void action_shadelower(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 2, TRUE); + if (data->client.any.c->shaded) + action_lower(data); + else + action_shade(data); } -void action_toggle_maximize_vert(union ActionData *data) +void action_resize_relative(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE); } void action_send_to_desktop(union ActionData *data) { - 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); - } - } -} - -void action_send_to_next_desktop(union ActionData *data) -{ - guint d; + ObClient *c = data->sendto.any.c; - if (!data->sendtonextprev.c) return; + if (!client_normal(c)) return; - d = screen_desktop + 1; - if (d >= screen_num_desktops) { - if (!data->sendtonextprev.wrap) return; - d = 0; + 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); } - client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow); - if (data->sendtonextprev.follow) screen_set_desktop(d); } -void action_send_to_previous_desktop(union ActionData *data) +void action_send_to_desktop_dir(union ActionData *data) { + ObClient *c = data->sendtodir.inter.any.c; 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; + 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); } - client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow); - if (data->sendtonextprev.follow) screen_set_desktop(d); } -void action_desktop(union ActionData *data) -{ - if (data->desktop.desk < screen_num_desktops || - data->desktop.desk == DESKTOP_ALL) - screen_set_desktop(data->desktop.desk); -} - -void action_next_desktop(union ActionData *data) +void action_directional_focus(union ActionData *data) { - guint d; + /* if using focus_delay, stop the timer now so that focus doesn't go moving + on us */ + event_halt_focus_delay(); - d = screen_desktop + 1; - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - d = 0; - } - screen_set_desktop(d); + 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_previous_desktop(union ActionData *data) +void action_movetoedge(union ActionData *data) { - 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); -} + gint x, y; + ObClient *c = data->diraction.any.c; -static void cur_row_col(guint *r, guint *c) -{ - 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; - } + x = c->frame->area.x; + y = c->frame->area.y; + + 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 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; - 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(); } -} - -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.rows * - screen_desktop_layout.columns + - c % screen_desktop_layout.columns; - case Corner_BottomLeft: - return (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows) * - screen_desktop_layout.columns + - c % screen_desktop_layout.columns; - case Corner_TopRight: - return r % screen_desktop_layout.rows * - screen_desktop_layout.columns + - (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns); - case Corner_BottomRight: - return (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows) * - screen_desktop_layout.columns + - (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns); + 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; } - case Orientation_Vert: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - return c % screen_desktop_layout.columns * - screen_desktop_layout.rows + - r % screen_desktop_layout.rows; - case Corner_BottomLeft: - return c % screen_desktop_layout.columns * - screen_desktop_layout.rows + - (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows); - case Corner_TopRight: - return (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns) * - screen_desktop_layout.rows + - r % screen_desktop_layout.rows; - case Corner_BottomRight: - return (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns) * - screen_desktop_layout.rows + - (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows); + 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(); } - g_assert_not_reached(); - return 0; -} - -void action_next_desktop_column(union ActionData *data) -{ - guint r, c, d; - - cur_row_col(&r, &c); - ++c; - if (c >= screen_desktop_layout.columns) - c = 0; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - ++c; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); -} - -void action_previous_desktop_column(union ActionData *data) -{ - guint r, c, d; - - cur_row_col(&r, &c); - --c; - if (c >= screen_desktop_layout.columns) - c = screen_desktop_layout.columns - 1; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - --c; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + 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_next_desktop_row(union ActionData *data) +void action_send_to_layer(union ActionData *data) { - guint r, c, d; - - cur_row_col(&r, &c); - ++r; - if (r >= screen_desktop_layout.rows) - r = 0; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - ++r; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + client_set_layer(data->layer.any.c, data->layer.layer); } -void action_previous_desktop_row(union ActionData *data) +void action_toggle_layer(union ActionData *data) { - guint r, c, d; + ObClient *c = data->layer.any.c; - cur_row_col(&r, &c); - --r; - if (r >= screen_desktop_layout.rows) - r = screen_desktop_layout.rows - 1; - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - --r; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + 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_toggle_decorations(union ActionData *data) +void action_toggle_dockautohide(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); + config_dock_hide = !config_dock_hide; + dock_configure(); } -void action_moveresize(union ActionData *data) +void action_add_desktop(union ActionData *data) { - Client *c = data->moveresize.c; + client_action_start(data); + screen_set_num_desktops(screen_num_desktops+1); - if (!c || !client_normal(c)) return; + /* move all the clients over */ + if (data->addremovedesktop.current) { + GList *it; - moveresize_start(c, data->moveresize.x, data->moveresize.y, - data->moveresize.button, data->moveresize.corner); -} - -void action_restart(union ActionData *data) -{ - ob_restart_path = data->execute.path; - ob_shutdown = ob_restart = TRUE; -} - -void action_exit(union ActionData *data) -{ - ob_shutdown = TRUE; -} + 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); + } + } -void action_showmenu(union ActionData *data) -{ - if (data->showmenu.name) { - menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y, - data->showmenu.c); + 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); + } + } } -} -void action_cycle_windows(union ActionData *data) -{ - Client *c; - - c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final, - data->cycle.cancel); -} + /* 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_directional_focus(union ActionData *data) -{ - Client *nf; + screen_set_num_desktops(screen_num_desktops-1); - if (!data->dfocus.c) - return; - if ((nf = client_find_directional(data->dfocus.c, data->dfocus.direction))) - client_activate(nf); + client_action_end(data, config_focus_under_mouse); }