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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines