X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=22e1abf718bebd232e2dcfb90a4c3034d605a8b8;hb=d0e9015651aa960cf8cb58a5ab08da79e6aeb51b;hp=de45c0935fa204a7284eb38965558f1fda546e47;hpb=cf4e1780d0038fa03f16a8f92d954f667fa47c64;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index de45c093..22e1abf7 100644
--- a/render/render.c
+++ b/render/render.c
@@ -7,7 +7,11 @@
 #include "mask.h"
 #include "color.h"
 #include "image.h"
-#include "../kernel/openbox.h"
+#include "kernel/openbox.h"
+
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 
 int render_depth;
 Visual *render_visual;
@@ -56,7 +60,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,6 +105,89 @@ void truecolor_startup(void)
   XFree(timage);
 }
 
+void pseudocolor_startup(void)
+{
+  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;
@@ -96,7 +197,6 @@ void x_paint(Window win, Appearance *l)
     int y = l->area.y;
     int w = l->area.width;
     int h = l->area.height;
-    int parenty = l->surface.data.planar.parenty;
 
     if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
 
@@ -119,9 +219,10 @@ void x_paint(Window win, Appearance *l)
     if (l->surface.data.planar.grad == Background_ParentRelative) {
         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 * parenty;
+            + l->surface.data.planar.parentx
+            + sw * l->surface.data.planar.parenty;
         dest = l->surface.data.planar.pixel_data;
-        for (i = parenty; i < parenty + h; i++, source += sw, dest += w) {
+        for (i = 0; i < h; i++, source += sw, dest += w) {
             memcpy(dest, source, w * sizeof(pixel32));
         }
     }
@@ -276,15 +377,61 @@ void appearance_free(Appearance *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;
-    im->data = (char *)in;
-    reduce_depth((pixel32*)im->data, im);
+/* 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 = 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, Size *s)
+{
+    int i;
+    SIZE_SET(*s, 0, 0);
+
+    switch (l->surface.type) {
+    case Surface_Planar:
+        if (l->surface.data.planar.border ||
+            l->surface.data.planar.bevel == Bevel1)
+            SIZE_SET(*s, 2, 2);
+        else if (l->surface.data.planar.bevel == Bevel2)
+            SIZE_SET(*s, 4, 4);
+
+        for (i = 0; i < l->textures; ++i)
+            switch (l->texture[i].type) {
+            case Bitmask:
+                s->width += l->texture[i].data.mask.mask->w;
+                s->height += l->texture[i].data.mask.mask->h;
+                break;
+            case Text:
+                s->width +=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);
+                s->height +=  font_height(l->texture[i].data.text.font,
+                                          l->texture[i].data.text.shadow,
+                                          l->texture[i].data.text.offset);
+                break;
+            case RGBA:
+                s->width += l->texture[i].data.rgba.width;
+                s->height += l->texture[i].data.rgba.height;
+                break;
+            case NoTexture:
+                break;
+            }            
+        break;
+    }
+    return s;
 }