X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=dba74f684923d53ffb28ea04844f7bb18c6bcebc;hb=ea481338b5f16fd81a7b33e036ead39b918a51af;hp=8cb40fb6c7ca6614c65d95272bc284fada96fbd4;hpb=3234a7508326f0fd7b54b7cfe0bd443f8ba35260;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 8cb40fb6..dba74f68 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -19,17 +19,18 @@
 
 #include "debug.h"
 #include "dock.h"
-#include "mainloop.h"
 #include "screen.h"
-#include "prop.h"
 #include "config.h"
 #include "grab.h"
 #include "openbox.h"
 #include "render/theme.h"
+#include "obt/prop.h"
 
 #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
                          EnterWindowMask | LeaveWindowMask)
 #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
+#define DOCK_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
+                              ButtonMotionMask)
 
 static ObDock *dock;
 
@@ -56,9 +57,9 @@ void dock_startup(gboolean reconfig)
     if (reconfig) {
         GList *it;
 
-        XSetWindowBorder(ob_display, dock->frame,
+        XSetWindowBorder(obt_display, dock->frame,
                          RrColorPixel(ob_rr_theme->osd_border_color));
-        XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth);
+        XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
 
         RrAppearanceFree(dock->a_frame);
         dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
@@ -83,20 +84,23 @@ void dock_startup(gboolean reconfig)
 
     attrib.event_mask = DOCK_EVENT_MASK;
     attrib.override_redirect = True;
-    dock->frame = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
+    attrib.do_not_propagate_mask = DOCK_NOPROPAGATEMASK;
+    dock->frame = XCreateWindow(obt_display,
+                                RootWindow(obt_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,
+    XSetWindowBorder(obt_display, dock->frame,
                      RrColorPixel(ob_rr_theme->osd_border_color));
-    XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth);
+    XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
 
     /* Setting the window type so xcompmgr can tell what it is */
-    PROP_SET32(dock->frame, net_wm_window_type, atom,
-               prop_atoms.net_wm_window_type_dock);
+    OBT_PROP_SET32(dock->frame, NET_WM_WINDOW_TYPE, ATOM,
+                   OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK));
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
@@ -114,7 +118,7 @@ void dock_shutdown(gboolean reconfig)
         return;
     }
 
-    XDestroyWindow(ob_display, dock->frame);
+    XDestroyWindow(obt_display, dock->frame);
     RrAppearanceFree(dock->a_frame);
     g_hash_table_remove(window_map, &dock->frame);
     stacking_remove(dock);
@@ -132,19 +136,19 @@ void dock_add(Window win, XWMHints *wmhints)
     app->icon_win = (wmhints->flags & IconWindowHint) ?
         wmhints->icon_window : win;
 
