X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=babfa52235716e52bb8907b42b279878f52fc4b0;hb=06356d337c972c0a097134ed43ab40b683ebb095;hp=12b373ce70e7b0ad57efd36549559104526d19b1;hpb=46e2060fcfea07786dadaa3785f8d89caa49b3e9;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index 12b373ce..babfa522 100644
--- a/render/render.c
+++ b/render/render.c
@@ -5,11 +5,15 @@
 #include "gradient.h"
 #include "font.h"
 #include "mask.h"
+#include "color.h"
+#include "image.h"
 #include "../kernel/openbox.h"
 
 int render_depth;
 Visual *render_visual;
 Colormap render_colormap;
+int render_red_offset = 0, render_green_offset = 0, render_blue_offset = 0;
+int render_red_shift, render_green_shift, render_blue_shift;
 
 void render_startup(void)
 {
@@ -21,8 +25,8 @@ void render_startup(void)
 
     if (render_depth < 8) {
       XVisualInfo vinfo_template, *vinfo_return;
-      // search for a TrueColor Visual... if we can't find one...
-      // we will use the default visual for the screen
+      /* search for a TrueColor Visual... if we can't find one...
+         we will use the default visual for the screen */
       int vinfo_nitems;
       int best = -1;
 
@@ -37,7 +41,7 @@ void render_startup(void)
         for (i = 0; i < vinfo_nitems; ++i) {
           if (vinfo_return[i].depth > max_depth) {
             if (max_depth == 24 && vinfo_return[i].depth > 24)
-              break;          // prefer 24 bit over 32
+                break;          /* prefer 24 bit over 32 */
             max_depth = vinfo_return[i].depth;
             best = i;
           }
@@ -52,18 +56,50 @@ void render_startup(void)
       }
       XFree(vinfo_return);
     }  
+  truecolor_startup();
 }
 
-void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
+void truecolor_startup(void)
 {
-    int i;
-    XImage *im;
+  unsigned long red_mask, green_mask, blue_mask;
+  XImage *timage = NULL;
+
+  timage = XCreateImage(ob_display, render_visual, render_depth,
+                        ZPixmap, 0, NULL, 1, 1, 32, 0);
+  g_assert(timage != NULL);
+  /* find the offsets for each color in the visual's masks */
+  red_mask = timage->red_mask;
+  green_mask = timage->green_mask;
+  blue_mask = timage->blue_mask;
+
+  render_red_offset = 0;
+  render_green_offset = 0;
+  render_blue_offset = 0;
+
+  while (! (red_mask & 1))   { render_red_offset++;   red_mask   >>= 1; }
+  while (! (green_mask & 1)) { render_green_offset++; green_mask >>= 1; }
+  while (! (blue_mask & 1))  { render_blue_offset++;  blue_mask  >>= 1; }
+
+  render_red_shift = render_green_shift = render_blue_shift = 8;
+  while (red_mask)   { red_mask   >>= 1; render_red_shift--;   }
+  while (green_mask) { green_mask >>= 1; render_green_shift--; }
+  while (blue_mask)  { blue_mask  >>= 1; render_blue_shift--;  }
+  XFree(timage);
+}
+
+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;
 
-    if (w <= 0 || h <= 0) return;
+    if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
 
     g_assert(l->surface.type == Surface_Planar);
-//    printf("painting window %ld\n", win);
 
     oldp = l->pixmap; /* save to free after changing the visible pixmap */
     l->pixmap = XCreatePixmap(ob_display, ob_root, x+w, y+h, render_depth);
@@ -75,46 +111,68 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
                                render_colormap);
     g_assert(l->xftdraw != NULL);
 
-    if (l->surface.data.planar.pixel_data != NULL)
-        g_free(l->surface.data.planar.pixel_data);
+    g_free(l->surface.data.planar.pixel_data);
     l->surface.data.planar.pixel_data = g_new(pixel32, w * h);
 
-    if (l->surface.data.planar.grad == Background_Solid)
-        gradient_solid(l, w, h);
-    else gradient_render(&l->surface, w, h);
 
-/*reduce depth here...
-  also, 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 != None);
-        im->byte_order = endian;
-        im->data = l->surface.data.planar.pixel_data;
-        XPutImage(ob_display, l->pixmap, DefaultGC(ob_display, ob_screen),
-                  im, 0, 0, x, y, w, h);
-        im->data = NULL;
-        XDestroyImage(im);
+    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 * 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);
 
     for (i = 0; i < l->textures; i++) {
         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);
+            font_draw(l->xftdraw, &l->texture[i].data.text, 
+                      &l->texture[i].position);
         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, w, h);
+            mask_draw(l->pixmap, &l->texture[i].data.mask,
+                      &l->texture[i].position);
+        break;
+        case RGBA:
+            image_draw(l->surface.data.planar.pixel_data, 
+                       &l->texture[i].data.rgba,
+                       &l->texture[i].position);
         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);
@@ -140,7 +198,8 @@ Appearance *appearance_new(SurfaceType type, int numtex)
   out->surface.type = type;
   out->textures = numtex;
   out->xftdraw = NULL;
-  if (numtex) out->texture = g_new(Texture, numtex);
+  if (numtex) out->texture = g_new0(Texture, numtex);
+  else out->texture = NULL;
   out->pixmap = None;
 
   switch (type) {
@@ -191,10 +250,7 @@ Appearance *appearance_copy(Appearance *orig)
     break;
     }
     copy->textures = orig->textures;
-    if (orig->textures) {
-        copy->texture = malloc(orig->textures * sizeof(Texture));
-        memcpy(copy->texture, orig->texture, orig->textures * sizeof(Texture));
-    } else copy->texture = NULL;
+    copy->texture = g_memdup(orig->texture, orig->textures * sizeof(Texture));
     copy->pixmap = None;
     copy->xftdraw = NULL;
     return copy;
@@ -212,6 +268,23 @@ void appearance_free(Appearance *a)
         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)
+{
+    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);
+    XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen),
+              im, 0, 0, x, y, w, h);
+    im->data = NULL;
+    XDestroyImage(im);
+}