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

Diff Legend

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