X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=ff5b74cf9a34432d1cae4bffb30cfbdf8e901323;hb=7a6a516b8e3d8ad6b15379eabf6652a6f43eab27;hp=53c791396a1d7254d89d885dc9cdfaba75e19c80;hpb=ec304c9e433e4b1cedf924ca64d783f05db7d42d;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 53c79139..ff5b74cf 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -2,7 +2,7 @@
 
    dock.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,11 +57,11 @@ void dock_startup(gboolean reconfig)
         GList *it;
 
         XSetWindowBorder(ob_display, dock->frame,
-                         RrColorPixel(ob_rr_theme->frame_b_color));
-        XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
+                         RrColorPixel(ob_rr_theme->osd_border_color));
+        XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth);
 
         RrAppearanceFree(dock->a_frame);
-        dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title);
+        dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
 
         stacking_add(DOCK_AS_WINDOW(dock));
 
@@ -89,10 +89,10 @@ void dock_startup(gboolean reconfig)
                                 RrVisual(ob_rr_inst),
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
-    dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title);
+    dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
     XSetWindowBorder(ob_display, dock->frame,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-    XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
+                     RrColorPixel(ob_rr_theme->osd_border_color));
+    XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
@@ -220,7 +220,7 @@ void dock_configure()
     gint strw, strh;
     Rect *a;
 
-    RrMinsize(dock->a_frame, &minw, &minh);
+    RrMinSize(dock->a_frame, &minw, &minh);
 
     dock->w = dock->h = 0;
 
@@ -261,8 +261,8 @@ void dock_configure()
     }
 
     /* used for calculating offsets */
-    dock->w += ob_rr_theme->fbwidth * 2;
-    dock->h += ob_rr_theme->fbwidth * 2;
+    dock->w += ob_rr_theme->obwidth * 2;
+    dock->h += ob_rr_theme->obwidth * 2;
 
     a = screen_physical_area();
 
@@ -349,51 +349,51 @@ void dock_configure()
             case OB_DIRECTION_NORTHWEST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->y -= dock->h - ob_rr_theme->fbwidth;
+                    dock->y -= dock->h - ob_rr_theme->obwidth;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->x -= dock->w - ob_rr_theme->fbwidth;
+                    dock->x -= dock->w - ob_rr_theme->obwidth;
                     break;
                 }
                 break;
             case OB_DIRECTION_NORTH:
-                dock->y -= dock->h - ob_rr_theme->fbwidth;
+                dock->y -= dock->h - ob_rr_theme->obwidth;
                 break;
             case OB_DIRECTION_NORTHEAST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->y -= dock->h - ob_rr_theme->fbwidth;
+                    dock->y -= dock->h - ob_rr_theme->obwidth;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->x += dock->w - ob_rr_theme->fbwidth;
+                    dock->x += dock->w - ob_rr_theme->obwidth;
                     break;
                 }
                 break;
             case OB_DIRECTION_WEST:
-                dock->x -= dock->w - ob_rr_theme->fbwidth;
+                dock->x -= dock->w - ob_rr_theme->obwidth;
                 break;
             case OB_DIRECTION_EAST:
-                dock->x += dock->w - ob_rr_theme->fbwidth;
+                dock->x += dock->w - ob_rr_theme->obwidth;
                 break;
             case OB_DIRECTION_SOUTHWEST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->y += dock->h - ob_rr_theme->fbwidth;
+                    dock->y += dock->h - ob_rr_theme->obwidth;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->x -= dock->w - ob_rr_theme->fbwidth;
+                    dock->x -= dock->w - ob_rr_theme->obwidth;
                     break;
                 } break;
             case OB_DIRECTION_SOUTH:
-                dock->y += dock->h - ob_rr_theme->fbwidth;
+                dock->y += dock->h - ob_rr_theme->obwidth;
                 break;
             case OB_DIRECTION_SOUTHEAST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->y += dock->h - ob_rr_theme->fbwidth;
+                    dock->y += dock->h - ob_rr_theme->obwidth;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->x += dock->w - ob_rr_theme->fbwidth;
+                    dock->x += dock->w - ob_rr_theme->obwidth;
                     break;
                 }
                 break;
@@ -402,8 +402,8 @@ void dock_configure()
     }
 
     if (!config_dock_floating && config_dock_hide) {
-        strw = ob_rr_theme->fbwidth;
-        strh = ob_rr_theme->fbwidth;
+        strw = ob_rr_theme->obwidth;
+        strh = ob_rr_theme->obwidth;
     } else {
         strw = dock->w;
         strh = dock->h;
@@ -413,7 +413,8 @@ void dock_configure()
     if (!dock->dock_apps) {
         STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0);
-    } else if (config_dock_floating || config_dock_nostrut) {
+    } else if (config_dock_floating || config_dock_nostrut)
+    {
         STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0);
     } else {
@@ -501,8 +502,8 @@ void dock_configure()
     dock->h += minh;
 
     /* not used for actually sizing shit */
-    dock->w -= ob_rr_theme->fbwidth * 2;
-    dock->h -= ob_rr_theme->fbwidth * 2;
+    dock->w -= ob_rr_theme->obwidth * 2;
+    dock->h -= ob_rr_theme->obwidth * 2;
 
     if (dock->dock_apps) {
         g_assert(dock->w > 0);
@@ -517,8 +518,8 @@ void dock_configure()
         XUnmapWindow(ob_display, dock->frame);
 
     /* but they are useful outside of this function! */
-    dock->w += ob_rr_theme->fbwidth * 2;
-    dock->h += ob_rr_theme->fbwidth * 2;
+    dock->w += ob_rr_theme->obwidth * 2;
+    dock->h += ob_rr_theme->obwidth * 2;
 
     screen_update_areas();
 }
@@ -616,14 +617,14 @@ 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, NULL);
+                                 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, NULL);
+                                 hide_timeout, NULL, g_direct_equal, NULL);
         } else if (dock->hidden && config_dock_hide) {
             ob_main_loop_timeout_remove(ob_main_loop, show_timeout);
         }