X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=d3a09955a8b49c953d7c52f3d74f69ac21735e89;hb=71af5156bad35b6ea0b45a220fa05cb6f8d745fe;hp=fa54fbb25b657929047d76ff70be57ccdfe88a6f;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index fa54fbb2..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
@@ -23,30 +24,38 @@
 #include <glib.h>
 
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
-static void gradient_solid(RrAppearance *l, int w, int h);
-static void gradient_vertical(RrSurface *sf, int w, int h);
-static void gradient_horizontal(RrSurface *sf, int w, int h);
-static void gradient_diagonal(RrSurface *sf, int w, int h);
-static void gradient_crossdiagonal(RrSurface *sf, int w, int h);
-static void gradient_pyramid(RrSurface *sf, int inw, int inh);
-
-void RrRender(RrAppearance *a, int w, int h)
+static void gradient_solid(RrAppearance *l, 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_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);
+
+void RrRender(RrAppearance *a, gint w, gint h)
 {
     RrPixel32 *data = a->surface.pixel_data;
     RrPixel32 current;
-    unsigned int r,g,b;
-    int off, x;
+    guint r,g,b;
+    gint off, x;
 
     switch (a->surface.grad) {
     case RR_SURFACE_SOLID:
         gradient_solid(a, w, h);
         break;
+    case RR_SURFACE_SPLIT_VERTICAL:
+        gradient_splitvertical(a, w, h);
+        break;
     case RR_SURFACE_VERTICAL:
         gradient_vertical(&a->surface, w, h);
         break;
     case RR_SURFACE_HORIZONTAL:
         gradient_horizontal(&a->surface, w, h);
         break;
+    case RR_SURFACE_MIRROR_HORIZONTAL:
+        gradient_mirrorhorizontal(&a->surface, w, h);
+        break;
     case RR_SURFACE_DIAGONAL:
         gradient_diagonal(&a->surface, w, h);
         break;
@@ -62,7 +71,7 @@ void RrRender(RrAppearance *a, int w, int h)
     }
   
     if (a->surface.interlaced) {
-        int i;
+        gint i;
         RrPixel32 *p;
 
         r = a->surface.interlace_color->r;
@@ -121,7 +130,7 @@ void RrRender(RrAppearance *a, int w, int h)
 
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
 {
-    int r, g, b;
+    gint r, g, b;
 
     RrPixel32 *up, *down;
     if (raised) {
@@ -155,7 +164,7 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
 
 static void create_bevel_colors(RrAppearance *l)
 {
-    int r, g, b;
+    gint r, g, b;
 
     /* light color */
     r = l->surface.primary->r;
@@ -181,31 +190,27 @@ static void create_bevel_colors(RrAppearance *l)
     l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
 }
 
-static void gradient_solid(RrAppearance *l, int w, int h) 
+static void gradient_solid(RrAppearance *l, gint w, gint h) 
 {
+    gint i;
     RrPixel32 pix;
-    int i, a, b;
+    RrPixel32 *data = l->surface.pixel_data;
     RrSurface *sp = &l->surface;
-    int left = 0, top = 0, right = w - 1, bottom = h - 1;
+    gint left = 0, top = 0, right = w - 1, bottom = h - 1;
 
     pix = (sp->primary->r << RrDefaultRedOffset)
         + (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)
@@ -225,14 +230,14 @@ static void gradient_solid(RrAppearance *l, int w, int 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 */
@@ -256,15 +261,14 @@ static void gradient_solid(RrAppearance *l, int w, int 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 */
@@ -285,8 +289,8 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 /* * * * * * * * * * * * * * GRADIENT MAGIC WOOT * * * * * * * * * * * * * * */
 
 #define VARS(x)                                                     \
-    unsigned int color##x[3];                                       \
-    int len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
+    guint color##x[3];                                       \
+    gint len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
     gboolean bigslope##x[3] /* color slope > 1 */
 
 #define SETUP(x, from, to, w)         \
@@ -334,7 +338,7 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 
 #define NEXT(x)                                           \
 {                                                         \
-    int i;                                                \
+    gint i;                                                \
     for (i = 2; i >= 0; --i) {                            \
         if (!cdelta##x[i]) continue;                      \
                                                           \
@@ -359,9 +363,70 @@ static void gradient_solid(RrAppearance *l, int w, int h)
     }                                                     \
 }
 
-static void gradient_horizontal(RrSurface *sf, int w, int h)
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
+{
+    gint x, y1, y3, r, g, b;
+    RrSurface *sf = &a->surface;
+    RrPixel32 *data = sf->pixel_data;
+    RrPixel32 current;
+    RrColor *primary_light, *secondary_light;
+
+    VARS(y1);
+    VARS(y3);
+
+    r = sf->primary->r;
+    r += r >> 2;
+    g = sf->primary->g;
+    g += g >> 2;
+    b = sf->primary->b;
+    b += b >> 2;
+    if (r > 0xFF) r = 0xFF;
+    if (g > 0xFF) g = 0xFF;
+    if (b > 0xFF) b = 0xFF;
+      primary_light = RrColorNew(a->inst, r, g, b);
+
+    r = sf->secondary->r;
+    r += r >> 4;
+    g = sf->secondary->g;
+    g += g >> 4;
+    b = sf->secondary->b;
+    b += b >> 4;
+    if (r > 0xFF) r = 0xFF;
+    if (g > 0xFF) g = 0xFF;
+    if (b > 0xFF) b = 0xFF;
+    secondary_light = RrColorNew(a->inst, r, g, b);
+
+    SETUP(y1, primary_light, sf->primary, (h / 2) -1);
+    SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
+
+    for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */
+        current = COLOR(y1);
+        for (x = w - 1; x >= 0; --x)  /* 0 -> w */
+            *(data++) = current;
+
+        NEXT(y1);
+    }
+
+    
+    for (y3 = (h / 2) - 1; y3 > 0; --y3) {
+        current = COLOR(y3);
+        for (x = w - 1; x >= 0; --x)
+            *(data++) = current;
+
+        NEXT(y3);
+    }
+
+    current = COLOR(y3);
+    for (x = w - 1; x >= 0; --x)  /* 0 -> w */
+        *(data++) = current;
+
+    RrColorFree(primary_light);
+    RrColorFree(secondary_light);
+}
+
+static void gradient_horizontal(RrSurface *sf, gint w, gint h)
 {
-    int x, y;
+    gint x, y;
     RrPixel32 *data = sf->pixel_data, *datav;
     RrPixel32 current;
 
@@ -384,9 +449,48 @@ static void gradient_horizontal(RrSurface *sf, int w, int h)
         *(data + y * w) = current;
 }
 
-static void gradient_vertical(RrSurface *sf, int w, int h)
+static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h)
+{
+    gint x, y;
+    RrPixel32 *data = sf->pixel_data, *datav;
+    RrPixel32 current;
+
+    VARS(x);
+    SETUP(x, sf->primary, sf->secondary, w/2);
+
+    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;
+            }
+            ++data;
+
+            NEXT(x);
+        }
+    }
+    current = COLOR(x);
+    for (y = h - 1; y >= 0; --y)  /* 0 -> h */
+        *(data + y * w) = current;
+}
+
+static void gradient_vertical(RrSurface *sf, gint w, gint h)
 {
-    int x, y;
+    gint x, y;
     RrPixel32 *data = sf->pixel_data;
     RrPixel32 current;
 
@@ -406,9 +510,9 @@ static void gradient_vertical(RrSurface *sf, int w, int h)
 }
 
 
-static void gradient_diagonal(RrSurface *sf, int w, int h)
+static void gradient_diagonal(RrSurface *sf, gint w, gint h)
 {
-    int x, y;
+    gint x, y;
     RrPixel32 *data = sf->pixel_data;
     RrColor left, right;
     RrColor extracorner;
@@ -453,9 +557,9 @@ static void gradient_diagonal(RrSurface *sf, int w, int h)
     *data = COLOR(x);
 }
 
-static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
+static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h)
 {
-    int x, y;
+    gint x, y;
     RrPixel32 *data = sf->pixel_data;
     RrColor left, right;
     RrColor extracorner;
@@ -500,9 +604,9 @@ static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
     *data = COLOR(x);
 }
 
-static void gradient_pyramid(RrSurface *sf, int inw, int inh)
+static void gradient_pyramid(RrSurface *sf, gint inw, gint inh)
 {
-    int x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
+    gint x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
     RrPixel32 *data = sf->pixel_data;
     RrPixel32 *end = data + inw*inh - 1;
     RrPixel32 current;