X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=f2a0572fb6be06f1874690207e37e542f22179a5;hb=3f32dfa87e08556d7f6a58efab9b7479e515be26;hp=560ee38e67e2581753ef39a18c8494e941a3c66c;hpb=f8ad321e50c7838a747b3314676ab24ee4d0e423;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index 560ee38e..f2a0572f 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,203 +1,357 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <glib.h>
+
 #include "render.h"
 #include "gradient.h"
-#include "../kernel/openbox.h"
+#include "font.h"
+#include "mask.h"
+#include "color.h"
+#include "image.h"
+#include "theme.h"
 
-int render_depth;
-Visual *render_visual;
-Colormap render_colormap;
+#include <glib.h>
 
-void render_startup(void)
-{
-    paint = x_paint;
-
-    render_depth = DefaultDepth(ob_display, ob_screen);
-    render_visual = DefaultVisual(ob_display, ob_screen);
-    render_colormap = DefaultColormap(ob_display, ob_screen);
-
-    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
-      int vinfo_nitems;
-      int best = -1;
-
-      vinfo_template.screen = ob_screen;
-      vinfo_template.class = TrueColor;
-      vinfo_return = XGetVisualInfo(ob_display,
-                                    VisualScreenMask | VisualClassMask,
-                                    &vinfo_template, &vinfo_nitems);
-      if (vinfo_return) {
-        int i;
-        int max_depth = 1;
-        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
-            max_depth = vinfo_return[i].depth;
-            best = i;
-          }
-        }
-        if (max_depth < render_depth) best = -1;
-      }
-      if (best != -1) {
-        render_depth = vinfo_return[best].depth;
-        render_visual = vinfo_return[best].visual;
-        render_colormap = XCreateColormap(ob_display, ob_root, render_visual,
-                                          AllocNone);
-      }
-      XFree(vinfo_return);
-    }  
-}
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+
+static void pixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h);
 
-void x_paint(Window win, Appearance *l, int w, int h)
+void RrPaint(RrAppearance *l, Window win, gint w, gint h)
 {
-    int i;
-    XImage *im;
+    int i, transferred = 0, sw;
+    pixel32 *source, *dest;
+    Pixmap oldp;
+    Rect tarea; /* area in which to draw textures */
+    gboolean resized;
 
     if (w <= 0 || h <= 0) return;
 
-    g_assert(l->surface.type == Surface_Planar);
-//    printf("painting window %ld\n", win);
+    resized = (l->w != w || l->h != h);
+
+    if (resized) {
+        oldp = l->pixmap; /* save to free after changing the visible pixmap */
+        l->pixmap = XCreatePixmap(RrDisplay(l->inst),
+                                  RrRootWindow(l->inst),
+                                  w, h, RrDepth(l->inst));
+    } else
+        oldp = None;
 
-    if (l->pixmap != None) XFreePixmap(ob_display, l->pixmap);
-    l->pixmap = XCreatePixmap(ob_display, ob_root, w, h, render_depth);
     g_assert(l->pixmap != None);
+    l->w = w;
+    l->h = h;
 
     if (l->xftdraw != NULL)
         XftDrawDestroy(l->xftdraw);
-    l->xftdraw = XftDrawCreate(ob_display, l->pixmap, render_visual, 
-                               render_colormap);
+    l->xftdraw = XftDrawCreate(RrDisplay(l->inst), l->pixmap,
+                               RrVisual(l->inst), RrColormap(l->inst));
     g_assert(l->xftdraw != NULL);
 
-    if (l->surface.data.planar.pixel_data != NULL)
-        g_free(l->surface.data.planar.pixel_data);
-    l->surface.data.planar.pixel_data = g_new(pixel32, w * h);
+    g_free(l->surface.pixel_data);
+    l->surface.pixel_data = g_new(pixel32, w * h);
+
+    if (l->surface.grad == RR_SURFACE_PARENTREL) {
+        g_assert (l->surface.parent);
+        g_assert (l->surface.parent->w);
+
+        sw = l->surface.parent->w;
+        source = (l->surface.parent->surface.pixel_data + l->surface.parentx +
+                  sw * l->surface.parenty);
+        dest = l->surface.pixel_data;
+        for (i = 0; i < h; i++, source += sw, dest += w) {
+            memcpy(dest, source, w * sizeof(pixel32));
+        }
+    } else if (l->surface.grad == RR_SURFACE_SOLID)
+        gradient_solid(l, 0, 0, w, h);
+    else
+        gradient_render(&l->surface, w, h);
+
+    RECT_SET(tarea, 0, 0, w, h);
+    if (l->surface.grad != RR_SURFACE_PARENTREL) {
+        if (l->surface.relief != RR_RELIEF_FLAT) {
+            switch (l->surface.bevel) {
+            case RR_BEVEL_1:
+                tarea.x += 1; tarea.y += 1;
+                tarea.width -= 2; tarea.height -= 2;
+                break;
+            case RR_BEVEL_2:
+                tarea.x += 2; tarea.y += 2;
+                tarea.width -= 4; tarea.height -= 4;
+                break;
+            }
+        } else if (l->surface.border) {
+            tarea.x += 1; tarea.y += 1;
+            tarea.width -= 2; tarea.height -= 2;
+        }
+    }
 
-    if (l->surface.data.planar.grad == Background_Solid)
-        gradient_solid(l, w, h);
-    else gradient_render(&l->surface, w, h);
     for (i = 0; i < l->textures; i++) {
         switch (l->texture[i].type) {
-        case Text:
+        case RR_TEXTURE_NONE:
+            break;
+        case RR_TEXTURE_TEXT:
+            if (!transferred) {
+                transferred = 1;
+                if (l->surface.grad != RR_SURFACE_SOLID)
+                    pixel32_to_pixmap(l, 0, 0, w, h);
+            }
             if (l->xftdraw == NULL) {
-                l->xftdraw = XftDrawCreate(ob_display, l->pixmap, 
-                                        render_visual, render_colormap);
+                l->xftdraw = XftDrawCreate(RrDisplay(l->inst), l->pixmap, 
+                                           RrVisual(l->inst),
+                                           RrColormap(l->inst));
+            }
+            font_draw(l->xftdraw, &l->texture[i].data.text, &tarea);
+        break;
+        case RR_TEXTURE_MASK:
+            if (!transferred) {
+                transferred = 1;
+                if (l->surface.grad != RR_SURFACE_SOLID)
+                    pixel32_to_pixmap(l, 0, 0, w, h);
             }
-            font_draw(l->xftdraw, l->texture[i].data.text);
+            if (l->texture[i].data.mask.color->gc == None)
+                color_allocate_gc(l->texture[i].data.mask.color);
+            RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea);
+        break;
+        case RR_TEXTURE_RGBA:
+            image_draw(l->surface.pixel_data,
+                       &l->texture[i].data.rgba, &tarea);
         break;
         }
     }
-//reduce depth
-    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, 0, 0, w, h);
-        im->data = NULL;
-        XDestroyImage(im);
+
+    if (!transferred) {
+        transferred = 1;
+        if (l->surface.grad != RR_SURFACE_SOLID)
+            pixel32_to_pixmap(l, 0, 0, w, h);
     }
-    XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);
-    XClearWindow(ob_display, win);
-}
 
-/*
-void gl_paint(Window win, Appearance *l)
-{
-    glXMakeCurrent(ob_display, win, gl_context);
-}
-*/
 
-void render_shutdown(void)
-{
+    XSetWindowBackgroundPixmap(RrDisplay(l->inst), win, l->pixmap);
+    XClearWindow(RrDisplay(l->inst), win);
+    if (oldp) XFreePixmap(RrDisplay(l->inst), oldp);
 }
 
-Appearance *appearance_new(SurfaceType type, int numtex)
+RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
 {
-  PlanarSurface *p;
-  Appearance *out;
+  RrAppearance *out;
 
-  out = g_new(Appearance, 1);
-  out->surface.type = type;
+  out = g_new0(RrAppearance, 1);
+  out->inst = inst;
   out->textures = numtex;
-  out->xftdraw = NULL;
-  if (numtex) out->texture = g_new(Texture, numtex);
-  out->pixmap = None;
-
-  switch (type) {
-  case Surface_Planar:
-    p = &out->surface.data.planar;
-    p->primary = NULL;
-    p->secondary = NULL;
-    p->border_color = NULL;
-    p->pixel_data = NULL;
-    break;
-  }
+  if (numtex) out->texture = g_new0(RrTexture, numtex);
+
   return out;
 }
 
-Appearance *appearance_copy(Appearance *orig)
+RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 {
-    PlanarSurface *spo, *spc;
-    Appearance *copy = g_new(Appearance, 1);
-    copy->surface.type = orig->surface.type;
-    switch (orig->surface.type) {
-    case Surface_Planar:
-        spo = &(orig->surface.data.planar);
-        spc = &(copy->surface.data.planar);
-        spc->grad = spo->grad;
-        spc->relief = spo->relief;
-        spc->bevel = spo->bevel;
-        if (spo->primary != NULL)
-            spc->primary = color_new(spo->primary->r,
-                                     spo->primary->g, 
-                                     spo->primary->b);
-        else spc->primary = NULL;
-
-        if (spo->secondary != NULL)
-            spc->secondary = color_new(spo->secondary->r,
-                                       spo->secondary->g,
-                                       spo->secondary->b);
-        else spc->secondary = NULL;
-
-        if (spo->border_color != NULL)
-            spc->border_color = color_new(spo->border_color->r,
-                                          spo->border_color->g,
-                                          spo->border_color->b);
-        else spc->border_color = NULL;
-
-        spc->interlaced = spo->interlaced;
-        spc->border = spo->border;
-        spc->pixel_data = NULL;
-    break;
-    }
+    RrSurface *spo, *spc;
+    RrAppearance *copy = g_new(RrAppearance, 1);
+
+    copy->inst = orig->inst;
+
+    spo = &(orig->surface);
+    spc = &(copy->surface);
+    spc->grad = spo->grad;
+    spc->relief = spo->relief;
+    spc->bevel = spo->bevel;
+    if (spo->primary != NULL)
+        spc->primary = RrColorNew(copy->inst,
+                                  spo->primary->r,
+                                  spo->primary->g, 
+                                  spo->primary->b);
+    else spc->primary = NULL;
+
+    if (spo->secondary != NULL)
+        spc->secondary = RrColorNew(copy->inst,
+                                    spo->secondary->r,
+                                    spo->secondary->g,
+                                    spo->secondary->b);
+    else spc->secondary = NULL;
+
+    if (spo->border_color != NULL)
+        spc->border_color = RrColorNew(copy->inst,
+                                       spo->border_color->r,
+                                       spo->border_color->g,
+                                       spo->border_color->b);
+    else spc->border_color = NULL;
+
+    if (spo->bevel_dark != NULL)
+        spc->bevel_dark = RrColorNew(copy->inst,
+                                     spo->bevel_dark->r,
+                                     spo->bevel_dark->g,
+                                     spo->bevel_dark->b);
+    else spc->bevel_dark = NULL;
+
+    if (spo->bevel_light != NULL)
+        spc->bevel_light = RrColorNew(copy->inst,
+                                      spo->bevel_light->r,
+                                      spo->bevel_light->g,
+                                      spo->bevel_light->b);
+    else spc->bevel_light = NULL;
+
+    spc->interlaced = spo->interlaced;
+    spc->border = spo->border;
+    spc->pixel_data = NULL;
+
     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(RrTexture));
     copy->pixmap = None;
     copy->xftdraw = NULL;
+    copy->w = copy->h = 0;
     return copy;
 }
 
