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

Diff Legend

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