X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=804e6c36f4891d8ed578f0f9283c8127c5124f98;hb=7a166a383805f7693e0800f3bf693e3736463a0d;hp=ba847c538f7bf660105b95e1b76f9c8fa515d4ff;hpb=9a49853466629866fc762bd21a4d7ec1a1d27353;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index ba847c53..804e6c36 100644
--- a/render/render.c
+++ b/render/render.c
@@ -7,7 +7,12 @@
 #include "mask.h"
 #include "color.h"
 #include "image.h"
-#include "../kernel/openbox.h"
+#include "theme.h"
+#include "kernel/openbox.h"
+
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 
 int render_depth;
 Visual *render_visual;
@@ -56,7 +61,21 @@ void render_startup(void)
       }
       XFree(vinfo_return);
     }  
-  truecolor_startup();
+  switch (render_visual->class) {
+  case TrueColor:
+    truecolor_startup();
+    break;
+  case PseudoColor:
+  case StaticColor:
+  case GrayScale:
+  case StaticGray:
+    pseudocolor_startup();
+    break;
+  default:
+    g_critical("unsupported visual class.\n");
+    exit(EXIT_FAILURE);
+
+  }
 }
 
 void truecolor_startup(void)
@@ -87,11 +106,99 @@ void truecolor_startup(void)
   XFree(timage);
 }
 