-void appearance_free(Appearance *a)
+void RrAppearanceFree(RrAppearance *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 (a) {
+        RrSurface *p;
+        if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap);
+        if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
+        if (a->textures)
+            g_free(a->texture);
+        p = &a->surface;
+        RrColorFree(p->primary);
+        RrColorFree(p->secondary);
+        RrColorFree(p->border_color);
+        RrColorFree(p->bevel_dark);
+        RrColorFree(p->bevel_light);
+        g_free(p->pixel_data);
+
+        g_free(a);
+    }
+}
+
+
+static void pixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
+{
+    pixel32 *in, *scratch;
+    Pixmap out;
+    XImage *im = NULL;
+    im = XCreateImage(RrDisplay(l->inst), RrVisual(l->inst), RrDepth(l->inst),
+                      ZPixmap, 0, NULL, w, h, 32, 0);
+    g_assert(im != NULL);
+
+    in = l->surface.pixel_data;
+    out = l->pixmap;
+
+    im->byte_order = render_endian;
+/* this malloc is a complete waste of time on normal 32bpp
+   as reduce_depth just sets im->data = data and returns
+*/
+    scratch = g_new(pixel32, im->width * im->height);
+    im->data = (char*) scratch;
+    reduce_depth(l->inst, in, im);
+    XPutImage(RrDisplay(l->inst), out,
+              DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)),
+              im, 0, 0, x, y, w, h);
+    im->data = NULL;
+    XDestroyImage(im);
+    g_free(scratch);
+}
+
+void RrMinsize(RrAppearance *l, gint *w, gint *h)
+{
+    gint i;
+    gint m;
+    *w = *h = 0;
+
+    for (i = 0; i < l->textures; ++i) {
+        switch (l->texture[i].type) {
+        case RR_TEXTURE_NONE:
+            break;
+        case RR_TEXTURE_MASK:
+            *w = MAX(*w, l->texture[i].data.mask.mask->width);
+            *h = MAX(*h, l->texture[i].data.mask.mask->height);
+            break;
+        case RR_TEXTURE_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 = MAX(*w, m);
+            m = font_height(l->texture[i].data.text.font,
+                            l->texture[i].data.text.shadow,
+                            l->texture[i].data.text.offset);
+            *h += MAX(*h, m);
+            break;
+        case RR_TEXTURE_RGBA:
+            *w += MAX(*w, l->texture[i].data.rgba.width);
+            *h += MAX(*h, l->texture[i].data.rgba.height);
+            break;
+        }
+    }
+
+    if (l->surface.relief != RR_RELIEF_FLAT) {
+        switch (l->surface.bevel) {
+        case RR_BEVEL_1:
+            *w += 2;
+            *h += 2;
+            break;
+        case RR_BEVEL_2:
+            *w += 4;
+            *h += 4;
+            break;
+        }
+    } else if (l->surface.border) {
+        *w += 2;
+        *h += 2;
     }
-    g_free(a);
+
+    if (*w < 1) *w = 1;
+    if (*h < 1) *h = 1;
+}
+
+gboolean RrPixmapToRGBA(const RrInstance *inst,
+                        Pixmap pmap, Pixmap mask,
+                        gint *w, gint *h, pixel32 **data)
+{
+    Window xr;
+    gint xx, xy;
+    guint pw, ph, mw, mh, xb, xd, i, x, y, di;
+    XImage *xi, *xm = NULL;
+
+    if (!XGetGeometry(RrDisplay(inst),
+                      pmap, &xr, &xx, &xy, &pw, &ph, &xb, &xd))
+        return FALSE;
+    if (mask) {
+        if (!XGetGeometry(RrDisplay(inst), mask,
+                          &xr, &xx, &xy, &mw, &mh, &xb, &xd))
+            return FALSE;
+        if (pw != mw || ph != mh || xd != 1)
+            return FALSE;
+    }
+
+    xi = XGetImage(RrDisplay(inst), pmap,
+                   0, 0, pw, ph, 0xffffffff, ZPixmap);
+    if (!xi)
+        return FALSE;
+
+    if (mask) {
+        xm = XGetImage(RrDisplay(inst), mask,
+                       0, 0, mw, mh, 0xffffffff, ZPixmap);
+        if (!xm)
+            return FALSE;
+    }
+
+    *data = g_new(pixel32, pw * ph);
+    increase_depth(inst, *data, xi);
+
+    if (mask) {
+        /* apply transparency from the mask */
+        di = 0;
+        for (i = 0, y = 0; y < ph; ++y) {
+            for (x = 0; x < pw; ++x, ++i) {
+                if (!((((unsigned)xm->data[di + x / 8]) >> (x % 8)) & 0x1))
+                    (*data)[i] &= ~(0xff << default_alpha_offset);
+            }
+            di += xm->bytes_per_line;
+        }
+    }
+
+    *w = pw;
+    *h = ph;
+
+    return TRUE;
 }