#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include <glib.h>
#include "render.h"
#include "gradient.h"
#include "font.h"
#include "color.h"
#include "image.h"
#include "theme.h"
-#include "kernel/openbox.h"
+
+#include <glib.h>
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
-int render_depth;
-XVisualInfo render_visual_info;
-
-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;
-int render_red_mask, render_green_mask, render_blue_mask;
-
-
-void render_startup(void)
-{
- render_depth = DefaultDepth(ob_display, ob_screen);
- render_visual = DefaultVisual(ob_display, ob_screen);
- render_colormap = DefaultColormap(ob_display, ob_screen);
-
- 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)
-{
- 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 */
- render_red_mask = red_mask = timage->red_mask;
- render_green_mask = green_mask = timage->green_mask;
- render_blue_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);
-}
+static void pixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h);
-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 = pseudo_ncolors();
-
- 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 paint(Window win, Appearance *l, int w, int h)
+void RrPaint(RrAppearance *l, Window win, gint w, gint h)
{
int i, transferred = 0, sw;
pixel32 *source, *dest;
if (resized) {
oldp = l->pixmap; /* save to free after changing the visible pixmap */
- l->pixmap = XCreatePixmap(ob_display, ob_root, w, h, render_depth);
+ l->pixmap = XCreatePixmap(RrDisplay(l->inst),
+ RrRootWindow(l->inst),
+ w, h, RrDepth(l->inst));
} else
oldp = None;
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);
g_free(l->surface.pixel_data);
l->surface.pixel_data = g_new(pixel32, w * h);
- if (l->surface.grad == Background_ParentRelative) {
+ if (l->surface.grad == RR_SURFACE_PARENTREL) {
g_assert (l->surface.parent);
g_assert (l->surface.parent->w);
for (i = 0; i < h; i++, source += sw, dest += w) {
memcpy(dest, source, w * sizeof(pixel32));
}
- }
- else if (l->surface.grad == Background_Solid)
+ } else if (l->surface.grad == RR_SURFACE_SOLID)
gradient_solid(l, 0, 0, w, h);
- else gradient_render(&l->surface, w, h);
+ else
+ gradient_render(&l->surface, w, h);
RECT_SET(tarea, 0, 0, w, h);
- if (l->surface.grad != Background_ParentRelative) {
- if (l->surface.relief != Flat) {
+ if (l->surface.grad != RR_SURFACE_PARENTREL) {
+ if (l->surface.relief != RR_RELIEF_FLAT) {
switch (l->surface.bevel) {
- case Bevel1:
+ case RR_BEVEL_1:
tarea.x += 1; tarea.y += 1;
tarea.width -= 2; tarea.height -= 2;
break;
- case Bevel2:
+ case RR_BEVEL_2:
tarea.x += 2; tarea.y += 2;
tarea.width -= 4; tarea.height -= 4;
break;
for (i = 0; i < l->textures; i++) {
switch (l->texture[i].type) {
- case NoTexture:
+ case RR_TEXTURE_NONE:
break;
- case Text:
+ case RR_TEXTURE_TEXT:
if (!transferred) {
transferred = 1;
- if (l->surface.grad != Background_Solid)
- pixel32_to_pixmap(l->surface.pixel_data,
- l->pixmap, 0, 0, w, h);
+ 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 Bitmask:
+ case RR_TEXTURE_MASK:
if (!transferred) {
transferred = 1;
- if (l->surface.grad != Background_Solid)
- pixel32_to_pixmap(l->surface.pixel_data,
- l->pixmap, 0, 0, w, h);
+ if (l->surface.grad != RR_SURFACE_SOLID)
+ pixel32_to_pixmap(l, 0, 0, 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, &tarea);
+ RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea);
break;
- case RGBA:
+ case RR_TEXTURE_RGBA:
image_draw(l->surface.pixel_data,
&l->texture[i].data.rgba, &tarea);
break;
if (!transferred) {
transferred = 1;
- if (l->surface.grad != Background_Solid)
- pixel32_to_pixmap(l->surface.pixel_data, l->pixmap, 0, 0, w, h);
+ 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);
- if (oldp) XFreePixmap(ob_display, oldp);
+ XSetWindowBackgroundPixmap(RrDisplay(l->inst), win, l->pixmap);
+ XClearWindow(RrDisplay(l->inst), win);
+ if (oldp) XFreePixmap(RrDisplay(l->inst), oldp);
}
-void render_shutdown(void)
+RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
{
-}
+ RrAppearance *out;
-Appearance *appearance_new(int numtex)
-{
- Surface *p;
- Appearance *out;
-
- out = g_new(Appearance, 1);
+ out = g_new0(RrAppearance, 1);
+ out->inst = inst;
out->textures = numtex;
- out->xftdraw = NULL;
- if (numtex) out->texture = g_new0(Texture, numtex);
- else out->texture = NULL;
- out->pixmap = None;
- out->w = out->h = 0;
-
- p = &out->surface;
- p->primary = NULL;
- p->secondary = NULL;
- p->border_color = NULL;
- p->bevel_dark = NULL;
- p->bevel_light = NULL;
- p->pixel_data = NULL;
+ if (numtex) out->texture = g_new0(RrTexture, numtex);
+
return out;
}
-Appearance *appearance_copy(Appearance *orig)
+RrAppearance *RrAppearanceCopy(RrAppearance *orig)
{
- Surface *spo, *spc;
- Appearance *copy = g_new(Appearance, 1);
+ RrSurface *spo, *spc;
+ RrAppearance *copy = g_new(RrAppearance, 1);
+
+ copy->inst = orig->inst;
spo = &(orig->surface);
spc = &(copy->surface);
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);
+ spc->primary = RrColorNew(copy->inst,
+ 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);
+ 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 = color_new(spo->border_color->r,
- spo->border_color->g,
- spo->border_color->b);
+ 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 = color_new(spo->bevel_dark->r,
- spo->bevel_dark->g,
- spo->bevel_dark->b);
+ 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 = color_new(spo->bevel_light->r,
- spo->bevel_light->g,
- spo->bevel_light->b);
+ 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->pixel_data = NULL;
copy->textures = orig->textures;
- copy->texture = g_memdup(orig->texture, orig->textures * sizeof(Texture));
+ 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)
{
if (a) {
- Surface *p;
- if (a->pixmap != None) XFreePixmap(ob_display, a->pixmap);
+ 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;
- color_free(p->primary);
- color_free(p->secondary);
- color_free(p->border_color);
- color_free(p->bevel_dark);
- color_free(p->bevel_light);
+ 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);
}
-void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h)
+static void pixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
{
- pixel32 *scratch;
+ pixel32 *in, *scratch;
+ Pixmap out;
XImage *im = NULL;
- im = XCreateImage(ob_display, render_visual, render_depth,
+ 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(in, im);
- XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen),
+ 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 appearance_minsize(Appearance *l, int *w, int *h)
+void RrMinsize(RrAppearance *l, gint *w, gint *h)
{
- int i;
- int m;
+ gint i;
+ gint m;
*w = *h = 0;
for (i = 0; i < l->textures; ++i) {
switch (l->texture[i].type) {
- case Bitmask:
- *w = MAX(*w, l->texture[i].data.mask.mask->w);
- *h = MAX(*h, l->texture[i].data.mask.mask->h);
+ 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 Text:
+ 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);
*h += MAX(*h, m);
break;
- case RGBA:
+ case RR_TEXTURE_RGBA:
*w += MAX(*w, l->texture[i].data.rgba.width);
*h += MAX(*h, l->texture[i].data.rgba.height);
break;
- case NoTexture:
- break;
}
}
- if (l->surface.relief != Flat) {
+ if (l->surface.relief != RR_RELIEF_FLAT) {
switch (l->surface.bevel) {
- case Bevel1:
+ case RR_BEVEL_1:
*w += 2;
*h += 2;
break;
- case Bevel2:
+ case RR_BEVEL_2:
*w += 4;
*h += 4;
break;
if (*h < 1) *h = 1;
}
-gboolean render_pixmap_to_rgba(Pixmap pmap, Pixmap mask,
- int *w, int *h, pixel32 **data)
+gboolean RrPixmapToRGBA(const RrInstance *inst,
+ Pixmap pmap, Pixmap mask,
+ gint *w, gint *h, pixel32 **data)
{
Window xr;
- int xx, xy;
+ gint xx, xy;
guint pw, ph, mw, mh, xb, xd, i, x, y, di;
XImage *xi, *xm = NULL;
- if (!XGetGeometry(ob_display, pmap, &xr, &xx, &xy, &pw, &ph, &xb, &xd))
+ if (!XGetGeometry(RrDisplay(inst),
+ pmap, &xr, &xx, &xy, &pw, &ph, &xb, &xd))
return FALSE;
if (mask) {
- if (!XGetGeometry(ob_display, mask, &xr, &xx, &xy, &mw, &mh, &xb, &xd))
+ 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(ob_display, pmap, 0, 0, pw, ph, 0xffffffff, ZPixmap);
+ xi = XGetImage(RrDisplay(inst), pmap,
+ 0, 0, pw, ph, 0xffffffff, ZPixmap);
if (!xi)
return FALSE;
if (mask) {
- xm = XGetImage(ob_display, mask, 0, 0, mw, mh, 0xffffffff, ZPixmap);
+ xm = XGetImage(RrDisplay(inst), mask,
+ 0, 0, mw, mh, 0xffffffff, ZPixmap);
if (!xm)
return FALSE;
}
*data = g_new(pixel32, pw * ph);
- increase_depth(*data, xi);
+ increase_depth(inst, *data, xi);
if (mask) {
/* apply transparency from the mask */
projects / chaz / openbox / blobdiff