-void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
+void pseudocolor_startup(void)
 {
-    int i;
-    XImage *im = NULL;
+  XColor icolors[256];
+  int tr, tg, tb, n, r, g, b, i, incolors, ii;
+  unsigned long dev;
+  int cpc, _ncolors;
+  g_message("Initializing PseudoColor RenderControl\n");
+
+  /* determine the number of colors and the bits-per-color */
+  pseudo_bpc = 2; /* XXX THIS SHOULD BE A USER OPTION */
+  g_assert(pseudo_bpc >= 1);
+  _ncolors = 1 << (pseudo_bpc * 3);
+
+  if (_ncolors > 1 << render_depth) {
+    g_warning("PseudoRenderControl: Invalid colormap size. Resizing.\n");
+    pseudo_bpc = 1 << (render_depth/3) >> 3;
+    _ncolors = 1 << (pseudo_bpc * 3);
+  }
+
+  /* build a color cube */
+  pseudo_colors = malloc(_ncolors * sizeof(XColor));
+  cpc = 1 << pseudo_bpc; /* colors per channel */
+
+  for (n = 0, r = 0; r < cpc; r++)
+    for (g = 0; g < cpc; g++)
+      for (b = 0; b < cpc; b++, n++) {
+        tr = (int)(((float)(r)/(float)(cpc-1)) * 0xFF);
+        tg = (int)(((float)(g)/(float)(cpc-1)) * 0xFF);
+        tb = (int)(((float)(b)/(float)(cpc-1)) * 0xFF);
+        pseudo_colors[n].red = tr | tr << 8;
+        pseudo_colors[n].green = tg | tg << 8;
+        pseudo_colors[n].blue = tb | tb << 8;
+        pseudo_colors[n].flags = DoRed|DoGreen|DoBlue; /* used to track 
+                                                          allocation */
+      }
+
+  /* allocate the colors */
+  for (i = 0; i < _ncolors; i++)
+    if (!XAllocColor(ob_display, render_colormap, &pseudo_colors[i]))
+      pseudo_colors[i].flags = 0; /* mark it as unallocated */
+
+  /* try allocate any colors that failed allocation above */
+
+  /* get the allocated values from the X server (only the first 256 XXX why!?)
+   */
+  incolors = (((1 << render_depth) > 256) ? 256 : (1 << render_depth));
+  for (i = 0; i < incolors; i++)
+    icolors[i].pixel = i;
+  XQueryColors(ob_display, render_colormap, icolors, incolors);
+
+  /* try match unallocated ones */
+  for (i = 0; i < _ncolors; i++) {
+    if (!pseudo_colors[i].flags) { /* if it wasn't allocated... */
+      unsigned long closest = 0xffffffff, close = 0;
+      for (ii = 0; ii < incolors; ii++) {
+        /* find deviations */
+        r = (pseudo_colors[i].red - icolors[ii].red) & 0xff;
+        g = (pseudo_colors[i].green - icolors[ii].green) & 0xff;
+        b = (pseudo_colors[i].blue - icolors[ii].blue) & 0xff;
+        /* find a weighted absolute deviation */
+        dev = (r * r) + (g * g) + (b * b);
+
+        if (dev < closest) {
+          closest = dev;
+          close = ii;
+        }
+      }
+
+      pseudo_colors[i].red = icolors[close].red;
+      pseudo_colors[i].green = icolors[close].green;
+      pseudo_colors[i].blue = icolors[close].blue;
+      pseudo_colors[i].pixel = icolors[close].pixel;
+
+      /* try alloc this closest color, it had better succeed! */
+      if (XAllocColor(ob_display, render_colormap, &pseudo_colors[i]))
+        pseudo_colors[i].flags = DoRed|DoGreen|DoBlue; /* mark as alloced */
+      else
+        g_assert(FALSE); /* wtf has gone wrong, its already alloced for
+                            chissake! */
+    }
+  }
+}
+
+void x_paint(Window win, Appearance *l)
+{
+    int i, transferred = 0, sw;
+    pixel32 *source, *dest;
     Pixmap oldp;
+    int x = l->area.x;
+    int y = l->area.y;
+    int w = l->area.width;
+    int h = l->area.height;
+    Rect tarea; /* area in which to draw textures */
 
     if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
 
@@ -112,51 +219,82 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
 
 
     if (l->surface.data.planar.grad == Background_ParentRelative) {
-        memset(l->surface.data.planar.pixel_data, 0, w*h*4);
+        sw = l->surface.data.planar.parent->area.width;
+        source = l->surface.data.planar.parent->surface.data.planar.pixel_data
+            + l->surface.data.planar.parentx
+            + sw * l->surface.data.planar.parenty;
+        dest = l->surface.data.planar.pixel_data;
+        for (i = 0; i < h; i++, source += sw, dest += w) {
+            memcpy(dest, source, w * sizeof(pixel32));
+        }
     }
     else if (l->surface.data.planar.grad == Background_Solid)
         gradient_solid(l, x, y, w, h);
     else gradient_render(&l->surface, w, h);
 
-/*this is not the right place for this code, it's only here so
-  text rendering shows up for now.
-*/
-    if (l->surface.data.planar.grad != Background_Solid) {
-        im = XCreateImage(ob_display, render_visual, render_depth,
-                          ZPixmap, 0, NULL, w, h, 32, 0);
-        g_assert(im != NULL);
-        im->byte_order = endian;
-        im->data = (char *)l->surface.data.planar.pixel_data;
-        reduce_depth((pixel32*)im->data, im);
-        XPutImage(ob_display, l->pixmap, DefaultGC(ob_display, ob_screen),
-                  im, 0, 0, x, y, w, h);
-        im->data = NULL;
-        XDestroyImage(im);
-    }
-
     for (i = 0; i < l->textures; i++) {
+        tarea = l->texture[i].position;
+        if (l->surface.data.planar.grad != Background_ParentRelative) {
+            if (l->surface.data.planar.relief != Flat) {
+                switch (l->surface.data.planar.bevel) {
+                case Bevel1:
+                    tarea.x += 1; tarea.y += 1;
+                    tarea.width -= 2; tarea.height -= 2;
+                    break;
+                case Bevel2:
+                    tarea.x += 2; tarea.y += 2;
+                    tarea.width -= 4; tarea.height -= 4;
+                    break;
+                }
+            } else if (l->surface.data.planar.border) {
+                tarea.x += 1; tarea.y += 1;
+                tarea.width -= 2; tarea.height -= 2;
+            }
+        }
+
         switch (l->texture[i].type) {
         case Text:
+            if (!transferred) {
+                transferred = 1;
+                if (l->surface.data.planar.grad != Background_Solid)
+                    pixel32_to_pixmap(l->surface.data.planar.pixel_data, 
+                                      l->pixmap,x,y,w,h);
+            }
             if (l->xftdraw == NULL) {
                 l->xftdraw = XftDrawCreate(ob_display, l->pixmap, 
                                         render_visual, render_colormap);
             }
             font_draw(l->xftdraw, &l->texture[i].data.text, 
-                      &l->texture[i].position);
+                      &tarea);
         break;
         case Bitmask:
+            if (!transferred) {
+                transferred = 1;
+                if (l->surface.data.planar.grad != Background_Solid)
+                    pixel32_to_pixmap(l->surface.data.planar.pixel_data, 
+                                      l->pixmap,x,y,w,h);
+            }
             if (l->texture[i].data.mask.color->gc == None)
                 color_allocate_gc(l->texture[i].data.mask.color);
             mask_draw(l->pixmap, &l->texture[i].data.mask,
-                      &l->texture[i].position);
+                      &tarea);
         break;
         case RGBA:
             image_draw(l->surface.data.planar.pixel_data, 
                        &l->texture[i].data.rgba,
-                       &l->texture[i].position);
+                       &tarea, &l->area);
         break;
         }
     }
