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

Diff Legend

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