X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=ae42ab9d2eb020b85536b409fb3bb77b35f7f9de;hb=eb7a3a0638c12ea4f42cd9e62ba33369e8e06327;hp=8433c260889cd637a1b283411d5f494bd3b553b7;hpb=a488360f48abbfd6e67576a1844d792b28e6065c;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 8433c260..ae42ab9d 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -28,7 +28,7 @@
 #include "render/theme.h"
 
 #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
-                         EnterWindowMask | LeaveWindowMask)
+                         EnterWindowMask | LeaveWindowMask | FocusChangeMask)
 #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
 
 static ObDock *dock;
@@ -41,7 +41,7 @@ static void dock_app_grab_button(ObDockApp *app, gboolean grab)
         grab_button_full(config_dock_app_move_button,
                          config_dock_app_move_modifiers, app->icon_win,
                          ButtonPressMask | ButtonReleaseMask |
-                         ButtonMotionMask | PointerMotionHintMask,
+                         ButtonMotionMask,
                          GrabModeAsync, OB_CURSOR_MOVE);
     } else {
         ungrab_button(config_dock_app_move_button,
@@ -57,7 +57,8 @@ void dock_startup(gboolean reconfig)
         GList *it;
 
         XSetWindowBorder(ob_display, dock->frame,
-                         RrColorPixel(ob_rr_theme->frame_b_color));
+                         RrColorPixel(ob_rr_theme->
+                                      frame_focused_border_color));
         XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
 
         RrAppearanceFree(dock->a_frame);
@@ -91,7 +92,7 @@ void dock_startup(gboolean reconfig)
                                 &attrib);
     dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title);
     XSetWindowBorder(ob_display, dock->frame,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
+                     RrColorPixel(ob_rr_theme->frame_focused_border_color));
     XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
@@ -220,7 +221,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;
 
@@ -413,7 +414,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 {