ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC vs.
Revision 1.221 by sf-exg, Fri May 25 09:27:35 2012 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010-2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 13 * (at your option) any later version.
… …
58# endif 58# endif
59 59
60void 60void
61rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
62{ 62{
63#ifdef HAVE_PIXBUF 63# ifdef BG_IMAGE_FROM_FILE
64 if (pixbuf) 64 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
65 g_object_unref (pixbuf); 65 bg_image->destroy ();
66#endif 66# endif
67 67
68 if (bg_pixmap) 68 if (bg_pixmap)
69 XFreePixmap (dpy, bg_pixmap); 69 XFreePixmap (dpy, bg_pixmap);
70} 70}
71 71
… …
90 if (bg_flags & BG_IS_TRANSPARENT) 90 if (bg_flags & BG_IS_TRANSPARENT)
91 return true; 91 return true;
92# endif 92# endif
93 93
94# ifdef BG_IMAGE_FROM_FILE 94# ifdef BG_IMAGE_FROM_FILE
95 if (bg_flags & BG_IS_FROM_FILE) 95 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
96 { 96 {
97 if (bg_flags & BG_IS_SIZE_SENSITIVE) 97 if ((bg_image->flags & IM_IS_SIZE_SENSITIVE)
98 || bg_image->width () > szHint.width
99 || bg_image->height () > szHint.height)
98 return true; 100 return true;
99 } 101 }
100# endif 102# endif
101 103
102 return false; 104 return false;
… …
109 if (bg_flags & BG_IS_TRANSPARENT) 111 if (bg_flags & BG_IS_TRANSPARENT)
110 return true; 112 return true;
111# endif 113# endif
112 114
113# ifdef BG_IMAGE_FROM_FILE 115# ifdef BG_IMAGE_FROM_FILE
114 if (bg_flags & BG_IS_FROM_FILE) 116 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
115 { 117 {
116 if (bg_flags & BG_ROOT_ALIGN) 118 if (bg_image->flags & IM_ROOT_ALIGN)
117 return true; 119 return true;
118 } 120 }
119# endif 121# endif
120 122
121 return false; 123 return false;
… …
123 125
124# ifdef BG_IMAGE_FROM_FILE 126# ifdef BG_IMAGE_FROM_FILE
125static inline int 127static inline int
126make_align_position (int align, int window_size, int image_size) 128make_align_position (int align, int window_size, int image_size)
127{ 129{
128 int diff = window_size - image_size;
129 int smaller = min (image_size, window_size);
130
131 if (align >= 0 && align <= 100) 130 if (align >= 0 && align <= 100)
132 return diff * align / 100; 131 return lerp (0, window_size - image_size, align);
133 else if (align > 100) 132 else if (align > 100)
134 return (align - 100) * smaller / 100 + window_size - smaller; 133 return lerp (window_size - image_size, window_size, align - 100);
135 else 134 else
136 return (align + 100) * smaller / 100 - image_size; 135 return lerp (-image_size, 0, align + 100);
137} 136}
138 137
139static inline int 138static inline int
140make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 139make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
141{ 140{
… …
151 150
152 min_it (dst_size, target_size - dst_pos); 151 min_it (dst_size, target_size - dst_pos);
153 return src_pos; 152 return src_pos;
154} 153}
155 154
155static void
156parse_style (const char *style, int &x, int &y, unsigned int &w, unsigned int &h, uint8_t &flags)
157{
158 if (!strcasecmp (style, "tiled"))
159 {
160 flags = IM_TILE;
161 w = h = noScale;
162 x = y = 0;
163 }
164 else if (!strcasecmp (style, "aspect-stretched"))
165 {
166 flags = IM_KEEP_ASPECT;
167 w = h = windowScale;
168 x = y = centerAlign;
169 }
170 else if (!strcasecmp (style, "stretched"))
171 {
172 flags = 0;
173 w = h = windowScale;
174 x = y = centerAlign;
175 }
176 else if (!strcasecmp (style, "centered"))
177 {
178 flags = 0;
179 w = h = noScale;
180 x = y = centerAlign;
181 }
182 else if (!strcasecmp (style, "root-tiled"))
183 {
184 flags = IM_TILE|IM_ROOT_ALIGN;
185 w = h = noScale;
186 x = y = 0;
187 }
188}
189
156bool 190bool
157rxvt_term::bg_set_geometry (const char *geom, bool update) 191rxvt_image::set_geometry (const char *geom, bool update)
158{ 192{
159 bool changed = false; 193 bool changed = false;
160 int geom_flags = 0; 194 int geom_flags = 0;
161 int x = h_align; 195 int x = h_align;
162 int y = v_align; 196 int y = v_align;
163 unsigned int w = h_scale; 197 unsigned int w = h_scale;
164 unsigned int h = v_scale; 198 unsigned int h = v_scale;
165 unsigned long new_flags = 0; 199 uint8_t new_flags = 0;
166 200
167 if (geom == NULL) 201 if (geom == NULL)
168 return false; 202 return false;
169 203
170 if (geom[0]) 204 if (geom[0])
171 { 205 {
172 char **arr = rxvt_strsplit (':', geom); 206 char **arr = rxvt_strsplit (':', geom);
173 207
174 for (int i = 0; arr[i]; i++) 208 for (int i = 0; arr[i]; i++)
175 { 209 {
176 if (!strcasecmp (arr[i], "style=tiled")) 210 if (!strncasecmp (arr[i], "style=", 6))
177 { 211 {
178 new_flags = BG_TILE; 212 parse_style (arr[i] + 6, x, y, w, h, new_flags);
179 w = h = noScale;
180 x = y = 0;
181 geom_flags = WidthValue|HeightValue|XValue|YValue; 213 geom_flags = WidthValue|HeightValue|XValue|YValue;
182 } 214 }
183 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
184 {
185 new_flags = BG_KEEP_ASPECT;
186 w = h = windowScale;
187 x = y = centerAlign;
188 geom_flags = WidthValue|HeightValue|XValue|YValue;
189 }
190 else if (!strcasecmp (arr[i], "style=stretched"))
191 {
192 new_flags = 0;
193 w = h = windowScale;
194 geom_flags = WidthValue|HeightValue;
195 }
196 else if (!strcasecmp (arr[i], "style=centered"))
197 {
198 new_flags = 0;
199 w = h = noScale;
200 x = y = centerAlign;
201 geom_flags = WidthValue|HeightValue|XValue|YValue;
202 }
203 else if (!strcasecmp (arr[i], "style=root-tiled"))
204 {
205 new_flags = BG_TILE|BG_ROOT_ALIGN;
206 w = h = noScale;
207 geom_flags = WidthValue|HeightValue;
208 }
209 else if (!strcasecmp (arr[i], "op=tile")) 215 else if (!strcasecmp (arr[i], "op=tile"))
210 new_flags |= BG_TILE; 216 new_flags |= IM_TILE;
211 else if (!strcasecmp (arr[i], "op=keep-aspect")) 217 else if (!strcasecmp (arr[i], "op=keep-aspect"))
212 new_flags |= BG_KEEP_ASPECT; 218 new_flags |= IM_KEEP_ASPECT;
213 else if (!strcasecmp (arr[i], "op=root-align")) 219 else if (!strcasecmp (arr[i], "op=root-align"))
214 new_flags |= BG_ROOT_ALIGN; 220 new_flags |= IM_ROOT_ALIGN;
215 221
216 // deprecated 222 // deprecated
217 else if (!strcasecmp (arr[i], "tile")) 223 else if (!strcasecmp (arr[i], "tile"))
218 { 224 {
219 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
220 w = h = noScale; 226 w = h = noScale;
221 geom_flags |= WidthValue|HeightValue; 227 geom_flags |= WidthValue|HeightValue;
222 } 228 }
223 else if (!strcasecmp (arr[i], "propscale")) 229 else if (!strcasecmp (arr[i], "propscale"))
224 { 230 {
225 new_flags |= BG_KEEP_ASPECT; 231 new_flags |= IM_KEEP_ASPECT;
226 w = h = windowScale; 232 w = h = windowScale;
227 geom_flags |= WidthValue|HeightValue; 233 geom_flags |= WidthValue|HeightValue;
228 } 234 }
229 else if (!strcasecmp (arr[i], "hscale")) 235 else if (!strcasecmp (arr[i], "hscale"))
230 { 236 {
231 new_flags |= BG_TILE; 237 new_flags |= IM_TILE;
232 w = windowScale; 238 w = windowScale;
233 h = noScale; 239 h = noScale;
234 geom_flags |= WidthValue|HeightValue; 240 geom_flags |= WidthValue|HeightValue;
235 } 241 }
236 else if (!strcasecmp (arr[i], "vscale")) 242 else if (!strcasecmp (arr[i], "vscale"))
237 { 243 {
238 new_flags |= BG_TILE; 244 new_flags |= IM_TILE;
239 h = windowScale; 245 h = windowScale;
240 w = noScale; 246 w = noScale;
241 geom_flags |= WidthValue|HeightValue; 247 geom_flags |= WidthValue|HeightValue;
242 } 248 }
243 else if (!strcasecmp (arr[i], "scale")) 249 else if (!strcasecmp (arr[i], "scale"))
… …
251 x = y = centerAlign; 257 x = y = centerAlign;
252 geom_flags |= WidthValue|HeightValue|XValue|YValue; 258 geom_flags |= WidthValue|HeightValue|XValue|YValue;
253 } 259 }
254 else if (!strcasecmp (arr[i], "root")) 260 else if (!strcasecmp (arr[i], "root"))
255 { 261 {
256 new_flags |= BG_TILE|BG_ROOT_ALIGN; 262 new_flags |= IM_TILE|IM_ROOT_ALIGN;
257 w = h = noScale; 263 w = h = noScale;
258 geom_flags |= WidthValue|HeightValue; 264 geom_flags |= WidthValue|HeightValue;
259 } 265 }
260 266
261 else 267 else
… …
263 } /* done parsing ops */ 269 } /* done parsing ops */
264 270
265 rxvt_free_strsplit (arr); 271 rxvt_free_strsplit (arr);
266 } 272 }
267 273
268 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 274 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
269 275
270 if (!update) 276 if (!update)
271 { 277 {
272 if (!(geom_flags & XValue)) 278 if (!(geom_flags & XValue))
273 x = y = defaultAlign; 279 x = y = defaultAlign;
… …
280 h = w; 286 h = w;
281 else if (!(geom_flags & WidthValue)) 287 else if (!(geom_flags & WidthValue))
282 w = h; 288 w = h;
283 } 289 }
284 290
285 min_it (w, 1000);
286 min_it (h, 1000);
287 clamp_it (x, -100, 200); 291 clamp_it (x, -100, 200);
288 clamp_it (y, -100, 200); 292 clamp_it (y, -100, 200);
289 293
290 if (bg_flags != new_flags 294 if (flags != new_flags
291 || h_scale != w 295 || h_scale != w
292 || v_scale != h 296 || v_scale != h
293 || h_align != x 297 || h_align != x
294 || v_align != y) 298 || v_align != y)
295 { 299 {
296 bg_flags = new_flags; 300 flags = new_flags;
297 h_scale = w; 301 h_scale = w;
298 v_scale = h; 302 v_scale = h;
299 h_align = x; 303 h_align = x;
300 v_align = y; 304 v_align = y;
301 changed = true; 305 changed = true;
302 } 306 }
303 307
308 if (!(flags & IM_TILE)
309 || h_scale || v_scale
310 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
311 flags |= IM_IS_SIZE_SENSITIVE;
312 else
313 flags &= ~IM_IS_SIZE_SENSITIVE;
314
304 return changed; 315 return changed;
305} 316}
306 317
307void 318void
308rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
309{ 320{
321 int image_width = image.width ();
322 int image_height = image.height ();
310 int target_width = szHint.width; 323 int target_width = szHint.width;
311 int target_height = szHint.height; 324 int target_height = szHint.height;
325 int h_scale = min (image.h_scale, 32767 * 100 / target_width);
326 int v_scale = min (image.v_scale, 32767 * 100 / target_height);
312 327
313 w = h_scale * target_width / 100; 328 w = h_scale * target_width / 100;
314 h = v_scale * target_height / 100; 329 h = v_scale * target_height / 100;
315 330
316 if (bg_flags & BG_KEEP_ASPECT) 331 if (image.flags & IM_KEEP_ASPECT)
317 { 332 {
318 float scale = (float)w / image_width; 333 float scale = (float)w / image_width;
319 min_it (scale, (float)h / image_height); 334 min_it (scale, (float)h / image_height);
320 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
321 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
322 } 337 }
323 338
324 if (!w) w = image_width; 339 if (!w) w = image_width;
325 if (!h) h = image_height; 340 if (!h) h = image_height;
326 341
327 if (bg_flags & BG_ROOT_ALIGN) 342 if (image.flags & IM_ROOT_ALIGN)
328 { 343 {
329 x = -target_x; 344 x = -target_x;
330 y = -target_y; 345 y = -target_y;
331 } 346 }
332 else 347 else
333 { 348 {
334 x = make_align_position (h_align, target_width, w); 349 x = make_align_position (image.h_align, target_width, w);
335 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (image.v_align, target_height, h);
336 } 351 }
337
338 if (!(bg_flags & BG_TILE)
339 || h_scale || v_scale
340 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
341 || image_width > target_width || image_height > target_height)
342 bg_flags |= BG_IS_SIZE_SENSITIVE;
343 else
344 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
345} 352}
346 353
347# ifdef HAVE_PIXBUF 354# ifdef HAVE_PIXBUF
348bool 355bool
349rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 356rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
350 int src_x, int src_y, int dst_x, int dst_y, 357 int src_x, int src_y, int dst_x, int dst_y,
351 unsigned int width, unsigned int height) 358 unsigned int width, unsigned int height, bool argb)
352{ 359{
353 XImage *ximage; 360 XImage *ximage;
354 char *data, *line; 361 char *line;
355 int bytes_per_pixel;
356 int width_r, width_g, width_b; 362 int width_r, width_g, width_b, width_a;
357 int sh_r, sh_g, sh_b; 363 int sh_r, sh_g, sh_b, sh_a;
364 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
358 int rowstride; 365 int rowstride;
359 int channels; 366 int channels;
360 unsigned char *row; 367 unsigned char *row;
361 368
362 if (visual->c_class != TrueColor) 369 if (visual->c_class != TrueColor)
363 return false; 370 return false;
364 371
365 if (depth == 24 || depth == 32) 372 if (argb)
366 bytes_per_pixel = 4; 373 {
367 else if (depth == 15 || depth == 16) 374 red_mask = 0xff << 16;
368 bytes_per_pixel = 2; 375 green_mask = 0xff << 8;
376 blue_mask = 0xff;
377 alpha_mask = 0xff << 24;
378 }
369 else 379 else
380 {
381 red_mask = visual->red_mask;
382 green_mask = visual->green_mask;
383 blue_mask = visual->blue_mask;
384#if XRENDER
385 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
386 if (format)
387 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
388 else
389#endif
390 alpha_mask = 0;
391 }
392
393 width_r = ecb_popcount32 (red_mask);
394 width_g = ecb_popcount32 (green_mask);
395 width_b = ecb_popcount32 (blue_mask);
396 width_a = ecb_popcount32 (alpha_mask);
397
398 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
370 return false; 399 return false;
371 400
372 width_r = ecb_popcount32 (visual->red_mask); 401 sh_r = ecb_ctz32 (red_mask);
373 width_g = ecb_popcount32 (visual->green_mask); 402 sh_g = ecb_ctz32 (green_mask);
374 width_b = ecb_popcount32 (visual->blue_mask); 403 sh_b = ecb_ctz32 (blue_mask);
404 sh_a = ecb_ctz32 (alpha_mask);
375 405
376 if (width_r > 8 || width_g > 8 || width_b > 8) 406 if (width > 32767 || height > 32767)
377 return false; 407 return false;
378 408
379 sh_r = ecb_ctz32 (visual->red_mask); 409 ximage = XCreateImage (dpy, visual, argb ? 32 : depth, ZPixmap, 0, 0,
380 sh_g = ecb_ctz32 (visual->green_mask); 410 width, height, 32, 0);
381 sh_b = ecb_ctz32 (visual->blue_mask); 411 if (!ximage)
382
383 if (width > INT_MAX / height / bytes_per_pixel)
384 return false; 412 return false;
385 413
386 data = (char *)malloc (width * height * bytes_per_pixel); 414 if (height > INT_MAX / ximage->bytes_per_line
387 if (!data) 415 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
388 return false;
389
390 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
391 width, height, bytes_per_pixel * 8, 0);
392 if (!ximage)
393 { 416 {
394 free (data); 417 XDestroyImage (ximage);
395 return false; 418 return false;
396 } 419 }
397 420
398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 421 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
399 422
400 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 423 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
401 channels = gdk_pixbuf_get_n_channels (pixbuf); 424 channels = gdk_pixbuf_get_n_channels (pixbuf);
402 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 425 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
403 line = data; 426 line = ximage->data;
427
428 rgba c (0, 0, 0);
429
430 if (channels == 4 && alpha_mask == 0)
431 {
432 pix_colors[Color_bg].get (c);
433 c.r >>= 8;
434 c.g >>= 8;
435 c.b >>= 8;
436 }
404 437
405 for (int y = 0; y < height; y++) 438 for (int y = 0; y < height; y++)
406 { 439 {
407 for (int x = 0; x < width; x++) 440 for (int x = 0; x < width; x++)
408 { 441 {
409 unsigned char *pixel = row + x * channels; 442 unsigned char *pixel = row + x * channels;
410 uint32_t value; 443 uint32_t value;
444 unsigned char r, g, b, a;
411 445
446 if (channels == 4)
447 {
448 a = pixel[3];
449 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
450 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
451 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
452 }
453 else
454 {
455 a = 0xff;
456 r = pixel[0];
457 g = pixel[1];
458 b = pixel[2];
459 }
460
412 value = ((pixel[0] >> (8 - width_r)) << sh_r) 461 value = ((r >> (8 - width_r)) << sh_r)
413 | ((pixel[1] >> (8 - width_g)) << sh_g) 462 | ((g >> (8 - width_g)) << sh_g)
414 | ((pixel[2] >> (8 - width_b)) << sh_b); 463 | ((b >> (8 - width_b)) << sh_b)
464 | ((a >> (8 - width_a)) << sh_a);
415 465
416 if (bytes_per_pixel == 4) 466 if (ximage->bits_per_pixel == 32)
417 ((uint32_t *)line)[x] = value; 467 ((uint32_t *)line)[x] = value;
418 else 468 else
419 ((uint16_t *)line)[x] = value; 469 XPutPixel (ximage, x, y, value);
420 } 470 }
421 471
422 row += rowstride; 472 row += rowstride;
423 line += ximage->bytes_per_line; 473 line += ximage->bytes_per_line;
424 } 474 }
… …
427 XDestroyImage (ximage); 477 XDestroyImage (ximage);
428 return true; 478 return true;
429} 479}
430 480
431bool 481bool
432rxvt_term::render_image (bool transparent) 482rxvt_term::render_image (rxvt_image &image)
433{ 483{
484 GdkPixbuf *pixbuf = image.pixbuf;
434 if (!pixbuf) 485 if (!pixbuf)
435 return false; 486 return false;
436 487
437 if (transparent 488 bool need_blend = bg_flags & BG_IS_VALID;
489
490 if (need_blend
438 && !(bg_flags & BG_HAS_RENDER)) 491 && !(bg_flags & BG_HAS_RENDER))
439 return false; 492 return false;
440 493
441 GdkPixbuf *result; 494 GdkPixbuf *result;
442 495
… …
451 int x = 0; 504 int x = 0;
452 int y = 0; 505 int y = 0;
453 int w = 0; 506 int w = 0;
454 int h = 0; 507 int h = 0;
455 508
456 get_image_geometry (image_width, image_height, w, h, x, y); 509 get_image_geometry (image, w, h, x, y);
457 510
458 if (!(bg_flags & BG_ROOT_ALIGN) 511 if (!(image.flags & IM_ROOT_ALIGN)
459 && (x >= target_width 512 && (x >= target_width
460 || y >= target_height 513 || y >= target_height
461 || x + w <= 0 514 || x + w <= 0
462 || y + h <= 0)) 515 || y + h <= 0))
463 return false; 516 return false;
… …
477 530
478 bool ret = false; 531 bool ret = false;
479 532
480 XGCValues gcv; 533 XGCValues gcv;
481 GC gc; 534 GC gc;
482 Pixmap root_pmap; 535 Pixmap tmp_pixmap;
483 536
484 image_width = gdk_pixbuf_get_width (result); 537 image_width = gdk_pixbuf_get_width (result);
485 image_height = gdk_pixbuf_get_height (result); 538 image_height = gdk_pixbuf_get_height (result);
486 539
487 if (transparent) 540 if (need_blend)
488 { 541 tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
489 root_pmap = bg_pixmap;
490 bg_pixmap = None;
491 }
492 else 542 else
493 { 543 {
544 // optimise bg pixmap size when tiling, but only if there are no
545 // other pixbufs to render. Otherwise, the bg pixmap size must
546 // be equal to the window size.
494 if (bg_flags & BG_TILE) 547 if ((image.flags & IM_TILE)
548 && image_vec.size () == 1)
495 { 549 {
496 new_pmap_width = min (image_width, target_width); 550 new_pmap_width = min (image_width, target_width);
497 new_pmap_height = min (image_height, target_height); 551 new_pmap_height = min (image_height, target_height);
498 } 552 }
499 }
500 553
501 if (bg_pixmap == None 554 if (bg_pixmap == None
502 || bg_pmap_width != new_pmap_width 555 || bg_pmap_width != new_pmap_width
503 || bg_pmap_height != new_pmap_height) 556 || bg_pmap_height != new_pmap_height)
504 { 557 {
505 if (bg_pixmap) 558 if (bg_pixmap)
506 XFreePixmap (dpy, bg_pixmap); 559 XFreePixmap (dpy, bg_pixmap);
507 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 560 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
508 bg_pmap_width = new_pmap_width; 561 bg_pmap_width = new_pmap_width;
509 bg_pmap_height = new_pmap_height; 562 bg_pmap_height = new_pmap_height;
563 }
564
565 tmp_pixmap = bg_pixmap;
510 } 566 }
511 567
512 gcv.foreground = pix_colors[Color_bg]; 568 gcv.foreground = pix_colors[Color_bg];
513 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 569 gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
514 570
515 if (gc) 571 if (gc)
516 { 572 {
517 if (bg_flags & BG_TILE) 573 if (image.flags & IM_TILE)
518 { 574 {
519 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 575 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
520 pixbuf_to_pixmap (result, tile, gc, 576 pixbuf_to_pixmap (result, tile, gc,
521 0, 0, 577 0, 0,
522 0, 0, 578 0, 0,
523 image_width, image_height); 579 image_width, image_height, need_blend);
524 580
525 gcv.tile = tile; 581 gcv.tile = tile;
526 gcv.fill_style = FillTiled; 582 gcv.fill_style = FillTiled;
527 gcv.ts_x_origin = x; 583 gcv.ts_x_origin = x;
528 gcv.ts_y_origin = y; 584 gcv.ts_y_origin = y;
529 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 585 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
530 586
531 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 587 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
532 XFreePixmap (dpy, tile); 588 XFreePixmap (dpy, tile);
533 } 589 }
534 else 590 else
535 { 591 {
536 int src_x, src_y, dst_x, dst_y; 592 int src_x, src_y, dst_x, dst_y;
… …
540 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 596 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
541 597
542 if (dst_x > 0 || dst_y > 0 598 if (dst_x > 0 || dst_y > 0
543 || dst_x + dst_width < new_pmap_width 599 || dst_x + dst_width < new_pmap_width
544 || dst_y + dst_height < new_pmap_height) 600 || dst_y + dst_height < new_pmap_height)
545 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 601 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
546 602
547 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 603 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
548 pixbuf_to_pixmap (result, bg_pixmap, gc, 604 pixbuf_to_pixmap (result, tmp_pixmap, gc,
549 src_x, src_y, 605 src_x, src_y,
550 dst_x, dst_y, 606 dst_x, dst_y,
551 dst_width, dst_height); 607 dst_width, dst_height, need_blend);
552 } 608 }
553 609
554#if XRENDER 610#if XRENDER
555 if (transparent) 611 if (need_blend)
556 { 612 {
613 XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
557 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 614 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
558 615
559 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 616 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0);
560 617
561 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0); 618 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
562 619
563 Picture mask = create_xrender_mask (dpy, vt, False, False); 620 Picture mask = create_xrender_mask (dpy, vt, False, False);
564 621
565 XRenderColor mask_c; 622 XRenderColor mask_c;
566 623
567 mask_c.alpha = 0x8000; 624 mask_c.alpha = gdk_pixbuf_get_has_alpha (image.pixbuf) ? 0xffff : image.alpha;
568 mask_c.red = 625 mask_c.red =
569 mask_c.green = 626 mask_c.green =
570 mask_c.blue = 0; 627 mask_c.blue = 0;
571 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 628 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
572 629
… …
584 } 641 }
585 642
586 if (result != pixbuf) 643 if (result != pixbuf)
587 g_object_unref (result); 644 g_object_unref (result);
588 645
589 if (transparent) 646 if (need_blend)
590 XFreePixmap (dpy, root_pmap); 647 XFreePixmap (dpy, tmp_pixmap);
591 648
592 return ret; 649 return ret;
593} 650}
594# endif /* HAVE_PIXBUF */ 651# endif /* HAVE_PIXBUF */
595 652
653# ifndef NO_RESOURCES
654static int
655rxvt_define_image (XrmDatabase *database ecb_unused,
656 XrmBindingList bindings ecb_unused,
657 XrmQuarkList quarks,
658 XrmRepresentation *type ecb_unused,
659 XrmValue *value,
660 XPointer closure ecb_unused)
661{
662 int size;
663
664 for (size = 0; quarks[size] != NULLQUARK; size++)
665 ;
666
667 if (size >= 2)
668 {
669 int id = strtol (XrmQuarkToString (quarks[size-2]), 0, 0);
670 if (id >= 1)
671 GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
672 }
673 return False;
674}
675
676void
677rxvt_term::parse_image (int id, const char *type, const char *arg)
678{
679 rxvt_image *image;
680
681 for (image = image_vec.begin (); image < image_vec.end (); image++)
682 if (image->id == id)
683 break;
684
685 if (image == image_vec.end ())
686 {
687 image = new_image ();
688 image->id = id;
689 }
690}
691# endif
692
693rxvt_image::rxvt_image ()
694{
695 id =
696 alpha =
697 flags =
698 h_scale =
699 v_scale =
700 h_align =
701 v_align = 0;
702
703# ifdef HAVE_PIXBUF
704 pixbuf = 0;
705# endif
706}
707
596bool 708bool
597rxvt_term::bg_set_file (const char *file) 709rxvt_image::set_file_geometry (const char *file)
598{ 710{
599 if (!file || !*file) 711 if (!file || !*file)
600 return false; 712 return false;
601 713
602 bool ret = false;
603 const char *p = strchr (file, ';'); 714 const char *p = strchr (file, ';');
604 715
605 if (p) 716 if (p)
606 { 717 {
607 size_t len = p - file; 718 size_t len = p - file;
… …
609 memcpy (f, file, len); 720 memcpy (f, file, len);
610 f[len] = '\0'; 721 f[len] = '\0';
611 file = f; 722 file = f;
612 } 723 }
613 724
725 bool ret = set_file (file);
726 alpha = 0x8000;
727 if (ret && p)
728 set_geometry (p + 1);
729 return ret;
730}
731
732bool
733rxvt_image::set_file (const char *file)
734{
735 bool ret = false;
736
614# ifdef HAVE_PIXBUF 737# ifdef HAVE_PIXBUF
615 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 738 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
616 if (image) 739 if (image)
617 { 740 {
618 if (pixbuf) 741 if (pixbuf)
619 g_object_unref (pixbuf); 742 g_object_unref (pixbuf);
620 pixbuf = image; 743 pixbuf = image;
621 bg_flags |= BG_IS_FROM_FILE;
622 ret = true; 744 ret = true;
623 } 745 }
624# endif 746# endif
625 747
626 if (ret) 748 if (ret)
627 { 749 {
628 if (p) 750 alpha = 0xffff;
629 bg_set_geometry (p + 1); 751 flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE;
630 else 752 h_scale = v_scale = defaultScale;
631 bg_set_default_geometry (); 753 h_align = v_align = defaultAlign;
632 } 754 }
633 755
634 return ret; 756 return ret;
635} 757}
636 758
637# endif /* BG_IMAGE_FROM_FILE */ 759# endif /* BG_IMAGE_FROM_FILE */
638 760
639# ifdef ENABLE_TRANSPARENCY 761# ifdef ENABLE_TRANSPARENCY
640bool
641rxvt_term::bg_set_transparent ()
642{
643 if (!(bg_flags & BG_IS_TRANSPARENT))
644 {
645 bg_flags |= BG_IS_TRANSPARENT;
646 return true;
647 }
648
649 return false;
650}
651
652bool 762bool
653rxvt_term::bg_set_blur (const char *geom) 763rxvt_term::bg_set_blur (const char *geom)
654{ 764{
655 bool changed = false; 765 bool changed = false;
656 unsigned int hr, vr; 766 unsigned int hr, vr;
… …
675 { 785 {
676 changed = true; 786 changed = true;
677 v_blurRadius = vr; 787 v_blurRadius = vr;
678 } 788 }
679 789
680 if (h_blurRadius && v_blurRadius)
681 bg_flags |= BG_NEEDS_BLUR;
682 else
683 bg_flags &= ~BG_NEEDS_BLUR;
684
685 return changed; 790 return changed;
686}
687
688void
689rxvt_term::set_tint_shade_flags ()
690{
691 if (shade != 100 || (bg_flags & BG_TINT_SET))
692 bg_flags |= BG_NEEDS_TINT;
693 else
694 bg_flags &= ~BG_NEEDS_TINT;
695} 791}
696 792
697bool 793bool
698rxvt_term::bg_set_tint (rxvt_color &new_tint) 794rxvt_term::bg_set_tint (rxvt_color &new_tint)
699{ 795{
… …
709 && (c.b <= 0x00ff || c.b >= 0xff00)) 805 && (c.b <= 0x00ff || c.b >= 0xff00))
710 bg_flags |= BG_TINT_BITAND; 806 bg_flags |= BG_TINT_BITAND;
711 else 807 else
712 bg_flags &= ~BG_TINT_BITAND; 808 bg_flags &= ~BG_TINT_BITAND;
713 809
714 set_tint_shade_flags ();
715 return true; 810 return true;
716 } 811 }
717 812
718 return false; 813 return false;
719} 814}
… …
728 new_shade = 200 - (100 + new_shade); 823 new_shade = 200 - (100 + new_shade);
729 824
730 if (new_shade != shade) 825 if (new_shade != shade)
731 { 826 {
732 shade = new_shade; 827 shade = new_shade;
733 set_tint_shade_flags ();
734 return true; 828 return true;
735 } 829 }
736 830
737 return false; 831 return false;
738} 832}
… …
759 params[i+2] = XDoubleToFixed (kernel[i] / sum); 853 params[i+2] = XDoubleToFixed (kernel[i] / sum);
760} 854}
761#endif 855#endif
762 856
763bool 857bool
764rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) 858rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
765{ 859{
766 bool ret = false; 860 bool ret = false;
767#if XRENDER 861#if XRENDER
768 if (!(bg_flags & BG_HAS_RENDER_CONV)) 862 if (!(bg_flags & BG_HAS_RENDER_CONV))
769 return false; 863 return false;
… …
824#endif 918#endif
825 return ret; 919 return ret;
826} 920}
827 921
828bool 922bool
829rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 923rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
830{ 924{
831 bool ret = false; 925 bool ret = false;
832 926
833 if (shade == 100 && (bg_flags & BG_TINT_BITAND)) 927 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
834 { 928 {
… …
1014 1108
1015 if (gc) 1109 if (gc)
1016 { 1110 {
1017 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1111 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1018 ret = true; 1112 ret = true;
1019 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS; 1113 bool need_blur = h_blurRadius && v_blurRadius;
1114 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1020 1115
1021 if (!(bg_flags & BG_CLIENT_RENDER)) 1116 if (!(bg_flags & BG_CLIENT_RENDER))
1022 { 1117 {
1023 if (bg_flags & BG_NEEDS_BLUR) 1118 if (need_blur)
1024 { 1119 {
1025 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth)) 1120 if (blur_pixmap (bg_pixmap, window_width, window_height))
1026 tr_flags &= ~BG_NEEDS_BLUR; 1121 need_blur = false;
1027 } 1122 }
1028 if (bg_flags & BG_NEEDS_TINT) 1123 if (need_tint)
1029 { 1124 {
1030 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1125 if (tint_pixmap (bg_pixmap, window_width, window_height))
1031 tr_flags &= ~BG_NEEDS_TINT; 1126 need_tint = false;
1032 } 1127 }
1033 if (tr_flags & BG_NEEDS_TINT) 1128 if (need_tint)
1034 { 1129 {
1035 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1130 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1036 if (ximage) 1131 if (ximage)
1037 { 1132 {
1038 /* our own client-side tinting */ 1133 /* our own client-side tinting */
1039 tint_ximage (DefaultVisual (dpy, display->screen), ximage); 1134 tint_ximage (ximage);
1040 1135
1041 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1136 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1042 XDestroyImage (ximage); 1137 XDestroyImage (ximage);
1043 } 1138 }
1044 } 1139 }
… …
1065# endif /* ENABLE_TRANSPARENCY */ 1160# endif /* ENABLE_TRANSPARENCY */
1066 1161
1067bool 1162bool
1068rxvt_term::bg_render () 1163rxvt_term::bg_render ()
1069{ 1164{
1070 bool transparent = false;
1071
1072 bg_invalidate (); 1165 bg_invalidate ();
1073# ifdef ENABLE_TRANSPARENCY 1166# ifdef ENABLE_TRANSPARENCY
1074 if (bg_flags & BG_IS_TRANSPARENT) 1167 if (bg_flags & BG_IS_TRANSPARENT)
1075 { 1168 {
1076 /* we need to re-generate transparency pixmap in that case ! */ 1169 /* we need to re-generate transparency pixmap in that case ! */
1077 transparent = make_transparency_pixmap (); 1170 if (make_transparency_pixmap ())
1078 if (transparent)
1079 bg_flags |= BG_IS_VALID; 1171 bg_flags |= BG_IS_VALID;
1080 } 1172 }
1081# endif 1173# endif
1082 1174
1083# ifdef BG_IMAGE_FROM_FILE 1175# ifdef BG_IMAGE_FROM_FILE
1084 if (bg_flags & BG_IS_FROM_FILE) 1176 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
1085 { 1177 {
1086 if (render_image (transparent)) 1178 if (render_image (*bg_image))
1087 bg_flags |= BG_IS_VALID; 1179 bg_flags |= BG_IS_VALID;
1088 } 1180 }
1089# endif 1181# endif
1090 1182
1091 if (!(bg_flags & BG_IS_VALID)) 1183 if (!(bg_flags & BG_IS_VALID))
… …
1125 bg_flags |= BG_HAS_RENDER_CONV; 1217 bg_flags |= BG_HAS_RENDER_CONV;
1126 1218
1127 XFree (filters); 1219 XFree (filters);
1128 } 1220 }
1129#endif 1221#endif
1222
1223#ifdef BG_IMAGE_FROM_FILE
1224 if (rs[Rs_backgroundPixmap])
1225 {
1226 rxvt_image *image = new_image ();
1227 if (!image->set_file_geometry (rs[Rs_backgroundPixmap]))
1228 image_vec.pop_back ();
1229 }
1230
1231# ifndef NO_RESOURCES
1232 find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
1233 vector<rxvt_image>::iterator bg_image = image_vec.begin ();
1234 while (bg_image != image_vec.end ())
1235 {
1236 if (!(bg_image->flags & IM_IS_SET))
1237 bg_image = image_vec.erase (bg_image);
1238 else
1239 bg_image++;
1240 }
1241# endif
1242
1243 if (image_vec.size () > 0
1244 && !bg_window_position_sensitive ())
1245 update_background ();
1246#endif
1130} 1247}
1131 1248
1132#endif /* HAVE_BG_PIXMAP */ 1249#endif /* HAVE_BG_PIXMAP */
1133 1250
1134#ifdef ENABLE_TRANSPARENCY 1251#ifdef ENABLE_TRANSPARENCY
… …
1145 lookup[i] = (tmp / 0xffff) << sh; 1262 lookup[i] = (tmp / 0xffff) << sh;
1146 } 1263 }
1147} 1264}
1148 1265
1149void 1266void
1150rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1267rxvt_term::tint_ximage (XImage *ximage)
1151{ 1268{
1269 unsigned int size_r, size_g, size_b;
1152 int sh_r, sh_g, sh_b; 1270 int sh_r, sh_g, sh_b;
1153 uint32_t mask_r, mask_g, mask_b; 1271 uint32_t mask_r, mask_g, mask_b;
1154 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1272 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1155 unsigned short low; 1273 unsigned short low;
1156 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1274 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
… …
1161 mask_r = visual->red_mask; 1279 mask_r = visual->red_mask;
1162 mask_g = visual->green_mask; 1280 mask_g = visual->green_mask;
1163 mask_b = visual->blue_mask; 1281 mask_b = visual->blue_mask;
1164 1282
1165 /* boring lookup table pre-initialization */ 1283 /* boring lookup table pre-initialization */
1166 switch (ximage->depth) 1284 sh_r = ecb_ctz32 (mask_r);
1167 { 1285 sh_g = ecb_ctz32 (mask_g);
1168 case 15: 1286 sh_b = ecb_ctz32 (mask_b);
1169 if ((mask_r != 0x7c00) || 1287
1170 (mask_g != 0x03e0) || 1288 size_r = mask_r >> sh_r;
1171 (mask_b != 0x001f)) 1289 size_g = mask_g >> sh_g;
1290 size_b = mask_b >> sh_b;
1291
1292 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1172 return; 1293 return;
1173 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1294
1295 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1174 lookup_r = lookup; 1296 lookup_r = lookup;
1175 lookup_g = lookup+32; 1297 lookup_g = lookup + size_r;
1176 lookup_b = lookup+32+32; 1298 lookup_b = lookup + size_r + size_g;
1177 sh_r = 10;
1178 sh_g = 5;
1179 sh_b = 0;
1180 break;
1181 case 16:
1182 if ((mask_r != 0xf800) ||
1183 (mask_g != 0x07e0) ||
1184 (mask_b != 0x001f))
1185 return;
1186 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1187 lookup_r = lookup;
1188 lookup_g = lookup+32;
1189 lookup_b = lookup+32+64;
1190 sh_r = 11;
1191 sh_g = 5;
1192 sh_b = 0;
1193 break;
1194 case 24:
1195 if ((mask_r != 0xff0000) ||
1196 (mask_g != 0x00ff00) ||
1197 (mask_b != 0x0000ff))
1198 return;
1199 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1200 lookup_r = lookup;
1201 lookup_g = lookup+256;
1202 lookup_b = lookup+256+256;
1203 sh_r = 16;
1204 sh_g = 8;
1205 sh_b = 0;
1206 break;
1207 case 32:
1208 if ((mask_r != 0xff0000) ||
1209 (mask_g != 0x00ff00) ||
1210 (mask_b != 0x0000ff))
1211 return;
1212 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1213 lookup_r = lookup;
1214 lookup_g = lookup+256;
1215 lookup_b = lookup+256+256;
1216 sh_r = 16;
1217 sh_g = 8;
1218 sh_b = 0;
1219 break;
1220 default:
1221 return; /* we do not support this color depth */
1222 }
1223 1299
1224 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1300 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1225 1301
1226 if (bg_flags & BG_TINT_SET) 1302 if (bg_flags & BG_TINT_SET)
1227 tint.get (c); 1303 tint.get (c);
… …
1249 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1325 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1250 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1326 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1251 1327
1252 /* apply table to input image (replacing colors by newly calculated ones) */ 1328 /* apply table to input image (replacing colors by newly calculated ones) */
1253 if (ximage->bits_per_pixel == 32 1329 if (ximage->bits_per_pixel == 32
1254 && (ximage->depth == 24 || ximage->depth == 32)
1255 && ximage->byte_order == host_byte_order) 1330 && ximage->byte_order == host_byte_order)
1256 { 1331 {
1257 uint32_t *p1, *pf, *p, *pl; 1332 char *line = ximage->data;
1258 p1 = (uint32_t *) ximage->data;
1259 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1260 1333
1261 while (p1 < pf) 1334 for (int y = 0; y < ximage->height; y++)
1262 { 1335 {
1263 p = p1; 1336 uint32_t *p = (uint32_t *)line;
1264 pl = p1 + ximage->width; 1337 for (int x = 0; x < ximage->width; x++)
1265 for (; p < pl; p++)
1266 { 1338 {
1267 *p = lookup_r[(*p & 0xff0000) >> 16] | 1339 *p = lookup_r[(*p & mask_r) >> sh_r] |
1268 lookup_g[(*p & 0x00ff00) >> 8] | 1340 lookup_g[(*p & mask_g) >> sh_g] |
1269 lookup_b[(*p & 0x0000ff)] | 1341 lookup_b[(*p & mask_b) >> sh_b];
1270 (*p & 0xff000000); 1342 p++;
1271 } 1343 }
1272 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1344 line += ximage->bytes_per_line;
1273 } 1345 }
1274 } 1346 }
1275 else 1347 else
1276 { 1348 {
1277 for (int y = 0; y < ximage->height; y++) 1349 for (int y = 0; y < ximage->height; y++)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines