merge r6892-6893 from trunk

diff --git a/openbox/client.c b/openbox/client.c
index 573c271c8cb8eb2049bc14e5818cb35704056bfd..ffbcd5cae8c7074f08d3e99ea3a762e23246558a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2357,7 +2357,6 @@ static void client_change_wm_state(ObClient *self)
         state[0] = self->wmstate;
         state[1] = None;
         PROP_SETA32(self->window, wm_state, wm_state, state, 2);
-        ob_debug("setting wm_state %d\n", self->wmstate);
     }
 }
 

diff --git a/render/image.c b/render/image.c
index f878933274d88a25345c261269e21153abcb6ab6..3c08444db14116ddf32f604fcc7d262cb8711358 100644 (file)
--- a/render/image.c
+++ b/render/image.c
@@ -142,10 +142,13 @@ void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba,
         source = rgba->data;
     }
 
-    /* copy source -> dest, and apply the alpha channel */
+    /* copy source -> dest, and apply the alpha channel.
+
+       center the image if it is smaller than the area */
     col = 0;
     num_pixels = dw * dh;
-    dest = target + area->x + target_w * area->y;
+    dest = target + area->x + (area->width - dw) / 2 +
+        (target_w * (area->y + (area->height - dh) / 2));
     while (num_pixels-- > 0) {
         guchar alpha, r, g, b, bgr, bgg, bgb;