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.11 by sasha, Wed Nov 14 22:25:41 2007 UTC vs.
Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
38 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
40 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
41 43
42#else 44#else
43#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
44#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
45#endif 47#endif
46 48
47/* 49/*
48 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
49 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
50 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
51 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
52 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
53 * affects on the background image : 55 * effects on the background image :
54 * 56 *
55 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
56 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
57 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
58 * the image in the window. 60 * the image in the window.
59 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
60 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
61 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
62 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
63 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
64 * 66 *
65 * Adjusting position only : 67 * Adjusting position only :
66 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
67 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
68 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
69 * from current position (relative). 71 * from current position (relative).
70 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
71 * from current position. 73 * from current position.
72 * 74 *
73 * Adjusting scale only : 75 * Adjusting scale only :
74 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
75 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
76 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
77 * 79 *
78 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
79 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
80 * the tile size and origin. 82 * the tile size and origin.
81 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
82 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
83 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
84 * current background color. 86 * current background color.
85 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
86 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
87 * scale Scale both up and down 89 * scale Scale both up and down
88 * auto Same as 100x100+50+50 90 * auto Same as 100x100+50+50
89 */ 91 */
90 92
91#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
92bgPixmap_t::bgPixmap_t() 94bgPixmap_t::bgPixmap_t ()
93{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
111 valid_since = invalid_since = 0;
112 target = 0;
103} 113}
104 114
105bgPixmap_t::~bgPixmap_t() 115void
116bgPixmap_t::destroy ()
106{ 117{
107#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
108 if (original_asim) 119 if (original_asim)
109 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
110#endif 121#endif
122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
111 if (pixmap && target) 128 if (pixmap && target)
112 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
113} 130}
114 131
115bool 132bool
116bgPixmap_t::window_size_sensitive () 133bgPixmap_t::window_size_sensitive ()
117{ 134{
118# ifdef BG_IMAGE_FROM_FILE
119# ifdef HAVE_AFTERIMAGE
120 if (original_asim != NULL)
121# endif
122 {
123 if (h_scale != 0 || v_scale != 0
124 || h_align != 0 || v_align != 0)
125 return true;
126 }
127# endif
128# ifdef ENABLE_TRANSPARENCY 135# ifdef ENABLE_TRANSPARENCY
129 if (flags & isTransparent) 136 if (flags & isTransparent)
130 return true; 137 return true;
131# endif 138# endif
139
140# ifdef BG_IMAGE_FROM_FILE
141 if (have_image)
142 {
143 if (h_scale != 0 || v_scale != 0
144 || h_align != 0 || v_align != 0)
145 return true;
146 }
147# endif
148
132 return false; 149 return false;
133} 150}
134 151
152bool
153bgPixmap_t::window_position_sensitive ()
154{
155# ifdef ENABLE_TRANSPARENCY
156 if (flags & isTransparent)
157 return true;
158# endif
159
160# ifdef BG_IMAGE_FROM_FILE
161 if (have_image)
162 {
163 if (h_align == rootAlign || v_align == rootAlign)
164 return true;
165 }
166# endif
167
168 return false;
169};
170
135bool bgPixmap_t::need_client_side_rendering () 171bool bgPixmap_t::need_client_side_rendering ()
136{ 172{
137# ifdef HAVE_AFTERIMAGE 173# ifdef HAVE_AFTERIMAGE
138 if (original_asim != NULL) 174 if (original_asim)
139 return true; 175 return true;
140# endif 176# endif
141# ifdef ENABLE_TRANSPARENCY 177# ifdef ENABLE_TRANSPARENCY
142 if (flags & isTransparent) 178 if (flags & isTransparent)
143 { 179 {
… …
172static inline bool 208static inline bool
173check_set_align_value (int geom_flags, int flag, int &align, int new_value) 209check_set_align_value (int geom_flags, int flag, int &align, int new_value)
174{ 210{
175 if (geom_flags & flag) 211 if (geom_flags & flag)
176 { 212 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
177 if (new_value < -100) 215 if (new_value < -100)
178 new_value = -100; 216 new_value = -100;
179 else if (new_value > 200) 217 else if (new_value > 200)
180 new_value = 200; 218 new_value = 200;
219 }
181 if (new_value != align) 220 if (new_value != align)
182 { 221 {
183 align = new_value; 222 align = new_value;
184 return true; 223 return true;
185 } 224 }
… …
189 228
190static inline int 229static inline int
191make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
192{ 231{
193 int diff = window_size - image_size; 232 int diff = window_size - image_size;
194 int smaller = MIN (image_size,window_size); 233 int smaller = min (image_size, window_size);
195 234
196 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 50)
197 return diff * align / 100; 236 return diff * align / 100;
198 else if (align > 50 && align <= 100) 237 else if (align > 50 && align <= 100)
199 return window_size - image_size - diff * (100 - align) / 100; 238 return window_size - image_size - diff * (100 - align) / 100;
… …
208make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
209{ 248{
210 int src_pos = 0; 249 int src_pos = 0;
211 dst_pos = 0; 250 dst_pos = 0;
212 dst_size = size; 251 dst_size = size;
213 if (pos < 0 && size > target_size) 252 if (pos < 0)
214 { 253 {
215 src_pos = -pos; 254 src_pos = -pos;
216 dst_size += pos; 255 dst_size += pos;
217 } 256 }
218 else if (pos > 0) 257 else if (pos > 0)
… …
229 int geom_flags = 0, changed = 0; 268 int geom_flags = 0, changed = 0;
230 int x = 0, y = 0; 269 int x = 0, y = 0;
231 unsigned int w = 0, h = 0; 270 unsigned int w = 0, h = 0;
232 unsigned int n; 271 unsigned int n;
233 unsigned long new_flags = (flags & (~geometryFlags)); 272 unsigned long new_flags = (flags & (~geometryFlags));
234 char *p; 273 const char *p;
235# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 274# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
236 275
237 if (geom == NULL) 276 if (geom == NULL)
238 return false; 277 return false;
239 278
240 char str[MAXLEN_GEOM]; 279 char str[MAXLEN_GEOM];
… …
247 if (n < MAXLEN_GEOM) 286 if (n < MAXLEN_GEOM)
248 { 287 {
249 char *ops; 288 char *ops;
250 new_flags |= geometrySet; 289 new_flags |= geometrySet;
251 290
252 strncpy (str, geom, n); 291 memcpy (str, geom, n);
253 str[n] = '\0'; 292 str[n] = '\0';
254 if (str[0] == ':') 293 if (str[0] == ':')
255 ops = &str[0]; 294 ops = &str[0];
256 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 295 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
257 ops = &str[0]; 296 ops = &str[0];
… …
277 y = x; 316 y = x;
278 geom_flags |= YValue; 317 geom_flags |= YValue;
279 } 318 }
280 319
281 if (flags & geometrySet) 320 if (flags & geometrySet)
321 {
282 {/* new geometry is an adjustment to the old one ! */ 322 /* new geometry is an adjustment to the old one ! */
283 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 323 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
284 { 324 {
285 if (w == 0 && h != 0) 325 if (w == 0 && h != 0)
286 { 326 {
287 w = h_scale; 327 w = h_scale;
… …
303 } 343 }
304 } 344 }
305 else /* setting up geometry from scratch */ 345 else /* setting up geometry from scratch */
306 { 346 {
307 if (!(geom_flags & XValue)) 347 if (!(geom_flags & XValue))
348 {
308 {/* use default geometry - centered */ 349 /* use default geometry - centered */
309 x = y = defaultAlign; 350 x = y = defaultAlign;
310 } 351 }
311 else if (!(geom_flags & YValue)) 352 else if (!(geom_flags & YValue))
312 y = x; 353 y = x;
313 354
314 if ((geom_flags & (WidthValue|HeightValue)) == 0) 355 if ((geom_flags & (WidthValue|HeightValue)) == 0)
356 {
315 {/* use default geometry - scaled */ 357 /* use default geometry - scaled */
316 w = h = defaultScale; 358 w = h = defaultScale;
317 } 359 }
318 else if (geom_flags & WidthValue) 360 else if (geom_flags & WidthValue)
319 { 361 {
320 if (!(geom_flags & HeightValue)) 362 if (!(geom_flags & HeightValue))
… …
323 else 365 else
324 w = h; 366 w = h;
325 } 367 }
326 } /* done parsing geometry string */ 368 } /* done parsing geometry string */
327 else if (!(flags & geometrySet)) 369 else if (!(flags & geometrySet))
370 {
328 { /* default geometry - scaled and centered */ 371 /* default geometry - scaled and centered */
329 x = y = defaultAlign; 372 x = y = defaultAlign;
330 w = h = defaultScale; 373 w = h = defaultScale;
331 } 374 }
332 375
333 if (!(flags & geometrySet)) 376 if (!(flags & geometrySet))
… …
336 if (ops) 379 if (ops)
337 { 380 {
338 while (*ops) 381 while (*ops)
339 { 382 {
340 while (*ops == ':' || isspace(*ops)) ++ops; 383 while (*ops == ':' || isspace(*ops)) ++ops;
384
341# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 385# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
342 if (CHECK_GEOM_OPS("tile")) 386 if (CHECK_GEOM_OPS ("tile"))
343 { 387 {
344 w = h = 0; 388 w = h = noScale;
345 geom_flags |= WidthValue|HeightValue; 389 geom_flags |= WidthValue|HeightValue;
346 } 390 }
347 else if (CHECK_GEOM_OPS("propscale")) 391 else if (CHECK_GEOM_OPS ("propscale"))
348 { 392 {
349 if (w == 0 && h == 0) 393 if (w == 0 && h == 0)
350 { 394 {
351 w = 100; 395 w = windowScale;
352 geom_flags |= WidthValue; 396 geom_flags |= WidthValue;
353 } 397 }
354 new_flags |= propScale; 398 new_flags |= propScale;
355 } 399 }
356 else if (CHECK_GEOM_OPS("hscale")) 400 else if (CHECK_GEOM_OPS ("hscale"))
357 { 401 {
358 if (w == 0) 402 if (w == 0) w = windowScale;
359 w = 100; 403
360 h = 0; 404 h = noScale;
361 geom_flags |= WidthValue|HeightValue; 405 geom_flags |= WidthValue|HeightValue;
362 } 406 }
363 else if (CHECK_GEOM_OPS("vscale")) 407 else if (CHECK_GEOM_OPS ("vscale"))
364 { 408 {
365 if (h == 0) 409 if (h == 0) h = windowScale;
366 h = 100; 410
367 w = 0; 411 w = noScale;
368 geom_flags |= WidthValue|HeightValue; 412 geom_flags |= WidthValue|HeightValue;
369 } 413 }
370 else if (CHECK_GEOM_OPS("scale")) 414 else if (CHECK_GEOM_OPS ("scale"))
371 { 415 {
372 if (h == 0) 416 if (h == 0) h = windowScale;
373 h = 100;
374 if (w == 0) 417 if (w == 0) w = windowScale;
375 w = 100; 418
376 geom_flags |= WidthValue|HeightValue; 419 geom_flags |= WidthValue|HeightValue;
377 } 420 }
378 else if (CHECK_GEOM_OPS("auto")) 421 else if (CHECK_GEOM_OPS ("auto"))
379 { 422 {
423 w = h = windowScale;
424 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 }
427 else if (CHECK_GEOM_OPS ("root"))
428 {
380 w = h = 100; 429 w = h = noScale;
381 x = y = 50; 430 x = y = rootAlign;
382 geom_flags |= WidthValue|HeightValue|XValue|YValue; 431 geom_flags |= WidthValue|HeightValue|XValue|YValue;
383 } 432 }
384# undef CHECK_GEOM_OPS 433# undef CHECK_GEOM_OPS
434
385 while (*ops != ':' && *ops != '\0') ++ops; 435 while (*ops != ':' && *ops != '\0') ++ops;
386 } /* done parsing ops */ 436 } /* done parsing ops */
387 } 437 }
388 438
389 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 439 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
390 ++changed;
391 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 440 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
392 ++changed;
393 if (check_set_align_value (geom_flags, XValue, h_align, x)) 441 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
394 ++changed;
395 if (check_set_align_value (geom_flags, YValue, v_align, y)) 442 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
396 ++changed;
397 } 443 }
398 444
399 if (new_flags != flags) 445 if (new_flags != flags)
400 { 446 {
401 flags = new_flags; 447 flags = new_flags;
402 changed++; 448 changed++;
403 } 449 }
450
404//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
405// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
406 return (changed > 0); 453 return (changed > 0);
454}
455
456void
457bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
458{
459 int target_width = target->szHint.width;
460 int target_height = target->szHint.height;
461
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464
465 if (h_align == rootAlign || v_align == rootAlign)
466 {
467 target->get_window_origin (x, y);
468 x = -x;
469 y = -y;
470 }
471
472 if (h_align != rootAlign)
473 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
474
475 if (v_align != rootAlign)
476 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
407} 477}
408 478
409# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
410bool 480bool
411bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
412{ 482{
413 if (target == NULL) 483 if (target == NULL)
414 return false; 484 return false;
415 485
486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = (shade == 0) ? 100 : shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
522
523 ASImage *result = 0;
524
416 int target_width = (int)target->szHint.width; 525 int target_width = target->szHint.width;
417 int target_height = (int)target->szHint.height; 526 int target_height = target->szHint.height;
418 int new_pmap_width = target_width, new_pmap_height = target_height; 527 int new_pmap_width = target_width;
419 ASImage *result = NULL; 528 int new_pmap_height = target_height;
420 529
421 int x = 0; 530 int x = 0;
422 int y = 0; 531 int y = 0;
423 int w = h_scale * target_width / 100; 532 int w = 0;
424 int h = v_scale * target_height / 100; 533 int h = 0;
425 534
426 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
427 536
428 if (original_asim) 537 if (original_asim)
429 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
430 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
431 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
432 }
433 539
434 if (original_asim == NULL 540 if (!original_asim
435 || x >= target_width 541 || x >= target_width
436 || y >= target_height 542 || y >= target_height
437 || (w > 0 && x + w <= 0) 543 || (w > 0 && x + w <= 0)
438 || (h > 0 && y + h <= 0)) 544 || (h > 0 && y + h <= 0))
439 { 545 {
440 if (background) 546 if (background)
441 { 547 {
442 new_pmap_width = background->width; 548 new_pmap_width = background->width;
443 new_pmap_height = background->height; 549 new_pmap_height = background->height;
444 result = background; 550 result = background;
551
445 if (background_tint != TINT_LEAVE_SAME) 552 if (background_tint != TINT_LEAVE_SAME)
446 { 553 {
447 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 554 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
448 target_width, target_height, background_tint, 555 target_width, target_height, background_tint,
449 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 556 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
450 if (tmp) 557 if (tmp)
451 result = tmp; 558 result = tmp;
452 } 559 }
… …
455 new_pmap_width = new_pmap_height = 0; 562 new_pmap_width = new_pmap_height = 0;
456 } 563 }
457 else 564 else
458 { 565 {
459 result = original_asim; 566 result = original_asim;
567
460 if ((w > 0 && w != original_asim->width) 568 if ((w > 0 && w != original_asim->width)
461 || (h > 0 && h != original_asim->height)) 569 || (h > 0 && h != original_asim->height))
462 { 570 {
463 result = scale_asimage (target->asv, original_asim, 571 result = scale_asimage (target->asv, original_asim,
464 w > 0 ? w : original_asim->width, 572 w > 0 ? w : original_asim->width,
465 h > 0 ? h : original_asim->height, 573 h > 0 ? h : original_asim->height,
466 background ? ASA_ASImage : ASA_XImage, 574 background ? ASA_ASImage : ASA_XImage,
467 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
468 } 576 }
577
469 if (background == NULL) 578 if (background == NULL)
470 {/* if tiling - pixmap has to be sized exactly as the image */ 579 {
471 if (h_scale == 0)
472 new_pmap_width = result->width;
473 if (v_scale == 0)
474 new_pmap_height = result->height;
475 /* we also need to tile our image in one or both directions */
476 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
477 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
478 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
479 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
480 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
591 new_pmap_width,
481 result->width, result->height, 592 new_pmap_height,
482 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 595 if (tmp)
485 { 596 {
486 if (result != original_asim) 597 if (result != original_asim)
487 destroy_asimage (&result); 598 destroy_asimage (&result);
599
488 result = tmp; 600 result = tmp;
489 } 601 }
490 } 602 }
491 } 603 }
492 else 604 else
605 {
493 {/* if blending background and image - pixmap has to be sized same as target window */ 606 /* if blending background and image - pixmap has to be sized same as target window */
494 ASImageLayer *layers = create_image_layers (2); 607 ASImageLayer *layers = create_image_layers (2);
495 ASImage *merged_im = NULL;
496 608
497 layers[0].im = background; 609 layers[0].im = background;
498 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
499 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
500 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
501 layers[1].im = result; 613 layers[1].im = result;
614
502 if (w <= 0) 615 if (w <= 0)
616 {
503 {/* tile horizontally */ 617 /* tile horizontally */
504 while (x > 0) x -= (int)result->width; 618 while (x > 0) x -= (int)result->width;
505 layers[1].dst_x = x; 619 layers[1].dst_x = x;
506 layers[1].clip_width = result->width+target_width; 620 layers[1].clip_width = result->width+target_width;
507 } 621 }
508 else 622 else
623 {
509 {/* clip horizontally */ 624 /* clip horizontally */
510 layers[1].dst_x = x; 625 layers[1].dst_x = x;
511 layers[1].clip_width = result->width; 626 layers[1].clip_width = result->width;
512 } 627 }
628
513 if (h <= 0) 629 if (h <= 0)
514 { 630 {
515 while (y > 0) y -= (int)result->height; 631 while (y > 0) y -= (int)result->height;
516 layers[1].dst_y = y; 632 layers[1].dst_y = y;
517 layers[1].clip_height = result->height + target_height; 633 layers[1].clip_height = result->height + target_height;
… …
519 else 635 else
520 { 636 {
521 layers[1].dst_y = y; 637 layers[1].dst_y = y;
522 layers[1].clip_height = result->height; 638 layers[1].clip_height = result->height;
523 } 639 }
640
524 if (target->rs[Rs_blendtype]) 641 if (target->rs[Rs_blendtype])
525 { 642 {
526 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 643 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
527 if (layers[1].merge_scanlines == NULL) 644 if (layers[1].merge_scanlines == NULL)
528 layers[1].merge_scanlines = alphablend_scanlines; 645 layers[1].merge_scanlines = alphablend_scanlines;
529 } 646 }
647
530 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 648 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
531 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 649 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
650
532 if (tmp) 651 if (tmp)
533 { 652 {
534 if (result != original_asim) 653 if (result != original_asim)
535 destroy_asimage (&result); 654 destroy_asimage (&result);
655
536 result = tmp; 656 result = tmp;
537 } 657 }
658
538 free (layers); 659 free (layers);
539 } 660 }
540 } 661 }
541 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
542 663
543 if (pixmap) 664 bool ret = false;
544 {
545 if (result == NULL
546 || pmap_width != new_pmap_width
547 || pmap_height != new_pmap_height
548 || pmap_depth != target->depth)
549 {
550 XFreePixmap (target->dpy, pixmap);
551 pixmap = None;
552 }
553 }
554 665
555 if (result) 666 if (result)
556 { 667 {
557 XGCValues gcv; 668 XGCValues gcv;
558 GC gc; 669 GC gc;
670
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 }
559 681
560 /* create Pixmap */ 682 /* create Pixmap */
561 if (pixmap == None) 683 if (pixmap == None)
562 { 684 {
563 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
564 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
565 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
566 pmap_depth = target->depth; 688 pmap_depth = target->depth;
567 } 689 }
568 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
569 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
570 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
571 693
572 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
573 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
574 if (background == NULL) 696 if (background == NULL)
575 { 697 {
576 if (h_scale > 0) 698 if (!(h_scale == 0 || v_scale == 0))
699 {
577 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
578 if (v_scale > 0)
579 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
580 703
581 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
582 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
583 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
584 {
585 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
586 }
587 } 708 }
588 709
589 /* put result on pixmap */ 710 /* put result on pixmap */
590 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 711 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
591 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 712 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
593 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
594 destroy_asimage (&result); 715 destroy_asimage (&result);
595 716
596 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
597 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
598 }
599 719
720 ret = true;
721 }
722
723 if (background)
724 destroy_asimage (&background);
725
600 return true; 726 return ret;
601} 727}
602# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740 // TODO: add alpha blending
741 if (background_flags)
742 return false;
743
744 GdkPixbuf *result;
745
746 int image_width = gdk_pixbuf_get_width (pixbuf);
747 int image_height = gdk_pixbuf_get_height (pixbuf);
748
749 int target_width = target->szHint.width;
750 int target_height = target->szHint.height;
751 int new_pmap_width = target_width;
752 int new_pmap_height = target_height;
753
754 int x = 0;
755 int y = 0;
756 int w = 0;
757 int h = 0;
758
759 get_image_geometry (image_width, image_height, w, h, x, y);
760
761 if (x >= target_width
762 || y >= target_height
763 || (w > 0 && x + w <= 0)
764 || (h > 0 && y + h <= 0))
765 return false;
766
767 result = pixbuf;
768
769 if ((w > 0 && w != image_width)
770 || (h > 0 && h != image_height))
771 {
772 result = gdk_pixbuf_scale_simple (pixbuf,
773 w > 0 ? w : image_width,
774 h > 0 ? h : image_height,
775 GDK_INTERP_BILINEAR);
776 }
777
778 bool ret = false;
779
780 if (result)
781 {
782 XGCValues gcv;
783 GC gc;
784
785 image_width = gdk_pixbuf_get_width (result);
786 image_height = gdk_pixbuf_get_height (result);
787
788 if (h_scale == 0 || v_scale == 0)
789 {
790 new_pmap_width = min (image_width, target_width);
791 new_pmap_height = min (image_height, target_height);
792 }
793
794 if (pixmap)
795 {
796 if (pmap_width != new_pmap_width
797 || pmap_height != new_pmap_height
798 || pmap_depth != target->depth)
799 {
800 XFreePixmap (target->dpy, pixmap);
801 pixmap = None;
802 }
803 }
804
805 if (pixmap == None)
806 {
807 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
808 pmap_width = new_pmap_width;
809 pmap_height = new_pmap_height;
810 pmap_depth = target->depth;
811 }
812
813 gcv.foreground = target->pix_colors[Color_bg];
814 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
815
816 if (h_scale == 0 || v_scale == 0)
817 {
818 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
819 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
820 0, 0,
821 0, 0,
822 image_width, image_height,
823 XLIB_RGB_DITHER_NONE,
824 0, 0);
825
826 gcv.tile = tile;
827 gcv.fill_style = FillTiled;
828 gcv.ts_x_origin = x;
829 gcv.ts_y_origin = y;
830 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
831
832 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
833 XFreePixmap (target->dpy, tile);
834 }
835 else
836 {
837 int src_x, src_y, dst_x, dst_y;
838 int dst_width, dst_height;
839
840 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
841 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
842
843 if (dst_x > 0 || dst_y > 0
844 || dst_x + dst_width < new_pmap_width
845 || dst_y + dst_height < new_pmap_height)
846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
847
848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
849 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
850 src_x, src_y,
851 dst_x, dst_y,
852 dst_width, dst_height,
853 XLIB_RGB_DITHER_NONE,
854 0, 0);
855 }
856
857 if (result != pixbuf)
858 g_object_unref (result);
859
860 XFreeGC (target->dpy, gc);
861
862 ret = true;
863 }
864
865 return ret;
866}
867# endif /* HAVE_PIXBUF */
603 868
604bool 869bool
605bgPixmap_t::set_file (const char *file) 870bgPixmap_t::set_file (const char *file)
606{ 871{
607 char *f;
608
609 assert (file != NULL); 872 assert (file);
610 873
611 if (*file != '\0') 874 if (*file)
612 { 875 {
876 if (const char *p = strchr (file, ';'))
877 {
878 size_t len = p - file;
879 char *f = rxvt_temp_buf<char> (len + 1);
880 memcpy (f, file, len);
881 f[len] = '\0';
882 file = f;
883 }
884
613# ifdef HAVE_AFTERIMAGE 885# ifdef HAVE_AFTERIMAGE
614 if (target->asimman == NULL) 886 if (!target->asimman)
615 target->asimman = create_generic_imageman (target->rs[Rs_path]); 887 target->asimman = create_generic_imageman (target->rs[Rs_path]);
616 if ((f = strchr (file, ';')) == NULL)
617 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 888 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
618 else 889 if (original_asim)
619 { 890 have_image = true;
620 size_t len = f - file; 891 return have_image;
621 f = (char *)malloc (len + 1);
622 strncpy (f, file, len);
623 f[len] = '\0';
624 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
625 free (f);
626 }
627 return (original_asim != NULL);
628# endif 892# endif
893
894# ifdef HAVE_PIXBUF
895 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
896 if (pixbuf)
897 have_image = true;
898 return have_image;
899# endif
629 } 900 }
901
630 return false; 902 return false;
631} 903}
632 904
633# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
634 906
635# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
636bool 908bool
637bgPixmap_t::set_transparent () 909bgPixmap_t::set_transparent ()
638{ 910{
639 if (!(flags & isTransparent)) 911 if (!(flags & isTransparent))
640 { 912 {
641 flags |= isTransparent; 913 flags |= isTransparent;
642 return true; 914 return true;
643 } 915 }
916
644 return false; 917 return false;
645} 918}
646 919
647bool 920bool
648bgPixmap_t::set_blur_radius (const char *geom) 921bgPixmap_t::set_blur_radius (const char *geom)
… …
650 int changed = 0; 923 int changed = 0;
651 unsigned int hr, vr; 924 unsigned int hr, vr;
652 int junk; 925 int junk;
653 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 926 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
654 927
655 if (!(geom_flags&WidthValue)) 928 if (!(geom_flags & WidthValue))
656 hr = 1; 929 hr = 1;
657 if (!(geom_flags&HeightValue)) 930 if (!(geom_flags & HeightValue))
658 vr = hr; 931 vr = hr;
659 932
660 if (h_blurRadius != hr) 933 if (h_blurRadius != hr)
661 { 934 {
662 ++changed; 935 ++changed;
… …
672 if (v_blurRadius == 0 && h_blurRadius == 0) 945 if (v_blurRadius == 0 && h_blurRadius == 0)
673 flags &= ~blurNeeded; 946 flags &= ~blurNeeded;
674 else 947 else
675 flags |= blurNeeded; 948 flags |= blurNeeded;
676 949
677 return (changed>0); 950 return (changed > 0);
678} 951}
679 952
680static inline unsigned long 953static inline unsigned long
681compute_tint_shade_flags (rxvt_color *tint, int shade) 954compute_tint_shade_flags (rxvt_color *tint, int shade)
682{ 955{
… …
699 flags |= bgPixmap_t::tintNeeded; 972 flags |= bgPixmap_t::tintNeeded;
700 else if (tint) 973 else if (tint)
701 { 974 {
702 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 975 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
703 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 976 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
704 { 977 {
705 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
706 } 979 }
707 } 980 }
708 981
709 if (flags & bgPixmap_t::tintNeeded) 982 if (flags & bgPixmap_t::tintNeeded)
710 { 983 {
711 if (flags & bgPixmap_t::tintWholesome) 984 if (flags & bgPixmap_t::tintWholesome)
… …
729 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1002 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
730 tint = new_tint; 1003 tint = new_tint;
731 flags = (flags & ~tintFlags) | new_flags | tintSet; 1004 flags = (flags & ~tintFlags) | new_flags | tintSet;
732 return true; 1005 return true;
733 } 1006 }
1007
734 return false; 1008 return false;
735} 1009}
736 1010
737bool 1011bool
738bgPixmap_t::unset_tint () 1012bgPixmap_t::unset_tint ()
739{ 1013{
740 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1014 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
741 1015
742 if (new_flags != (flags & tintFlags)) 1016 if (new_flags != (flags & tintFlags))
743 { 1017 {
744 flags = (flags&~tintFlags)|new_flags; 1018 flags = (flags & ~tintFlags) | new_flags;
745 return true; 1019 return true;
746 } 1020 }
1021
747 return false; 1022 return false;
748} 1023}
749 1024
750bool 1025bool
751bgPixmap_t::set_shade (const char *shade_str) 1026bgPixmap_t::set_shade (const char *shade_str)
752{ 1027{
753 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1028 int new_shade = (shade_str) ? atoi (shade_str) : 0;
754 1029
755 if (new_shade < 0 && new_shade > -100) 1030 if (new_shade < 0 && new_shade > -100)
756 new_shade = 200 - (100 + new_shade); 1031 new_shade = 200 - (100 + new_shade);
757 else if (new_shade == 100) 1032 else if (new_shade == 100)
758 new_shade = 0; 1033 new_shade = 0;
759 1034
760 if (new_shade != shade) 1035 if (new_shade != shade)
761 { 1036 {
762 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1037 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
763 shade = new_shade; 1038 shade = new_shade;
764 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1039 flags = (flags & (~tintFlags | tintSet)) | new_flags;
765 return true; 1040 return true;
766 } 1041 }
1042
767 return false; 1043 return false;
768} 1044}
769 1045
770/* make_transparency_pixmap() 1046/* make_transparency_pixmap()
771 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1047 * Builds a pixmap sized the same as terminal window, with depth same as the root window
… …
778 unsigned long result = 0; 1054 unsigned long result = 0;
779 1055
780 if (target == NULL) 1056 if (target == NULL)
781 return 0; 1057 return 0;
782 1058
783 /* root dimentions may change from call to call - but Display structure should 1059 /* root dimensions may change from call to call - but Display structure should
784 * be always up-to-date, so let's use it : 1060 * be always up-to-date, so let's use it :
785 */ 1061 */
786 Window root = target->display->root; 1062 Window root = target->display->root;
787 int screen = target->display->screen; 1063 int screen = target->display->screen;
788 Display *dpy = target->dpy; 1064 Display *dpy = target->dpy;
… …
801 if (sx + window_width <= 0 || sy + window_height <= 0 1077 if (sx + window_width <= 0 || sy + window_height <= 0
802 || sx >= root_width || sy >= root_height) 1078 || sx >= root_width || sy >= root_height)
803 return 0; 1079 return 0;
804 1080
805 if (root_pixmap != None) 1081 if (root_pixmap != None)
1082 {
806 {/* we want to validate the pixmap and get it's size at the same time : */ 1083 /* we want to validate the pixmap and get it's size at the same time : */
807 int junk; 1084 int junk;
808 unsigned int ujunk; 1085 unsigned int ujunk;
809 /* root pixmap may be bad - allow a error */ 1086 /* root pixmap may be bad - allow a error */
810 target->allowedxerror = -1; 1087 target->allowedxerror = -1;
811 1088
… …
820 1097
821 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1098 if (tiled_root_pmap == None) /* something really bad happened - abort */
822 return 0; 1099 return 0;
823 1100
824 if (root_pixmap == None) 1101 if (root_pixmap == None)
1102 {
825 { /* use tricks to obtain the root background image :*/ 1103 /* use tricks to obtain the root background image :*/
826 /* we want to create Overrideredirect window overlapping out window 1104 /* we want to create Overrideredirect window overlapping out window
827 with background type of Parent Relative and then grab it */ 1105 with background type of Parent Relative and then grab it */
828 XSetWindowAttributes attr; 1106 XSetWindowAttributes attr;
829 Window src; 1107 Window src;
830 bool success = false; 1108 bool success = false;
831 1109
832 attr.background_pixmap = ParentRelative; 1110 attr.background_pixmap = ParentRelative;
833 attr.backing_store = Always; 1111 attr.backing_store = Always;
834 attr.event_mask = ExposureMask; 1112 attr.event_mask = ExposureMask;
835 attr.override_redirect = True; 1113 attr.override_redirect = True;
836 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1114 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
837 CopyFromParent, CopyFromParent, CopyFromParent, 1115 CopyFromParent, CopyFromParent, CopyFromParent,
838 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1116 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
839 &attr); 1117 &attr);
840 1118
841 if (src != None) 1119 if (src != None)
… …
845 XGrabServer (dpy); 1123 XGrabServer (dpy);
846 XMapRaised (dpy, src); 1124 XMapRaised (dpy, src);
847 XSync (dpy, False); 1125 XSync (dpy, False);
848 1126
849 /* XSync should get window where it's properly exposed, 1127 /* XSync should get window where it's properly exposed,
850 * but to be on the safe side - let's check for the actuall event to arrive : */ 1128 * but to be on the safe side - let's check for the actual event to arrive : */
851 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1129 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
852 ++ev_count; 1130 ++ev_count;
853 1131
854 if (ev_count > 0); 1132 if (ev_count > 0);
1133 {
855 { /* hooray! - we can grab the image! */ 1134 /* hooray! - we can grab the image! */
856 gc = XCreateGC (dpy, root, 0, NULL); 1135 gc = XCreateGC (dpy, root, 0, NULL);
857 if (gc) 1136 if (gc)
858 { 1137 {
859 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1138 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
860 success = true; 1139 success = true;
861 } 1140 }
862 } 1141 }
1142
863 XDestroyWindow (dpy, src); 1143 XDestroyWindow (dpy, src);
864 XUngrabServer (dpy); 1144 XUngrabServer (dpy);
865 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1145 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
866 } 1146 }
867 1147
868 if (!success) 1148 if (!success)
869 { 1149 {
870 XFreePixmap (dpy, tiled_root_pmap); 1150 XFreePixmap (dpy, tiled_root_pmap);
871 tiled_root_pmap = None; 1151 tiled_root_pmap = None;
872 } 1152 }
873 else 1153 else
874 result |= transpPmapTiled; 1154 result |= transpPmapTiled;
875 } 1155 }
876 else 1156 else
1157 {
877 {/* strightforward pixmap copy */ 1158 /* straightforward pixmap copy */
878 gcv.tile = root_pixmap; 1159 gcv.tile = root_pixmap;
879 gcv.fill_style = FillTiled; 1160 gcv.fill_style = FillTiled;
880 1161
881 while (sx < 0) sx += (int)root_width; 1162 while (sx < 0) sx += (int)root_width;
882 while (sy < 0) sy += (int)root_height; 1163 while (sy < 0) sy += (int)root_height;
… …
930 { 1211 {
931 c.r = (c.r * shade) / 100; 1212 c.r = (c.r * shade) / 100;
932 c.g = (c.g * shade) / 100; 1213 c.g = (c.g * shade) / 100;
933 c.b = (c.b * shade) / 100; 1214 c.b = (c.b * shade) / 100;
934 } 1215 }
935 else if( shade > 100 && shade < 200) 1216 else if (shade > 100 && shade < 200)
936 { 1217 {
937 c.r = (c.r * (200 - shade)) / 100; 1218 c.r = (c.r * (200 - shade)) / 100;
938 c.g = (c.g * (200 - shade)) / 100; 1219 c.g = (c.g * (200 - shade)) / 100;
939 c.b = (c.b * (200 - shade)) / 100; 1220 c.b = (c.b * (200 - shade)) / 100;
940 } 1221 }
… …
986 mask_c.blue = 0xffff - c.b; 1267 mask_c.blue = 0xffff - c.b;
987 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1268 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
988 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1269 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
989 result |= transpPmapTinted; 1270 result |= transpPmapTinted;
990 } 1271 }
1272
991 XRenderFreePicture (dpy, mask_pic); 1273 XRenderFreePicture (dpy, mask_pic);
992 XRenderFreePicture (dpy, overlay_pic); 1274 XRenderFreePicture (dpy, overlay_pic);
993 XRenderFreePicture (dpy, back_pic); 1275 XRenderFreePicture (dpy, back_pic);
994# if DO_TIMING_TEST 1276# if DO_TIMING_TEST
995 XSync (dpy, False); 1277 XSync (dpy, False);
996# endif 1278# endif
997# endif 1279# endif
998 } 1280 }
999 } 1281 }
1000 } /* server side rendering completed */ 1282 } /* server side rendering completed */
1001 1283
1002 if (pixmap) 1284 if (pixmap)
1003 XFreePixmap (dpy, pixmap); 1285 XFreePixmap (dpy, pixmap);
1004 1286
… …
1017} 1299}
1018 1300
1019bool 1301bool
1020bgPixmap_t::set_root_pixmap () 1302bgPixmap_t::set_root_pixmap ()
1021{ 1303{
1022 Pixmap new_root_pixmap = None;
1023
1024 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1304 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1025 if (new_root_pixmap == None) 1305 if (new_root_pixmap == None)
1026 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1306 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1027 1307
1028 if (new_root_pixmap != root_pixmap) 1308 if (new_root_pixmap != root_pixmap)
1029 { 1309 {
1030 root_pixmap = new_root_pixmap; 1310 root_pixmap = new_root_pixmap;
1031 return true; 1311 return true;
1032 } 1312 }
1313
1033 return false; 1314 return false;
1034} 1315}
1035# endif /* ENABLE_TRANSPARENCY */ 1316# endif /* ENABLE_TRANSPARENCY */
1036 1317
1037# ifndef HAVE_AFTERIMAGE 1318# ifndef HAVE_AFTERIMAGE
1038static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1319static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1039# endif 1320# endif
1040
1041 1321
1042bool 1322bool
1043bgPixmap_t::render () 1323bgPixmap_t::render ()
1044{ 1324{
1045 unsigned long background_flags = 0; 1325 unsigned long background_flags = 0;
… …
1047 if (target == NULL) 1327 if (target == NULL)
1048 return false; 1328 return false;
1049 1329
1050 TIMING_TEST_START (tp); 1330 TIMING_TEST_START (tp);
1051 1331
1052 invalidate(); 1332 invalidate ();
1053# ifdef ENABLE_TRANSPARENCY 1333# ifdef ENABLE_TRANSPARENCY
1054 if (flags & isTransparent) 1334 if (flags & isTransparent)
1055 { 1335 {
1056 /* we need to re-generate transparency pixmap in that case ! */ 1336 /* we need to re-generate transparency pixmap in that case ! */
1057 background_flags = make_transparency_pixmap (); 1337 background_flags = make_transparency_pixmap ();
1058 if (background_flags == 0) 1338 if (background_flags == 0)
1059 return false; 1339 return false;
1060 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1340 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1061 && pmap_depth == target->depth) 1341 && pmap_depth == target->depth)
1062 flags = flags & ~isInvalid; 1342 flags = flags & ~isInvalid;
1063 } 1343 }
1064# endif 1344# endif
1065 1345
1346# ifdef BG_IMAGE_FROM_FILE
1347 if (have_image
1348 || (background_flags & transpTransformations) != (flags & transpTransformations))
1349 {
1350 if (render_image (background_flags))
1351 flags = flags & ~isInvalid;
1352 }
1353# endif
1354
1066 XImage *result = NULL; 1355 XImage *result = NULL;
1067# ifdef HAVE_AFTERIMAGE 1356
1068 if (original_asim 1357 if (background_flags && (flags & isInvalid))
1069 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1358 {
1359 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1070 { 1360 }
1071 ASImage *background = NULL;
1072 ARGB32 as_tint = TINT_LEAVE_SAME;
1073 if (background_flags)
1074 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1075 1361
1076# ifdef ENABLE_TRANSPARENCY 1362 if (result)
1363 {
1364# if !defined(HAVE_AFTERIMAGE) && !XFT
1365 /* our own client-side tinting */
1366 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1367 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1077 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1368 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1078 {
1079 ShadingInfo as_shade;
1080 as_shade.shading = (shade == 0) ? 100 : shade;
1081
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083 if (flags & tintSet)
1084 tint.get (c);
1085 as_shade.tintColor.red = c.r;
1086 as_shade.tintColor.green = c.g;
1087 as_shade.tintColor.blue = c.b;
1088
1089 as_tint = shading2tint32 (&as_shade);
1090 }
1091 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1092 {
1093 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1094 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1095 100, ASIMAGE_QUALITY_DEFAULT);
1096 if (tmp)
1097 {
1098 destroy_asimage (&background);
1099 background = tmp;
1100 }
1101 }
1102# endif
1103
1104 if (render_asim (background, as_tint))
1105 flags = flags & ~isInvalid;
1106 if (background)
1107 destroy_asimage (&background);
1108 }
1109 else if (background_flags && pmap_depth != target->depth)
1110 {
1111 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1112 }
1113
1114# elif !XFT /* our own client-side tinting */
1115
1116 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1117 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1118
1119 if (background_flags && (flags & isInvalid))
1120 {
1121 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1122 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1123 { 1369 {
1124 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1370 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1125 if (flags & tintSet) 1371 if (flags & tintSet)
1126 tint.get (c); 1372 tint.get (c);
1127 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1373 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1128 } 1374 }
1129 } 1375# endif
1130# endif /* HAVE_AFTERIMAGE */
1131 1376
1132 if (result != NULL)
1133 {
1134 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1377 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1378
1135 if (gc) 1379 if (gc)
1136 { 1380 {
1137 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1381 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1138 { 1382 {
1139 XFreePixmap (target->dpy, pixmap); 1383 XFreePixmap (target->dpy, pixmap);
1140 pixmap = None; 1384 pixmap = None;
1141 } 1385 }
1386
1142 if (pixmap == None) 1387 if (pixmap == None)
1143 { 1388 {
1144 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1389 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1145 pmap_width = result->width; 1390 pmap_width = result->width;
1146 pmap_height = result->height; 1391 pmap_height = result->height;
1147 pmap_depth = target->depth; 1392 pmap_depth = target->depth;
1148 } 1393 }
1394
1149 if (pmap_depth != result->depth) 1395 if (pmap_depth != result->depth)
1396 {
1150 { /* Bad Match error will ensue ! stupid X !!!! */ 1397 /* Bad Match error will ensue ! stupid X !!!! */
1151 if( result->depth == 24 && pmap_depth == 32) 1398 if (result->depth == 24 && pmap_depth == 32)
1152 result->depth = 32; 1399 result->depth = 32;
1153 else if( result->depth == 32 && pmap_depth == 24) 1400 else if (result->depth == 32 && pmap_depth == 24)
1154 result->depth = 24; 1401 result->depth = 24;
1155 else 1402 else
1156 { 1403 {
1157 /* TODO: implement image recoding */ 1404 /* TODO: implement image recoding */
1158 } 1405 }
1159 } 1406 }
1407
1160 if (pmap_depth == result->depth) 1408 if (pmap_depth == result->depth)
1161 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1409 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1410
1162 XFreeGC (target->dpy, gc); 1411 XFreeGC (target->dpy, gc);
1163 flags = flags & ~isInvalid; 1412 flags = flags & ~isInvalid;
1164 } 1413 }
1414
1165 XDestroyImage (result); 1415 XDestroyImage (result);
1166 } 1416 }
1167 1417
1168 if (flags & isInvalid) 1418 if (flags & isInvalid)
1169 { 1419 {
1170 if (pixmap != None) 1420 if (pixmap != None)
… …
1173 pixmap = None; 1423 pixmap = None;
1174 } 1424 }
1175 } 1425 }
1176 1426
1177 apply (); 1427 apply ();
1428
1429 XSync (target->dpy, False);
1430 valid_since = ev::now ();
1178 1431
1179 TIMING_TEST_PRINT_RESULT (tp); 1432 TIMING_TEST_PRINT_RESULT (tp);
1180 1433
1181 return true; 1434 return true;
1182} 1435}
… …
1191# ifdef ENABLE_TRANSPARENCY 1444# ifdef ENABLE_TRANSPARENCY
1192 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1445 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1193# endif 1446# endif
1194 return true; 1447 return true;
1195 } 1448 }
1449
1196 return false; 1450 return false;
1197} 1451}
1198 1452
1199void 1453void
1200bgPixmap_t::apply() 1454bgPixmap_t::apply ()
1201{ 1455{
1202 if (target) 1456 if (target)
1203 { 1457 {
1204 flags &= ~isVtOrigin; 1458 flags &= ~isVtOrigin;
1459
1205 if (pixmap != None) 1460 if (pixmap != None)
1461 {
1206 { /* set target's background to pixmap */ 1462 /* set target's background to pixmap */
1207# ifdef ENABLE_TRANSPARENCY 1463# ifdef ENABLE_TRANSPARENCY
1208 if (flags & isTransparent) 1464 if (flags & isTransparent)
1209 { 1465 {
1210 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1466 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1211 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1467 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1212# if HAVE_SCROLLBARS 1468
1213 if (target->scrollBar.win) 1469 if (target->scrollBar.win)
1214 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1470 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1215# endif
1216 } 1471 }
1217 else 1472 else
1218# endif 1473# endif
1219 { 1474 {
1220 flags |= isVtOrigin; 1475 flags |= isVtOrigin;
1221 /* force old pixmap dereference in case it was transparent before :*/ 1476 /* force old pixmap dereference in case it was transparent before :*/
1222 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1477 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1223 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1478 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1224 /* do we also need to set scrollbar's background here ? */ 1479 /* do we also need to set scrollbar's background here ? */
1225# if HAVE_SCROLLBARS 1480
1226 if (target->scrollBar.win) 1481 if (target->scrollBar.win)
1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1482 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228# endif
1229 } 1483 }
1230 } 1484 }
1231 else 1485 else
1486 {
1232 { /* set target background to a pixel */ 1487 /* set target background to a pixel */
1233 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1488 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1234 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1489 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1235 /* do we also need to set scrollbar's background here ? */ 1490 /* do we also need to set scrollbar's background here ? */
1236# if HAVE_SCROLLBARS
1237 if (target->scrollBar.win) 1491 if (target->scrollBar.win)
1238 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1492 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1239# endif
1240 } 1493 }
1494
1241 /* don't want Expose on the parent or vt. It is better to use 1495 /* don't want Expose on the parent or vt. It is better to use
1242 scr_touch or we get a great deal of flicker otherwise: */ 1496 scr_touch or we get a great deal of flicker otherwise: */
1243 XClearWindow (target->dpy, target->parent[0]); 1497 XClearWindow (target->dpy, target->parent[0]);
1244 1498
1245# if HAVE_SCROLLBARS 1499 if (target->scrollBar.state && target->scrollBar.win)
1246 if (target->scrollBar.win)
1247 { 1500 {
1248 target->scrollBar.setIdle (); 1501 target->scrollBar.state = STATE_IDLE;
1249 target->scrollbar_show (0); 1502 target->scrollBar.show (0);
1250 } 1503 }
1251# endif
1252 1504
1253 target->want_refresh = 1; 1505 target->want_refresh = 1;
1254 flags |= hasChanged; 1506 flags |= hasChanged;
1255 } 1507 }
1256} 1508}
1257 1509
1258#endif /* HAVE_BG_PIXMAP */ 1510#endif /* HAVE_BG_PIXMAP */
1259 1511
1260#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1512#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1261/* taken from aterm-0.4.2 */ 1513/* taken from aterm-0.4.2 */
1262 1514
1263typedef uint32_t RUINT32T; 1515typedef uint32_t RUINT32T;
1264 1516
1265static void 1517static void
1266ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1518ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1267{ 1519{
1268 int sh_r, sh_g, sh_b; 1520 int sh_r, sh_g, sh_b;
1269 RUINT32T mask_r, mask_g, mask_b; 1521 RUINT32T mask_r, mask_g, mask_b;
1270 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1522 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1271 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1523 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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