diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-08-04 23:35:36 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-08-04 23:35:36 -0400 |
| commit | f55ae9e56945892825928cfb021b5e739d0d5224 (patch) | |
| tree | 19a26efae2532bc046160289adca8a8dc45ac3a7 /openbox/dock.c | |
| parent | 98b9ed97ebbcf22185359c8f6f1d539a105cd258 (diff) | |
| parent | fa085b73389de3af8236919f4e39c4c20d16ed7c (diff) | |
Merge branch 'backport'
Diffstat (limited to 'openbox/dock.c')
| -rw-r--r-- | openbox/dock.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/openbox/dock.c b/openbox/dock.c index 990c8208..3b32758a 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, @@ -624,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); } |