X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=53f7e25c506eafb793d75cab6c74621b472ca070;hb=b287b126ccebe8f65b90cba8191b720fdb901d49;hp=c2f7fac73cce4f8528617a6b97c01eb790b670bc;hpb=e91814e99f8e71fdf2d930acf43988110969547d;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index c2f7fac7..53f7e25c 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -1,22 +1,41 @@
+/* -*- 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) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "render.h"
 #include "gradient.h"
 #include "color.h"
 #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_vertical(RrSurface *sf, gint w, gint h);
+static void gradient_horizontal(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:
@@ -42,6 +61,22 @@ void RrRender(RrAppearance *a, int w, int h)
         return;
     }
   
+    if (a->surface.interlaced) {
+        gint i;
+        RrPixel32 *p;
+
+        r = a->surface.interlace_color->r;
+        g = a->surface.interlace_color->g;
+        b = a->surface.interlace_color->b;
+        current = (r << RrDefaultRedOffset)
+            + (g << RrDefaultGreenOffset)
+            + (b << RrDefaultBlueOffset);
+        p = data;
+        for (i = 0; i < h; i += 2, p += w)
+            for (x = 0; x < w; ++x, ++p)
+                *p = current;
+    }
+
     if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) {
         r = a->surface.border_color->r;
         g = a->surface.border_color->g;
@@ -82,28 +117,11 @@ void RrRender(RrAppearance *a, int w, int h)
                           a->surface.relief==RR_RELIEF_RAISED);
         }
     }
-
-    if (a->surface.interlaced) {
-        int i;
-        RrPixel32 *p;
-
-        r = a->surface.interlace_color->r;
-        g = a->surface.interlace_color->g;
-        b = a->surface.interlace_color->b;
-        current = (r << RrDefaultRedOffset)
-            + (g << RrDefaultGreenOffset)
-            + (b << RrDefaultBlueOffset);
-        p = data;
-        for (i = 0; i < h; i += 2, p += w)
-            for (x = 0; x < w; ++x, ++p)
-                *p = current;
-    }
-
 }
 
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
 {
-    int r, g, b;
+    gint r, g, b;
 
     RrPixel32 *up, *down;
     if (raised) {
@@ -137,7 +155,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;
@@ -163,12 +181,12 @@ 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) 
 {
     RrPixel32 pix;
-    int i, a, b;
+    gint i, a, b;
     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)
@@ -267,8 +285,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)         \
@@ -316,7 +334,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;                      \
                                                           \
@@ -341,9 +359,9 @@ static void gradient_solid(RrAppearance *l, int w, int h)
     }                                                     \
 }
 
-static void gradient_horizontal(RrSurface *sf, int w, int h)
+static void gradient_horizontal(RrSurface *sf, gint w, gint h)
 {
-    int x, y;
+    gint x, y;
     RrPixel32 *data = sf->pixel_data, *datav;
     RrPixel32 current;
 
@@ -366,9 +384,9 @@ 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_vertical(RrSurface *sf, gint w, gint h)
 {
-    int x, y;
+    gint x, y;
     RrPixel32 *data = sf->pixel_data;
     RrPixel32 current;
 
@@ -388,9 +406,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;
@@ -435,9 +453,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;
@@ -482,9 +500,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;