-    if (PROP_GETSS(app->win, wm_class, locale, &data)) {
+    if (OBT_PROP_GETSS(app->win, WM_CLASS, locale, &data)) {
         if (data[0]) {
             app->name = g_strdup(data[0]);
             if (data[1])
                 app->class = g_strdup(data[1]);
         }
-        g_strfreev(data);     
+        g_strfreev(data);
     }
 
     if (app->name == NULL) app->name = g_strdup("");
     if (app->class == NULL) app->class = g_strdup("");
-    
-    if (XGetWindowAttributes(ob_display, app->icon_win, &attrib)) {
+
+    if (XGetWindowAttributes(obt_display, app->icon_win, &attrib)) {
         app->w = attrib.width;
         app->h = attrib.height;
     } else {
@@ -154,7 +158,7 @@ void dock_add(Window win, XWMHints *wmhints)
     dock->dock_apps = g_list_append(dock->dock_apps, app);
     dock_configure();
 
-    XReparentWindow(ob_display, app->icon_win, dock->frame, app->x, app->y);
+    XReparentWindow(obt_display, app->icon_win, dock->frame, app->x, app->y);
     /*
       This is the same case as in frame.c for client windows. When Openbox is
       starting, the window is already mapped so we see unmap events occur for
@@ -167,16 +171,16 @@ void dock_add(Window win, XWMHints *wmhints)
 
     if (app->win != app->icon_win) {
         /* have to map it so that it can be re-managed on a restart */
-        XMoveWindow(ob_display, app->win, -1000, -1000);
-        XMapWindow(ob_display, app->win);
+        XMoveWindow(obt_display, app->win, -1000, -1000);
+        XMapWindow(obt_display, app->win);
     }
-    XMapWindow(ob_display, app->icon_win);
-    XSync(ob_display, False);
+    XMapWindow(obt_display, app->icon_win);
+    XSync(obt_display, False);
 
     /* specify that if we exit, the window should not be destroyed and should
        be reparented back to root automatically */
-    XChangeSaveSet(ob_display, app->icon_win, SetModeInsert);
-    XSelectInput(ob_display, app->icon_win, DOCKAPP_EVENT_MASK);
+    XChangeSaveSet(obt_display, app->icon_win, SetModeInsert);
+    XSelectInput(obt_display, app->icon_win, DOCKAPP_EVENT_MASK);
 
     dock_app_grab_button(app, TRUE);
 
@@ -185,7 +189,7 @@ void dock_add(Window win, XWMHints *wmhints)
     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);
@@ -194,16 +198,16 @@ void dock_remove_all()
 void dock_remove(ObDockApp *app, gboolean reparent)
 {
     dock_app_grab_button(app, FALSE);
-    XSelectInput(ob_display, app->icon_win, NoEventMask);
+    XSelectInput(obt_display, app->icon_win, NoEventMask);
     /* remove the window from our save set */
-    XChangeSaveSet(ob_display, app->icon_win, SetModeDelete);
-    XSync(ob_display, False);
+    XChangeSaveSet(obt_display, app->icon_win, SetModeDelete);
+    XSync(obt_display, False);
 
     g_hash_table_remove(window_map, &app->icon_win);
 
     if (reparent)
-        XReparentWindow(ob_display, app->icon_win,
-                        RootWindow(ob_display, ob_screen), app->x, app->y);
+        XReparentWindow(obt_display, app->icon_win,
+                        RootWindow(obt_display, ob_screen), app->x, app->y);
 
     dock->dock_apps = g_list_remove(dock->dock_apps, app);
     dock_configure();
@@ -215,7 +219,7 @@ void dock_remove(ObDockApp *app, gboolean reparent)
     g_free(app);
 }
 
-void dock_configure()
+void dock_configure(void)
 {
     GList *it;
     gint hspot, vspot;
@@ -223,8 +227,10 @@ void dock_configure()
     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;
 
@@ -265,7 +271,7 @@ void dock_configure()
             break;
         }
 
-        XMoveWindow(ob_display, app->icon_win, app->x, app->y);
+        XMoveWindow(obt_display, app->icon_win, app->x, app->y);
     }
 
     /* used for calculating offsets */
@@ -357,61 +363,61 @@ void dock_configure()
             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;
@@ -431,75 +437,75 @@ void dock_configure()
             switch (config_dock_orient) {
             case OB_ORIENTATION_HORZ:
                 STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
-                                  0, 0, dock->area.x, dock->area.x + dock->area.width - 1,
-                                  0, 0, 0, 0);
+                                  0, 0, dock->area.x, dock->area.x
+                                  + dock->area.width - 1, 0, 0, 0, 0);
                 break;
             case OB_ORIENTATION_VERT:
                 STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
-                                  dock->area.y, dock->area.y + dock->area.height - 1,
-                                  0, 0, 0, 0, 0, 0);
+                                  dock->area.y, dock->area.y
+                                  + dock->area.height - 1, 0, 0, 0, 0, 0, 0);
                 break;
             }
             break;
         case OB_DIRECTION_NORTH:
             STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
-                              0, 0, dock->area.x, dock->area.x + dock->area.width - 1,
-                              0, 0, 0, 0);
+                              0, 0, dock->area.x, dock->area.x
+                              + dock->area.width - 1, 0, 0, 0, 0);
             break;
         case OB_DIRECTION_NORTHEAST:
             switch (config_dock_orient) {
             case OB_ORIENTATION_HORZ:
                 STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
-                                  0, 0, dock->area.x, dock->area.x + dock->area.width -1,
-                                  0, 0, 0, 0);
+                                  0, 0, dock->area.x, dock->area.x
+                                  + dock->area.width -1, 0, 0, 0, 0);
                 break;
             case OB_ORIENTATION_VERT:
                 STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
