From 9005a02c5c4355ca18c1d070072bb9fbe0f2c040 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 30 Jul 2007 01:47:13 -0400 Subject: don't propagate mouse button events on dock windows thru to the root window --- openbox/dock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'openbox/dock.c') diff --git a/openbox/dock.c b/openbox/dock.c index 990c8208..36b08b06 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -30,6 +30,8 @@ #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \ EnterWindowMask | LeaveWindowMask) #define DOCKAPP_EVENT_MASK (StructureNotifyMask) +#define DOCK_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ + ButtonMotionMask) static ObDock *dock; @@ -83,11 +85,13 @@ void dock_startup(gboolean reconfig) attrib.event_mask = DOCK_EVENT_MASK; attrib.override_redirect = True; + attrib.do_not_propagate_mask = DOCK_NOPROPAGATEMASK; dock->frame = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen), 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), - CWOverrideRedirect | CWEventMask, + CWOverrideRedirect | CWEventMask | + CWDontPropagate, &attrib); dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); XSetWindowBorder(ob_display, dock->frame, -- cgit v1.2.3 From 3b4b52921adba74472904b37ec13d9c8d8686a10 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 3 Aug 2007 20:40:13 -0400 Subject: show a popup notification when switching desktops (also make all the config options export time in milliseconds not half milli half micro) --- openbox/dock.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'openbox/dock.c') diff --git a/openbox/dock.c b/openbox/dock.c index 36b08b06..3b32758a 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -628,15 +628,17 @@ void dock_hide(gboolean hide) { if (!hide) { if (dock->hidden && config_dock_hide) { - ob_main_loop_timeout_add(ob_main_loop, config_dock_show_delay, - show_timeout, NULL, g_direct_equal, NULL); + ob_main_loop_timeout_add(ob_main_loop, + config_dock_show_delay * 1000, + show_timeout, NULL, g_direct_equal, NULL); } else if (!dock->hidden && config_dock_hide) { ob_main_loop_timeout_remove(ob_main_loop, hide_timeout); } } else { if (!dock->hidden && config_dock_hide) { - ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay, - hide_timeout, NULL, g_direct_equal, NULL); + ob_main_loop_timeout_add(ob_main_loop, + config_dock_hide_delay * 1000, + hide_timeout, NULL, g_direct_equal, NULL); } else if (dock->hidden && config_dock_hide) { ob_main_loop_timeout_remove(ob_main_loop, show_timeout); } -- cgit v1.2.3