put group members above the window when lowering it

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index dea04cf4bdfe94c6921481d0da549f3beaea266c..96866923f568b7ce713e939fe8ea500e1391c3b2 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -15,7 +15,8 @@
 #  include <stdlib.h>
 #endif
 
-static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h);
+static void RrPixel32_to_pixmap(RrAppearance *l,
+                                gint x, gint y, gint w, gint h);
 
 void RrPaint(RrAppearance *l, Window win, gint w, gint h)
 {
@@ -29,13 +30,10 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
 
     resized = (l->w != w || l->h != h);
 
-    if (resized) {
-        oldp = l->pixmap; /* save to free after changing the visible pixmap */
-        l->pixmap = XCreatePixmap(RrDisplay(l->inst),
-                                  RrRootWindow(l->inst),
-                                  w, h, RrDepth(l->inst));
-    } else
-        oldp = None;
+    oldp = l->pixmap; /* save to free after changing the visible pixmap */
+    l->pixmap = XCreatePixmap(RrDisplay(l->inst),
+                              RrRootWindow(l->inst),
+                              w, h, RrDepth(l->inst));
 
     g_assert(l->pixmap != None);
     l->w = w;
@@ -55,16 +53,14 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
         g_assert (l->surface.parent->w);
 
         sw = l->surface.parent->w;
-        source = (l->surface.parent->surface.RrPixel_data + l->surface.parentx +
-                  sw * l->surface.parenty);
+        source = (l->surface.parent->surface.RrPixel_data +
+                  l->surface.parentx + sw * l->surface.parenty);
         dest = l->surface.RrPixel_data;
         for (i = 0; i < h; i++, source += sw, dest += w) {
             memcpy(dest, source, w * sizeof(RrPixel32));
         }
-    } else if (l->surface.grad == RR_SURFACE_SOLID)
-        gradient_solid(l, 0, 0, w, h);
-    else
-        gradient_render(&l->surface, w, h);
+    }else
+        RrRender(l, w, h);
 
     RECT_SET(tarea, 0, 0, w, h);
     if (l->surface.grad != RR_SURFACE_PARENTREL) {
@@ -267,13 +263,9 @@ void RrMinsize(RrAppearance *l, gint *w, gint *h)
             break;
         case RR_TEXTURE_TEXT:
             m = RrFontMeasureString(l->texture[i].data.text.font,
-                                    l->texture[i].data.text.string,
-                                    l->texture[i].data.text.shadow,
-                                    l->texture[i].data.text.offset);
+                                    l->texture[i].data.text.string);
             *w = MAX(*w, m);
-            m = RrFontHeight(l->texture[i].data.text.font,
-                             l->texture[i].data.text.shadow,
-                             l->texture[i].data.text.offset);
+            m = RrFontHeight(l->texture[i].data.text.font);
             *h += MAX(*h, m);
             break;
         case RR_TEXTURE_RGBA: