merge r5996-5998 from trunk

diff --git a/openbox/client.c b/openbox/client.c
index 600acfcc85e81759722ab65e1adf0525b8f38cc0..34ae4d868f5e770e7e58592f1ccd05cdb8967246 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -347,8 +347,8 @@ void client_manage(Window window)
 
         /* make sure the window is visible. */
         client_find_onscreen(self, &newx, &newy,
-                             self->frame->area.width,
-                             self->frame->area.height,
+                             self->area.width,
+                             self->area.height,
                              /* non-normal clients has less rules, and
                                 windows that are being restored from a
                                 session do also. we can assume you want
@@ -742,8 +742,8 @@ void client_move_onscreen(ObClient *self, gboolean rude)
     gint x = self->area.x;
     gint y = self->area.y;
     if (client_find_onscreen(self, &x, &y,
-                             self->frame->area.width,
-                             self->frame->area.height, rude)) {
+                             self->area.width,
+                             self->area.height, rude)) {
         client_move(self, x, y);
     }
 }

diff --git a/openbox/event.c b/openbox/event.c
index c00212f849a221b07027bcb8955aced902872ea8..cbc9aaf8a9e6af37c0fd7f87efa707d93278a936 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -894,6 +894,10 @@ static void event_handle_client(ObClient *client, XEvent *e)
             h = (e->xconfigurerequest.value_mask & CWHeight) ?
                 e->xconfigurerequest.height : client->area.height;
 
+            ob_debug("ConfigureRequest x %d %d y %d %d\n",
+                     e->xconfigurerequest.value_mask & CWX, x,
+                     e->xconfigurerequest.value_mask & CWY, y);
+
             client_find_onscreen(client, &x, &y, w, h, FALSE);
             client_configure_full(client, x, y, w, h, FALSE, TRUE, TRUE);
         }
@@ -1081,6 +1085,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
             else
                 h = client->area.height;
 
+            ob_debug("MOVERESIZE x %d %d y %d %d\n",
+                     e->xclient.data.l[0] & 1 << 8, x,
+                     e->xclient.data.l[0] & 1 << 9, y);
             client_convert_gravity(client, grav, &x, &y, w, h);
             client_find_onscreen(client, &x, &y, w, h, FALSE);
             client_configure(client, x, y, w, h, FALSE, TRUE);

diff --git a/render/render.h b/render/render.h
index 3b996375b7896023f67564860236b5239b35a189..ad638ae8b3705d9c3709fd78fa52c4f4f097c1f2 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -125,7 +125,7 @@ struct _RrTextureText {
     gint shadow_offset_x;
     gint shadow_offset_y;
     RrColor *shadow_color;
-    gchar shadow_alpha;
+    guchar shadow_alpha;
     gboolean shortcut; /*!< Underline a character */
     guint shortcut_pos; /*!< Position in bytes of the character to underline */
 };