X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=d3a09955a8b49c953d7c52f3d74f69ac21735e89;hb=df07fdc90a31cebccb0ee6406d42a2584dd01528;hp=7b26e54c820df1515042cfea5174087f5b1d0d3f;hpb=50292dbd75763a192eee748cc6c0b3e15505e7fe;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index 7b26e54c..d3a09955 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    gradient.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
    Copyright (c) 2003        Derek Foreman
 
    This program is free software; you can redistribute it and/or modify
@@ -24,10 +25,10 @@
 
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
 static void gradient_solid(RrAppearance *l, gint w, gint h);
-static void gradient_split(RrAppearance *a, gint w, gint h);
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h);
 static void gradient_vertical(RrSurface *sf, gint w, gint h);
 static void gradient_horizontal(RrSurface *sf, gint w, gint h);
-static void gradient_osx(RrSurface *sf, gint w, gint h);
+static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h);
 static void gradient_diagonal(RrSurface *sf, gint w, gint h);
 static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h);
 static void gradient_pyramid(RrSurface *sf, gint inw, gint inh);
@@ -43,8 +44,8 @@ void RrRender(RrAppearance *a, gint w, gint h)
     case RR_SURFACE_SOLID:
         gradient_solid(a, w, h);
         break;
-    case RR_SURFACE_SPLIT:
-        gradient_split(a, w, h);
+    case RR_SURFACE_SPLIT_VERTICAL:
+        gradient_splitvertical(a, w, h);
         break;
     case RR_SURFACE_VERTICAL:
         gradient_vertical(&a->surface, w, h);
@@ -52,8 +53,8 @@ void RrRender(RrAppearance *a, gint w, gint h)
     case RR_SURFACE_HORIZONTAL:
         gradient_horizontal(&a->surface, w, h);
         break;
-    case RR_SURFACE_OSX:
-        gradient_osx(&a->surface, w, h);
+    case RR_SURFACE_MIRROR_HORIZONTAL:
+        gradient_mirrorhorizontal(&a->surface, w, h);
         break;
     case RR_SURFACE_DIAGONAL:
         gradient_diagonal(&a->surface, w, h);
@@ -191,8 +192,9 @@ static void create_bevel_colors(RrAppearance *l)
 
 static void gradient_solid(RrAppearance *l, gint w, gint h) 
 {
+    gint i;
     RrPixel32 pix;
-    gint i, a, b;
+    RrPixel32 *data = l->surface.pixel_data;
     RrSurface *sp = &l->surface;
     gint left = 0, top = 0, right = w - 1, bottom = h - 1;
 
@@ -200,20 +202,15 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
         + (sp->primary->g << RrDefaultGreenOffset)
         + (sp->primary->b << RrDefaultBlueOffset);
 
-    for (a = 0; a < w; a++)
-        for (b = 0; b < h; b++)
-            sp->pixel_data[a + b * w] = pix;
+    for (i = 0; i < w * h; i++)
+        *data++ = pix;
+
+    if (sp->interlaced)
+        return;
 
     XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
                    0, 0, w, h);
 
-    if (sp->interlaced) {
-        for (i = 0; i < h; i += 2)
-            XDrawLine(RrDisplay(l->inst), l->pixmap,
-                      RrColorGC(sp->interlace_color),
-                      0, i, w, i);
-    }
-
     switch (sp->relief) {
     case RR_RELIEF_RAISED:
         if (!sp->bevel_dark)
@@ -233,14 +230,14 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
             break;
         case RR_BEVEL_2:
             XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
-                      left + 1, bottom - 2, right - 2, bottom - 2);
+                      left + 2, bottom - 1, right - 2, bottom - 1);
             XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
-                      right - 2, bottom - 2, right - 2, top + 1);
+                      right - 1, bottom - 1, right - 1, top + 1);
 
             XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
-                      left + 1, top + 1, right - 2, top + 1);
+                      left + 2, top + 1, right - 2, top + 1);
             XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
