From b906db3e11c06997261297cdb1992fd1b05738ff Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 14 May 2007 20:55:36 +0000 Subject: [PATCH] remove the dialog option for Desktop action for now. can't change desktop during a grab. the dialog for desktop changing will need to change, and then we can add it back --- openbox/action.c | 23 ++++++++++++----------- openbox/action.h | 2 +- openbox/client.c | 2 -- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/openbox/action.c b/openbox/action.c index aa9465b8..d8e782ca 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -260,7 +260,9 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact) void setup_action_desktop(ObAction **a, ObUserAction uact) { +/* (*a)->data.desktop.inter.any.interactive = FALSE; +*/ } void setup_action_desktop_prev(ObAction **a, ObUserAction uact) @@ -1013,9 +1015,11 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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); @@ -1600,18 +1604,15 @@ void action_send_to_desktop(union ActionData *data) void action_desktop(union ActionData *data) { - if (!data->inter.any.interactive || - (!data->inter.cancel && !data->inter.final)) + /* XXX add the interactive/dialog option back again once the dialog + has been made to not use grabs */ + if (data->desktop.desk < screen_num_desktops || + data->desktop.desk == DESKTOP_ALL) { - if (data->desktop.desk < screen_num_desktops || - data->desktop.desk == DESKTOP_ALL) - { - screen_set_desktop(data->desktop.desk, TRUE); - if (data->inter.any.interactive) - screen_desktop_popup(data->desktop.desk, TRUE); - } - } else - screen_desktop_popup(0, FALSE); + screen_set_desktop(data->desktop.desk, TRUE); + if (data->inter.any.interactive) + screen_desktop_popup(data->desktop.desk, TRUE); + } } void action_desktop_dir(union ActionData *data) diff --git a/openbox/action.h b/openbox/action.h index 7c48f37b..38452e44 100644 --- a/openbox/action.h +++ b/openbox/action.h @@ -115,7 +115,7 @@ struct SendToDesktopDirection { }; struct Desktop { - struct InteractiveAction inter; + struct AnyAction inter; guint desk; }; diff --git a/openbox/client.c b/openbox/client.c index c1df4786..18aac818 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -3332,8 +3332,6 @@ ObClient *client_focus_target(ObClient *self) gboolean client_can_focus(ObClient *self) { - XEvent ev; - /* choose the correct target */ self = client_focus_target(self); -- 2.45.2