ob_ prefix

[chaz/openbox] / engines / openbox / obengine.c

diff --git a/engines/openbox/obengine.c b/engines/openbox/obengine.c
index 1ef502ae372a3be7c4b09bf0c163f2d365efa543..b6b9638f3da723c96a997622b98d05b7494d93f1 100644 (file)
--- a/engines/openbox/obengine.c
+++ b/engines/openbox/obengine.c
@@ -14,7 +14,8 @@
 #include <glib.h>
 
 #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
-#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask)
+#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
+                         ButtonPressMask | ButtonReleaseMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
                            ButtonMotionMask | ExposureMask)
 
@@ -529,7 +530,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
                 self->bwidth;
             XMapWindow(ob_display, self->handle);
 
-            if (self->a_focused_handle->surface.data.planar.grad ==
+            if (ob_a_focused_grip->surface.data.planar.grad ==
                 Background_ParentRelative)
                 RECT_SET(self->a_focused_handle->area, 0, 0,
                          self->width, ob_s_handle_height);
@@ -538,7 +539,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
                          GRIP_WIDTH + self->bwidth, 0,
                          self->width - (GRIP_WIDTH + self->bwidth) * 2,
                          ob_s_handle_height);
-            if (self->a_unfocused_handle->surface.data.planar.grad ==
+            if (ob_a_unfocused_grip->surface.data.planar.grad ==
                 Background_ParentRelative)
                 RECT_SET(self->a_unfocused_handle->area, 0, 0,
                          self->width, ob_s_handle_height);