+
+    if (!transferred) {
+        transferred = 1;
+        if (l->surface.data.planar.grad != Background_Solid)
+            pixel32_to_pixmap(l->surface.data.planar.pixel_data, l->pixmap
+                              ,x,y,w,h);
+    }
+
+
     XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);
     XClearWindow(ob_display, win);
     if (oldp != None) XFreePixmap(ob_display, oldp);
@@ -242,17 +380,90 @@ Appearance *appearance_copy(Appearance *orig)
 
 void appearance_free(Appearance *a)
 {
-    PlanarSurface *p;
-    if (a->pixmap != None) XFreePixmap(ob_display, a->pixmap);
-    if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
-    if (a->textures)
-        g_free(a->texture);
-    if (a->surface.type == Surface_Planar) {
-        p = &a->surface.data.planar;
-        if (p->primary != NULL) color_free(p->primary);
-        if (p->secondary != NULL) color_free(p->secondary);
-        if (p->border_color != NULL) color_free(p->border_color);
-        if (p->pixel_data != NULL) g_free(p->pixel_data);
+    if (a) {
+        PlanarSurface *p;
+        if (a->pixmap != None) XFreePixmap(ob_display, a->pixmap);
+        if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
+        if (a->textures)
+            g_free(a->texture);
+        if (a->surface.type == Surface_Planar) {
+            p = &a->surface.data.planar;
+            if (p->primary != NULL) color_free(p->primary);
+            if (p->secondary != NULL) color_free(p->secondary);
+            if (p->border_color != NULL) color_free(p->border_color);
+            if (p->pixel_data != NULL) g_free(p->pixel_data);
+        }
+        g_free(a);
+    }
+}
+
+
+void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h)
+{
+    unsigned char *scratch;
+    XImage *im = NULL;
+    im = XCreateImage(ob_display, render_visual, render_depth,
+                      ZPixmap, 0, NULL, w, h, 32, 0);
+    g_assert(im != NULL);
+    im->byte_order = endian;
+/* this malloc is a complete waste of time on normal 32bpp
+   as reduce_depth just sets im->data = data and returns
+*/
+    scratch = malloc(im->width * im->height * sizeof(pixel32));
+    im->data = (char*) scratch;
+    reduce_depth(in, im);
+    XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen),
+              im, 0, 0, x, y, w, h);
+    im->data = NULL;
+    XDestroyImage(im);
+    free(scratch);
+}
+
+void appearance_minsize(Appearance *l, int *w, int *h)
+{
+    int i;
+    int m;
+    *w = *h = 1;
+
+    switch (l->surface.type) {
+    case Surface_Planar:
+        if (l->surface.data.planar.relief != Flat) {
+            switch (l->surface.data.planar.bevel) {
+            case Bevel1:
+                *w = *h = 2;
+                break;
+            case Bevel2:
+                *w = *h = 4;
+                break;
+            }
+        } else if (l->surface.data.planar.border)
+            *w = *h = 2;
+
+        for (i = 0; i < l->textures; ++i) {
+            switch (l->texture[i].type) {
+            case Bitmask:
+                *w += l->texture[i].data.mask.mask->w;
+                *h += l->texture[i].data.mask.mask->h;
+                break;
+            case Text:
+                m = font_measure_string(l->texture[i].data.text.font,
+                                        l->texture[i].data.text.string,
+                                        l->texture[i].data.text.shadow,
+                                        l->texture[i].data.text.offset);
+                *w += m;
+                m = font_height(l->texture[i].data.text.font,
+                                l->texture[i].data.text.shadow,
+                                l->texture[i].data.text.offset);
+                *h += m;
+                break;
+            case RGBA:
+                *w += l->texture[i].data.rgba.width;
+                *h += l->texture[i].data.rgba.height;
+                break;
+            case NoTexture:
+                break;
+            }
+        }
+        break;
     }
-    g_free(a);
 }