-                                  0, 0, 0, 0,
-                                  dock->area.y, dock->area.y + dock->area.height - 1, 0, 0);
+                                  0, 0, 0, 0, dock->area.y, dock->area.y
+                                  + dock->area.height - 1, 0, 0);
                 break;
             }
             break;
         case OB_DIRECTION_WEST:
             STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
-                              dock->area.y, dock->area.y + dock->area.height - 1,
-                              0, 0, 0, 0, 0, 0);
+                              dock->area.y, dock->area.y
+                              + dock->area.height - 1, 0, 0, 0, 0, 0, 0);
             break;
         case OB_DIRECTION_EAST:
             STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
-                              0, 0, 0, 0,
-                              dock->area.y, dock->area.y + dock->area.height - 1, 0, 0);
+                              0, 0, 0, 0, dock->area.y, dock->area.y
+                              + dock->area.height - 1, 0, 0);
             break;
         case OB_DIRECTION_SOUTHWEST:
             switch (config_dock_orient) {
             case OB_ORIENTATION_HORZ:
                 STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
-                                  0, 0, 0, 0, 0, 0,
-                                  dock->area.x, dock->area.x + dock->area.width - 1);
+                                  0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x
+                                  + dock->area.width - 1);
                 break;
             case OB_ORIENTATION_VERT:
                 STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
-                                  dock->area.y, dock->area.y + dock->area.height - 1,
-                                  0, 0, 0, 0, 0, 0);
+                                  dock->area.y, dock->area.y
+                                  + dock->area.height - 1, 0, 0, 0, 0, 0, 0);
                 break;
             }
             break;
         case OB_DIRECTION_SOUTH:
             STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
-                              0, 0, 0, 0, 0, 0,
-                              dock->area.x, dock->area.x + dock->area.width - 1);
+                              0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x
+                              + dock->area.width - 1);
             break;
         case OB_DIRECTION_SOUTHEAST:
             switch (config_dock_orient) {
             case OB_ORIENTATION_HORZ:
                 STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
-                                  0, 0, 0, 0, 0, 0,
-                                  dock->area.x, dock->area.x + dock->area.width - 1);
+                                  0, 0, 0, 0, 0, 0, dock->area.x,
+                                  dock->area.x + dock->area.width - 1);
                 break;
             case OB_ORIENTATION_VERT:
                 STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
-                                  0, 0, 0, 0,
-                                  dock->area.y, dock->area.y + dock->area.height - 1, 0, 0);
+                                  0, 0, 0, 0, dock->area.y, dock->area.y
+                                  + dock->area.height - 1, 0, 0);
                 break;
             }
             break;
@@ -514,13 +520,14 @@ void dock_configure()
         g_assert(dock->area.width > 0);
         g_assert(dock->area.height > 0);
 
-        XMoveResizeWindow(ob_display, dock->frame,
-                          dock->area.x, dock->area.y, dock->area.width, dock->area.height);
+        XMoveResizeWindow(obt_display, dock->frame, dock->area.x, dock->area.y,
+                          dock->area.width, dock->area.height);
 
-        RrPaint(dock->a_frame, dock->frame, dock->area.width, dock->area.height);
-        XMapWindow(ob_display, dock->frame);
+        RrPaint(dock->a_frame, dock->frame, dock->area.width,
+                dock->area.height);
+        XMapWindow(obt_display, dock->frame);
     } else
-        XUnmapWindow(ob_display, dock->frame);
+        XUnmapWindow(obt_display, dock->frame);
 
     /* but they are useful outside of this function! */
     dock->area.width += ob_rr_theme->obwidth * 2;
@@ -623,22 +630,27 @@ 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);
+            obt_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);
+            obt_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);
+            obt_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);
+            obt_main_loop_timeout_remove(ob_main_loop, show_timeout);
         }
     }
 }
 
 void dock_get_area(Rect *a)
 {
-    RECT_SET(*a, dock->area.x, dock->area.y, dock->area.width, dock->area.height);
+    RECT_SET(*a, dock->area.x, dock->area.y,
+             dock->area.width, dock->area.height);
 }