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.201 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.225 by sf-exg, Wed May 30 21:20:05 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 && align <= 200) 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 if (align >= -100 && align < 0) 134 else
136 return (align + 100) * smaller / 100 - image_size; 135 return lerp (-image_size, 0, align + 100);
137 return 0;
138} 136}
139 137
140static inline int 138static inline int
141make_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)
142{ 140{
152 150
153 min_it (dst_size, target_size - dst_pos); 151 min_it (dst_size, target_size - dst_pos);
154 return src_pos; 152 return src_pos;
155} 153}
156 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
157bool 190bool
158rxvt_term::bg_set_geometry (const char *geom, bool update) 191rxvt_image::set_geometry (const char *geom, bool update)
159{ 192{
160 bool changed = false; 193 bool changed = false;
161 int geom_flags = 0; 194 int geom_flags = 0;
162 int x = h_align; 195 int x = h_align;
163 int y = v_align; 196 int y = v_align;
164 unsigned int w = h_scale; 197 unsigned int w = h_scale;
165 unsigned int h = v_scale; 198 unsigned int h = v_scale;
166 unsigned long new_flags = 0; 199 uint8_t new_flags = 0;
167 200
168 if (geom == NULL) 201 if (geom == NULL)
169 return false; 202 return false;
170 203
171 if (geom[0]) 204 if (geom[0])
172 { 205 {
173 char **arr = rxvt_strsplit (':', geom); 206 char **arr = rxvt_strsplit (':', geom);
174 207
175 for (int i = 0; arr[i]; i++) 208 for (int i = 0; arr[i]; i++)
176 { 209 {
177 if (!strcasecmp (arr[i], "style=tiled")) 210 if (!strncasecmp (arr[i], "style=", 6))
178 { 211 {
179 new_flags = BG_TILE; 212 parse_style (arr[i] + 6, x, y, w, h, new_flags);
180 w = h = noScale;
181 x = y = 0;
182 geom_flags = WidthValue|HeightValue|XValue|YValue; 213 geom_flags = WidthValue|HeightValue|XValue|YValue;
183 } 214 }
184 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
185 {
186 new_flags = BG_KEEP_ASPECT;
187 w = h = windowScale;
188 x = y = centerAlign;
189 geom_flags = WidthValue|HeightValue|XValue|YValue;
190 }
191 else if (!strcasecmp (arr[i], "style=stretched"))
192 {
193 new_flags = 0;
194 w = h = windowScale;
195 geom_flags = WidthValue|HeightValue;
196 }
197 else if (!strcasecmp (arr[i], "style=centered"))
198 {
199 new_flags = 0;
200 w = h = noScale;
201 x = y = centerAlign;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=root-tiled"))
205 {
206 new_flags = BG_TILE|BG_ROOT_ALIGN;
207 w = h = noScale;
208 geom_flags = WidthValue|HeightValue;
209 }
210 else if (!strcasecmp (arr[i], "op=tile")) 215 else if (!strcasecmp (arr[i], "op=tile"))
211 new_flags |= BG_TILE; 216 new_flags |= IM_TILE;
212 else if (!strcasecmp (arr[i], "op=keep-aspect")) 217 else if (!strcasecmp (arr[i], "op=keep-aspect"))
213 new_flags |= BG_KEEP_ASPECT; 218 new_flags |= IM_KEEP_ASPECT;
214 else if (!strcasecmp (arr[i], "op=root-align")) 219 else if (!strcasecmp (arr[i], "op=root-align"))
215 new_flags |= BG_ROOT_ALIGN; 220 new_flags |= IM_ROOT_ALIGN;
216 221
217 // deprecated 222 // deprecated
218 else if (!strcasecmp (arr[i], "tile")) 223 else if (!strcasecmp (arr[i], "tile"))
219 { 224 {
220 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
221 w = h = noScale; 226 w = h = noScale;
222 geom_flags |= WidthValue|HeightValue; 227 geom_flags |= WidthValue|HeightValue;
223 } 228 }
224 else if (!strcasecmp (arr[i], "propscale")) 229 else if (!strcasecmp (arr[i], "propscale"))
225 { 230 {
226 new_flags |= BG_KEEP_ASPECT; 231 new_flags |= IM_KEEP_ASPECT;
227 w = h = windowScale; 232 w = h = windowScale;
228 geom_flags |= WidthValue|HeightValue; 233 geom_flags |= WidthValue|HeightValue;
229 } 234 }
230 else if (!strcasecmp (arr[i], "hscale")) 235 else if (!strcasecmp (arr[i], "hscale"))
231 { 236 {
232 new_flags |= BG_TILE; 237 new_flags |= IM_TILE;
233 w = windowScale; 238 w = windowScale;
234 h = noScale; 239 h = noScale;
235 geom_flags |= WidthValue|HeightValue; 240 geom_flags |= WidthValue|HeightValue;
236 } 241 }
237 else if (!strcasecmp (arr[i], "vscale")) 242 else if (!strcasecmp (arr[i], "vscale"))
238 { 243 {
239 new_flags |= BG_TILE; 244 new_flags |= IM_TILE;
240 h = windowScale; 245 h = windowScale;
241 w = noScale; 246 w = noScale;
242 geom_flags |= WidthValue|HeightValue; 247 geom_flags |= WidthValue|HeightValue;
243 } 248 }
244 else if (!strcasecmp (arr[i], "scale")) 249 else if (!strcasecmp (arr[i], "scale"))
252 x = y = centerAlign; 257 x = y = centerAlign;
253 geom_flags |= WidthValue|HeightValue|XValue|YValue; 258 geom_flags |= WidthValue|HeightValue|XValue|YValue;
254 } 259 }
255 else if (!strcasecmp (arr[i], "root")) 260 else if (!strcasecmp (arr[i], "root"))
256 { 261 {
257 new_flags |= BG_TILE|BG_ROOT_ALIGN; 262 new_flags |= IM_TILE|IM_ROOT_ALIGN;
258 w = h = noScale; 263 w = h = noScale;
259 geom_flags |= WidthValue|HeightValue; 264 geom_flags |= WidthValue|HeightValue;
260 } 265 }
261 266
262 else 267 else
264 } /* done parsing ops */ 269 } /* done parsing ops */
265 270
266 rxvt_free_strsplit (arr); 271 rxvt_free_strsplit (arr);
267 } 272 }
268 273
269 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 274 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
270 275
271 if (!update) 276 if (!update)
272 { 277 {
273 if (!(geom_flags & XValue)) 278 if (!(geom_flags & XValue))
274 x = y = defaultAlign; 279 x = y = defaultAlign;
281 h = w; 286 h = w;
282 else if (!(geom_flags & WidthValue)) 287 else if (!(geom_flags & WidthValue))
283 w = h; 288 w = h;
284 } 289 }
285 290
286 min_it (w, 1000);
287 min_it (h, 1000);
288 clamp_it (x, -100, 200); 291 clamp_it (x, -100, 200);
289 clamp_it (y, -100, 200); 292 clamp_it (y, -100, 200);
290 293
291 if (bg_flags != new_flags 294 if (flags != new_flags
292 || h_scale != w 295 || h_scale != w
293 || v_scale != h 296 || v_scale != h
294 || h_align != x 297 || h_align != x
295 || v_align != y) 298 || v_align != y)
296 { 299 {
297 bg_flags = new_flags; 300 flags = new_flags;
298 h_scale = w; 301 h_scale = w;
299 v_scale = h; 302 v_scale = h;
300 h_align = x; 303 h_align = x;
301 v_align = y; 304 v_align = y;
302 changed = true; 305 changed = true;
303 } 306 }
304 307
308 if (is_size_sensitive ())
309 flags |= IM_IS_SIZE_SENSITIVE;
310 else
311 flags &= ~IM_IS_SIZE_SENSITIVE;
312
305 return changed; 313 return changed;
306} 314}
307 315
308void 316void
309rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 317rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
310{ 318{
319 int image_width = image.width ();
320 int image_height = image.height ();
311 int target_width = szHint.width; 321 int target_width = szHint.width;
312 int target_height = szHint.height; 322 int target_height = szHint.height;
323 int h_scale = min (image.h_scale, 32767 * 100 / target_width);
324 int v_scale = min (image.v_scale, 32767 * 100 / target_height);
313 325
314 w = h_scale * target_width / 100; 326 w = h_scale * target_width / 100;
315 h = v_scale * target_height / 100; 327 h = v_scale * target_height / 100;
316 328
317 if (bg_flags & BG_KEEP_ASPECT) 329 if (image.flags & IM_KEEP_ASPECT)
318 { 330 {
319 float scale = (float)w / image_width; 331 float scale = (float)w / image_width;
320 min_it (scale, (float)h / image_height); 332 min_it (scale, (float)h / image_height);
321 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
322 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
323 } 335 }
324 336
325 if (!w) w = image_width; 337 if (!w) w = image_width;
326 if (!h) h = image_height; 338 if (!h) h = image_height;
327 339
328 if (bg_flags & BG_ROOT_ALIGN) 340 if (image.flags & IM_ROOT_ALIGN)
329 { 341 {
330 x = -target_x; 342 x = -target_x;
331 y = -target_y; 343 y = -target_y;
332 } 344 }
333 else 345 else
334 { 346 {
335 x = make_align_position (h_align, target_width, w); 347 x = make_align_position (image.h_align, target_width, w);
336 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (image.v_align, target_height, h);
337 } 349 }
338
339 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
340 if (!(bg_flags & BG_TILE)
341 || h_scale || v_scale
342 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
343 || w > target_width || h > target_height)
344 bg_flags |= BG_IS_SIZE_SENSITIVE;
345} 350}
346 351
347# ifdef HAVE_PIXBUF 352# ifdef HAVE_PIXBUF
348bool 353bool
349rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 354rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
350 int src_x, int src_y, int dst_x, int dst_y, 355 int src_x, int src_y, int dst_x, int dst_y,
351 unsigned int width, unsigned int height) 356 unsigned int width, unsigned int height, bool argb)
352{ 357{
353 XImage *ximage; 358 XImage *ximage;
354 char *data, *line; 359 char *line;
355 int bytes_per_pixel;
356 int width_r, width_g, width_b; 360 int width_r, width_g, width_b, width_a;
357 int sh_r, sh_g, sh_b; 361 int sh_r, sh_g, sh_b, sh_a;
362 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
358 int rowstride; 363 int rowstride;
359 int channels; 364 int channels;
360 unsigned char *row; 365 unsigned char *row;
361 366
362 if (visual->c_class != TrueColor) 367 if (visual->c_class != TrueColor)
363 return false; 368 return false;
364 369
365 if (depth == 24 || depth == 32) 370 if (argb)
366 bytes_per_pixel = 4; 371 {
367 else if (depth == 15 || depth == 16) 372 red_mask = 0xff << 16;
368 bytes_per_pixel = 2; 373 green_mask = 0xff << 8;
374 blue_mask = 0xff;
375 alpha_mask = 0xff << 24;
376 }
369 else 377 else
378 {
379 red_mask = visual->red_mask;
380 green_mask = visual->green_mask;
381 blue_mask = visual->blue_mask;
382#if XRENDER
383 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
384 if (format)
385 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
386 else
387#endif
388 alpha_mask = 0;
389 }
390
391 width_r = ecb_popcount32 (red_mask);
392 width_g = ecb_popcount32 (green_mask);
393 width_b = ecb_popcount32 (blue_mask);
394 width_a = ecb_popcount32 (alpha_mask);
395
396 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
370 return false; 397 return false;
371 398
372 width_r = ecb_popcount32 (visual->red_mask); 399 sh_r = ecb_ctz32 (red_mask);
373 width_g = ecb_popcount32 (visual->green_mask); 400 sh_g = ecb_ctz32 (green_mask);
374 width_b = ecb_popcount32 (visual->blue_mask); 401 sh_b = ecb_ctz32 (blue_mask);
402 sh_a = ecb_ctz32 (alpha_mask);
375 403
376 if (width_r > 8 || width_g > 8 || width_b > 8) 404 if (width > 32767 || height > 32767)
377 return false; 405 return false;
378 406
379 sh_r = ecb_ctz32 (visual->red_mask); 407 ximage = XCreateImage (dpy, visual, argb ? 32 : depth, ZPixmap, 0, 0,
380 sh_g = ecb_ctz32 (visual->green_mask); 408 width, height, 32, 0);
381 sh_b = ecb_ctz32 (visual->blue_mask); 409 if (!ximage)
382
383 if (width > INT_MAX / height / bytes_per_pixel)
384 return false; 410 return false;
385 411
386 data = (char *)malloc (width * height * bytes_per_pixel); 412 if (height > INT_MAX / ximage->bytes_per_line
387 if (!data) 413 || !(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 { 414 {
394 free (data); 415 XDestroyImage (ximage);
395 return false; 416 return false;
396 } 417 }
397 418
398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 419 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
399 420
400 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 421 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
401 channels = gdk_pixbuf_get_n_channels (pixbuf); 422 channels = gdk_pixbuf_get_n_channels (pixbuf);
402 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 423 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
403 line = data; 424 line = ximage->data;
425
426 rgba c (0, 0, 0);
427
428 if (channels == 4 && alpha_mask == 0)
429 {
430 pix_colors[Color_bg].get (c);
431 c.r >>= 8;
432 c.g >>= 8;
433 c.b >>= 8;
434 }
404 435
405 for (int y = 0; y < height; y++) 436 for (int y = 0; y < height; y++)
406 { 437 {
407 for (int x = 0; x < width; x++) 438 for (int x = 0; x < width; x++)
408 { 439 {
409 unsigned char *pixel = row + x * channels; 440 unsigned char *pixel = row + x * channels;
410 uint32_t value; 441 uint32_t value;
442 unsigned char r, g, b, a;
411 443
444 if (channels == 4)
445 {
446 a = pixel[3];
447 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
448 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
449 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
450 }
451 else
452 {
453 a = 0xff;
454 r = pixel[0];
455 g = pixel[1];
456 b = pixel[2];
457 }
458
412 value = ((pixel[0] >> (8 - width_r)) << sh_r) 459 value = ((r >> (8 - width_r)) << sh_r)
413 | ((pixel[1] >> (8 - width_g)) << sh_g) 460 | ((g >> (8 - width_g)) << sh_g)
414 | ((pixel[2] >> (8 - width_b)) << sh_b); 461 | ((b >> (8 - width_b)) << sh_b)
462 | ((a >> (8 - width_a)) << sh_a);
415 463
416 if (bytes_per_pixel == 4) 464 if (ximage->bits_per_pixel == 32)
417 ((uint32_t *)line)[x] = value; 465 ((uint32_t *)line)[x] = value;
418 else 466 else
419 ((uint16_t *)line)[x] = value; 467 XPutPixel (ximage, x, y, value);
420 } 468 }
421 469
422 row += rowstride; 470 row += rowstride;
423 line += ximage->bytes_per_line; 471 line += ximage->bytes_per_line;
424 } 472 }
427 XDestroyImage (ximage); 475 XDestroyImage (ximage);
428 return true; 476 return true;
429} 477}
430 478
431bool 479bool
432rxvt_term::render_image (unsigned long tr_flags) 480rxvt_term::render_image (rxvt_image &image)
433{ 481{
482 GdkPixbuf *pixbuf = image.pixbuf;
434 if (!pixbuf) 483 if (!pixbuf)
435 return false; 484 return false;
436 485
437 if (tr_flags 486 bool need_blend = bg_flags & BG_IS_VALID;
487
488 if (need_blend
438 && !(bg_flags & BG_HAS_RENDER)) 489 && !(bg_flags & BG_HAS_RENDER))
439 return false; 490 return false;
440 491
441 GdkPixbuf *result; 492 GdkPixbuf *result;
442 493
451 int x = 0; 502 int x = 0;
452 int y = 0; 503 int y = 0;
453 int w = 0; 504 int w = 0;
454 int h = 0; 505 int h = 0;
455 506
456 get_image_geometry (image_width, image_height, w, h, x, y); 507 get_image_geometry (image, w, h, x, y);
457 508
458 if (!(bg_flags & BG_ROOT_ALIGN) 509 if (!(image.flags & IM_ROOT_ALIGN)
459 && (x >= target_width 510 && (x >= target_width
460 || y >= target_height 511 || y >= target_height
461 || x + w <= 0 512 || x + w <= 0
462 || y + h <= 0)) 513 || y + h <= 0))
463 return false; 514 return false;
477 528
478 bool ret = false; 529 bool ret = false;
479 530
480 XGCValues gcv; 531 XGCValues gcv;
481 GC gc; 532 GC gc;
482 Pixmap root_pmap; 533 Pixmap tmp_pixmap;
483 534
484 image_width = gdk_pixbuf_get_width (result); 535 image_width = gdk_pixbuf_get_width (result);
485 image_height = gdk_pixbuf_get_height (result); 536 image_height = gdk_pixbuf_get_height (result);
486 537
487 if (tr_flags) 538 if (need_blend)
488 { 539 tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
489 root_pmap = bg_pixmap;
490 bg_pixmap = None;
491 }
492 else 540 else
493 { 541 {
542 // optimise bg pixmap size when tiling, but only if there are no
543 // other pixbufs to render. Otherwise, the bg pixmap size must
544 // be equal to the window size.
494 if (bg_flags & BG_TILE) 545 if ((image.flags & IM_TILE)
546 && image_vec.size () == 1)
495 { 547 {
496 new_pmap_width = min (image_width, target_width); 548 new_pmap_width = min (image_width, target_width);
497 new_pmap_height = min (image_height, target_height); 549 new_pmap_height = min (image_height, target_height);
498 } 550 }
499 }
500 551
501 if (bg_pixmap == None 552 if (bg_pixmap == None
502 || bg_pmap_width != new_pmap_width 553 || bg_pmap_width != new_pmap_width
503 || bg_pmap_height != new_pmap_height) 554 || bg_pmap_height != new_pmap_height)
504 { 555 {
505 if (bg_pixmap) 556 if (bg_pixmap)
506 XFreePixmap (dpy, bg_pixmap); 557 XFreePixmap (dpy, bg_pixmap);
507 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 558 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
508 bg_pmap_width = new_pmap_width; 559 bg_pmap_width = new_pmap_width;
509 bg_pmap_height = new_pmap_height; 560 bg_pmap_height = new_pmap_height;
561 }
562
563 tmp_pixmap = bg_pixmap;
510 } 564 }
511 565
512 gcv.foreground = pix_colors[Color_bg]; 566 gcv.foreground = pix_colors[Color_bg];
513 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 567 gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
514 568
515 if (gc) 569 if (gc)
516 { 570 {
517 if (bg_flags & BG_TILE) 571 if (image.flags & IM_TILE)
518 { 572 {
519 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 573 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
520 pixbuf_to_pixmap (result, tile, gc, 574 pixbuf_to_pixmap (result, tile, gc,
521 0, 0, 575 0, 0,
522 0, 0, 576 0, 0,
523 image_width, image_height); 577 image_width, image_height, need_blend);
524 578
525 gcv.tile = tile; 579 gcv.tile = tile;
526 gcv.fill_style = FillTiled; 580 gcv.fill_style = FillTiled;
527 gcv.ts_x_origin = x; 581 gcv.ts_x_origin = x;
528 gcv.ts_y_origin = y; 582 gcv.ts_y_origin = y;
529 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 583 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
530 584
531 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 585 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
532 XFreePixmap (dpy, tile); 586 XFreePixmap (dpy, tile);
533 } 587 }
534 else 588 else
535 { 589 {
536 int src_x, src_y, dst_x, dst_y; 590 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); 594 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
541 595
542 if (dst_x > 0 || dst_y > 0 596 if (dst_x > 0 || dst_y > 0
543 || dst_x + dst_width < new_pmap_width 597 || dst_x + dst_width < new_pmap_width
544 || dst_y + dst_height < new_pmap_height) 598 || dst_y + dst_height < new_pmap_height)
545 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 599 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
546 600
547 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 601 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
548 pixbuf_to_pixmap (result, bg_pixmap, gc, 602 pixbuf_to_pixmap (result, tmp_pixmap, gc,
549 src_x, src_y, 603 src_x, src_y,
550 dst_x, dst_y, 604 dst_x, dst_y,
551 dst_width, dst_height); 605 dst_width, dst_height, need_blend);
552 } 606 }
553 607
554#if XRENDER 608#if XRENDER
555 if (tr_flags) 609 if (need_blend)
556 { 610 {
611 XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
557 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 612 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
558 613
559 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 614 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0);
560 615
561 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0); 616 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
562 617
563 Picture mask = create_xrender_mask (dpy, vt, False, False); 618 Picture mask = create_xrender_mask (dpy, vt, False, False);
564 619
565 XRenderColor mask_c; 620 XRenderColor mask_c;
566 621
567 mask_c.alpha = 0x8000; 622 mask_c.alpha = image.alpha;
568 mask_c.red = 623 mask_c.red =
569 mask_c.green = 624 mask_c.green =
570 mask_c.blue = 0; 625 mask_c.blue = 0;
571 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 626 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
572 627
584 } 639 }
585 640
586 if (result != pixbuf) 641 if (result != pixbuf)
587 g_object_unref (result); 642 g_object_unref (result);
588 643
589 if (tr_flags) 644 if (need_blend)
590 XFreePixmap (dpy, root_pmap); 645 XFreePixmap (dpy, tmp_pixmap);
591 646
592 return ret; 647 return ret;
593} 648}
594# endif /* HAVE_PIXBUF */ 649# endif /* HAVE_PIXBUF */
595 650
651# ifndef NO_RESOURCES
652static int
653rxvt_define_image (XrmDatabase *database ecb_unused,
654 XrmBindingList bindings ecb_unused,
655 XrmQuarkList quarks,
656 XrmRepresentation *type ecb_unused,
657 XrmValue *value,
658 XPointer closure ecb_unused)
659{
660 int size;
661
662 for (size = 0; quarks[size] != NULLQUARK; size++)
663 ;
664
665 if (size >= 2)
666 {
667 int id = strtol (XrmQuarkToString (quarks[size-2]), 0, 0);
668 if (id >= 1)
669 GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
670 }
671 return False;
672}
673
674void
675rxvt_term::parse_image (int id, const char *type, const char *arg)
676{
677 if (image_vec.size () < id + 1)
678 image_vec.resize (id + 1);
679
680 rxvt_image *image = &image_vec[id];
681}
682# endif
683
684rxvt_image::rxvt_image ()
685{
686 alpha = 0xffff;
687 flags = 0;
688 h_scale =
689 v_scale = defaultScale;
690 h_align =
691 v_align = defaultAlign;
692
693# ifdef HAVE_PIXBUF
694 pixbuf = 0;
695# endif
696}
697
596bool 698bool
597rxvt_term::bg_set_file (const char *file) 699rxvt_image::set_file_geometry (const char *file)
598{ 700{
599 if (!file || !*file) 701 if (!file || !*file)
600 return false; 702 return false;
601 703
602 bool ret = false;
603 const char *p = strchr (file, ';'); 704 const char *p = strchr (file, ';');
604 705
605 if (p) 706 if (p)
606 { 707 {
607 size_t len = p - file; 708 size_t len = p - file;
609 memcpy (f, file, len); 710 memcpy (f, file, len);
610 f[len] = '\0'; 711 f[len] = '\0';
611 file = f; 712 file = f;
612 } 713 }
613 714
715 bool ret = set_file (file);
716 alpha = 0x8000;
717 if (ret)
718 set_geometry (p ? p + 1 : "");
719 return ret;
720}
721
722bool
723rxvt_image::set_file (const char *file)
724{
725 bool ret = false;
726
614# ifdef HAVE_PIXBUF 727# ifdef HAVE_PIXBUF
615 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 728 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
616 if (image) 729 if (image)
617 { 730 {
618 if (pixbuf) 731 if (pixbuf)
619 g_object_unref (pixbuf); 732 g_object_unref (pixbuf);
620 pixbuf = image; 733 pixbuf = image;
621 bg_flags |= BG_IS_FROM_FILE;
622 ret = true; 734 ret = true;
623 } 735 }
624# endif 736# endif
625 737
626 if (ret) 738 if (ret)
627 { 739 flags |= IM_IS_SET;
628 if (p)
629 bg_set_geometry (p + 1);
630 else
631 bg_set_default_geometry ();
632 }
633 740
634 return ret; 741 return ret;
635} 742}
636 743
637# endif /* BG_IMAGE_FROM_FILE */ 744# endif /* BG_IMAGE_FROM_FILE */
638 745
639# ifdef ENABLE_TRANSPARENCY 746# 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 747bool
653rxvt_term::bg_set_blur (const char *geom) 748rxvt_term::bg_set_blur (const char *geom)
654{ 749{
655 bool changed = false; 750 bool changed = false;
656 unsigned int hr, vr; 751 unsigned int hr, vr;
675 { 770 {
676 changed = true; 771 changed = true;
677 v_blurRadius = vr; 772 v_blurRadius = vr;
678 } 773 }
679 774
680 if (h_blurRadius == 0 || v_blurRadius == 0)
681 bg_flags &= ~BG_NEEDS_BLUR;
682 else
683 bg_flags |= BG_NEEDS_BLUR;
684
685 return changed; 775 return changed;
686} 776}
687 777
688void 778bool
689rxvt_term::set_tint_shade_flags () 779rxvt_term::bg_set_tint (rxvt_color &new_tint)
690{ 780{
781 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
782 {
783 tint = new_tint;
784 bg_flags |= BG_TINT_SET;
785
691 rgba c; 786 rgba c;
692 bool has_shade = shade != 100;
693
694 bg_flags &= ~BG_TINT_FLAGS;
695
696 if (bg_flags & BG_TINT_SET)
697 {
698 tint.get (c); 787 tint.get (c);
699 if (!has_shade
700 && (c.r <= 0x00ff || c.r >= 0xff00) 788 if ((c.r <= 0x00ff || c.r >= 0xff00)
701 && (c.g <= 0x00ff || c.g >= 0xff00) 789 && (c.g <= 0x00ff || c.g >= 0xff00)
702 && (c.b <= 0x00ff || c.b >= 0xff00)) 790 && (c.b <= 0x00ff || c.b >= 0xff00))
703 bg_flags |= BG_TINT_BITAND; 791 bg_flags |= BG_TINT_BITAND;
704 } 792 else
705
706 if (has_shade || (bg_flags & BG_TINT_SET))
707 bg_flags |= BG_NEEDS_TINT;
708}
709
710bool
711rxvt_term::bg_set_tint (rxvt_color &new_tint)
712{
713 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
714 {
715 tint = new_tint;
716 bg_flags |= BG_TINT_SET; 793 bg_flags &= ~BG_TINT_BITAND;
717 set_tint_shade_flags (); 794
718 return true; 795 return true;
719 } 796 }
720 797
721 return false; 798 return false;
722} 799}
731 new_shade = 200 - (100 + new_shade); 808 new_shade = 200 - (100 + new_shade);
732 809
733 if (new_shade != shade) 810 if (new_shade != shade)
734 { 811 {
735 shade = new_shade; 812 shade = new_shade;
736 set_tint_shade_flags ();
737 return true; 813 return true;
738 } 814 }
739 815
740 return false; 816 return false;
741} 817}
762 params[i+2] = XDoubleToFixed (kernel[i] / sum); 838 params[i+2] = XDoubleToFixed (kernel[i] / sum);
763} 839}
764#endif 840#endif
765 841
766bool 842bool
767rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) 843rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
768{ 844{
769 bool ret = false; 845 bool ret = false;
770#if XRENDER 846#if XRENDER
771 if (!(bg_flags & BG_HAS_RENDER_CONV)) 847 if (!(bg_flags & BG_HAS_RENDER_CONV))
772 return false; 848 return false;
827#endif 903#endif
828 return ret; 904 return ret;
829} 905}
830 906
831bool 907bool
832rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 908rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
833{ 909{
834 bool ret = false; 910 bool ret = false;
835 911
836 if (bg_flags & BG_TINT_BITAND) 912 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
837 { 913 {
838 XGCValues gcv; 914 XGCValues gcv;
839 GC gc; 915 GC gc;
840 916
841 /* In this case we can tint image server-side getting significant 917 /* In this case we can tint image server-side getting significant
922/* 998/*
923 * Builds a pixmap of the same size as the terminal window that contains 999 * Builds a pixmap of the same size as the terminal window that contains
924 * the tiled portion of the root pixmap that is supposed to be covered by 1000 * the tiled portion of the root pixmap that is supposed to be covered by
925 * our window. 1001 * our window.
926 */ 1002 */
927unsigned long 1003bool
928rxvt_term::make_transparency_pixmap () 1004rxvt_term::make_transparency_pixmap ()
929{ 1005{
930 unsigned long result = 0; 1006 bool ret = false;
931 1007
932 /* root dimensions may change from call to call - but Display structure should 1008 /* root dimensions may change from call to call - but Display structure should
933 * be always up-to-date, so let's use it : 1009 * be always up-to-date, so let's use it :
934 */ 1010 */
935 int screen = display->screen; 1011 int screen = display->screen;
1016 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1092 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1017 1093
1018 if (gc) 1094 if (gc)
1019 { 1095 {
1020 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1096 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1021 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1097 ret = true;
1098 bool need_blur = h_blurRadius && v_blurRadius;
1099 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1022 1100
1023 if (!(bg_flags & BG_CLIENT_RENDER)) 1101 if (!(bg_flags & BG_CLIENT_RENDER))
1024 { 1102 {
1025 if (bg_flags & BG_NEEDS_BLUR) 1103 if (need_blur)
1026 { 1104 {
1027 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth)) 1105 if (blur_pixmap (bg_pixmap, window_width, window_height))
1028 result &= ~BG_NEEDS_BLUR; 1106 need_blur = false;
1029 } 1107 }
1030 if (bg_flags & BG_NEEDS_TINT) 1108 if (need_tint)
1031 { 1109 {
1032 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1110 if (tint_pixmap (bg_pixmap, window_width, window_height))
1033 result &= ~BG_NEEDS_TINT; 1111 need_tint = false;
1034 } 1112 }
1035 if (result & BG_NEEDS_TINT) 1113 if (need_tint)
1036 { 1114 {
1037 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1115 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1038 if (ximage) 1116 if (ximage)
1039 { 1117 {
1040 /* our own client-side tinting */ 1118 /* our own client-side tinting */
1041 tint_ximage (DefaultVisual (dpy, display->screen), ximage); 1119 tint_ximage (ximage);
1042 1120
1043 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1121 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1044 XDestroyImage (ximage); 1122 XDestroyImage (ximage);
1045 } 1123 }
1046 } 1124 }
1050 } 1128 }
1051 1129
1052 if (recoded_root_pmap != root_pixmap) 1130 if (recoded_root_pmap != root_pixmap)
1053 XFreePixmap (dpy, recoded_root_pmap); 1131 XFreePixmap (dpy, recoded_root_pmap);
1054 1132
1055 return result; 1133 return ret;
1056} 1134}
1057 1135
1058void 1136void
1059rxvt_term::bg_set_root_pixmap () 1137rxvt_term::bg_set_root_pixmap ()
1060{ 1138{
1067# endif /* ENABLE_TRANSPARENCY */ 1145# endif /* ENABLE_TRANSPARENCY */
1068 1146
1069bool 1147bool
1070rxvt_term::bg_render () 1148rxvt_term::bg_render ()
1071{ 1149{
1072 unsigned long tr_flags = 0;
1073
1074 bg_invalidate (); 1150 bg_invalidate ();
1075# ifdef ENABLE_TRANSPARENCY 1151# ifdef ENABLE_TRANSPARENCY
1076 if (bg_flags & BG_IS_TRANSPARENT) 1152 if (bg_flags & BG_IS_TRANSPARENT)
1077 { 1153 {
1078 /* we need to re-generate transparency pixmap in that case ! */ 1154 /* we need to re-generate transparency pixmap in that case ! */
1079 tr_flags = make_transparency_pixmap (); 1155 if (make_transparency_pixmap ())
1080 if (tr_flags)
1081 bg_flags |= BG_IS_VALID; 1156 bg_flags |= BG_IS_VALID;
1082 } 1157 }
1083# endif 1158# endif
1084 1159
1085# ifdef BG_IMAGE_FROM_FILE 1160# ifdef BG_IMAGE_FROM_FILE
1086 if ((bg_flags & BG_IS_FROM_FILE) 1161 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
1087 || (tr_flags & BG_EFFECTS_FLAGS))
1088 { 1162 {
1089 if (render_image (tr_flags)) 1163 if (render_image (*bg_image))
1090 bg_flags |= BG_IS_VALID; 1164 bg_flags |= BG_IS_VALID;
1091 } 1165 }
1092# endif 1166# endif
1093 1167
1094 if (!(bg_flags & BG_IS_VALID)) 1168 if (!(bg_flags & BG_IS_VALID))
1128 bg_flags |= BG_HAS_RENDER_CONV; 1202 bg_flags |= BG_HAS_RENDER_CONV;
1129 1203
1130 XFree (filters); 1204 XFree (filters);
1131 } 1205 }
1132#endif 1206#endif
1207
1208#ifdef BG_IMAGE_FROM_FILE
1209 if (rs[Rs_backgroundPixmap])
1210 {
1211 rxvt_image *image = new_image ();
1212 if (!image->set_file_geometry (rs[Rs_backgroundPixmap]))
1213 image_vec.pop_back ();
1214 }
1215
1216# ifndef NO_RESOURCES
1217 find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
1218 vector<rxvt_image>::iterator bg_image = image_vec.begin ();
1219 while (bg_image != image_vec.end ())
1220 {
1221 if (!(bg_image->flags & IM_IS_SET))
1222 bg_image = image_vec.erase (bg_image);
1223 else
1224 {
1225 if (bg_image->is_size_sensitive ())
1226 bg_image->flags |= IM_IS_SIZE_SENSITIVE;
1227
1228 bg_image++;
1229 }
1230 }
1231# endif
1232
1233 if (image_vec.size () > 0
1234 && !bg_window_position_sensitive ())
1235 update_background ();
1236#endif
1133} 1237}
1134 1238
1135#endif /* HAVE_BG_PIXMAP */ 1239#endif /* HAVE_BG_PIXMAP */
1136 1240
1137#ifdef ENABLE_TRANSPARENCY 1241#ifdef ENABLE_TRANSPARENCY
1148 lookup[i] = (tmp / 0xffff) << sh; 1252 lookup[i] = (tmp / 0xffff) << sh;
1149 } 1253 }
1150} 1254}
1151 1255
1152void 1256void
1153rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1257rxvt_term::tint_ximage (XImage *ximage)
1154{ 1258{
1259 unsigned int size_r, size_g, size_b;
1155 int sh_r, sh_g, sh_b; 1260 int sh_r, sh_g, sh_b;
1156 uint32_t mask_r, mask_g, mask_b; 1261 uint32_t mask_r, mask_g, mask_b;
1157 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1262 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1158 unsigned short low; 1263 unsigned short low;
1159 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1264 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1164 mask_r = visual->red_mask; 1269 mask_r = visual->red_mask;
1165 mask_g = visual->green_mask; 1270 mask_g = visual->green_mask;
1166 mask_b = visual->blue_mask; 1271 mask_b = visual->blue_mask;
1167 1272
1168 /* boring lookup table pre-initialization */ 1273 /* boring lookup table pre-initialization */
1169 switch (ximage->depth) 1274 sh_r = ecb_ctz32 (mask_r);
1170 { 1275 sh_g = ecb_ctz32 (mask_g);
1171 case 15: 1276 sh_b = ecb_ctz32 (mask_b);
1172 if ((mask_r != 0x7c00) || 1277
1173 (mask_g != 0x03e0) || 1278 size_r = mask_r >> sh_r;
1174 (mask_b != 0x001f)) 1279 size_g = mask_g >> sh_g;
1280 size_b = mask_b >> sh_b;
1281
1282 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1175 return; 1283 return;
1176 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1284
1285 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1177 lookup_r = lookup; 1286 lookup_r = lookup;
1178 lookup_g = lookup+32; 1287 lookup_g = lookup + size_r;
1179 lookup_b = lookup+32+32; 1288 lookup_b = lookup + size_r + size_g;
1180 sh_r = 10;
1181 sh_g = 5;
1182 sh_b = 0;
1183 break;
1184 case 16:
1185 if ((mask_r != 0xf800) ||
1186 (mask_g != 0x07e0) ||
1187 (mask_b != 0x001f))
1188 return;
1189 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1190 lookup_r = lookup;
1191 lookup_g = lookup+32;
1192 lookup_b = lookup+32+64;
1193 sh_r = 11;
1194 sh_g = 5;
1195 sh_b = 0;
1196 break;
1197 case 24:
1198 if ((mask_r != 0xff0000) ||
1199 (mask_g != 0x00ff00) ||
1200 (mask_b != 0x0000ff))
1201 return;
1202 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1203 lookup_r = lookup;
1204 lookup_g = lookup+256;
1205 lookup_b = lookup+256+256;
1206 sh_r = 16;
1207 sh_g = 8;
1208 sh_b = 0;
1209 break;
1210 case 32:
1211 if ((mask_r != 0xff0000) ||
1212 (mask_g != 0x00ff00) ||
1213 (mask_b != 0x0000ff))
1214 return;
1215 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1216 lookup_r = lookup;
1217 lookup_g = lookup+256;
1218 lookup_b = lookup+256+256;
1219 sh_r = 16;
1220 sh_g = 8;
1221 sh_b = 0;
1222 break;
1223 default:
1224 return; /* we do not support this color depth */
1225 }
1226 1289
1227 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1290 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1228 1291
1229 if (bg_flags & BG_TINT_SET) 1292 if (bg_flags & BG_TINT_SET)
1230 tint.get (c); 1293 tint.get (c);
1252 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1315 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1253 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1316 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1254 1317
1255 /* apply table to input image (replacing colors by newly calculated ones) */ 1318 /* apply table to input image (replacing colors by newly calculated ones) */
1256 if (ximage->bits_per_pixel == 32 1319 if (ximage->bits_per_pixel == 32
1257 && (ximage->depth == 24 || ximage->depth == 32)
1258 && ximage->byte_order == host_byte_order) 1320 && ximage->byte_order == host_byte_order)
1259 { 1321 {
1260 uint32_t *p1, *pf, *p, *pl; 1322 char *line = ximage->data;
1261 p1 = (uint32_t *) ximage->data;
1262 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1263 1323
1264 while (p1 < pf) 1324 for (int y = 0; y < ximage->height; y++)
1265 { 1325 {
1266 p = p1; 1326 uint32_t *p = (uint32_t *)line;
1267 pl = p1 + ximage->width; 1327 for (int x = 0; x < ximage->width; x++)
1268 for (; p < pl; p++)
1269 { 1328 {
1270 *p = lookup_r[(*p & 0xff0000) >> 16] | 1329 *p = lookup_r[(*p & mask_r) >> sh_r] |
1271 lookup_g[(*p & 0x00ff00) >> 8] | 1330 lookup_g[(*p & mask_g) >> sh_g] |
1272 lookup_b[(*p & 0x0000ff)] | 1331 lookup_b[(*p & mask_b) >> sh_b];
1273 (*p & 0xff000000); 1332 p++;
1274 } 1333 }
1275 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1334 line += ximage->bytes_per_line;
1276 } 1335 }
1277 } 1336 }
1278 else 1337 else
1279 { 1338 {
1280 for (int y = 0; y < ximage->height; y++) 1339 for (int y = 0; y < ximage->height; y++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines