X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=2e348c7c20aa9ef3e5a2a9f220e85f39f8745329;hb=8ab1e9537e5aebfe48d826cbf266cf8d582d9d65;hp=4187c26243d8f1ceb87ec7ff8119058c0b34335f;hpb=20f4d7fd44a268c1f461495f8c4c8f269aa0f292;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 4187c262..24f4b36f 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -2,7 +2,7 @@ action.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + 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 @@ -20,6 +20,7 @@ #include "debug.h" #include "client.h" #include "focus.h" +#include "focus_cycle.h" #include "moveresize.h" #include "menu.h" #include "prop.h" @@ -34,33 +35,11 @@ #include "config.h" #include "mainloop.h" #include "startupnotify.h" +#include "gettext.h" #include -inline void client_action_start(union ActionData *data) -{ - if (config_focus_follow) - if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button) - grab_pointer(TRUE, OB_CURSOR_NONE); -} -inline void client_action_end(union ActionData *data) -{ - if (config_focus_follow) - if (data->any.context != OB_FRAME_CONTEXT_CLIENT) { - if (!data->any.button) { - grab_pointer(FALSE, OB_CURSOR_NONE); - } else { - ObClient *c; - - /* usually this is sorta redundant, but with a press action - the enter event will come as a GrabNotify which is - ignored, so this will handle that case */ - if ((c = client_under_pointer())) - event_enter_client(c); - } - } -} typedef struct { @@ -92,6 +71,8 @@ void action_unref(ObAction *a) /* 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); @@ -107,68 +88,14 @@ ObAction* action_copy(const ObAction *src) /* 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_directional_focus_north(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_NORTH; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_east(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_EAST; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_south(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_west(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_WEST; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_southeast(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST; - (*a)->data.interdiraction.dialog = TRUE; -} - -void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST; - (*a)->data.interdiraction.dialog = TRUE; -} - void setup_action_send_to_desktop(ObAction **a, ObUserAction uact) { (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS; @@ -235,11 +162,6 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact) (*a)->data.sendtodir.follow = TRUE; } -void setup_action_desktop(ObAction **a, ObUserAction uact) -{ - (*a)->data.desktop.inter.any.interactive = FALSE; -} - void setup_action_desktop_prev(ObAction **a, ObUserAction uact) { (*a)->data.desktopdir.inter.any.interactive = TRUE; @@ -288,22 +210,6 @@ void setup_action_desktop_down(ObAction **a, ObUserAction uact) (*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; -} - -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; -} - void setup_action_movefromedge_north(ObAction **a, ObUserAction uact) { (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; @@ -402,36 +308,24 @@ void setup_action_bottom_layer(ObAction **a, ObUserAction uact) (*a)->data.layer.layer = -1; } -void setup_action_move(ObAction **a, ObUserAction uact) +void setup_action_resize(ObAction **a, ObUserAction uact) { (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS; - (*a)->data.moveresize.move = TRUE; (*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) +void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact) { - (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS; - (*a)->data.moveresize.move = FALSE; - (*a)->data.moveresize.keyboard = - (uact == OB_USER_ACTION_NONE || - uact == OB_USER_ACTION_KEYBOARD_KEY || - uact == OB_USER_ACTION_MENU_SELECTION); + (*a)->data.addremovedesktop.current = TRUE; } -void setup_action_showmenu(ObAction **a, ObUserAction uact) +void setup_action_addremove_desktop_last(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 = FALSE; } void setup_client_action(ObAction **a, ObUserAction uact) @@ -441,101 +335,6 @@ void setup_client_action(ObAction **a, ObUserAction uact) 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 - }, - { - "activate", - action_activate, - setup_client_action - }, - { - "focus", - action_focus, - setup_client_action - }, - { - "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 - }, { "shadelower", action_shadelower, @@ -546,111 +345,6 @@ ActionString actionstrings[] = action_unshaderaise, setup_client_action }, - { - "shade", - action_shade, - setup_client_action - }, - { - "unshade", - action_unshade, - setup_client_action - }, - { - "toggleshade", - action_toggle_shade, - setup_client_action - }, - { - "toggleomnipresent", - action_toggle_omnipresent, - setup_client_action - }, - { - "moverelativehorz", - action_move_relative_horz, - setup_client_action - }, - { - "moverelativevert", - action_move_relative_vert, - setup_client_action - }, - { - "movetocenter", - action_move_to_center, - setup_client_action - }, - { - "resizerelativehorz", - action_resize_relative_horz, - setup_client_action - }, - { - "resizerelativevert", - action_resize_relative_vert, - setup_client_action - }, - { - "moverelative", - action_move_relative, - setup_client_action - }, - { - "resizerelative", - action_resize_relative, - 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 - }, - { - "unmaximizehorz", - action_unmaximize_horz, - setup_client_action - }, - { - "togglemaximizehorz", - action_toggle_maximize_horz, - setup_client_action - }, - { - "maximizevert", - action_maximize_vert, - setup_client_action - }, - { - "unmaximizevert", - action_unmaximize_vert, - setup_client_action - }, - { - "togglemaximizevert", - action_toggle_maximize_vert, - setup_client_action - }, - { - "togglefullscreen", - action_toggle_fullscreen, - setup_client_action - }, { "sendtodesktop", action_send_to_desktop, @@ -686,101 +380,11 @@ ActionString actionstrings[] = action_send_to_desktop_dir, setup_action_send_to_desktop_down }, - { - "desktop", - action_desktop, - setup_action_desktop - }, - { - "desktopnext", - action_desktop_dir, - setup_action_desktop_next - }, - { - "desktopprevious", - action_desktop_dir, - setup_action_desktop_prev - }, - { - "desktopright", - action_desktop_dir, - setup_action_desktop_right - }, - { - "desktopleft", - action_desktop_dir, - setup_action_desktop_left - }, - { - "desktopup", - action_desktop_dir, - setup_action_desktop_up - }, - { - "desktopdown", - action_desktop_dir, - setup_action_desktop_down - }, - { - "toggledecorations", - action_toggle_decorations, - setup_client_action - }, - { - "move", - action_moveresize, - setup_action_move - }, - { - "resize", - action_moveresize, - setup_action_resize - }, { "toggledockautohide", action_toggle_dockautohide, 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, @@ -806,16 +410,6 @@ ActionString actionstrings[] = action_toggle_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, @@ -876,6 +470,26 @@ ActionString actionstrings[] = 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, @@ -907,10 +521,11 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact) break; } if (!exist) - g_warning("Invalid action '%s' requested. No such action exists.", + g_message(_("Invalid action '%s' requested. No such action exists."), name); if (!a) - g_warning("Invalid use of action '%s'. Action will be ignored.", name); + g_message(_("Invalid use of action '%s'. Action will be ignored."), + name); return a; } @@ -923,63 +538,13 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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_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 || - act->func == action_resize_relative_vert) { - if ((n = parse_find_node("delta", node->xmlChildrenNode))) - act->data.relative.deltax = parse_int(doc, n); - } else if (act->func == action_move_relative) { - if ((n = parse_find_node("x", node->xmlChildrenNode))) - act->data.relative.deltax = parse_int(doc, n); - if ((n = parse_find_node("y", node->xmlChildrenNode))) - act->data.relative.deltay = parse_int(doc, n); - } else if (act->func == action_resize_relative) { - if ((n = parse_find_node("left", node->xmlChildrenNode))) - act->data.relative.deltaxl = parse_int(doc, n); - if ((n = parse_find_node("up", node->xmlChildrenNode))) - act->data.relative.deltayu = parse_int(doc, n); - if ((n = parse_find_node("right", node->xmlChildrenNode))) - act->data.relative.deltax = parse_int(doc, n); - if ((n = parse_find_node("down", node->xmlChildrenNode))) - act->data.relative.deltay = parse_int(doc, n); } else if (act->func == action_desktop) { - if ((n = parse_find_node("desktop", node->xmlChildrenNode))) - act->data.desktop.desk = parse_int(doc, n); - if (act->data.desktop.desk > 0) act->data.desktop.desk--; - if ((n = parse_find_node("dialog", node->xmlChildrenNode))) - act->data.desktop.inter.any.interactive = - parse_bool(doc, n); } 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_desktop_dir) { - if ((n = parse_find_node("wrap", node->xmlChildrenNode))) - act->data.desktopdir.wrap = parse_bool(doc, n); - if ((n = parse_find_node("dialog", node->xmlChildrenNode))) - act->data.desktopdir.inter.any.interactive = - 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); @@ -988,23 +553,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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); - } else if (act->func == action_directional_focus) { - if ((n = parse_find_node("dialog", node->xmlChildrenNode))) - act->data.cycle.dialog = parse_bool(doc, n); - } 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); @@ -1013,12 +561,11 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, - guint state, gint button, gint x, gint y, Time time, + guint state, guint button, gint x, gint y, Time time, gboolean cancel, gboolean done) { GSList *it; ObAction *a; - gboolean inter = FALSE; if (!acts) return; @@ -1026,25 +573,6 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, if (x < 0 && y < 0) screen_pointer_pos(&x, &y); - if (grab_on_keyboard()) - inter = TRUE; - else - for (it = acts; it; it = g_slist_next(it)) { - a = it->data; - if (a->data.any.interactive) { - inter = TRUE; - break; - } - } - - if (!inter) { - /* sometimes when we execute another app as an action, - it won't work right unless we XUngrabKeyboard first, - even though we grabbed the key/button Asychronously. - e.g. "gnome-panel-control --main-menu" */ - XUngrabKeyboard(ob_display, event_curtime); - } - for (it = acts; it; it = g_slist_next(it)) { a = it->data; @@ -1068,10 +596,51 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, /* 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 */ - if (a->data.any.interactive || a->func == action_moveresize) { + 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); } @@ -1091,141 +660,6 @@ void action_run_string(const gchar *name, struct _ObClient *c, Time time) action_run(l, c, 0, time); } -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 (!g_shell_parse_argv (cmd, NULL, &argv, &e)) { - g_warning("failed to execute '%s': %s", - cmd, e->message); - g_error_free(e); - } else if (data->execute.startupnotify) { - gchar **env, *program; - - program = g_path_get_basename(argv[0]); - env = sn_get_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, env, G_SPAWN_SEARCH_PATH | - G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, NULL, &e)) { - g_warning("failed to execute '%s': %s", - cmd, e->message); - g_error_free(e); - sn_spawn_cancel(); - } - g_strfreev(env); - 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_warning("failed to execute '%s': %s", - cmd, e->message); - g_error_free(e); - } - g_strfreev(argv); - } - g_free(cmd); - } else { - g_warning("failed to convert '%s' from utf8", data->execute.path); - } - } -} - -void action_activate(union ActionData *data) -{ - /* similar to the openbox dock for dockapps, don't let user actions give - focus to 3rd-party docks (panels) either (unless they ask for it - themselves). */ - if (data->client.any.c->type != OB_CLIENT_TYPE_DOCK) { - /* 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); - } -} - -void action_focus(union ActionData *data) -{ - /* similar to the openbox dock for dockapps, don't let user actions give - focus to 3rd-party docks (panels) either (unless they ask for it - themselves). */ - if (data->client.any.c->type != OB_CLIENT_TYPE_DOCK) { - /* if using focus_delay, stop the timer now so that focus doesn't go - moving on us */ - event_halt_focus_delay(); - - if (client_validate(data->client.any.c)) - client_focus(data->client.any.c); - } -} - -void action_unfocus (union ActionData *data) -{ - if (data->client.any.c == focus_client) - focus_fallback(FALSE); -} - -void action_iconify(union ActionData *data) -{ - client_action_start(data); - client_iconify(data->client.any.c, TRUE, TRUE); - client_action_end(data); -} - -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; - GList *it; - gboolean raise = FALSE; - - for (it = stacking_list; it; it = g_list_next(it)) { - if (WINDOW_IS_CLIENT(it->data)) { - ObClient *cit = it->data; - - if (cit == c) break; - if (client_normal(cit) == client_normal(c) && - cit->layer == c->layer && - cit->frame->visible && - !client_search_transient(c, cit)) - { - if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) { - raise = TRUE; - break; - } - } - } - } - - if (raise) - action_raise(data); - else - action_lower(data); -} - -void action_raise(union ActionData *data) -{ - client_action_start(data); - stacking_raise(CLIENT_AS_WINDOW(data->client.any.c)); - client_action_end(data); -} - void action_unshaderaise(union ActionData *data) { if (data->client.any.c->shaded) @@ -1242,202 +676,8 @@ void action_shadelower(union ActionData *data) 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); -} - -void action_close(union ActionData *data) -{ - client_close(data->client.any.c); -} - -void action_kill(union ActionData *data) -{ - client_kill(data->client.any.c); -} - -void action_shade(union ActionData *data) -{ - client_action_start(data); - client_shade(data->client.any.c, TRUE); - client_action_end(data); -} - -void action_unshade(union ActionData *data) -{ - client_action_start(data); - client_shade(data->client.any.c, FALSE); - client_action_end(data); -} - -void action_toggle_shade(union ActionData *data) -{ - client_action_start(data); - client_shade(data->client.any.c, !data->client.any.c->shaded); - client_action_end(data); -} - -void action_toggle_omnipresent(union ActionData *data) -{ - client_set_desktop(data->client.any.c, - data->client.any.c->desktop == DESKTOP_ALL ? - screen_desktop : DESKTOP_ALL, FALSE); -} - -void action_move_relative_horz(union ActionData *data) -{ - ObClient *c = data->relative.any.c; - client_action_start(data); - client_move(c, c->area.x + data->relative.deltax, c->area.y); - client_action_end(data); -} - -void action_move_relative_vert(union ActionData *data) -{ - ObClient *c = data->relative.any.c; - client_action_start(data); - client_move(c, c->area.x, c->area.y + data->relative.deltax); - client_action_end(data); -} - -void action_move_to_center(union ActionData *data) -{ - ObClient *c = data->client.any.c; - Rect *area; - area = screen_area_monitor(c->desktop, 0); - client_action_start(data); - client_move(c, area->width / 2 - c->area.width / 2, - area->height / 2 - c->area.height / 2); - client_action_end(data); -} - -void action_resize_relative_horz(union ActionData *data) -{ - ObClient *c = data->relative.any.c; - client_action_start(data); - client_resize(c, - c->area.width + data->relative.deltax * c->size_inc.width, - c->area.height); - client_action_end(data); -} - -void action_resize_relative_vert(union ActionData *data) -{ - ObClient *c = data->relative.any.c; - if (!c->shaded) { - client_action_start(data); - client_resize(c, c->area.width, c->area.height + - data->relative.deltax * c->size_inc.height); - client_action_end(data); - } -} - -void action_move_relative(union ActionData *data) -{ - ObClient *c = data->relative.any.c; - client_action_start(data); - client_move(c, c->area.x + data->relative.deltax, c->area.y + - data->relative.deltay); - client_action_end(data); -} - void action_resize_relative(union ActionData *data) { - ObClient *c = data->relative.any.c; - gint x, y, ow, w, oh, h, lw, lh; - - client_action_start(data); - - x = c->area.x; - y = c->area.y; - ow = c->area.width; - w = ow + data->relative.deltax * c->size_inc.width - + data->relative.deltaxl * c->size_inc.width; - oh = c->area.height; - h = oh + data->relative.deltay * c->size_inc.height - + data->relative.deltayu * c->size_inc.height; - - client_try_configure(c, OB_CORNER_TOPLEFT, &x, &y, &w, &h, &lw, &lh, TRUE); - client_move_resize(c, x + (ow - w), y + (oh - h), w, h); - client_action_end(data); -} - -void action_maximize_full(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, TRUE, 0); - client_action_end(data); -} - -void action_unmaximize_full(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, FALSE, 0); - client_action_end(data); -} - -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); -} - -void action_maximize_horz(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, TRUE, 1); - client_action_end(data); -} - -void action_unmaximize_horz(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, FALSE, 1); - client_action_end(data); -} - -void action_toggle_maximize_horz(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, - !data->client.any.c->max_horz, 1); - client_action_end(data); -} - -void action_maximize_vert(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, TRUE, 2); - client_action_end(data); -} - -void action_unmaximize_vert(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, FALSE, 2); - client_action_end(data); -} - -void action_toggle_maximize_vert(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, - !data->client.any.c->max_vert, 2); - client_action_end(data); -} - -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); } void action_send_to_desktop(union ActionData *data) @@ -1448,54 +688,9 @@ void action_send_to_desktop(union ActionData *data) if (data->sendto.desk < screen_num_desktops || data->sendto.desk == DESKTOP_ALL) { - client_set_desktop(c, data->sendto.desk, data->sendto.follow); - if (data->sendto.follow) - screen_set_desktop(data->sendto.desk); - } -} - -void action_desktop(union ActionData *data) -{ - static guint first = (unsigned) -1; - - if (data->inter.any.interactive && first == (unsigned) -1) - first = screen_desktop; - - if (!data->inter.any.interactive || - (!data->inter.cancel && !data->inter.final)) - { - if (data->desktop.desk < screen_num_desktops || - data->desktop.desk == DESKTOP_ALL) - { - screen_set_desktop(data->desktop.desk); - if (data->inter.any.interactive) - screen_desktop_popup(data->desktop.desk, TRUE); - } - } else if (data->inter.cancel) { - screen_set_desktop(first); - } - - if (!data->inter.any.interactive || data->inter.final) { - screen_desktop_popup(0, FALSE); - first = (unsigned) -1; - } -} - -void action_desktop_dir(union ActionData *data) -{ - guint d; - - d = screen_cycle_desktop(data->desktopdir.dir, - data->desktopdir.wrap, - data->desktopdir.linear, - data->desktopdir.inter.any.interactive, - data->desktopdir.inter.final, - data->desktopdir.inter.cancel); - if (!data->sendtodir.inter.any.interactive || - !data->sendtodir.inter.final || - data->sendtodir.inter.cancel) - { - screen_set_desktop(d); + 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); } } @@ -1511,140 +706,18 @@ void action_send_to_desktop_dir(union ActionData *data) 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) + (data->sendtodir.inter.final && !data->sendtodir.inter.cancel)) { - client_set_desktop(c, d, data->sendtodir.follow); - if (data->sendtodir.follow) - screen_set_desktop(d); + 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); -} - -void action_toggle_decorations(union ActionData *data) -{ - ObClient *c = data->client.any.c; - - client_action_start(data); - client_set_undecorated(c, !c->undecorated); - client_action_end(data); -} - -static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch) -{ - if (config_resize_four_corners) { - if (x - cx > cw / 2) { - if (y - cy > ch / 2) - return prop_atoms.net_wm_moveresize_size_bottomright; - else - return prop_atoms.net_wm_moveresize_size_topright; - } else { - if (y - cy > ch / 2) - return prop_atoms.net_wm_moveresize_size_bottomleft; - else - return prop_atoms.net_wm_moveresize_size_topleft; - } - } else { - if (x - cx > cw * 2 / 3) { - if (y - cy > ch * 2 / 3) - return prop_atoms.net_wm_moveresize_size_bottomright; - else if (y - cy < ch / 3) - return prop_atoms.net_wm_moveresize_size_topright; - else - return prop_atoms.net_wm_moveresize_size_right; - } else if (x - cx < cw / 3) { - if (y - cy > ch * 2 / 3) - return prop_atoms.net_wm_moveresize_size_bottomleft; - else if (y - cy < ch / 3) - return prop_atoms.net_wm_moveresize_size_topleft; - else - return prop_atoms.net_wm_moveresize_size_left; - } else - if (y - cy > ch * 2 / 3) - return prop_atoms.net_wm_moveresize_size_bottom; - else if (y - cy < ch / 3) - return prop_atoms.net_wm_moveresize_size_top; - else - return prop_atoms.net_wm_moveresize_move; - } -} - -void action_moveresize(union ActionData *data) -{ - ObClient *c = data->moveresize.any.c; - guint32 corner; - - if (!client_normal(c)) return; - - if (data->moveresize.keyboard) { - corner = (data->moveresize.move ? - prop_atoms.net_wm_moveresize_move_keyboard : - prop_atoms.net_wm_moveresize_size_keyboard); - } else { - corner = (data->moveresize.move ? - prop_atoms.net_wm_moveresize_move : - pick_corner(data->any.x, data->any.y, - c->frame->area.x, c->frame->area.y, - /* use the client size because the frame - can be differently sized (shaded - windows) and we want this based on the - clients size */ - c->area.width + c->frame->size.left + - c->frame->size.right, - c->area.height + c->frame->size.top + - c->frame->size.bottom)); - } - - 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) { - gint x, y; - ObClient *c = data->showmenu.any.c; - if (data->any.button == -1 && c) { - x = c->frame->area.x + c->frame->size.left; - y = c->frame->area.y + c->frame->size.top; - } else { - x = data->any.x; - y = data->any.y; - } - menu_show(data->showmenu.name, x, y, 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.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 @@ -1652,6 +725,8 @@ void action_directional_focus(union ActionData *data) event_halt_focus_delay(); focus_directional_cycle(data->interdiraction.direction, + data->interdiraction.dock_windows, + data->interdiraction.desktop_windows, data->any.interactive, data->interdiraction.dialog, data->interdiraction.inter.final, @@ -1690,10 +765,10 @@ void action_movetoedge(union ActionData *data) default: g_assert_not_reached(); } - frame_frame_gravity(c->frame, &x, &y); + 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); + client_action_end(data, FALSE); } void action_growtoedge(union ActionData *data) @@ -1702,36 +777,37 @@ void action_growtoedge(union ActionData *data) ObClient *c = data->diraction.any.c; Rect *a; - //FIXME growtoedge resizes shaded windows to 0 height - if (c->shaded) - return; - - 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; - width = c->frame->area.width; - height = c->frame->area.height; + /* 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 = c->frame->area.height / 2; + height = height / 2; else { - height = c->frame->area.y + c->frame->area.height - dest; + 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 = c->frame->area.width / 2; + width = width / 2; else { - width = c->frame->area.x + c->frame->area.width - dest; + 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; @@ -1754,12 +830,13 @@ void action_growtoedge(union ActionData *data) default: g_assert_not_reached(); } - frame_frame_gravity(c->frame, &x, &y); 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); + client_action_end(data, FALSE); + g_free(a); } void action_send_to_layer(union ActionData *data) @@ -1776,7 +853,7 @@ void action_toggle_layer(union ActionData *data) 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); + client_action_end(data, config_focus_under_mouse); } void action_toggle_dockautohide(union ActionData *data) @@ -1785,17 +862,75 @@ void action_toggle_dockautohide(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); -} + client_action_start(data); + screen_set_num_desktops(screen_num_desktops+1); -void action_show_desktop(union ActionData *data) -{ - screen_show_desktop(TRUE); + /* move all the clients over */ + if (data->addremovedesktop.current) { + GList *it; + + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + if (c->desktop != DESKTOP_ALL && c->desktop >= screen_desktop) + client_set_desktop(c, c->desktop+1, FALSE, TRUE); + } + } + + client_action_end(data, config_focus_under_mouse); } -void action_unshow_desktop(union ActionData *data) +void action_remove_desktop(union ActionData *data) { - screen_show_desktop(FALSE); + 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); }