-                      left + 1, bottom - 2, left + 1, top + 1);
+                      left + 1, bottom - 1, left + 1, top + 1);
             break;
         default:
             g_assert_not_reached(); /* unhandled BevelType */
@@ -264,15 +261,14 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
             break;
         case RR_BEVEL_2:
             XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
-                      left + 1, bottom - 2, right - 2, bottom - 2);
+                      left + 2, bottom - 1, right - 2, bottom - 1);
             XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
-                      right - 2, bottom - 2, right - 2, top + 1);
-      
+                      right - 1, bottom - 1, right - 1, top + 1);
+
             XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
-                      left + 1, top + 1, right - 2, top + 1);
+                      left + 2, top + 1, right - 2, top + 1);
             XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
-                      left + 1, bottom - 2, left + 1, top + 1);
-
+                      left + 1, bottom - 1, left + 1, top + 1);
             break;
         default:
             g_assert_not_reached(); /* unhandled BevelType */
@@ -367,7 +363,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
     }                                                     \
 }
 
-static void gradient_split(RrAppearance *a, gint w, gint h)
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
 {
     gint x, y1, y3, r, g, b;
     RrSurface *sf = &a->surface;
@@ -375,6 +371,9 @@ static void gradient_split(RrAppearance *a, gint w, gint h)
     RrPixel32 current;
     RrColor *primary_light, *secondary_light;
 
+    VARS(y1);
+    VARS(y3);
+
     r = sf->primary->r;
     r += r >> 2;
     g = sf->primary->g;
@@ -397,10 +396,7 @@ static void gradient_split(RrAppearance *a, gint w, gint h)
     if (b > 0xFF) b = 0xFF;
     secondary_light = RrColorNew(a->inst, r, g, b);
 
-    VARS(y1);
     SETUP(y1, primary_light, sf->primary, (h / 2) -1);
-  
-    VARS(y3);
     SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
 
     for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */
@@ -453,7 +449,7 @@ static void gradient_horizontal(RrSurface *sf, gint w, gint h)
         *(data + y * w) = current;
 }
 
-static void gradient_osx(RrSurface *sf, gint w, gint h)
+static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h)
 {
     gint x, y;
     RrPixel32 *data = sf->pixel_data, *datav;
@@ -462,28 +458,30 @@ static void gradient_osx(RrSurface *sf, gint w, gint h)
     VARS(x);
     SETUP(x, sf->primary, sf->secondary, w/2);
 
-    for (x = w - 1; x > w/2-1; --x) {  /* 0 -> w-1 */
-        current = COLOR(x);
-        datav = data;
-        for (y = h - 1; y >= 0; --y) {  /* 0 -> h */
-            *datav = current;
-            datav += w;
-        }
-        ++data;
+    if (w > 1) {
+        for (x = w - 1; x > w/2-1; --x) {  /* 0 -> w-1 */
+            current = COLOR(x);
+            datav = data;
+            for (y = h - 1; y >= 0; --y) {  /* 0 -> h */
+                *datav = current;
+                datav += w;
+            }
+            ++data;
 
-        NEXT(x);
-    }
-    SETUP(x, sf->secondary, sf->primary, w/2);
-    for (x = w/2 - 1; x > 0; --x) {  /* 0 -> w-1 */
-        current = COLOR(x);
-        datav = data;
-        for (y = h - 1; y >= 0; --y) {  /* 0 -> h */
-            *datav = current;
-            datav += w;
+            NEXT(x);
         }
-        ++data;
+        SETUP(x, sf->secondary, sf->primary, w/2);
+        for (x = w/2 - 1; x > 0; --x) {  /* 0 -> w-1 */
+            current = COLOR(x);
+            datav = data;
+            for (y = h - 1; y >= 0; --y) {  /* 0 -> h */
+                *datav = current;
+                datav += w;
+            }
+            ++data;
 
-        NEXT(x);
+            NEXT(x);
+        }
     }
     current = COLOR(x);
     for (y = h - 1; y >= 0; --y)  /* 0 -> h */