From a18c1697b1176c26e74267f2ac7a153a2cf2c442 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 18 May 2003 23:06:11 +0000 Subject: make icons use pixel32 data, and image_draw takes pixel32 data. client.c gets pixmap icons as a backup to netwm ones, and they are converted into pixel32 data. --- render/image.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'render/image.c') diff --git a/render/image.c b/render/image.c index 7b58712b..feb25970 100644 --- a/render/image.c +++ b/render/image.c @@ -5,7 +5,7 @@ void image_draw(pixel32 *target, TextureRGBA *rgba, Rect *position, Rect *surarea) { - gulong *draw = rgba->data; + pixel32 *draw = rgba->data; guint c, i, e, t, sfw, sfh; sfw = position->width; sfh = position->height; @@ -50,10 +50,10 @@ void image_draw(pixel32 *target, TextureRGBA *rgba, Rect *position, for (i = 0, c = 0, t = position->x, e = sfw*sfh; i < e; ++i, ++t) { guchar alpha, r, g, b, bgr, bgg, bgb; - alpha = draw[i] >> 24; - r = draw[i] >> 16; - g = draw[i] >> 8; - b = draw[i]; + alpha = draw[i] >> default_alpha_offset; + r = draw[i] >> default_red_offset; + g = draw[i] >> default_green_offset; + b = draw[i] >> default_blue_offset; if (c >= sfw) { c = 0; -- cgit v1.2.3