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.49 by sf-exg, Tue Aug 31 15:12:49 2010 UTC vs.
Revision 1.129 by root, Mon Jan 3 03:05:47 2011 UTC

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

Diff Legend

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