#define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
EnterWindowMask | LeaveWindowMask)
#define DOCKAPP_EVENT_MASK (StructureNotifyMask)
+#define DOCK_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
+ ButtonMotionMask)
static ObDock *dock;
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,
ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
}
-void dock_remove_all()
+void dock_remove_all(void)
{
while (dock->dock_apps)
dock_remove(dock->dock_apps->data, TRUE);
g_free(app);
}
-void dock_configure()
+void dock_configure(void)
{
GList *it;
gint hspot, vspot;
gint l, r, t, b;
gint strw, strh;
Rect *a;
+ gint hidesize;
RrMargins(dock->a_frame, &l, &t, &r, &b);
+ hidesize = MAX(1, ob_rr_theme->obwidth);
dock->area.width = dock->area.height = 0;
case OB_DIRECTION_NORTHWEST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+ dock->area.y -= dock->area.height - hidesize;
break;
case OB_ORIENTATION_VERT:
- dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+ dock->area.x -= dock->area.width - hidesize;
break;
}
break;
case OB_DIRECTION_NORTH:
- dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+ dock->area.y -= dock->area.height - hidesize;
break;
case OB_DIRECTION_NORTHEAST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+ dock->area.y -= dock->area.height - hidesize;
break;
case OB_ORIENTATION_VERT:
- dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+ dock->area.x += dock->area.width - hidesize;
break;
}
break;
case OB_DIRECTION_WEST:
- dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+ dock->area.x -= dock->area.width - hidesize;
break;
case OB_DIRECTION_EAST:
- dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+ dock->area.x += dock->area.width - hidesize;
break;
case OB_DIRECTION_SOUTHWEST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+ dock->area.y += dock->area.height - hidesize;
break;
case OB_ORIENTATION_VERT:
- dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+ dock->area.x -= dock->area.width - hidesize;
break;
} break;
case OB_DIRECTION_SOUTH:
- dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+ dock->area.y += dock->area.height - hidesize;
break;
case OB_DIRECTION_SOUTHEAST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+ dock->area.y += dock->area.height - hidesize;
break;
case OB_ORIENTATION_VERT:
- dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+ dock->area.x += dock->area.width - hidesize;
break;
}
break;
}
if (!config_dock_floating && config_dock_hide) {
- strw = ob_rr_theme->obwidth;
- strh = ob_rr_theme->obwidth;
+ strw = hidesize;
+ strh = hidesize;
} else {
strw = dock->area.width;
strh = dock->area.height;
{
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);
}