nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dana Jansens 2007-05-14 20:55:36 +00:00
parent ff7eb1ea3d
commit b906db3e11
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
openbox/action.c
View file

@ -260,7 +260,9 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
void setup_action_desktop(ObAction **a, ObUserAction uact) void setup_action_desktop(ObAction **a, ObUserAction uact)
{ {
/*
(*a)->data.desktop.inter.any.interactive = FALSE; (*a)->data.desktop.inter.any.interactive = FALSE;
*/
} }
void setup_action_desktop_prev(ObAction **a, ObUserAction uact) 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))) if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
act->data.desktop.desk = parse_int(doc, n); act->data.desktop.desk = parse_int(doc, n);
if (act->data.desktop.desk > 0) act->data.desktop.desk--; if (act->data.desktop.desk > 0) act->data.desktop.desk--;
/*
if ((n = parse_find_node("dialog", node->xmlChildrenNode))) if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
act->data.desktop.inter.any.interactive = act->data.desktop.inter.any.interactive =
parse_bool(doc, n); parse_bool(doc, n);
*/
} else if (act->func == action_send_to_desktop) { } else if (act->func == action_send_to_desktop) {
if ((n = parse_find_node("desktop", node->xmlChildrenNode))) if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
act->data.sendto.desk = parse_int(doc, n); 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) void action_desktop(union ActionData *data)
{ {
if (!data->inter.any.interactive || /* XXX add the interactive/dialog option back again once the dialog
(!data->inter.cancel && !data->inter.final)) 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 || screen_set_desktop(data->desktop.desk, TRUE);
data->desktop.desk == DESKTOP_ALL) if (data->inter.any.interactive)
{ screen_desktop_popup(data->desktop.desk, TRUE);
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);
} }
void action_desktop_dir(union ActionData *data) void action_desktop_dir(union ActionData *data)

2
openbox/action.h
View file

@ -115,7 +115,7 @@ struct SendToDesktopDirection {
}; };
struct Desktop { struct Desktop {
struct InteractiveAction inter; struct AnyAction inter;
guint desk; guint desk;
}; };

2
openbox/client.c
View file

@ -3332,8 +3332,6 @@ ObClient *client_focus_target(ObClient *self)
gboolean client_can_focus(ObClient *self) gboolean client_can_focus(ObClient *self)
{ {
XEvent ev;
/* choose the correct target */ /* choose the correct target */
self = client_focus_target(self); self = client_focus_target(self);