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