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.110 by sf-exg, Wed Nov 3 11:58:03 2010 UTC vs.
Revision 1.122 by sf-exg, Sat Nov 20 11:30:58 2010 UTC

… …
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
31#endif 31#endif
32 32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
33#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
34 38
35#if DO_TIMING_TEST 39#if DO_TIMING_TEST
36# include <sys/time.h> 40# include <sys/time.h>
37#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
62 * 66 *
63 * 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%.
64 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
65 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
66 * the image in the window. 70 * the image in the window.
67 * WxH+X Assumes Y == X
68 * WxH Assumes Y == X == 50 (centers the image)
69 * W+X+Y Assumes H == W
70 * W+X Assumes H == W and Y == X
71 * W Assumes H == W and Y == X == 50
72 *
73 * Adjusting position only :
74 * =+X+Y Set position to X% by Y% (absolute).
75 * =+X Set position to X% by X%.
76 * +X+Y Adjust position horizontally X% and vertically Y%
77 * from current position (relative).
78 * +X Adjust position horizontally X% and vertically X%
79 * from current position.
80 *
81 * Adjusting scale only :
82 * Wx0 Multiply horizontal scaling factor by W%
83 * 0xH Multiply vertical scaling factor by H%
84 * 0x0 No scaling (show image at normal size).
85 * 71 *
86 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
87 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
88 * the tile size and origin. 74 * the tile size and origin.
89 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
117#endif 103#endif
118 flags = 0; 104 flags = 0;
119 pixmap = None; 105 pixmap = None;
120 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
121 target = 0; 107 target = 0;
108 target_x = target_y = 0;
122} 109}
123 110
124void 111void
125bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
126{ 113{
… …
137 if (pixmap && target) 124 if (pixmap && target)
138 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
139} 126}
140 127
141bool 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;
140}
141
142bool
142bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
143{ 144{
144# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 146 if (flags & isTransparent)
146 return true; 147 return true;
… …
172 return true; 173 return true;
173 } 174 }
174# endif 175# endif
175 176
176 return false; 177 return false;
177}; 178}
178 179
179bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
180{ 181{
181# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
182 if (original_asim) 183 if (original_asim)
… …
252 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
253 return src_pos; 254 return src_pos;
254} 255}
255 256
256bool 257bool
257bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
258{ 259{
259 bool changed = false; 260 bool changed = false;
260 int geom_flags = 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 new_flags |= propScale; 324 new_flags |= propScale;
386 } 325 }
387 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
388 { 327 {
389 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
390 329
391 h = noScale; 330 h = noScale;
392 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
393 } 332 }
394 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
395 { 334 {
396 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
397 336
398 w = noScale; 337 w = noScale;
399 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
400 } 339 }
401 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
402 { 341 {
403 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
404 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
405 344
406 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
407 } 346 }
408 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
409 { 348 {
410 w = h = windowScale; 349 w = h = windowScale;
411 x = y = centerAlign; 350 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 352 }
414 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
415 { 354 {
416 new_flags |= rootAlign; 355 new_flags |= rootAlign;
417 w = h = noScale; 356 w = h = noScale;
418 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
419 } 358 }
420# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
421 360
422 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
423 } /* done parsing ops */ 362 } /* done parsing ops */
424 } 363 }
425 364
426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
428 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
430 }
431 369
432 if (new_flags != flags) 370 if (new_flags != flags)
433 { 371 {
434 flags = new_flags; 372 flags = new_flags;
435 changed = true; 373 changed = true;
… …
460 if (!w) w = image_width; 398 if (!w) w = image_width;
461 if (!h) h = image_height; 399 if (!h) h = image_height;
462 400
463 if (flags & rootAlign) 401 if (flags & rootAlign)
464 { 402 {
465 target->get_window_origin (x, y);
466 x = -x; 403 x = -target_x;
467 y = -y; 404 y = -target_y;
468 } 405 }
469 else 406 else
470 { 407 {
471 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
666 if (result) 603 if (result)
667 { 604 {
668 XGCValues gcv; 605 XGCValues gcv;
669 GC gc; 606 GC gc;
670 607
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 608 /* create Pixmap */
683 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
684 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
685 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);
686 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
688 pmap_depth = target->depth; 619 pmap_depth = target->depth;
689 } 620 }
… …
797 new_pmap_width = min (image_width, target_width); 728 new_pmap_width = min (image_width, target_width);
798 new_pmap_height = min (image_height, target_height); 729 new_pmap_height = min (image_height, target_height);
799 } 730 }
800 } 731 }
801 732
802 if (pixmap)
803 {
804 if (pmap_width != new_pmap_width
805 || pmap_height != new_pmap_height
806 || pmap_depth != target->depth)
807 {
808 XFreePixmap (target->dpy, pixmap);
809 pixmap = None;
810 }
811 }
812
813 if (pixmap == None) 733 if (pixmap == None
734 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height
736 || pmap_depth != target->depth)
814 { 737 {
738 if (pixmap)
739 XFreePixmap (target->dpy, pixmap);
815 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 740 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
816 pmap_width = new_pmap_width; 741 pmap_width = new_pmap_width;
817 pmap_height = new_pmap_height; 742 pmap_height = new_pmap_height;
818 pmap_depth = target->depth; 743 pmap_depth = target->depth;
819 } 744 }
… …
1016 941
1017 if (tint) 942 if (tint)
1018 { 943 {
1019 tint->get (c); 944 tint->get (c);
1020# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
946 if (!has_shade
1021 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
1022 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
1023 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
1024 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
1025# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
1026 } 952 }
… …
1239 1165
1240 if (mask_pic && overlay_pic && back_pic) 1166 if (mask_pic && overlay_pic && back_pic)
1241 { 1167 {
1242 XRenderColor mask_c; 1168 XRenderColor mask_c;
1243 1169
1244 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1170 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1245 mask_c.alpha = 0xffff; 1171 mask_c.alpha = 0xffff;
1246 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1172 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1247 1173
1248 mask_c.alpha = 0; 1174 mask_c.alpha = 0;
1249 mask_c.red = 0xffff - c.r; 1175 mask_c.red = 0xffff - c.r;
… …
1289 int window_height = target->szHint.height; 1215 int window_height = target->szHint.height;
1290 int sx, sy; 1216 int sx, sy;
1291 XGCValues gcv; 1217 XGCValues gcv;
1292 GC gc; 1218 GC gc;
1293 1219
1294 target->get_window_origin (sx, sy); 1220 sx = target_x;
1221 sy = target_y;
1295 1222
1296 /* check if we are outside of the visible part of the virtual screen : */ 1223 /* check if we are outside of the visible part of the virtual screen : */
1297 if (sx + window_width <= 0 || sy + window_height <= 0 1224 if (sx + window_width <= 0 || sy + window_height <= 0
1298 || sx >= root_width || sy >= root_height) 1225 || sx >= root_width || sy >= root_height)
1299 return 0; 1226 return 0;
… …
1352 1279
1353 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1280 if (tiled_root_pmap == None) /* something really bad happened - abort */
1354 return 0; 1281 return 0;
1355 1282
1356 /* straightforward pixmap copy */ 1283 /* straightforward pixmap copy */
1284 while (sx < 0) sx += (int)root_width;
1285 while (sy < 0) sy += (int)root_height;
1286
1357 gcv.tile = recoded_root_pmap; 1287 gcv.tile = recoded_root_pmap;
1358 gcv.fill_style = FillTiled; 1288 gcv.fill_style = FillTiled;
1359
1360 while (sx < 0) sx += (int)root_width;
1361 while (sy < 0) sy += (int)root_height;
1362
1363 gcv.ts_x_origin = -sx; 1289 gcv.ts_x_origin = -sx;
1364 gcv.ts_y_origin = -sy; 1290 gcv.ts_y_origin = -sy;
1365 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1366 1292
1367 if (gc) 1293 if (gc)
1368 { 1294 {
1369 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1295 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1370 result |= transpPmapTiled; 1296 result |= transpPmapTiled;
1371 XFreeGC (dpy, gc); 1297 XFreeGC (dpy, gc);
1372 }
1373 1298
1374 if (tiled_root_pmap != None)
1375 {
1376 if (!need_client_side_rendering ()) 1299 if (!need_client_side_rendering ())
1377 { 1300 {
1378 if ((flags & blurNeeded) 1301 if ((flags & blurNeeded)
1379 && (flags & HAS_RENDER_CONV)) 1302 && (flags & HAS_RENDER_CONV))
1380 { 1303 {
… …
1395 pixmap = tiled_root_pmap; 1318 pixmap = tiled_root_pmap;
1396 pmap_width = window_width; 1319 pmap_width = window_width;
1397 pmap_height = window_height; 1320 pmap_height = window_height;
1398 pmap_depth = target->depth; 1321 pmap_depth = target->depth;
1399 } 1322 }
1323 else
1324 XFreePixmap (dpy, tiled_root_pmap);
1400 1325
1401 if (recoded_root_pmap != root_pixmap) 1326 if (recoded_root_pmap != root_pixmap)
1402 XFreePixmap (dpy, recoded_root_pmap); 1327 XFreePixmap (dpy, recoded_root_pmap);
1403 1328
1404 return result; 1329 return result;
… …
1413 1338
1414 root_pixmap = new_root_pixmap; 1339 root_pixmap = new_root_pixmap;
1415} 1340}
1416# endif /* ENABLE_TRANSPARENCY */ 1341# endif /* ENABLE_TRANSPARENCY */
1417 1342
1418# ifndef HAVE_AFTERIMAGE 1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1419static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1420# endif 1345# endif
1421 1346
1422bool 1347bool
1423bgPixmap_t::render () 1348bgPixmap_t::render ()
1424{ 1349{
… …
1434 /* we need to re-generate transparency pixmap in that case ! */ 1359 /* we need to re-generate transparency pixmap in that case ! */
1435 background_flags = make_transparency_pixmap (); 1360 background_flags = make_transparency_pixmap ();
1436 if (background_flags == 0) 1361 if (background_flags == 0)
1437 return false; 1362 return false;
1438 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1363 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1439 flags = flags & ~isInvalid; 1364 flags &= ~isInvalid;
1440 } 1365 }
1441# endif 1366# endif
1442 1367
1443# ifdef BG_IMAGE_FROM_FILE 1368# ifdef BG_IMAGE_FROM_FILE
1444 if (have_image 1369 if (have_image
1445 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1370 || (background_flags & transpTransformations) != (flags & transpTransformations))
1446 { 1371 {
1447 if (render_image (background_flags)) 1372 if (render_image (background_flags))
1448 flags = flags & ~isInvalid; 1373 flags &= ~isInvalid;
1449 } 1374 }
1450# endif 1375# endif
1451 1376
1377# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1452 XImage *result = NULL; 1378 XImage *result = NULL;
1453 1379
1454 if (background_flags && (flags & isInvalid)) 1380 if (background_flags && (flags & isInvalid))
1455 { 1381 {
1456 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1382 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1457 } 1383 }
1458 1384
1459 if (result) 1385 if (result)
1460 { 1386 {
1461# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1462 /* our own client-side tinting */ 1387 /* our own client-side tinting */
1463 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1464 { 1389 {
1465 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1466 if (flags & tintSet) 1391 if (flags & tintSet)
1467 tint.get (c); 1392 tint.get (c);
1468 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1469 } 1394 }
1470# endif
1471 1395
1472 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1473 1397
1474 if (gc) 1398 if (gc)
1475 { 1399 {
1476 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1400 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1477 1401
1478 XFreeGC (target->dpy, gc); 1402 XFreeGC (target->dpy, gc);
1479 flags = flags & ~isInvalid; 1403 flags &= ~isInvalid;
1480 } 1404 }
1481 1405
1482 XDestroyImage (result); 1406 XDestroyImage (result);
1483 } 1407 }
1408# endif
1484 1409
1485 if (flags & isInvalid) 1410 if (flags & isInvalid)
1486 { 1411 {
1487 if (pixmap != None) 1412 if (pixmap != None)
1488 { 1413 {
… …
1574 flags |= hasChanged; 1499 flags |= hasChanged;
1575} 1500}
1576 1501
1577#endif /* HAVE_BG_PIXMAP */ 1502#endif /* HAVE_BG_PIXMAP */
1578 1503
1579#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1580/* taken from aterm-0.4.2 */ 1505/* taken from aterm-0.4.2 */
1581 1506
1582static void 1507static void
1583ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1584{ 1509{
1585 int sh_r, sh_g, sh_b; 1510 int sh_r, sh_g, sh_b;
1586 uint32_t mask_r, mask_g, mask_b; 1511 uint32_t mask_r, mask_g, mask_b;
1587 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1588 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1513 rgba low;
1589 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1514 rgba high;
1590 int i; 1515 int i;
1591 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1592 1517
1593 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1594 1519
… …
1659 /* prepare limits for color transformation (each channel is handled separately) */ 1584 /* prepare limits for color transformation (each channel is handled separately) */
1660 if (shade > 100) 1585 if (shade > 100)
1661 { 1586 {
1662 shade = 200 - shade; 1587 shade = 200 - shade;
1663 1588
1664 lower_lim_r = 65535-rm; 1589 high.r = (65535 - c.r) * shade / 100;
1665 lower_lim_g = 65535-gm; 1590 high.g = (65535 - c.g) * shade / 100;
1666 lower_lim_b = 65535-bm; 1591 high.b = (65535 - c.b) * shade / 100;
1667 1592
1668 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1593 low.r = 65535 - high.r;
1669 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1594 low.g = 65535 - high.g;
1670 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1595 low.b = 65535 - high.b;
1671
1672 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1673 } 1596 }
1674 else 1597 else
1675 { 1598 {
1599 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100;
1601 high.b = c.b * shade / 100;
1676 1602
1677 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1603 low.r = low.g = low.b = 0;
1678
1679 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1680 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1681 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1682 } 1604 }
1683 1605
1684 /* fill our lookup tables */ 1606 /* fill our lookup tables */
1685 for (i = 0; i <= mask_r>>sh_r; i++) 1607 for (i = 0; i <= mask_r>>sh_r; i++)
1686 { 1608 {
1687 uint32_t tmp; 1609 uint32_t tmp;
1688 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1610 tmp = i * high.r;
1689 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1611 tmp += (mask_r>>sh_r) * low.r;
1690 lookup_r[i] = (tmp/65535)<<sh_r; 1612 lookup_r[i] = (tmp/65535)<<sh_r;
1691 } 1613 }
1692 for (i = 0; i <= mask_g>>sh_g; i++) 1614 for (i = 0; i <= mask_g>>sh_g; i++)
1693 { 1615 {
1694 uint32_t tmp; 1616 uint32_t tmp;
1695 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1617 tmp = i * high.g;
1696 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1618 tmp += (mask_g>>sh_g) * low.g;
1697 lookup_g[i] = (tmp/65535)<<sh_g; 1619 lookup_g[i] = (tmp/65535)<<sh_g;
1698 } 1620 }
1699 for (i = 0; i <= mask_b>>sh_b; i++) 1621 for (i = 0; i <= mask_b>>sh_b; i++)
1700 { 1622 {
1701 uint32_t tmp; 1623 uint32_t tmp;
1702 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1624 tmp = i * high.b;
1703 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1625 tmp += (mask_b>>sh_b) * low.b;
1704 lookup_b[i] = (tmp/65535)<<sh_b; 1626 lookup_b[i] = (tmp/65535)<<sh_b;
1705 } 1627 }
1706 1628
1707 /* apply table to input image (replacing colors by newly calculated ones) */ 1629 /* apply table to input image (replacing colors by newly calculated ones) */
1708 if (srcImage->bits_per_pixel == 32 1630 if (srcImage->bits_per_pixel == 32

Diff Legend

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