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.117 by sf-exg, Fri Nov 12 22:00:05 2010 UTC vs.
Revision 1.132 by sf-exg, Mon Jan 10 20:46:20 2011 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;
… …
171 if (flags & rootAlign) 172 if (flags & rootAlign)
172 return true; 173 return true;
173 } 174 }
174# endif 175# endif
175 176
176 return false;
177}
178
179bool bgPixmap_t::need_client_side_rendering ()
180{
181# ifdef HAVE_AFTERIMAGE
182 if (original_asim)
183 return true;
184# endif
185 return false; 177 return false;
186} 178}
187 179
188# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
189static inline bool 181static inline bool
… …
252 dst_size = target_size - dst_pos; 244 dst_size = target_size - dst_pos;
253 return src_pos; 245 return src_pos;
254} 246}
255 247
256bool 248bool
257bgPixmap_t::set_geometry (const char *geom) 249bgPixmap_t::set_geometry (const char *geom, bool update)
258{ 250{
259 bool changed = false; 251 bool changed = false;
260 int geom_flags = 0; 252 int geom_flags = 0;
261 int x = 0, y = 0; 253 int x = 0, y = 0;
262 unsigned int w = 0, h = 0; 254 unsigned int w = 0, h = 0;
263 unsigned int n; 255 unsigned int n;
264 unsigned long new_flags = (flags & (~geometryFlags)); 256 unsigned long new_flags = (flags & (~geometryFlags));
265 const char *p; 257 const char *ops;
266# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 258# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
267 259
268 if (geom == NULL) 260 if (geom == NULL)
269 return false; 261 return false;
270 262
271 char str[MAXLEN_GEOM]; 263 char str[MAXLEN_GEOM];
272 264
273 while (isspace(*geom)) ++geom;
274 if ((p = strchr (geom, ';')) == NULL)
275 p = strchr (geom, '\0'); 265 ops = strchr (geom, ':');
276 266 if (ops == NULL)
267 n = strlen (geom);
268 else
277 n = (p - geom); 269 n = ops - geom;
270
278 if (n < MAXLEN_GEOM) 271 if (n >= MAXLEN_GEOM)
279 { 272 return false;
280 char *ops;
281 new_flags |= geometrySet;
282 273
283 memcpy (str, geom, n); 274 memcpy (str, geom, n);
284 str[n] = '\0'; 275 str[n] = '\0';
285 if (str[0] == ':') 276 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 277
301 if (ops > str || ops == NULL) 278 if (str[0])
302 { 279 {
303 /* we have geometry string - let's handle it prior to applying ops */ 280 /* we have geometry string - let's handle it prior to applying ops */
304 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 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 */ 282 } /* done parsing geometry string */
361 else if (!(flags & geometrySet)) 283
362 { 284 if (!update)
363 /* default geometry - scaled and centered */ 285 {
286 if (!(geom_flags & XValue))
364 x = y = defaultAlign; 287 x = y = defaultAlign;
288 else if (!(geom_flags & YValue))
289 y = x;
290
291 if (!(geom_flags & (WidthValue|HeightValue)))
365 w = h = defaultScale; 292 w = h = defaultScale;
366 } 293 else if (!(geom_flags & HeightValue))
294 h = w;
295 else if (!(geom_flags & WidthValue))
296 w = h;
367 297
368 if (!(flags & geometrySet))
369 geom_flags |= WidthValue|HeightValue|XValue|YValue; 298 geom_flags |= WidthValue|HeightValue|XValue|YValue;
299 }
370 300
371 if (ops) 301 if (ops)
372 { 302 {
373 while (*ops) 303 char **arr = rxvt_strsplit (':', ops + 1);
304
305 for (int i = 0; arr[i]; i++)
374 { 306 {
375 while (*ops == ':' || isspace(*ops)) ++ops;
376
377# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 307# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0)
378 if (CHECK_GEOM_OPS ("tile")) 308 if (CHECK_GEOM_OPS ("tile"))
379 { 309 {
380 w = h = noScale; 310 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 311 geom_flags |= WidthValue|HeightValue;
382 } 312 }
383 else if (CHECK_GEOM_OPS ("propscale")) 313 else if (CHECK_GEOM_OPS ("propscale"))
384 { 314 {
385 new_flags |= propScale; 315 new_flags |= propScale;
386 } 316 }
387 else if (CHECK_GEOM_OPS ("hscale")) 317 else if (CHECK_GEOM_OPS ("hscale"))
388 { 318 {
389 if (w == 0) w = windowScale; 319 if (w == 0) w = windowScale;
390 320
391 h = noScale; 321 h = noScale;
392 geom_flags |= WidthValue|HeightValue; 322 geom_flags |= WidthValue|HeightValue;
393 } 323 }
394 else if (CHECK_GEOM_OPS ("vscale")) 324 else if (CHECK_GEOM_OPS ("vscale"))
395 { 325 {
396 if (h == 0) h = windowScale; 326 if (h == 0) h = windowScale;
397 327
398 w = noScale; 328 w = noScale;
399 geom_flags |= WidthValue|HeightValue; 329 geom_flags |= WidthValue|HeightValue;
400 } 330 }
401 else if (CHECK_GEOM_OPS ("scale")) 331 else if (CHECK_GEOM_OPS ("scale"))
402 { 332 {
403 if (h == 0) h = windowScale; 333 if (h == 0) h = windowScale;
404 if (w == 0) w = windowScale; 334 if (w == 0) w = windowScale;
405 335
406 geom_flags |= WidthValue|HeightValue; 336 geom_flags |= WidthValue|HeightValue;
407 } 337 }
408 else if (CHECK_GEOM_OPS ("auto")) 338 else if (CHECK_GEOM_OPS ("auto"))
409 { 339 {
410 w = h = windowScale; 340 w = h = windowScale;
411 x = y = centerAlign; 341 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 342 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 343 }
414 else if (CHECK_GEOM_OPS ("root")) 344 else if (CHECK_GEOM_OPS ("root"))
415 { 345 {
416 new_flags |= rootAlign; 346 new_flags |= rootAlign;
417 w = h = noScale; 347 w = h = noScale;
418 geom_flags |= WidthValue|HeightValue; 348 geom_flags |= WidthValue|HeightValue;
419 } 349 }
420# undef CHECK_GEOM_OPS 350# undef CHECK_GEOM_OPS
421
422 while (*ops != ':' && *ops != '\0') ++ops;
423 } /* done parsing ops */ 351 } /* done parsing ops */
424 }
425 352
353 rxvt_free_strsplit (arr);
354 }
355
426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 356 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; 357 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; 358 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; 359 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
430 }
431 360
432 if (new_flags != flags) 361 if (new_flags != flags)
433 { 362 {
434 flags = new_flags; 363 flags = new_flags;
435 changed = true; 364 changed = true;
… …
460 if (!w) w = image_width; 389 if (!w) w = image_width;
461 if (!h) h = image_height; 390 if (!h) h = image_height;
462 391
463 if (flags & rootAlign) 392 if (flags & rootAlign)
464 { 393 {
465 target->get_window_origin (x, y);
466 x = -x; 394 x = -target_x;
467 y = -y; 395 y = -target_y;
468 } 396 }
469 else 397 else
470 { 398 {
471 x = make_align_position (h_align, target_width, w); 399 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h); 400 y = make_align_position (v_align, target_height, h);
… …
720} 648}
721# endif /* HAVE_AFTERIMAGE */ 649# endif /* HAVE_AFTERIMAGE */
722 650
723# ifdef HAVE_PIXBUF 651# ifdef HAVE_PIXBUF
724bool 652bool
653bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
654 int src_x, int src_y, int dst_x, int dst_y,
655 unsigned int width, unsigned int height)
656{
657 XImage *ximage;
658 char *data, *line;
659 int bytes_per_pixel;
660 int width_r, width_g, width_b;
661 int sh_r, sh_g, sh_b;
662 int rowstride;
663 int channels;
664 unsigned char *row;
665 Visual *visual = target->visual;
666 int depth = target->depth;
667
668 if (visual->c_class != TrueColor)
669 return false;
670
671 if (depth == 24 || depth == 32)
672 bytes_per_pixel = 4;
673 else if (depth == 15 || depth == 16)
674 bytes_per_pixel = 2;
675 else
676 return false;
677
678 width_r = rxvt_popcount (visual->red_mask);
679 width_g = rxvt_popcount (visual->green_mask);
680 width_b = rxvt_popcount (visual->blue_mask);
681
682 if (width_r > 8 || width_g > 8 || width_b > 8)
683 return false;
684
685 sh_r = rxvt_ctz (visual->red_mask);
686 sh_g = rxvt_ctz (visual->green_mask);
687 sh_b = rxvt_ctz (visual->blue_mask);
688
689 if (width > INT_MAX / height / bytes_per_pixel)
690 return false;
691
692 data = (char *)malloc (width * height * bytes_per_pixel);
693 if (!data)
694 return false;
695
696 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
697 width, height, bytes_per_pixel * 8, 0);
698 if (!ximage)
699 {
700 free (data);
701 return false;
702 }
703
704 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
705
706 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
707 channels = gdk_pixbuf_get_n_channels (pixbuf);
708 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
709 line = data;
710
711 for (int y = 0; y < height; y++)
712 {
713 for (int x = 0; x < width; x++)
714 {
715 unsigned char *pixel = row + x * channels;
716 uint32_t value;
717
718 value = ((pixel[0] >> (8 - width_r)) << sh_r)
719 | ((pixel[1] >> (8 - width_g)) << sh_g)
720 | ((pixel[2] >> (8 - width_b)) << sh_b);
721
722 if (bytes_per_pixel == 4)
723 ((uint32_t *)line)[x] = value;
724 else
725 ((uint16_t *)line)[x] = value;
726 }
727
728 row += rowstride;
729 line += ximage->bytes_per_line;
730 }
731
732 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
733 XDestroyImage (ximage);
734 return true;
735}
736
737bool
725bgPixmap_t::render_image (unsigned long background_flags) 738bgPixmap_t::render_image (unsigned long background_flags)
726{ 739{
727 if (target == NULL) 740 if (target == NULL)
728 return false; 741 return false;
729 742
… …
810 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
811 824
812 if (h_scale == 0 || v_scale == 0) 825 if (h_scale == 0 || v_scale == 0)
813 { 826 {
814 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
815 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 828 pixbuf_to_pixmap (result, tile, gc,
816 0, 0, 829 0, 0,
817 0, 0, 830 0, 0,
818 image_width, image_height, 831 image_width, image_height);
819 XLIB_RGB_DITHER_NONE,
820 0, 0);
821 832
822 gcv.tile = tile; 833 gcv.tile = tile;
823 gcv.fill_style = FillTiled; 834 gcv.fill_style = FillTiled;
824 gcv.ts_x_origin = x; 835 gcv.ts_x_origin = x;
825 gcv.ts_y_origin = y; 836 gcv.ts_y_origin = y;
… …
840 || dst_x + dst_width < new_pmap_width 851 || dst_x + dst_width < new_pmap_width
841 || dst_y + dst_height < new_pmap_height) 852 || dst_y + dst_height < new_pmap_height)
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 853 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 854
844 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 855 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
845 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 856 pixbuf_to_pixmap (result, pixmap, gc,
846 src_x, src_y, 857 src_x, src_y,
847 dst_x, dst_y, 858 dst_x, dst_y,
848 dst_width, dst_height, 859 dst_width, dst_height);
849 XLIB_RGB_DITHER_NONE,
850 0, 0);
851 } 860 }
852 861
853#if XRENDER 862#if XRENDER
854 if (background_flags) 863 if (background_flags)
855 { 864 {
… …
922 if (image) 931 if (image)
923 { 932 {
924 if (original_asim) 933 if (original_asim)
925 safe_asimage_destroy (original_asim); 934 safe_asimage_destroy (original_asim);
926 original_asim = image; 935 original_asim = image;
936 flags |= CLIENT_RENDER;
927 have_image = true; 937 have_image = true;
928 return true; 938 return true;
929 } 939 }
930# endif 940# endif
931 941
… …
1003 bool has_shade = shade != 100; 1013 bool has_shade = shade != 100;
1004 1014
1005 if (tint) 1015 if (tint)
1006 { 1016 {
1007 tint->get (c); 1017 tint->get (c);
1008# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1018# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1019 if (!has_shade
1009 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1020 && IS_COMPONENT_WHOLESOME (c.r)
1010 && IS_COMPONENT_WHOLESOME (c.g) 1021 && IS_COMPONENT_WHOLESOME (c.g)
1011 && IS_COMPONENT_WHOLESOME (c.b)) 1022 && IS_COMPONENT_WHOLESOME (c.b))
1012 flags |= bgPixmap_t::tintWholesome; 1023 flags |= bgPixmap_t::tintWholesome;
1013# undef IS_COMPONENT_WHOLESOME 1024# undef IS_COMPONENT_WHOLESOME
1014 } 1025 }
1015 1026
1016 if (has_shade) 1027 if (has_shade || tint)
1017 flags |= bgPixmap_t::tintNeeded; 1028 flags |= bgPixmap_t::tintNeeded;
1018 else if (tint)
1019 {
1020 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1021 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1022 {
1023 flags |= bgPixmap_t::tintNeeded;
1024 }
1025 }
1026 1029
1027 return flags; 1030 return flags;
1028} 1031}
1029 1032
1030bool 1033bool
… …
1033 if (!(flags & tintSet) || tint != new_tint) 1036 if (!(flags & tintSet) || tint != new_tint)
1034 { 1037 {
1035 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1038 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1036 tint = new_tint; 1039 tint = new_tint;
1037 flags = (flags & ~tintFlags) | new_flags | tintSet; 1040 flags = (flags & ~tintFlags) | new_flags | tintSet;
1038 return true;
1039 }
1040
1041 return false;
1042}
1043
1044bool
1045bgPixmap_t::unset_tint ()
1046{
1047 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1048
1049 if (new_flags != (flags & tintFlags))
1050 {
1051 flags = (flags & ~tintFlags) | new_flags;
1052 return true; 1041 return true;
1053 } 1042 }
1054 1043
1055 return false; 1044 return false;
1056} 1045}
… …
1201 c.g = (c.g * shade) / 100; 1190 c.g = (c.g * shade) / 100;
1202 c.b = (c.b * shade) / 100; 1191 c.b = (c.b * shade) / 100;
1203 } 1192 }
1204 else 1193 else
1205 { 1194 {
1206 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1195 c.r = (c.r * (200 - shade)) / 100;
1207 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1196 c.g = (c.g * (200 - shade)) / 100;
1208 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1197 c.b = (c.b * (200 - shade)) / 100;
1209 } 1198 }
1210 1199
1211 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1200 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1212 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1201 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1213 XRenderPictureAttributes pa; 1202 XRenderPictureAttributes pa;
… …
1227 1216
1228 if (mask_pic && overlay_pic && back_pic) 1217 if (mask_pic && overlay_pic && back_pic)
1229 { 1218 {
1230 XRenderColor mask_c; 1219 XRenderColor mask_c;
1231 1220
1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1221 mask_c.red = mask_c.green = mask_c.blue = 0;
1233 mask_c.alpha = 0xffff; 1222 mask_c.alpha = 0xffff;
1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1223 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1235 1224
1236 mask_c.alpha = 0; 1225 mask_c.alpha = 0;
1237 mask_c.red = 0xffff - c.r; 1226 mask_c.red = 0xffff - c.r;
1238 mask_c.green = 0xffff - c.g; 1227 mask_c.green = 0xffff - c.g;
1239 mask_c.blue = 0xffff - c.b; 1228 mask_c.blue = 0xffff - c.b;
1240 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1229 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1241 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1230 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1231
1232 if (shade > 100)
1233 {
1234 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1235 mask_c.alpha = 0;
1236 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1237
1238 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239 }
1240
1242 ret = true; 1241 ret = true;
1243 } 1242 }
1244 1243
1245 XRenderFreePicture (dpy, mask_pic); 1244 XRenderFreePicture (dpy, mask_pic);
1246 XRenderFreePicture (dpy, overlay_pic); 1245 XRenderFreePicture (dpy, overlay_pic);
… …
1277 int window_height = target->szHint.height; 1276 int window_height = target->szHint.height;
1278 int sx, sy; 1277 int sx, sy;
1279 XGCValues gcv; 1278 XGCValues gcv;
1280 GC gc; 1279 GC gc;
1281 1280
1282 target->get_window_origin (sx, sy); 1281 sx = target_x;
1282 sy = target_y;
1283 1283
1284 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1285 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1286 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1287 return 0; 1287 return 0;
… …
1340 1340
1341 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1342 return 0; 1342 return 0;
1343 1343
1344 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1345 while (sx < 0) sx += (int)root_width;
1346 while (sy < 0) sy += (int)root_height;
1347
1345 gcv.tile = recoded_root_pmap; 1348 gcv.tile = recoded_root_pmap;
1346 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
1347
1348 while (sx < 0) sx += (int)root_width;
1349 while (sy < 0) sy += (int)root_height;
1350
1351 gcv.ts_x_origin = -sx; 1350 gcv.ts_x_origin = -sx;
1352 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1354 1353
1355 if (gc) 1354 if (gc)
1356 { 1355 {
1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1358 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1359 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1360 1359
1361 if (!need_client_side_rendering ()) 1360 if (!(flags & CLIENT_RENDER))
1362 { 1361 {
1363 if ((flags & blurNeeded) 1362 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV)) 1363 && (flags & HAS_RENDER_CONV))
1365 { 1364 {
1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
… …
1392} 1391}
1393 1392
1394void 1393void
1395bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
1396{ 1395{
1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1396 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1398 if (new_root_pixmap == None) 1397 if (new_root_pixmap == None)
1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1398 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1400 1399
1401 root_pixmap = new_root_pixmap; 1400 root_pixmap = new_root_pixmap;
1402} 1401}
1403# endif /* ENABLE_TRANSPARENCY */ 1402# endif /* ENABLE_TRANSPARENCY */
1404 1403
1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1404#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1405static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1407# endif 1406# endif
1408 1407
1409bool 1408bool
1410bgPixmap_t::render () 1409bgPixmap_t::render ()
1411{ 1410{
… …
1421 /* we need to re-generate transparency pixmap in that case ! */ 1420 /* we need to re-generate transparency pixmap in that case ! */
1422 background_flags = make_transparency_pixmap (); 1421 background_flags = make_transparency_pixmap ();
1423 if (background_flags == 0) 1422 if (background_flags == 0)
1424 return false; 1423 return false;
1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1424 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1426 flags = flags & ~isInvalid; 1425 flags &= ~isInvalid;
1427 } 1426 }
1428# endif 1427# endif
1429 1428
1430# ifdef BG_IMAGE_FROM_FILE 1429# ifdef BG_IMAGE_FROM_FILE
1431 if (have_image 1430 if (have_image
1432 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1431 || (background_flags & transpTransformations) != (flags & transpTransformations))
1433 { 1432 {
1434 if (render_image (background_flags)) 1433 if (render_image (background_flags))
1435 flags = flags & ~isInvalid; 1434 flags &= ~isInvalid;
1436 } 1435 }
1437# endif 1436# endif
1438 1437
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1440 XImage *result = NULL; 1439 XImage *result = NULL;
… …
1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1451 { 1450 {
1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1453 if (flags & tintSet) 1452 if (flags & tintSet)
1454 tint.get (c); 1453 tint.get (c);
1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1454 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1456 } 1455 }
1457 1456
1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1457 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459 1458
1460 if (gc) 1459 if (gc)
1461 { 1460 {
1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1461 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1463 1462
1464 XFreeGC (target->dpy, gc); 1463 XFreeGC (target->dpy, gc);
1465 flags = flags & ~isInvalid; 1464 flags &= ~isInvalid;
1466 } 1465 }
1467 1466
1468 XDestroyImage (result); 1467 XDestroyImage (result);
1469 } 1468 }
1470# endif 1469# endif
… …
1565 1564
1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1565#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1567/* taken from aterm-0.4.2 */ 1566/* taken from aterm-0.4.2 */
1568 1567
1569static void 1568static void
1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1569shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1571{ 1570{
1572 int sh_r, sh_g, sh_b; 1571 int sh_r, sh_g, sh_b;
1573 uint32_t mask_r, mask_g, mask_b; 1572 uint32_t mask_r, mask_g, mask_b;
1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1573 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1575 rgba low; 1574 rgba low;
1576 rgba high; 1575 rgba high;
1577 int i; 1576 int i;
1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1577 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1579 1578
1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1579 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1581 1580
1582 /* for convenience */ 1581 /* for convenience */
1583 mask_r = visual->red_mask; 1582 mask_r = visual->red_mask;
1584 mask_g = visual->green_mask; 1583 mask_g = visual->green_mask;
1585 mask_b = visual->blue_mask; 1584 mask_b = visual->blue_mask;
1586 1585
1587 /* boring lookup table pre-initialization */ 1586 /* boring lookup table pre-initialization */
1588 switch (srcImage->depth) 1587 switch (ximage->depth)
1589 { 1588 {
1590 case 15: 1589 case 15:
1591 if ((mask_r != 0x7c00) || 1590 if ((mask_r != 0x7c00) ||
1592 (mask_g != 0x03e0) || 1591 (mask_g != 0x03e0) ||
1593 (mask_b != 0x001f)) 1592 (mask_b != 0x001f))
… …
1646 /* prepare limits for color transformation (each channel is handled separately) */ 1645 /* prepare limits for color transformation (each channel is handled separately) */
1647 if (shade > 100) 1646 if (shade > 100)
1648 { 1647 {
1649 shade = 200 - shade; 1648 shade = 200 - shade;
1650 1649
1651 high.r = (65535 - c.r) * shade / 100; 1650 high.r = c.r * shade / 100;
1652 high.g = (65535 - c.g) * shade / 100; 1651 high.g = c.g * shade / 100;
1653 high.b = (65535 - c.b) * shade / 100; 1652 high.b = c.b * shade / 100;
1654 1653
1655 low.r = 65535 - high.r; 1654 low.r = 65535 * (100 - shade) / 100;
1656 low.g = 65535 - high.g; 1655 low.g = 65535 * (100 - shade) / 100;
1657 low.b = 65535 - high.b; 1656 low.b = 65535 * (100 - shade) / 100;
1658 } 1657 }
1659 else 1658 else
1660 { 1659 {
1661 high.r = c.r * shade / 100; 1660 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100; 1661 high.g = c.g * shade / 100;
… …
1687 tmp += (mask_b>>sh_b) * low.b; 1686 tmp += (mask_b>>sh_b) * low.b;
1688 lookup_b[i] = (tmp/65535)<<sh_b; 1687 lookup_b[i] = (tmp/65535)<<sh_b;
1689 } 1688 }
1690 1689
1691 /* apply table to input image (replacing colors by newly calculated ones) */ 1690 /* apply table to input image (replacing colors by newly calculated ones) */
1692 if (srcImage->bits_per_pixel == 32 1691 if (ximage->bits_per_pixel == 32
1693 && (srcImage->depth == 24 || srcImage->depth == 32) 1692 && (ximage->depth == 24 || ximage->depth == 32)
1694 && srcImage->byte_order == host_byte_order) 1693 && ximage->byte_order == host_byte_order)
1695 { 1694 {
1696 uint32_t *p1, *pf, *p, *pl; 1695 uint32_t *p1, *pf, *p, *pl;
1697 p1 = (uint32_t *) srcImage->data; 1696 p1 = (uint32_t *) ximage->data;
1698 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1697 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1699 1698
1700 while (p1 < pf) 1699 while (p1 < pf)
1701 { 1700 {
1702 p = p1; 1701 p = p1;
1703 pl = p1 + srcImage->width; 1702 pl = p1 + ximage->width;
1704 for (; p < pl; p++) 1703 for (; p < pl; p++)
1705 { 1704 {
1706 *p = lookup_r[(*p & 0xff0000) >> 16] | 1705 *p = lookup_r[(*p & 0xff0000) >> 16] |
1707 lookup_g[(*p & 0x00ff00) >> 8] | 1706 lookup_g[(*p & 0x00ff00) >> 8] |
1708 lookup_b[(*p & 0x0000ff)] | 1707 lookup_b[(*p & 0x0000ff)] |
1709 (*p & 0xff000000); 1708 (*p & 0xff000000);
1710 } 1709 }
1711 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1710 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1712 } 1711 }
1713 } 1712 }
1714 else 1713 else
1715 { 1714 {
1716 for (int y = 0; y < srcImage->height; y++) 1715 for (int y = 0; y < ximage->height; y++)
1717 for (int x = 0; x < srcImage->width; x++) 1716 for (int x = 0; x < ximage->width; x++)
1718 { 1717 {
1719 unsigned long pixel = XGetPixel (srcImage, x, y); 1718 unsigned long pixel = XGetPixel (ximage, x, y);
1720 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1719 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1721 lookup_g[(pixel & mask_g) >> sh_g] | 1720 lookup_g[(pixel & mask_g) >> sh_g] |
1722 lookup_b[(pixel & mask_b) >> sh_b]; 1721 lookup_b[(pixel & mask_b) >> sh_b];
1723 XPutPixel (srcImage, x, y, pixel); 1722 XPutPixel (ximage, x, y, pixel);
1724 } 1723 }
1725 } 1724 }
1726 1725
1727 free (lookup); 1726 free (lookup);
1728} 1727}

Diff Legend

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