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.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.142 by sf-exg, Thu Jan 27 17:37:18 2011 UTC

30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
31#endif 31#endif
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif
36
37#define DO_TIMING_TEST 0
38
39#if DO_TIMING_TEST
40# include <sys/time.h>
41#define TIMING_TEST_START(id) \
42 struct timeval timing_test_##id##_stv; \
43 gettimeofday (&timing_test_##id##_stv, NULL);
44
45#define TIMING_TEST_PRINT_RESULT(id) \
46 do { \
47 struct timeval tv; \
48 gettimeofday (&tv, NULL); \
49 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
50 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
51 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
52 } while (0)
53
54#else
55#define TIMING_TEST_START(id) do {} while (0)
56#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
57#endif 35#endif
58 36
59/* 37/*
60 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
61 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
81 * scale Scale both up and down 59 * scale Scale both up and down
82 * auto Same as 100x100+50+50 60 * auto Same as 100x100+50+50
83 */ 61 */
84 62
85#ifdef HAVE_BG_PIXMAP 63#ifdef HAVE_BG_PIXMAP
86bgPixmap_t::bgPixmap_t ()
87{
88 // this is basically redundant as bgPixmap_t is only used in
89 // zero_initialised-derived structs
90#ifdef HAVE_AFTERIMAGE
91 original_asim = NULL;
92#endif
93#ifdef HAVE_PIXBUF
94 pixbuf = NULL;
95#endif
96#ifdef BG_IMAGE_FROM_FILE
97 have_image = false;
98 h_scale = v_scale = 0;
99 h_align = v_align = 0;
100#endif
101#ifdef ENABLE_TRANSPARENCY
102 shade = 100;
103#endif
104 flags = 0;
105 pixmap = None;
106 valid_since = invalid_since = 0;
107 target = 0;
108}
109
110void 64void
111bgPixmap_t::destroy () 65rxvt_term::bg_destroy ()
112{ 66{
113#ifdef HAVE_AFTERIMAGE 67#ifdef HAVE_AFTERIMAGE
114 if (original_asim) 68 if (original_asim)
115 safe_asimage_destroy (original_asim); 69 safe_asimage_destroy (original_asim);
116#endif 70#endif
118#ifdef HAVE_PIXBUF 72#ifdef HAVE_PIXBUF
119 if (pixbuf) 73 if (pixbuf)
120 g_object_unref (pixbuf); 74 g_object_unref (pixbuf);
121#endif 75#endif
122 76
123 if (pixmap && target) 77 if (bg_pixmap)
124 XFreePixmap (target->dpy, pixmap); 78 XFreePixmap (dpy, bg_pixmap);
125} 79}
126 80
127bool 81bool
128bgPixmap_t::window_size_sensitive () 82rxvt_term::bg_set_position (int x, int y)
83{
84
85 if (target_x != x
86 || target_y != y)
87 {
88 target_x = x;
89 target_y = y;
90 return true;
91 }
92 return false;
93}
94
95bool
96rxvt_term::bg_window_size_sensitive ()
129{ 97{
130# ifdef ENABLE_TRANSPARENCY 98# ifdef ENABLE_TRANSPARENCY
131 if (flags & isTransparent) 99 if (bg_flags & isTransparent)
132 return true; 100 return true;
133# endif 101# endif
134 102
135# ifdef BG_IMAGE_FROM_FILE 103# ifdef BG_IMAGE_FROM_FILE
136 if (have_image) 104 if (have_image)
137 { 105 {
138 if (flags & sizeSensitive) 106 if (bg_flags & sizeSensitive)
139 return true; 107 return true;
140 } 108 }
141# endif 109# endif
142 110
143 return false; 111 return false;
144} 112}
145 113
146bool 114bool
147bgPixmap_t::window_position_sensitive () 115rxvt_term::bg_window_position_sensitive ()
148{ 116{
149# ifdef ENABLE_TRANSPARENCY 117# ifdef ENABLE_TRANSPARENCY
150 if (flags & isTransparent) 118 if (bg_flags & isTransparent)
151 return true; 119 return true;
152# endif 120# endif
153 121
154# ifdef BG_IMAGE_FROM_FILE 122# ifdef BG_IMAGE_FROM_FILE
155 if (have_image) 123 if (have_image)
156 { 124 {
157 if (flags & rootAlign) 125 if (bg_flags & rootAlign)
158 return true; 126 return true;
159 } 127 }
160# endif 128# endif
161 129
162 return false;
163}
164
165bool bgPixmap_t::need_client_side_rendering ()
166{
167# ifdef HAVE_AFTERIMAGE
168 if (original_asim)
169 return true;
170# endif
171 return false; 130 return false;
172} 131}
173 132
174# ifdef BG_IMAGE_FROM_FILE 133# ifdef BG_IMAGE_FROM_FILE
175static inline bool 134static inline bool
238 dst_size = target_size - dst_pos; 197 dst_size = target_size - dst_pos;
239 return src_pos; 198 return src_pos;
240} 199}
241 200
242bool 201bool
243bgPixmap_t::set_geometry (const char *geom, bool update) 202rxvt_term::bg_set_geometry (const char *geom, bool update)
244{ 203{
245 bool changed = false; 204 bool changed = false;
246 int geom_flags = 0; 205 int geom_flags = 0;
247 int x = 0, y = 0; 206 int x = 0, y = 0;
248 unsigned int w = 0, h = 0; 207 unsigned int w = 0, h = 0;
249 unsigned int n; 208 unsigned int n;
250 unsigned long new_flags = (flags & (~geometryFlags)); 209 unsigned long new_flags = (bg_flags & (~geometryFlags));
251 const char *p; 210 const char *ops;
252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
253 211
254 if (geom == NULL) 212 if (geom == NULL)
255 return false; 213 return false;
256 214
257 char str[MAXLEN_GEOM]; 215 char str[256];
258 216
259 while (isspace(*geom)) ++geom;
260 if ((p = strchr (geom, ';')) == NULL)
261 p = strchr (geom, '\0'); 217 ops = strchr (geom, ':');
262 218 if (ops == NULL)
219 n = strlen (geom);
220 else
263 n = (p - geom); 221 n = ops - geom;
264 if (n < MAXLEN_GEOM)
265 {
266 char *ops;
267 222
223 if (n >= sizeof (str))
224 return false;
225
268 memcpy (str, geom, n); 226 memcpy (str, geom, n);
269 str[n] = '\0'; 227 str[n] = '\0';
270 if (str[0] == ':') 228 rxvt_strtrim (str);
271 ops = &str[0];
272 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
273 ops = &str[0];
274 else
275 {
276 char *tmp;
277 ops = strchr (str, ':');
278 if (ops != NULL)
279 {
280 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
281 *(++tmp) = '\0';
282 if (ops == tmp) ++ops;
283 }
284 }
285 229
286 if (ops > str || ops == NULL) 230 if (str[0])
287 { 231 {
288 /* we have geometry string - let's handle it prior to applying ops */ 232 /* we have geometry string - let's handle it prior to applying ops */
289 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 233 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
290
291 if (!update) /* setting up geometry from scratch */
292 {
293 if (!(geom_flags & XValue))
294 {
295 /* use default geometry - centered */
296 x = y = defaultAlign;
297 }
298 else if (!(geom_flags & YValue))
299 y = x;
300
301 if ((geom_flags & (WidthValue|HeightValue)) == 0)
302 {
303 /* use default geometry - scaled */
304 w = h = defaultScale;
305 }
306 else if (geom_flags & WidthValue)
307 {
308 if (!(geom_flags & HeightValue))
309 h = w;
310 }
311 else
312 w = h;
313 }
314 } /* done parsing geometry string */ 234 } /* done parsing geometry string */
235
315 else if (!update) 236 if (!update)
316 { 237 {
317 /* default geometry - scaled and centered */ 238 if (!(geom_flags & XValue))
318 x = y = defaultAlign; 239 x = y = defaultAlign;
240 else if (!(geom_flags & YValue))
241 y = x;
242
243 if (!(geom_flags & (WidthValue|HeightValue)))
319 w = h = defaultScale; 244 w = h = defaultScale;
320 } 245 else if (!(geom_flags & HeightValue))
246 h = w;
247 else if (!(geom_flags & WidthValue))
248 w = h;
321 249
322 if (!update)
323 geom_flags |= WidthValue|HeightValue|XValue|YValue; 250 geom_flags |= WidthValue|HeightValue|XValue|YValue;
251 }
324 252
325 if (ops) 253 if (ops)
326 { 254 {
327 while (*ops) 255 char **arr = rxvt_strsplit (':', ops + 1);
256
257 for (int i = 0; arr[i]; i++)
328 { 258 {
329 while (*ops == ':' || isspace(*ops)) ++ops; 259 if (!strcasecmp (arr[i], "tile"))
330
331# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
332 if (CHECK_GEOM_OPS ("tile"))
333 { 260 {
334 w = h = noScale; 261 w = h = noScale;
335 geom_flags |= WidthValue|HeightValue; 262 geom_flags |= WidthValue|HeightValue;
336 } 263 }
337 else if (CHECK_GEOM_OPS ("propscale")) 264 else if (!strcasecmp (arr[i], "propscale"))
338 { 265 {
339 new_flags |= propScale; 266 new_flags |= propScale;
340 } 267 }
341 else if (CHECK_GEOM_OPS ("hscale")) 268 else if (!strcasecmp (arr[i], "hscale"))
342 { 269 {
343 if (w == 0) w = windowScale; 270 if (w == 0) w = windowScale;
344 271
345 h = noScale; 272 h = noScale;
346 geom_flags |= WidthValue|HeightValue; 273 geom_flags |= WidthValue|HeightValue;
347 } 274 }
348 else if (CHECK_GEOM_OPS ("vscale")) 275 else if (!strcasecmp (arr[i], "vscale"))
349 { 276 {
350 if (h == 0) h = windowScale; 277 if (h == 0) h = windowScale;
351 278
352 w = noScale; 279 w = noScale;
353 geom_flags |= WidthValue|HeightValue; 280 geom_flags |= WidthValue|HeightValue;
354 } 281 }
355 else if (CHECK_GEOM_OPS ("scale")) 282 else if (!strcasecmp (arr[i], "scale"))
356 { 283 {
357 if (h == 0) h = windowScale; 284 if (h == 0) h = windowScale;
358 if (w == 0) w = windowScale; 285 if (w == 0) w = windowScale;
359 286
360 geom_flags |= WidthValue|HeightValue; 287 geom_flags |= WidthValue|HeightValue;
361 } 288 }
362 else if (CHECK_GEOM_OPS ("auto")) 289 else if (!strcasecmp (arr[i], "auto"))
363 { 290 {
364 w = h = windowScale; 291 w = h = windowScale;
365 x = y = centerAlign; 292 x = y = centerAlign;
366 geom_flags |= WidthValue|HeightValue|XValue|YValue; 293 geom_flags |= WidthValue|HeightValue|XValue|YValue;
367 } 294 }
368 else if (CHECK_GEOM_OPS ("root")) 295 else if (!strcasecmp (arr[i], "root"))
369 { 296 {
370 new_flags |= rootAlign; 297 new_flags |= rootAlign;
371 w = h = noScale; 298 w = h = noScale;
372 geom_flags |= WidthValue|HeightValue; 299 geom_flags |= WidthValue|HeightValue;
373 } 300 }
374# undef CHECK_GEOM_OPS
375
376 while (*ops != ':' && *ops != '\0') ++ops;
377 } /* done parsing ops */ 301 } /* done parsing ops */
378 }
379 302
303 rxvt_free_strsplit (arr);
304 }
305
380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
381 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
382 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
384 }
385 310
386 if (new_flags != flags) 311 if (new_flags != bg_flags)
387 { 312 {
388 flags = new_flags; 313 bg_flags = new_flags;
389 changed = true; 314 changed = true;
390 } 315 }
391 316
392 return changed; 317 return changed;
393} 318}
394 319
395void 320void
396bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
397{ 322{
398 int target_width = target->szHint.width; 323 int target_width = szHint.width;
399 int target_height = target->szHint.height; 324 int target_height = szHint.height;
400 325
401 if (flags & propScale) 326 if (bg_flags & propScale)
402 { 327 {
403 float scale = (float)target_width / image_width; 328 float scale = (float)target_width / image_width;
404 min_it (scale, (float)target_height / image_height); 329 min_it (scale, (float)target_height / image_height);
405 w = image_width * scale + 0.5; 330 w = image_width * scale + 0.5;
406 h = image_height * scale + 0.5; 331 h = image_height * scale + 0.5;
412 } 337 }
413 338
414 if (!w) w = image_width; 339 if (!w) w = image_width;
415 if (!h) h = image_height; 340 if (!h) h = image_height;
416 341
417 if (flags & rootAlign) 342 if (bg_flags & rootAlign)
418 { 343 {
419 target->get_window_origin (x, y);
420 x = -x; 344 x = -target_x;
421 y = -y; 345 y = -target_y;
422 } 346 }
423 else 347 else
424 { 348 {
425 x = make_align_position (h_align, target_width, w); 349 x = make_align_position (h_align, target_width, w);
426 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
427 } 351 }
428 352
429 flags &= ~sizeSensitive; 353 bg_flags &= ~sizeSensitive;
430 if ((flags & propScale) || h_scale || v_scale 354 if ((bg_flags & propScale) || h_scale || v_scale
431 || (!(flags & rootAlign) && (h_align || v_align)) 355 || (!(bg_flags & rootAlign) && (h_align || v_align))
432 || w > target_width || h > target_height) 356 || w > target_width || h > target_height)
433 flags |= sizeSensitive; 357 bg_flags |= sizeSensitive;
434} 358}
435 359
436# ifdef HAVE_AFTERIMAGE 360# ifdef HAVE_AFTERIMAGE
437bool 361bool
438bgPixmap_t::render_image (unsigned long background_flags) 362rxvt_term::render_image (unsigned long tr_flags)
439{ 363{
440 if (target == NULL)
441 return false;
442
443 target->init_asv (); 364 init_asv ();
444 365
445 ASImage *background = NULL; 366 ASImage *background = NULL;
446 ARGB32 background_tint = TINT_LEAVE_SAME; 367 ARGB32 background_tint = TINT_LEAVE_SAME;
447 368
448# ifdef ENABLE_TRANSPARENCY 369# ifdef ENABLE_TRANSPARENCY
449 if (background_flags) 370 if (tr_flags)
450 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 371 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
451 372
452 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 373 if (tr_flags & tintNeeded)
453 { 374 {
454 ShadingInfo as_shade; 375 ShadingInfo as_shade;
455 as_shade.shading = shade; 376 as_shade.shading = shade;
456 377
457 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
458 if (flags & tintSet) 379 if (bg_flags & tintSet)
459 tint.get (c); 380 tint.get (c);
460 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
461 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
462 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
463 384
464 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
465 } 386 }
466 387
467 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) 388 if ((tr_flags & blurNeeded) && background != NULL)
468 { 389 {
469 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 390 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
470 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
471 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
472 if (tmp) 393 if (tmp)
473 { 394 {
474 destroy_asimage (&background); 395 destroy_asimage (&background);
477 } 398 }
478# endif 399# endif
479 400
480 ASImage *result = 0; 401 ASImage *result = 0;
481 402
482 int target_width = target->szHint.width; 403 int target_width = szHint.width;
483 int target_height = target->szHint.height; 404 int target_height = szHint.height;
484 int new_pmap_width = target_width; 405 int new_pmap_width = target_width;
485 int new_pmap_height = target_height; 406 int new_pmap_height = target_height;
486 407
487 int x = 0; 408 int x = 0;
488 int y = 0; 409 int y = 0;
491 412
492 if (original_asim) 413 if (original_asim)
493 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 414 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
494 415
495 if (!original_asim 416 if (!original_asim
496 || (!(flags & rootAlign) 417 || (!(bg_flags & rootAlign)
497 && (x >= target_width 418 && (x >= target_width
498 || y >= target_height 419 || y >= target_height
499 || (x + w <= 0) 420 || (x + w <= 0)
500 || (y + h <= 0)))) 421 || (y + h <= 0))))
501 { 422 {
505 new_pmap_height = background->height; 426 new_pmap_height = background->height;
506 result = background; 427 result = background;
507 428
508 if (background_tint != TINT_LEAVE_SAME) 429 if (background_tint != TINT_LEAVE_SAME)
509 { 430 {
510 ASImage *tmp = tile_asimage (target->asv, background, 0, 0, 431 ASImage *tmp = tile_asimage (asv, background, 0, 0,
511 target_width, target_height, background_tint, 432 target_width, target_height, background_tint,
512 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 433 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
513 if (tmp) 434 if (tmp)
514 result = tmp; 435 result = tmp;
515 } 436 }
522 result = original_asim; 443 result = original_asim;
523 444
524 if ((w != original_asim->width) 445 if ((w != original_asim->width)
525 || (h != original_asim->height)) 446 || (h != original_asim->height))
526 { 447 {
527 result = scale_asimage (target->asv, original_asim, 448 result = scale_asimage (asv, original_asim,
528 w, h, 449 w, h,
529 background ? ASA_ASImage : ASA_XImage, 450 background ? ASA_ASImage : ASA_XImage,
530 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
531 } 452 }
532 453
538 but there is no need to make it bigger than the window! */ 459 but there is no need to make it bigger than the window! */
539 new_pmap_width = min (result->width, target_width); 460 new_pmap_width = min (result->width, target_width);
540 new_pmap_height = min (result->height, target_height); 461 new_pmap_height = min (result->height, target_height);
541 462
542 /* we also need to tile our image in both directions */ 463 /* we also need to tile our image in both directions */
543 ASImage *tmp = tile_asimage (target->asv, result, 464 ASImage *tmp = tile_asimage (asv, result,
544 (int)result->width - x, 465 (int)result->width - x,
545 (int)result->height - y, 466 (int)result->height - y,
546 new_pmap_width, 467 new_pmap_width,
547 new_pmap_height, 468 new_pmap_height,
548 TINT_LEAVE_SAME, ASA_XImage, 469 TINT_LEAVE_SAME, ASA_XImage,
591 { 512 {
592 layers[1].dst_y = y; 513 layers[1].dst_y = y;
593 layers[1].clip_height = result->height; 514 layers[1].clip_height = result->height;
594 } 515 }
595 516
596 if (target->rs[Rs_blendtype]) 517 if (rs[Rs_blendtype])
597 { 518 {
598 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 519 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
599 if (layers[1].merge_scanlines == NULL) 520 if (layers[1].merge_scanlines == NULL)
600 layers[1].merge_scanlines = alphablend_scanlines; 521 layers[1].merge_scanlines = alphablend_scanlines;
601 } 522 }
602 523
603 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 524 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
604 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 525 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
605 526
606 if (tmp) 527 if (tmp)
607 { 528 {
608 if (result != original_asim) 529 if (result != original_asim)
621 { 542 {
622 XGCValues gcv; 543 XGCValues gcv;
623 GC gc; 544 GC gc;
624 545
625 /* create Pixmap */ 546 /* create Pixmap */
626 if (pixmap == None 547 if (bg_pixmap == None
627 || pmap_width != new_pmap_width 548 || bg_pmap_width != new_pmap_width
628 || pmap_height != new_pmap_height 549 || bg_pmap_height != new_pmap_height)
629 || pmap_depth != target->depth)
630 { 550 {
631 if (pixmap) 551 if (bg_pixmap)
632 XFreePixmap (target->dpy, pixmap); 552 XFreePixmap (dpy, bg_pixmap);
633 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 553 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
634 pmap_width = new_pmap_width; 554 bg_pmap_width = new_pmap_width;
635 pmap_height = new_pmap_height; 555 bg_pmap_height = new_pmap_height;
636 pmap_depth = target->depth;
637 } 556 }
638 /* fill with background color (if result's not completely overlapping it) */ 557 /* fill with background color (if result's not completely overlapping it) */
639 gcv.foreground = target->pix_colors[Color_bg]; 558 gcv.foreground = pix_colors[Color_bg];
640 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 559 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
641 560
642 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
643 int dst_width = result->width, dst_height = result->height; 562 int dst_width = result->width, dst_height = result->height;
644 if (background == NULL) 563 if (background == NULL)
645 { 564 {
650 } 569 }
651 570
652 if (dst_x > 0 || dst_y > 0 571 if (dst_x > 0 || dst_y > 0
653 || dst_x + dst_width < new_pmap_width 572 || dst_x + dst_width < new_pmap_width
654 || dst_y + dst_height < new_pmap_height) 573 || dst_y + dst_height < new_pmap_height)
655 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 574 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
656 } 575 }
657 576
658 /* put result on pixmap */ 577 /* put result on pixmap */
659 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 578 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
660 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 579 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
661 580
662 if (result != background && result != original_asim) 581 if (result != background && result != original_asim)
663 destroy_asimage (&result); 582 destroy_asimage (&result);
664 583
665 XFreeGC (target->dpy, gc); 584 XFreeGC (dpy, gc);
666 585
667 ret = true; 586 ret = true;
668 } 587 }
669 588
670 if (background) 589 if (background)
674} 593}
675# endif /* HAVE_AFTERIMAGE */ 594# endif /* HAVE_AFTERIMAGE */
676 595
677# ifdef HAVE_PIXBUF 596# ifdef HAVE_PIXBUF
678bool 597bool
679bgPixmap_t::render_image (unsigned long background_flags) 598rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
599 int src_x, int src_y, int dst_x, int dst_y,
600 unsigned int width, unsigned int height)
680{ 601{
681 if (target == NULL) 602 XImage *ximage;
603 char *data, *line;
604 int bytes_per_pixel;
605 int width_r, width_g, width_b;
606 int sh_r, sh_g, sh_b;
607 int rowstride;
608 int channels;
609 unsigned char *row;
610
611 if (visual->c_class != TrueColor)
682 return false; 612 return false;
683 613
614 if (depth == 24 || depth == 32)
615 bytes_per_pixel = 4;
616 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2;
618 else
619 return false;
620
621 width_r = rxvt_popcount (visual->red_mask);
622 width_g = rxvt_popcount (visual->green_mask);
623 width_b = rxvt_popcount (visual->blue_mask);
624
625 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false;
627
628 sh_r = rxvt_ctz (visual->red_mask);
629 sh_g = rxvt_ctz (visual->green_mask);
630 sh_b = rxvt_ctz (visual->blue_mask);
631
632 if (width > INT_MAX / height / bytes_per_pixel)
633 return false;
634
635 data = (char *)malloc (width * height * bytes_per_pixel);
636 if (!data)
637 return false;
638
639 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
640 width, height, bytes_per_pixel * 8, 0);
641 if (!ximage)
642 {
643 free (data);
644 return false;
645 }
646
647 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
648
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
652 line = data;
653
654 for (int y = 0; y < height; y++)
655 {
656 for (int x = 0; x < width; x++)
657 {
658 unsigned char *pixel = row + x * channels;
659 uint32_t value;
660
661 value = ((pixel[0] >> (8 - width_r)) << sh_r)
662 | ((pixel[1] >> (8 - width_g)) << sh_g)
663 | ((pixel[2] >> (8 - width_b)) << sh_b);
664
665 if (bytes_per_pixel == 4)
666 ((uint32_t *)line)[x] = value;
667 else
668 ((uint16_t *)line)[x] = value;
669 }
670
671 row += rowstride;
672 line += ximage->bytes_per_line;
673 }
674
675 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
676 XDestroyImage (ximage);
677 return true;
678}
679
680bool
681rxvt_term::render_image (unsigned long tr_flags)
682{
684 if (!pixbuf) 683 if (!pixbuf)
685 return false; 684 return false;
686 685
687 if (background_flags 686 if (tr_flags
688 && !(flags & HAS_RENDER)) 687 && !(bg_flags & HAS_RENDER))
689 return false; 688 return false;
690 689
691 GdkPixbuf *result; 690 GdkPixbuf *result;
692 691
693 int image_width = gdk_pixbuf_get_width (pixbuf); 692 int image_width = gdk_pixbuf_get_width (pixbuf);
694 int image_height = gdk_pixbuf_get_height (pixbuf); 693 int image_height = gdk_pixbuf_get_height (pixbuf);
695 694
696 int target_width = target->szHint.width; 695 int target_width = szHint.width;
697 int target_height = target->szHint.height; 696 int target_height = szHint.height;
698 int new_pmap_width = target_width; 697 int new_pmap_width = target_width;
699 int new_pmap_height = target_height; 698 int new_pmap_height = target_height;
700 699
701 int x = 0; 700 int x = 0;
702 int y = 0; 701 int y = 0;
703 int w = 0; 702 int w = 0;
704 int h = 0; 703 int h = 0;
705 704
706 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
707 706
708 if (!(flags & rootAlign) 707 if (!(bg_flags & rootAlign)
709 && (x >= target_width 708 && (x >= target_width
710 || y >= target_height 709 || y >= target_height
711 || (x + w <= 0) 710 || (x + w <= 0)
712 || (y + h <= 0))) 711 || (y + h <= 0)))
713 return false; 712 return false;
731 Pixmap root_pmap; 730 Pixmap root_pmap;
732 731
733 image_width = gdk_pixbuf_get_width (result); 732 image_width = gdk_pixbuf_get_width (result);
734 image_height = gdk_pixbuf_get_height (result); 733 image_height = gdk_pixbuf_get_height (result);
735 734
736 if (background_flags) 735 if (tr_flags)
737 { 736 {
738 root_pmap = pixmap; 737 root_pmap = bg_pixmap;
739 pixmap = None; 738 bg_pixmap = None;
740 } 739 }
741 else 740 else
742 { 741 {
743 if (h_scale == 0 || v_scale == 0) 742 if (h_scale == 0 || v_scale == 0)
744 { 743 {
745 new_pmap_width = min (image_width, target_width); 744 new_pmap_width = min (image_width, target_width);
746 new_pmap_height = min (image_height, target_height); 745 new_pmap_height = min (image_height, target_height);
747 } 746 }
748 } 747 }
749 748
750 if (pixmap == None 749 if (bg_pixmap == None
751 || pmap_width != new_pmap_width 750 || bg_pmap_width != new_pmap_width
752 || pmap_height != new_pmap_height 751 || bg_pmap_height != new_pmap_height)
753 || pmap_depth != target->depth)
754 { 752 {
755 if (pixmap) 753 if (bg_pixmap)
756 XFreePixmap (target->dpy, pixmap); 754 XFreePixmap (dpy, bg_pixmap);
757 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
758 pmap_width = new_pmap_width; 756 bg_pmap_width = new_pmap_width;
759 pmap_height = new_pmap_height; 757 bg_pmap_height = new_pmap_height;
760 pmap_depth = target->depth;
761 } 758 }
762 759
763 gcv.foreground = target->pix_colors[Color_bg]; 760 gcv.foreground = pix_colors[Color_bg];
764 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 761 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
765 762
766 if (h_scale == 0 || v_scale == 0) 763 if (h_scale == 0 || v_scale == 0)
767 { 764 {
768 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
769 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 766 pixbuf_to_pixmap (result, tile, gc,
770 0, 0, 767 0, 0,
771 0, 0, 768 0, 0,
772 image_width, image_height, 769 image_width, image_height);
773 XLIB_RGB_DITHER_NONE,
774 0, 0);
775 770
776 gcv.tile = tile; 771 gcv.tile = tile;
777 gcv.fill_style = FillTiled; 772 gcv.fill_style = FillTiled;
778 gcv.ts_x_origin = x; 773 gcv.ts_x_origin = x;
779 gcv.ts_y_origin = y; 774 gcv.ts_y_origin = y;
780 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 775 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
781 776
782 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 777 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
783 XFreePixmap (target->dpy, tile); 778 XFreePixmap (dpy, tile);
784 } 779 }
785 else 780 else
786 { 781 {
787 int src_x, src_y, dst_x, dst_y; 782 int src_x, src_y, dst_x, dst_y;
788 int dst_width, dst_height; 783 int dst_width, dst_height;
791 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 786 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
792 787
793 if (dst_x > 0 || dst_y > 0 788 if (dst_x > 0 || dst_y > 0
794 || dst_x + dst_width < new_pmap_width 789 || dst_x + dst_width < new_pmap_width
795 || dst_y + dst_height < new_pmap_height) 790 || dst_y + dst_height < new_pmap_height)
796 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 791 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
797 792
798 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 793 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
799 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 794 pixbuf_to_pixmap (result, bg_pixmap, gc,
800 src_x, src_y, 795 src_x, src_y,
801 dst_x, dst_y, 796 dst_x, dst_y,
802 dst_width, dst_height, 797 dst_width, dst_height);
803 XLIB_RGB_DITHER_NONE,
804 0, 0);
805 } 798 }
806 799
807#if XRENDER 800#if XRENDER
808 if (background_flags) 801 if (tr_flags)
809 { 802 {
810 Display *dpy = target->dpy;
811 XRenderPictureAttributes pa; 803 XRenderPictureAttributes pa;
812 804
813 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual); 805 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
814 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 806 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
815 807
816 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 808 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
817 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 809 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
818 810
819 pa.repeat = True; 811 pa.repeat = True;
820 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); 812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
821 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
822 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
823 XFreePixmap (dpy, mask_pmap); 815 XFreePixmap (dpy, mask_pmap);
824 816
825 if (src && dst && mask) 817 if (src && dst && mask)
843#endif 835#endif
844 836
845 if (result != pixbuf) 837 if (result != pixbuf)
846 g_object_unref (result); 838 g_object_unref (result);
847 839
848 XFreeGC (target->dpy, gc); 840 XFreeGC (dpy, gc);
849 841
850 ret = true; 842 ret = true;
851 } 843 }
852 844
853 return ret; 845 return ret;
854} 846}
855# endif /* HAVE_PIXBUF */ 847# endif /* HAVE_PIXBUF */
856 848
857bool 849bool
858bgPixmap_t::set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
859{ 851{
860 if (!file || !*file) 852 if (!file || !*file)
861 return false; 853 return false;
862 854
863 if (const char *p = strchr (file, ';')) 855 if (const char *p = strchr (file, ';'))
868 f[len] = '\0'; 860 f[len] = '\0';
869 file = f; 861 file = f;
870 } 862 }
871 863
872# ifdef HAVE_AFTERIMAGE 864# ifdef HAVE_AFTERIMAGE
873 if (!target->asimman) 865 if (!asimman)
874 target->asimman = create_generic_imageman (target->rs[Rs_path]); 866 asimman = create_generic_imageman (rs[Rs_path]);
875 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 867 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
876 if (image) 868 if (image)
877 { 869 {
878 if (original_asim) 870 if (original_asim)
879 safe_asimage_destroy (original_asim); 871 safe_asimage_destroy (original_asim);
880 original_asim = image; 872 original_asim = image;
873 bg_flags |= CLIENT_RENDER;
881 have_image = true; 874 have_image = true;
882 return true; 875 return true;
883 } 876 }
884# endif 877# endif
885 878
900 893
901# endif /* BG_IMAGE_FROM_FILE */ 894# endif /* BG_IMAGE_FROM_FILE */
902 895
903# ifdef ENABLE_TRANSPARENCY 896# ifdef ENABLE_TRANSPARENCY
904bool 897bool
905bgPixmap_t::set_transparent () 898rxvt_term::bg_set_transparent ()
906{ 899{
907 if (!(flags & isTransparent)) 900 if (!(bg_flags & isTransparent))
908 { 901 {
909 flags |= isTransparent; 902 bg_flags |= isTransparent;
910 return true; 903 return true;
911 } 904 }
912 905
913 return false; 906 return false;
914} 907}
915 908
916bool 909bool
917bgPixmap_t::set_blur_radius (const char *geom) 910rxvt_term::bg_set_blur (const char *geom)
918{ 911{
919 bool changed = false; 912 bool changed = false;
920 unsigned int hr, vr; 913 unsigned int hr, vr;
921 int junk; 914 int junk;
922 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 915 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
940 changed = true; 933 changed = true;
941 v_blurRadius = vr; 934 v_blurRadius = vr;
942 } 935 }
943 936
944 if (v_blurRadius == 0 && h_blurRadius == 0) 937 if (v_blurRadius == 0 && h_blurRadius == 0)
945 flags &= ~blurNeeded; 938 bg_flags &= ~blurNeeded;
946 else 939 else
947 flags |= blurNeeded; 940 bg_flags |= blurNeeded;
948 941
949 return changed; 942 return changed;
950} 943}
951 944
952static inline unsigned long 945static inline unsigned long
957 bool has_shade = shade != 100; 950 bool has_shade = shade != 100;
958 951
959 if (tint) 952 if (tint)
960 { 953 {
961 tint->get (c); 954 tint->get (c);
962# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 955 if (!has_shade
963 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 956 && (c.r <= 0x00ff || c.r >= 0xff00)
964 && IS_COMPONENT_WHOLESOME (c.g) 957 && (c.g <= 0x00ff || c.g >= 0xff00)
965 && IS_COMPONENT_WHOLESOME (c.b)) 958 && (c.b <= 0x00ff || c.b >= 0xff00))
966 flags |= bgPixmap_t::tintWholesome; 959 flags |= rxvt_term::tintWholesome;
967# undef IS_COMPONENT_WHOLESOME
968 } 960 }
969 961
970 if (has_shade) 962 if (has_shade || tint)
971 flags |= bgPixmap_t::tintNeeded; 963 flags |= rxvt_term::tintNeeded;
972 else if (tint)
973 {
974 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
975 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
976 {
977 flags |= bgPixmap_t::tintNeeded;
978 }
979 }
980 964
981 return flags; 965 return flags;
982} 966}
983 967
984bool 968bool
985bgPixmap_t::set_tint (rxvt_color &new_tint) 969rxvt_term::bg_set_tint (rxvt_color &new_tint)
986{ 970{
987 if (!(flags & tintSet) || tint != new_tint) 971 if (!(bg_flags & tintSet) || tint != new_tint)
988 { 972 {
989 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
990 tint = new_tint; 974 tint = new_tint;
991 flags = (flags & ~tintFlags) | new_flags | tintSet; 975 bg_flags = (bg_flags & ~tintFlags) | new_flags | tintSet;
992 return true; 976 return true;
993 } 977 }
994 978
995 return false; 979 return false;
996} 980}
997 981
998bool 982bool
999bgPixmap_t::unset_tint ()
1000{
1001 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1002
1003 if (new_flags != (flags & tintFlags))
1004 {
1005 flags = (flags & ~tintFlags) | new_flags;
1006 return true;
1007 }
1008
1009 return false;
1010}
1011
1012bool
1013bgPixmap_t::set_shade (const char *shade_str) 983rxvt_term::bg_set_shade (const char *shade_str)
1014{ 984{
1015 int new_shade = (shade_str) ? atoi (shade_str) : 100; 985 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1016 986
1017 clamp_it (new_shade, -100, 200); 987 clamp_it (new_shade, -100, 200);
1018 if (new_shade < 0) 988 if (new_shade < 0)
1019 new_shade = 200 - (100 + new_shade); 989 new_shade = 200 - (100 + new_shade);
1020 990
1021 if (new_shade != shade) 991 if (new_shade != shade)
1022 { 992 {
1023 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 993 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & tintSet) ? &tint : NULL, new_shade);
1024 shade = new_shade; 994 shade = new_shade;
1025 flags = (flags & (~tintFlags | tintSet)) | new_flags; 995 bg_flags = (bg_flags & ~tintFlags) | new_flags;
1026 return true; 996 return true;
1027 } 997 }
1028 998
1029 return false; 999 return false;
1030} 1000}
1051 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1021 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1052} 1022}
1053#endif 1023#endif
1054 1024
1055bool 1025bool
1056bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1026rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1057{ 1027{
1058 bool ret = false; 1028 bool ret = false;
1059#if XRENDER 1029#if XRENDER
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1030 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double)); 1031 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1032 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063 1033
1064 Display *dpy = target->dpy;
1065 XRenderPictureAttributes pa; 1034 XRenderPictureAttributes pa;
1066 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1067 1036
1068 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1069 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1089 1058
1090 if (v_blurRadius) 1059 if (v_blurRadius)
1091 { 1060 {
1092 size = v_blurRadius * 2 + 1; 1061 size = v_blurRadius * 2 + 1;
1093 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1062 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1094 swap (params[0], params[1]); 1063 ::swap (params[0], params[1]);
1095 1064
1096 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1065 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1097 XRenderComposite (dpy, 1066 XRenderComposite (dpy,
1098 PictOpSrc, 1067 PictOpSrc,
1099 src, 1068 src,
1115#endif 1084#endif
1116 return ret; 1085 return ret;
1117} 1086}
1118 1087
1119bool 1088bool
1120bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1089rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1121{ 1090{
1122 Display *dpy = target->dpy;
1123 bool ret = false; 1091 bool ret = false;
1124 1092
1125 if (flags & tintWholesome) 1093 if (bg_flags & tintWholesome)
1126 { 1094 {
1127 XGCValues gcv; 1095 XGCValues gcv;
1128 GC gc; 1096 GC gc;
1129 1097
1130 /* In this case we can tint image server-side getting significant 1098 /* In this case we can tint image server-side getting significant
1144 else 1112 else
1145 { 1113 {
1146# if XRENDER 1114# if XRENDER
1147 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1148 1116
1149 if (flags & tintSet) 1117 if (bg_flags & tintSet)
1150 tint.get (c); 1118 tint.get (c);
1151 1119
1152 if (shade <= 100) 1120 if (shade <= 100)
1153 { 1121 {
1154 c.r = (c.r * shade) / 100; 1122 c.r = (c.r * shade) / 100;
1155 c.g = (c.g * shade) / 100; 1123 c.g = (c.g * shade) / 100;
1156 c.b = (c.b * shade) / 100; 1124 c.b = (c.b * shade) / 100;
1157 } 1125 }
1158 else 1126 else
1159 { 1127 {
1160 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1128 c.r = (c.r * (200 - shade)) / 100;
1161 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1129 c.g = (c.g * (200 - shade)) / 100;
1162 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1130 c.b = (c.b * (200 - shade)) / 100;
1163 } 1131 }
1164 1132
1165 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1133 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1166 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1134 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1167 XRenderPictureAttributes pa; 1135 XRenderPictureAttributes pa;
1181 1149
1182 if (mask_pic && overlay_pic && back_pic) 1150 if (mask_pic && overlay_pic && back_pic)
1183 { 1151 {
1184 XRenderColor mask_c; 1152 XRenderColor mask_c;
1185 1153
1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1154 mask_c.red = mask_c.green = mask_c.blue = 0;
1187 mask_c.alpha = 0xffff; 1155 mask_c.alpha = 0xffff;
1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1156 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1189 1157
1190 mask_c.alpha = 0; 1158 mask_c.alpha = 0;
1191 mask_c.red = 0xffff - c.r; 1159 mask_c.red = 0xffff - c.r;
1192 mask_c.green = 0xffff - c.g; 1160 mask_c.green = 0xffff - c.g;
1193 mask_c.blue = 0xffff - c.b; 1161 mask_c.blue = 0xffff - c.b;
1194 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1162 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1195 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1163 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1164
1165 if (shade > 100)
1166 {
1167 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1168 mask_c.alpha = 0;
1169 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1170
1171 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172 }
1173
1196 ret = true; 1174 ret = true;
1197 } 1175 }
1198 1176
1199 XRenderFreePicture (dpy, mask_pic); 1177 XRenderFreePicture (dpy, mask_pic);
1200 XRenderFreePicture (dpy, overlay_pic); 1178 XRenderFreePicture (dpy, overlay_pic);
1209 * Builds a pixmap of the same size as the terminal window that contains 1187 * Builds a pixmap of the same size as the terminal window that contains
1210 * the tiled portion of the root pixmap that is supposed to be covered by 1188 * the tiled portion of the root pixmap that is supposed to be covered by
1211 * our window. 1189 * our window.
1212 */ 1190 */
1213unsigned long 1191unsigned long
1214bgPixmap_t::make_transparency_pixmap () 1192rxvt_term::make_transparency_pixmap ()
1215{ 1193{
1216 unsigned long result = 0; 1194 unsigned long result = 0;
1217
1218 if (target == NULL)
1219 return 0;
1220 1195
1221 /* root dimensions may change from call to call - but Display structure should 1196 /* root dimensions may change from call to call - but Display structure should
1222 * be always up-to-date, so let's use it : 1197 * be always up-to-date, so let's use it :
1223 */ 1198 */
1224 int screen = target->display->screen; 1199 int screen = display->screen;
1225 Display *dpy = target->dpy;
1226 int root_depth = DefaultDepth (dpy, screen); 1200 int root_depth = DefaultDepth (dpy, screen);
1227 int root_width = DisplayWidth (dpy, screen); 1201 int root_width = DisplayWidth (dpy, screen);
1228 int root_height = DisplayHeight (dpy, screen); 1202 int root_height = DisplayHeight (dpy, screen);
1229 unsigned int root_pmap_width, root_pmap_height; 1203 unsigned int root_pmap_width, root_pmap_height;
1230 int window_width = target->szHint.width; 1204 int window_width = szHint.width;
1231 int window_height = target->szHint.height; 1205 int window_height = szHint.height;
1232 int sx, sy; 1206 int sx, sy;
1233 XGCValues gcv; 1207 XGCValues gcv;
1234 GC gc; 1208 GC gc;
1235 1209
1236 target->get_window_origin (sx, sy); 1210 sx = target_x;
1211 sy = target_y;
1237 1212
1238 /* check if we are outside of the visible part of the virtual screen : */ 1213 /* check if we are outside of the visible part of the virtual screen : */
1239 if (sx + window_width <= 0 || sy + window_height <= 0 1214 if (sx + window_width <= 0 || sy + window_height <= 0
1240 || sx >= root_width || sy >= root_height) 1215 || sx >= root_width || sy >= root_height)
1241 return 0; 1216 return 0;
1245 { 1220 {
1246 Window wdummy; 1221 Window wdummy;
1247 int idummy; 1222 int idummy;
1248 unsigned int udummy; 1223 unsigned int udummy;
1249 1224
1250 target->allowedxerror = -1; 1225 allowedxerror = -1;
1251 1226
1252 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) 1227 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1253 root_pixmap = None; 1228 root_pixmap = None;
1254 1229
1255 target->allowedxerror = 0; 1230 allowedxerror = 0;
1256 } 1231 }
1257 1232
1258 Pixmap recoded_root_pmap = root_pixmap; 1233 Pixmap recoded_root_pmap = root_pixmap;
1259 1234
1260 if (root_pixmap != None && root_depth != target->depth) 1235 if (root_pixmap != None && root_depth != depth)
1261 { 1236 {
1262#if XRENDER 1237#if XRENDER
1263 if (flags & HAS_RENDER) 1238 if (bg_flags & HAS_RENDER)
1264 { 1239 {
1265 XRenderPictureAttributes pa; 1240 XRenderPictureAttributes pa;
1266 1241
1267 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1242 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1268 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1243 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1269 1244
1270 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); 1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1271 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1246 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1272 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1247 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1273 1248
1274 if (src && dst) 1249 if (src && dst)
1275 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1250 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1276 else 1251 else
1288 } 1263 }
1289 1264
1290 if (root_pixmap == None) 1265 if (root_pixmap == None)
1291 return 0; 1266 return 0;
1292 1267
1268 if (bg_pixmap == None
1269 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height)
1271 {
1272 if (bg_pixmap)
1273 XFreePixmap (dpy, bg_pixmap);
1293 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1275 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height;
1277 }
1294 1278
1295 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1279 if (bg_pixmap == None)
1296 return 0; 1280 return 0;
1297 1281
1298 /* straightforward pixmap copy */ 1282 /* straightforward pixmap copy */
1283 while (sx < 0) sx += (int)root_width;
1284 while (sy < 0) sy += (int)root_height;
1285
1299 gcv.tile = recoded_root_pmap; 1286 gcv.tile = recoded_root_pmap;
1300 gcv.fill_style = FillTiled; 1287 gcv.fill_style = FillTiled;
1301
1302 while (sx < 0) sx += (int)root_width;
1303 while (sy < 0) sy += (int)root_height;
1304
1305 gcv.ts_x_origin = -sx; 1288 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1289 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1290 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1291
1309 if (gc) 1292 if (gc)
1310 { 1293 {
1311 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1294 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1312 result |= transpPmapTiled; 1295 result |= isValid | (bg_flags & effectsFlags);
1313 XFreeGC (dpy, gc); 1296 XFreeGC (dpy, gc);
1314 1297
1315 if (!need_client_side_rendering ()) 1298 if (!(bg_flags & CLIENT_RENDER))
1316 { 1299 {
1317 if ((flags & blurNeeded) 1300 if ((bg_flags & blurNeeded)
1318 && (flags & HAS_RENDER_CONV)) 1301 && (bg_flags & HAS_RENDER_CONV))
1319 {
1320 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1321 result |= transpPmapBlurred;
1322 } 1302 {
1303 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1304 result &= ~blurNeeded;
1305 }
1323 if ((flags & tintNeeded) 1306 if ((bg_flags & tintNeeded)
1324 && (flags & (tintWholesome | HAS_RENDER))) 1307 && (bg_flags & (tintWholesome | HAS_RENDER)))
1325 { 1308 {
1326 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1327 result |= transpPmapTinted; 1310 result &= ~tintNeeded;
1328 } 1311 }
1329 } /* server side rendering completed */ 1312 } /* server side rendering completed */
1330
1331 if (pixmap)
1332 XFreePixmap (dpy, pixmap);
1333
1334 pixmap = tiled_root_pmap;
1335 pmap_width = window_width;
1336 pmap_height = window_height;
1337 pmap_depth = target->depth;
1338 } 1313 }
1339 else
1340 XFreePixmap (dpy, tiled_root_pmap);
1341 1314
1342 if (recoded_root_pmap != root_pixmap) 1315 if (recoded_root_pmap != root_pixmap)
1343 XFreePixmap (dpy, recoded_root_pmap); 1316 XFreePixmap (dpy, recoded_root_pmap);
1344 1317
1345 return result; 1318 return result;
1346} 1319}
1347 1320
1348void 1321void
1349bgPixmap_t::set_root_pixmap () 1322rxvt_term::bg_set_root_pixmap ()
1350{ 1323{
1351 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1324 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1352 if (new_root_pixmap == None) 1325 if (new_root_pixmap == None)
1353 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1354 1327
1355 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1356} 1329}
1357# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1358 1331
1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1332#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1360static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1333static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1361# endif 1334# endif
1362 1335
1363bool 1336bool
1364bgPixmap_t::render () 1337rxvt_term::bg_render ()
1365{ 1338{
1366 unsigned long background_flags = 0; 1339 unsigned long tr_flags = 0;
1367 1340
1368 if (target == NULL)
1369 return false;
1370
1371 invalidate (); 1341 bg_invalidate ();
1372# ifdef ENABLE_TRANSPARENCY 1342# ifdef ENABLE_TRANSPARENCY
1373 if (flags & isTransparent) 1343 if (bg_flags & isTransparent)
1374 { 1344 {
1375 /* we need to re-generate transparency pixmap in that case ! */ 1345 /* we need to re-generate transparency pixmap in that case ! */
1376 background_flags = make_transparency_pixmap (); 1346 tr_flags = make_transparency_pixmap ();
1377 if (background_flags == 0) 1347 if (tr_flags == 0)
1378 return false; 1348 return false;
1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1349 else if (!(tr_flags & effectsFlags))
1380 flags = flags & ~isInvalid; 1350 bg_flags |= isValid;
1381 } 1351 }
1382# endif 1352# endif
1383 1353
1384# ifdef BG_IMAGE_FROM_FILE 1354# ifdef BG_IMAGE_FROM_FILE
1385 if (have_image 1355 if (have_image
1386 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1356 || (tr_flags & effectsFlags))
1387 { 1357 {
1388 if (render_image (background_flags)) 1358 if (render_image (tr_flags))
1389 flags = flags & ~isInvalid; 1359 bg_flags |= isValid;
1390 } 1360 }
1391# endif 1361# endif
1392 1362
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1363# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1394 XImage *result = NULL; 1364 XImage *result = NULL;
1395 1365
1396 if (background_flags && (flags & isInvalid)) 1366 if (tr_flags && !(bg_flags & isValid))
1397 { 1367 {
1398 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1368 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1399 } 1369 }
1400 1370
1401 if (result) 1371 if (result)
1402 { 1372 {
1403 /* our own client-side tinting */ 1373 /* our own client-side tinting */
1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1374 if (tr_flags & tintNeeded)
1405 { 1375 {
1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1407 if (flags & tintSet) 1377 if (bg_flags & tintSet)
1408 tint.get (c); 1378 tint.get (c);
1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1410 } 1380 }
1411 1381
1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1382 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1413 1383
1414 if (gc) 1384 if (gc)
1415 { 1385 {
1416 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1417 1387
1418 XFreeGC (target->dpy, gc); 1388 XFreeGC (dpy, gc);
1419 flags = flags & ~isInvalid; 1389 bg_flags |= isValid;
1420 } 1390 }
1421 1391
1422 XDestroyImage (result); 1392 XDestroyImage (result);
1423 } 1393 }
1424# endif 1394# endif
1425 1395
1426 if (flags & isInvalid) 1396 if (!(bg_flags & isValid))
1427 { 1397 {
1428 if (pixmap != None) 1398 if (bg_pixmap != None)
1429 { 1399 {
1430 XFreePixmap (target->dpy, pixmap); 1400 XFreePixmap (dpy, bg_pixmap);
1431 pixmap = None; 1401 bg_pixmap = None;
1432 } 1402 }
1433 } 1403 }
1434 1404
1435 apply (); 1405 scr_recolour (false);
1406 bg_flags |= hasChanged;
1436 1407
1437 valid_since = ev::now (); 1408 bg_valid_since = ev::now ();
1438 1409
1439 return true; 1410 return true;
1440} 1411}
1441 1412
1442void 1413void
1443bgPixmap_t::set_target (rxvt_term *new_target) 1414rxvt_term::bg_init ()
1444{ 1415{
1445 target = new_target; 1416#ifdef ENABLE_TRANSPARENCY
1417 shade = 100;
1418#endif
1446 1419
1447 flags &= ~(HAS_RENDER | HAS_RENDER_CONV); 1420 bg_flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1448#if XRENDER 1421#if XRENDER
1449 int major, minor; 1422 int major, minor;
1450 if (XRenderQueryVersion (target->dpy, &major, &minor)) 1423 if (XRenderQueryVersion (dpy, &major, &minor))
1451 flags |= HAS_RENDER; 1424 bg_flags |= HAS_RENDER;
1452 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt); 1425 XFilters *filters = XRenderQueryFilters (dpy, vt);
1453 if (filters) 1426 if (filters)
1454 { 1427 {
1455 for (int i = 0; i < filters->nfilter; i++) 1428 for (int i = 0; i < filters->nfilter; i++)
1456 if (!strcmp (filters->filter[i], FilterConvolution)) 1429 if (!strcmp (filters->filter[i], FilterConvolution))
1457 flags |= HAS_RENDER_CONV; 1430 bg_flags |= HAS_RENDER_CONV;
1458 1431
1459 XFree (filters); 1432 XFree (filters);
1460 } 1433 }
1461#endif 1434#endif
1462}
1463
1464void
1465bgPixmap_t::apply ()
1466{
1467 if (target == NULL)
1468 return;
1469
1470 if (pixmap != None)
1471 {
1472 /* set target's background to pixmap */
1473# ifdef ENABLE_TRANSPARENCY
1474 if (flags & isTransparent)
1475 {
1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1478
1479 if (target->scrollBar.win)
1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1481 }
1482 else
1483# endif
1484 {
1485 /* force old pixmap dereference in case it was transparent before :*/
1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1488 /* do we also need to set scrollbar's background here ? */
1489
1490 if (target->scrollBar.win)
1491 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1492 }
1493 }
1494 else
1495 {
1496 /* set target background to a pixel */
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1499 /* do we also need to set scrollbar's background here ? */
1500 if (target->scrollBar.win)
1501 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1502 }
1503
1504 /* don't want Expose on the parent or vt. It is better to use
1505 scr_touch or we get a great deal of flicker otherwise: */
1506 XClearWindow (target->dpy, target->parent[0]);
1507
1508 if (target->scrollBar.state && target->scrollBar.win)
1509 {
1510 target->scrollBar.state = STATE_IDLE;
1511 target->scrollBar.show (0);
1512 }
1513
1514 target->want_refresh = 1;
1515 flags |= hasChanged;
1516} 1435}
1517 1436
1518#endif /* HAVE_BG_PIXMAP */ 1437#endif /* HAVE_BG_PIXMAP */
1519 1438
1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1439#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1521/* taken from aterm-0.4.2 */ 1440/* taken from aterm-0.4.2 */
1522 1441
1523static void 1442static void
1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1443shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1525{ 1444{
1526 int sh_r, sh_g, sh_b; 1445 int sh_r, sh_g, sh_b;
1527 uint32_t mask_r, mask_g, mask_b; 1446 uint32_t mask_r, mask_g, mask_b;
1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1447 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1529 rgba low; 1448 rgba low;
1530 rgba high; 1449 rgba high;
1531 int i; 1450 int i;
1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1451 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1533 1452
1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1535 1454
1536 /* for convenience */ 1455 /* for convenience */
1537 mask_r = visual->red_mask; 1456 mask_r = visual->red_mask;
1538 mask_g = visual->green_mask; 1457 mask_g = visual->green_mask;
1539 mask_b = visual->blue_mask; 1458 mask_b = visual->blue_mask;
1540 1459
1541 /* boring lookup table pre-initialization */ 1460 /* boring lookup table pre-initialization */
1542 switch (srcImage->depth) 1461 switch (ximage->depth)
1543 { 1462 {
1544 case 15: 1463 case 15:
1545 if ((mask_r != 0x7c00) || 1464 if ((mask_r != 0x7c00) ||
1546 (mask_g != 0x03e0) || 1465 (mask_g != 0x03e0) ||
1547 (mask_b != 0x001f)) 1466 (mask_b != 0x001f))
1600 /* prepare limits for color transformation (each channel is handled separately) */ 1519 /* prepare limits for color transformation (each channel is handled separately) */
1601 if (shade > 100) 1520 if (shade > 100)
1602 { 1521 {
1603 shade = 200 - shade; 1522 shade = 200 - shade;
1604 1523
1605 high.r = (65535 - c.r) * shade / 100; 1524 high.r = c.r * shade / 100;
1606 high.g = (65535 - c.g) * shade / 100; 1525 high.g = c.g * shade / 100;
1607 high.b = (65535 - c.b) * shade / 100; 1526 high.b = c.b * shade / 100;
1608 1527
1609 low.r = 65535 - high.r; 1528 low.r = 65535 * (100 - shade) / 100;
1610 low.g = 65535 - high.g; 1529 low.g = 65535 * (100 - shade) / 100;
1611 low.b = 65535 - high.b; 1530 low.b = 65535 * (100 - shade) / 100;
1612 } 1531 }
1613 else 1532 else
1614 { 1533 {
1615 high.r = c.r * shade / 100; 1534 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100; 1535 high.g = c.g * shade / 100;
1641 tmp += (mask_b>>sh_b) * low.b; 1560 tmp += (mask_b>>sh_b) * low.b;
1642 lookup_b[i] = (tmp/65535)<<sh_b; 1561 lookup_b[i] = (tmp/65535)<<sh_b;
1643 } 1562 }
1644 1563
1645 /* apply table to input image (replacing colors by newly calculated ones) */ 1564 /* apply table to input image (replacing colors by newly calculated ones) */
1646 if (srcImage->bits_per_pixel == 32 1565 if (ximage->bits_per_pixel == 32
1647 && (srcImage->depth == 24 || srcImage->depth == 32) 1566 && (ximage->depth == 24 || ximage->depth == 32)
1648 && srcImage->byte_order == host_byte_order) 1567 && ximage->byte_order == host_byte_order)
1649 { 1568 {
1650 uint32_t *p1, *pf, *p, *pl; 1569 uint32_t *p1, *pf, *p, *pl;
1651 p1 = (uint32_t *) srcImage->data; 1570 p1 = (uint32_t *) ximage->data;
1652 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1571 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1653 1572
1654 while (p1 < pf) 1573 while (p1 < pf)
1655 { 1574 {
1656 p = p1; 1575 p = p1;
1657 pl = p1 + srcImage->width; 1576 pl = p1 + ximage->width;
1658 for (; p < pl; p++) 1577 for (; p < pl; p++)
1659 { 1578 {
1660 *p = lookup_r[(*p & 0xff0000) >> 16] | 1579 *p = lookup_r[(*p & 0xff0000) >> 16] |
1661 lookup_g[(*p & 0x00ff00) >> 8] | 1580 lookup_g[(*p & 0x00ff00) >> 8] |
1662 lookup_b[(*p & 0x0000ff)] | 1581 lookup_b[(*p & 0x0000ff)] |
1663 (*p & 0xff000000); 1582 (*p & 0xff000000);
1664 } 1583 }
1665 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1584 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1666 } 1585 }
1667 } 1586 }
1668 else 1587 else
1669 { 1588 {
1670 for (int y = 0; y < srcImage->height; y++) 1589 for (int y = 0; y < ximage->height; y++)
1671 for (int x = 0; x < srcImage->width; x++) 1590 for (int x = 0; x < ximage->width; x++)
1672 { 1591 {
1673 unsigned long pixel = XGetPixel (srcImage, x, y); 1592 unsigned long pixel = XGetPixel (ximage, x, y);
1674 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1593 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1675 lookup_g[(pixel & mask_g) >> sh_g] | 1594 lookup_g[(pixel & mask_g) >> sh_g] |
1676 lookup_b[(pixel & mask_b) >> sh_b]; 1595 lookup_b[(pixel & mask_b) >> sh_b];
1677 XPutPixel (srcImage, x, y, pixel); 1596 XPutPixel (ximage, x, y, pixel);
1678 } 1597 }
1679 } 1598 }
1680 1599
1681 free (lookup); 1600 free (lookup);
1682} 1601}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines