Fix issue with themes w/out pixmap mask,

Add trivial optimization frame draw.


(Old svn revision: 12317)

src/frame.c

@@ -931,22 +931,25 @@ frameDraw (Client * c, gboolean invalidate_cache, gboolean force_shape_update)
                         &c->pm_cache.pm_sides[SIDE_BOTTOM][state], 
                         0, 0, bottom_width, frameBottom (c)); 
 
-        xfwmWindowSetBG (&c->title, 
-                         &c->pm_cache.pm_title[state]);
-        xfwmWindowSetBG (&c->sides[SIDE_LEFT], 
-                         &c->pm_cache.pm_sides[SIDE_LEFT][state]);
-        xfwmWindowSetBG (&c->sides[SIDE_RIGHT], 
-                         &c->pm_cache.pm_sides[SIDE_RIGHT][state]);
-        xfwmWindowSetBG (&c->sides[SIDE_BOTTOM], 
-                         &c->pm_cache.pm_sides[SIDE_BOTTOM][state]);
-        xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT], 
-                         &screen_info->corners[CORNER_TOP_LEFT][state]);
-        xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT], 
-                         &screen_info->corners[CORNER_TOP_RIGHT][state]);
-        xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT], 
-                         &screen_info->corners[CORNER_BOTTOM_LEFT][state]);
-        xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT], 
-                         &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
+        if (requires_clearing | force_shape_update)
+        {
+            xfwmWindowSetBG (&c->title, 
+                             &c->pm_cache.pm_title[state]);
+            xfwmWindowSetBG (&c->sides[SIDE_LEFT], 
+                             &c->pm_cache.pm_sides[SIDE_LEFT][state]);
+            xfwmWindowSetBG (&c->sides[SIDE_RIGHT], 
+                             &c->pm_cache.pm_sides[SIDE_RIGHT][state]);
+            xfwmWindowSetBG (&c->sides[SIDE_BOTTOM], 
+                             &c->pm_cache.pm_sides[SIDE_BOTTOM][state]);
+            xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT], 
+                             &screen_info->corners[CORNER_TOP_LEFT][state]);
+            xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT], 
+                             &screen_info->corners[CORNER_TOP_RIGHT][state]);
+            xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT], 
+                             &screen_info->corners[CORNER_BOTTOM_LEFT][state]);
+            xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT], 
+                             &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
+        }
 
         if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
         {

src/mypixmap.c

@@ -222,30 +222,55 @@ xfwmPixmapFree (xfwmPixmap * pm)
     }
 }
 
-void
-xfwmPixmapFill (xfwmPixmap * src, xfwmPixmap * dst, gint x, gint y, gint width, gint height)
+static void
+xfwmPixmapFillRectangle (Display *dpy, int screen, Pixmap pm, Drawable d, int x, int y, int width, int height)
 {
     XGCValues gv;
     GC gc;
+    unsigned long mask;
 
-    TRACE ("entering xfwmWindowFill");
+    TRACE ("entering fillRectangle");
 
     if ((width < 1) || (height < 1))
     {
         return;
     }
-
     gv.fill_style = FillTiled;
+    gv.tile = pm;
     gv.ts_x_origin = x;
     gv.ts_y_origin = y;
+    gv.foreground = WhitePixel (dpy, screen);
+    if (gv.tile != None)
+    {
+        mask = GCTile | GCFillStyle | GCTileStipXOrigin;
+    }
+    else
+    {
+        mask = GCForeground;
+    }
+    gc = XCreateGC (dpy, d, mask, &gv);
+    XFillRectangle (dpy, d, gc, x, y, width, height);
+    XFreeGC (dpy, gc);
+}
+
+void
+xfwmPixmapFill (xfwmPixmap * src, xfwmPixmap * dst, gint x, gint y, gint width, gint height)
+{
+    XGCValues gv;
+    GC gc;
+    unsigned long mask;
 
-    gv.tile = src->pixmap;
-    gc = XCreateGC (myScreenGetXDisplay (src->screen_info), dst->pixmap, GCTile | GCFillStyle | GCTileStipXOrigin, &gv);
-    XFillRectangle (myScreenGetXDisplay (src->screen_info), dst->pixmap, gc, x, y, width, height);
-    XFreeGC (myScreenGetXDisplay (src->screen_info), gc);
+    TRACE ("entering xfwmWindowFill");
+
+    if ((width < 1) || (height < 1))
+    {
+        return;
+    }
 
-    gv.tile = src->mask;
-    gc = XCreateGC (myScreenGetXDisplay (src->screen_info), dst->mask, GCTile | GCFillStyle | GCTileStipXOrigin, &gv);
-    XFillRectangle (myScreenGetXDisplay (src->screen_info), dst->mask, gc, x, y, width, height);
-    XFreeGC (myScreenGetXDisplay (src->screen_info), gc);
+    xfwmPixmapFillRectangle (myScreenGetXDisplay (src->screen_info), 
+                             src->screen_info->screen,  
+                             src->pixmap, dst->pixmap, x, y, width, height);
+    xfwmPixmapFillRectangle (myScreenGetXDisplay (src->screen_info), 
+                             src->screen_info->screen,  
+                             src->mask, dst->mask, x, y, width, height);
 }

themes/default/top-left-active.xpm

@@ -11,6 +11,7 @@ static char * top_left_active_xpm[] = {
 "  $$@#++",
 " $.##+##",
 " $######",
+"$.######",
 "$@######",
 "$#######",
 "$#######",
@@ -25,5 +26,4 @@ static char * top_left_active_xpm[] = {
 "$#######",
 "$#######",
 "$#######",
-"$#######",
 "$#######"};

themes/default/top-left-inactive.xpm

@@ -11,6 +11,7 @@ static char * top_left_inactive_xpm[] = {
 "  $$@#++",
 " $.##+##",
 " $######",
+"$.######",
 "$@######",
 "$#######",
 "$#######",
@@ -25,5 +26,4 @@ static char * top_left_inactive_xpm[] = {
 "$#######",
 "$#######",
 "$#######",
-"$#######",
 "$#######"};

themes/default/top-right-active.xpm

@@ -11,6 +11,7 @@ static char * top_right_active_xpm[] = {
 "++#@$$  ",
 "##+##.$ ",
 "######$ ",
+"######.$",
 "######@$",
 "#######$",
 "#######$",
@@ -25,5 +26,4 @@ static char * top_right_active_xpm[] = {
 "#######$",
 "#######$",
 "#######$",
-"#######$",
 "#######$"};

themes/default/top-right-inactive.xpm

@@ -11,6 +11,7 @@ static char * top_right_inactive_xpm[] = {
 "++#@$$  ",
 "##+##.$ ",
 "######$ ",
+"######.$",
 "######@$",
 "#######$",
 "#######$",
@@ -25,5 +26,4 @@ static char * top_right_inactive_xpm[] = {
 "#######$",
 "#######$",
 "#######$",
-"#######$",
 "#######$"};