add an option for if the popup is used for desktop cycling. defaults on.

This commit is contained in:
Dana Jansens 2003-08-12 10:03:13 +00:00
parent f4979de3f5
commit e1fd32bcf5
4 changed files with 12 additions and 3 deletions

View file

@ -9,6 +9,7 @@ gboolean config_focus_follow;
gboolean config_focus_last; gboolean config_focus_last;
gboolean config_focus_last_on_desktop; gboolean config_focus_last_on_desktop;
gboolean config_focus_popup; gboolean config_focus_popup;
gboolean config_desktop_popup;
char *config_theme; char *config_theme;
@ -231,6 +232,8 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
nname = parse_find_node("name", nname->next); nname = parse_find_node("name", nname->next);
} }
} }
if ((n = parse_find_node("cyclingDialog", node)))
config_desktop_popup = parse_bool(doc, n);
} }
static void parse_resize(xmlDocPtr doc, xmlNodePtr node, void *d) static void parse_resize(xmlDocPtr doc, xmlNodePtr node, void *d)
@ -321,6 +324,7 @@ void config_startup()
config_desktops_num = 4; config_desktops_num = 4;
config_desktops_names = NULL; config_desktops_names = NULL;
config_desktop_popup = TRUE;
parse_register("desktops", parse_desktops, NULL); parse_register("desktops", parse_desktops, NULL);

View file

@ -16,6 +16,8 @@ extern gboolean config_focus_last;
extern gboolean config_focus_last_on_desktop; extern gboolean config_focus_last_on_desktop;
/*! Show a popup dialog while cycling focus */ /*! Show a popup dialog while cycling focus */
extern gboolean config_focus_popup; extern gboolean config_focus_popup;
/*! Show a popup dialog while cycling desktops */
extern gboolean config_desktop_popup;
/*! The number of slits to create /*! The number of slits to create
extern int config_slit_number;*/ extern int config_slit_number;*/
/*! When true windows' contents are refreshed while they are resized; otherwise /*! When true windows' contents are refreshed while they are resized; otherwise

View file

@ -121,8 +121,10 @@ static void fire_button(ObMouseAction a, ObFrameContext context,
act->data.sendtodir.cancel = FALSE; act->data.sendtodir.cancel = FALSE;
} }
if ((act->func == action_desktop_dir || if (config_desktop_popup &&
act->func == action_send_to_desktop_dir)) { (act->func == action_desktop_dir ||
act->func == action_send_to_desktop_dir))
{
keyboard_interactive_grab(state, c, context, act); keyboard_interactive_grab(state, c, context, act);
} }

View file

@ -700,7 +700,8 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
d = translate_row_col(r, c); d = translate_row_col(r, c);
} }
popup_cycle(d, TRUE); if (config_desktop_popup)
popup_cycle(d, TRUE);
return d; return d;
done_cycle: done_cycle: