diff options
| -rw-r--r-- | openbox/config.c | 4 | ||||
| -rw-r--r-- | openbox/config.h | 2 | ||||
| -rw-r--r-- | openbox/mouse.c | 6 | ||||
| -rw-r--r-- | openbox/screen.c | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/openbox/config.c b/openbox/config.c index 5444e013..f0514523 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -9,6 +9,7 @@ gboolean config_focus_follow; gboolean config_focus_last; gboolean config_focus_last_on_desktop; gboolean config_focus_popup; +gboolean config_desktop_popup; char *config_theme; @@ -231,6 +232,8 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d) 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) @@ -321,6 +324,7 @@ void config_startup() config_desktops_num = 4; config_desktops_names = NULL; + config_desktop_popup = TRUE; parse_register("desktops", parse_desktops, NULL); diff --git a/openbox/config.h b/openbox/config.h index 413ff184..b0254135 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -16,6 +16,8 @@ extern gboolean config_focus_last; extern gboolean config_focus_last_on_desktop; /*! Show a popup dialog while cycling focus */ extern gboolean config_focus_popup; +/*! Show a popup dialog while cycling desktops */ +extern gboolean config_desktop_popup; /*! The number of slits to create extern int config_slit_number;*/ /*! When true windows' contents are refreshed while they are resized; otherwise diff --git a/openbox/mouse.c b/openbox/mouse.c index 6651a1f2..2624ecb9 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -121,8 +121,10 @@ static void fire_button(ObMouseAction a, ObFrameContext context, act->data.sendtodir.cancel = FALSE; } - if ((act->func == action_desktop_dir || - act->func == action_send_to_desktop_dir)) { + if (config_desktop_popup && + (act->func == action_desktop_dir || + act->func == action_send_to_desktop_dir)) + { keyboard_interactive_grab(state, c, context, act); } diff --git a/openbox/screen.c b/openbox/screen.c index 8e5daec7..8835c1b2 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -700,7 +700,8 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, d = translate_row_col(r, c); } - popup_cycle(d, TRUE); + if (config_desktop_popup) + popup_cycle(d, TRUE); return d; done_cycle: |