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.115 by sf-exg, Thu Nov 11 10:42:45 2010 UTC vs.
Revision 1.142 by sf-exg, Thu Jan 27 17:37:18 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines