X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=41514ac43296bac8ce059e1034cadf0aa35e4fb5;hb=ae624a1487fd7db9291c4de1a3b2c34fcab89ef9;hp=5a5986e624e45eaf7cb3570f74b437dd3b459fb8;hpb=335a0eecc748153036be7611237ed52632473de9;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index 5a5986e6..41514ac4 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
@@ -22,11 +23,13 @@
 #include "color.h"
 #include <glib.h>
 
-static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
-static void gradient_solid(RrSurface *sf, gint w, gint h);
-static void gradient_split(RrSurface *sf, gint w, gint h);
+static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised);
+static void gradient_parentrelative(RrAppearance *a, gint w, gint 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);
@@ -39,11 +42,14 @@ void RrRender(RrAppearance *a, gint w, gint h)
     gint off, x;
 
     switch (a->surface.grad) {
+    case RR_SURFACE_PARENTREL:
+        gradient_parentrelative(a, w, h);
+        break;
     case RR_SURFACE_SOLID:
-        gradient_solid(&a->surface, w, h);
+        gradient_solid(a, w, h);
         break;
-    case RR_SURFACE_SPLIT:
-        gradient_split(&a->surface, w, h);
+    case RR_SURFACE_SPLIT_VERTICAL:
+        gradient_splitvertical(a, w, h);
         break;
     case RR_SURFACE_VERTICAL:
         gradient_vertical(&a->surface, w, h);
@@ -51,6 +57,9 @@ void RrRender(RrAppearance *a, gint w, gint h)
     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;
@@ -101,29 +110,29 @@ void RrRender(RrAppearance *a, gint w, gint h)
     if (a->surface.relief != RR_RELIEF_FLAT) {
         if (a->surface.bevel == RR_BEVEL_1) {
             for (off = 1, x = 1; x < w - 1; ++x, off++)
-                highlight(data + off,
+                highlight(&a->surface, data + off,
                           data + off + (h-1) * w,
                           a->surface.relief==RR_RELIEF_RAISED);
             for (off = 0, x = 0; x < h; ++x, off++)
-                highlight(data + off * w,
+                highlight(&a->surface, data + off * w,
                           data + off * w + w - 1,
                           a->surface.relief==RR_RELIEF_RAISED);
         }
 
         if (a->surface.bevel == RR_BEVEL_2) {
             for (off = 2, x = 2; x < w - 2; ++x, off++)
-                highlight(data + off + w,
+                highlight(&a->surface, data + off + w,
                           data + off + (h-2) * w,
                           a->surface.relief==RR_RELIEF_RAISED);
             for (off = 1, x = 1; x < h-1; ++x, off++)
-                highlight(data + off * w + 1,
+                highlight(&a->surface, data + off * w + 1,
                           data + off * w + w - 2,
                           a->surface.relief==RR_RELIEF_RAISED);
         }
     }
 }
 
-static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
+static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised)
 {
     gint r, g, b;
 
@@ -135,12 +144,13 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
         up = y;
         down = x;
     }
+
     r = (*up >> RrDefaultRedOffset) & 0xFF;
-    r += r >> 1;
+    r += (r * s->bevel_light_adjust) >> 8;
     g = (*up >> RrDefaultGreenOffset) & 0xFF;
-    g += g >> 1;
+    g += (g * s->bevel_light_adjust) >> 8;
     b = (*up >> RrDefaultBlueOffset) & 0xFF;
-    b += b >> 1;
+    b += (b * s->bevel_light_adjust) >> 8;
     if (r > 0xFF) r = 0xFF;
     if (g > 0xFF) g = 0xFF;
     if (b > 0xFF) b = 0xFF;
@@ -148,11 +158,11 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
         + (b << RrDefaultBlueOffset);
   
     r = (*down >> RrDefaultRedOffset) & 0xFF;
-    r = (r >> 1) + (r >> 2);
+    r -= (r * s->bevel_dark_adjust) >> 8;
     g = (*down >> RrDefaultGreenOffset) & 0xFF;
-    g = (g >> 1) + (g >> 2);
+    g -= (g * s->bevel_dark_adjust) >> 8;
     b = (*down >> RrDefaultBlueOffset) & 0xFF;
-    b = (b >> 1) + (b >> 2);
+    b -= (b * s->bevel_dark_adjust) >> 8;
     *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
         + (b << RrDefaultBlueOffset);
 }
@@ -163,11 +173,11 @@ static void create_bevel_colors(RrAppearance *l)
 
     /* light color */
     r = l->surface.primary->r;
-    r += r >> 1;
+    r += (r * l->surface.bevel_light_adjust) >> 8;
     g = l->surface.primary->g;
-    g += g >> 1;
+    g += (g * l->surface.bevel_light_adjust) >> 8;
     b = l->surface.primary->b;
-    b += b >> 1;
+    b += (b * l->surface.bevel_light_adjust) >> 8;
     if (r > 0xFF) r = 0xFF;
     if (g > 0xFF) g = 0xFF;
     if (b > 0xFF) b = 0xFF;
@@ -176,108 +186,154 @@ static void create_bevel_colors(RrAppearance *l)
 
     /* dark color */
     r = l->surface.primary->r;
-    r = (r >> 1) + (r >> 2);
+    r -= (r * l->surface.bevel_dark_adjust) >> 8;
     g = l->surface.primary->g;
-    g = (g >> 1) + (g >> 2);
+    g -= (g * l->surface.bevel_dark_adjust) >> 8;
     b = l->surface.primary->b;
-    b = (b >> 1) + (b >> 2);
+    b -= (b * l->surface.bevel_dark_adjust) >> 8;
     g_assert(!l->surface.bevel_dark);
     l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
 }
 
-static void gradient_solid(RrSurface *sf, gint w, gint h) 
+static void gradient_parentrelative(RrAppearance *a, gint w, gint h)
 {
+    RrPixel32 *source, *dest;
+    gint sw, sh, partial_w, partial_h, i;
+
+    g_assert (a->surface.parent);
+    g_assert (a->surface.parent->w);
+
+    sw = a->surface.parent->w;
+    sh = a->surface.parent->h;
+
+    /* This is a little hack. When a texture is parentrelative, and the same
+       area as the parent, and has a bevel, it will draw its bevel on top
+       of the parent's, amplifying it. So instead, rerender the child with
+       the parent's settings, but the child's bevel and interlace */
+    if (a->surface.relief != RR_RELIEF_FLAT &&
+        (a->surface.parent->surface.relief != RR_RELIEF_FLAT ||
+         a->surface.parent->surface.border) &&
+        !a->surface.parentx && !a->surface.parenty &&
+        sw == w && sh == h)
+    {
+        RrSurface old = a->surface;
+        a->surface = a->surface.parent->surface;
+
+        /* turn these off for the parent */
+        a->surface.relief = RR_RELIEF_FLAT;
+        a->surface.border = FALSE;
+
+        a->surface.pixel_data = old.pixel_data;
+
+        RrRender(a, w, h);
+        a->surface = old;
+    } else {
+        source = (a->surface.parent->surface.pixel_data +
+                  a->surface.parentx + sw * a->surface.parenty);
+        dest = a->surface.pixel_data;
+
+        if (a->surface.parentx + w > sw) {
+            partial_w = sw - a->surface.parentx;
+        } else partial_w = w;
+
+        if (a->surface.parenty + h > sh) {
+            partial_h = sh - a->surface.parenty;
+        } else partial_h = h;
+
+        for (i = 0; i < partial_h; i++, source += sw, dest += w) {
+            memcpy(dest, source, partial_w * sizeof(RrPixel32));
+        }
+    }
+}
+
+static void gradient_solid(RrAppearance *l, gint w, gint h) 
+{
+    gint i;
     RrPixel32 pix;
-    gint i, a, b;
-    RrAppearance *l = &sf->parent;
+    RrPixel32 *data = l->surface.pixel_data;
+    RrSurface *sp = &l->surface;
     gint left = 0, top = 0, right = w - 1, bottom = h - 1;
 
-    pix = (sf->primary->r << RrDefaultRedOffset)
-        + (sf->primary->g << RrDefaultGreenOffset)
-        + (sf->primary->b << RrDefaultBlueOffset);
+    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++)
-            sf->pixel_data[a + b * w] = pix;
+    for (i = 0; i < w * h; i++)
+        *data++ = pix;
 
-    XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->primary),
-                   0, 0, w, h);
+    if (sp->interlaced)
+        return;
 
-    if (sf->interlaced) {
-        for (i = 0; i < h; i += 2)
-            XDrawLine(RrDisplay(l->inst), l->pixmap,
-                      RrColorGC(sf->interlace_color),
-                      0, i, w, i);
-    }
+    XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
+                   0, 0, w, h);
 
-    switch (sf->relief) {
+    switch (sp->relief) {
     case RR_RELIEF_RAISED:
-        if (!sf->bevel_dark)
+        if (!sp->bevel_dark)
             create_bevel_colors(l);
 
-        switch (sf->bevel) {
+        switch (sp->bevel) {
         case RR_BEVEL_1:
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left, bottom, right, bottom);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       right, bottom, right, top);
                 
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left, top, right, top);
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left, bottom, left, top);
             break;
         case RR_BEVEL_2:
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
-                      left + 1, bottom - 2, right - 2, bottom - 2);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
-                      right - 2, bottom - 2, right - 2, top + 1);
-
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
-                      left + 1, top + 1, right - 2, top + 1);
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
-                      left + 1, bottom - 2, left + 1, top + 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+                      left + 2, bottom - 1, right - 2, bottom - 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+                      right - 1, bottom - 1, right - 1, top + 1);
+
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+                      left + 2, top + 1, right - 2, top + 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+                      left + 1, bottom - 1, left + 1, top + 1);
             break;
         default:
             g_assert_not_reached(); /* unhandled BevelType */
         }
         break;
     case RR_RELIEF_SUNKEN:
-        if (!sf->bevel_dark)
+        if (!sp->bevel_dark)
             create_bevel_colors(l);
 
-        switch (sf->bevel) {
+        switch (sp->bevel) {
         case RR_BEVEL_1:
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left, bottom, right, bottom);
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       right, bottom, right, top);
       
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left, top, right, top);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left, bottom, left, top);
             break;
         case RR_BEVEL_2:
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
-                      left + 1, bottom - 2, right - 2, bottom - 2);
-            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sf->bevel_light),
-                      right - 2, bottom - 2, right - 2, top + 1);
-      
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
-                      left + 1, top + 1, right - 2, top + 1);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sf->bevel_dark),
-                      left + 1, bottom - 2, left + 1, top + 1);
-
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+                      left + 2, bottom - 1, right - 2, bottom - 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+                      right - 1, bottom - 1, right - 1, top + 1);
+
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+                      left + 2, top + 1, right - 2, top + 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+                      left + 1, bottom - 1, left + 1, top + 1);
             break;
         default:
             g_assert_not_reached(); /* unhandled BevelType */
         }
         break;
     case RR_RELIEF_FLAT:
-        if (sf->border) {
+        if (sp->border) {
             XDrawRectangle(RrDisplay(l->inst), l->pixmap,
-                           RrColorGC(sf->border_color),
+                           RrColorGC(sp->border_color),
                            left, top, right, bottom);
         }
         break;
@@ -363,62 +419,54 @@ static void gradient_solid(RrSurface *sf, gint w, gint h)
     }                                                     \
 }
 
-static void gradient_split(RrSurface *sf, gint w, gint h)
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
 {
-    gint x, y1, y3, r, g, b;
-    RrAppearance *a = &a->parent;
+    gint x, y1, y2, y3;
+    RrSurface *sf = &a->surface;
     RrPixel32 *data = sf->pixel_data;
     RrPixel32 current;
-    RrColor *primary_light, *secondary_light;
-
-    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);
+    gint y1sz, y2sz, y3sz;
 
     VARS(y1);
-    SETUP(y1, primary_light, sf->primary, (h / 2) -1);
-  
+    VARS(y2);
     VARS(y3);
-    SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
 
-    for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */
+
+    y1sz = MAX(h/2 - 1, 1);
+    /* setup to get the colors _in between_ these other 2 */
+    y2sz = (h < 3 ? 0 : (h % 2 ? 3 : 2));
+    y3sz = MAX(h/2 - 1, 0);
+
+    SETUP(y1, sf->split_primary, sf->primary, y1sz);
+    if (y2sz) {
+        SETUP(y2, sf->primary, sf->secondary, y2sz);
+        NEXT(y2); /* skip the first one, its the same as the last of y1 */
+    }
+    SETUP(y3, sf->secondary, sf->split_secondary,  y3sz);
+
+    for (y1 = y1sz; y1 > 0; --y1) {
         current = COLOR(y1);
-        for (x = w - 1; x >= 0; --x)  /* 0 -> w */
+        for (x = w - 1; x >= 0; --x)
             *(data++) = current;
 
         NEXT(y1);
     }
 
+    for (y2 = y2sz; y2 > 0; --y2) {
+        current = COLOR(y2);
+        for (x = w - 1; x >= 0; --x)
+            *(data++) = current;
+        
+        NEXT(y2);
+    }
     
-    for (y3 = (h / 2) - 1; y3 > 0; --y3) {
+    for (y3 = y3sz; 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;
 }
 
 static void gradient_horizontal(RrSurface *sf, gint w, gint h)
@@ -446,6 +494,45 @@ static void gradient_horizontal(RrSurface *sf, gint w, gint h)
         *(data + y * w) = current;
 }
 
+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)
 {
     gint x, y;