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.29 by root, Tue Jan 29 17:52:52 2008 UTC vs.
Revision 1.43 by sf-exg, Sun Aug 29 13:40:42 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 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 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 2 of the License, or
… …
27#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
28 28
29#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h> 30# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
34 34
35#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
39 43
40#else 44#else
41#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 47#endif
44 48
45/* 49/*
46 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
48 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
51 * affects on the background image : 55 * effects on the background image :
52 * 56 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 60 * the image in the window.
… …
136# endif 140# endif
137 141
138 return false; 142 return false;
139} 143}
140 144
141bool 145bool
142bgPixmap_t::window_position_sensitive () 146bgPixmap_t::window_position_sensitive ()
143{ 147{
144# ifdef ENABLE_TRANSPARENCY 148# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 149 if (flags & isTransparent)
146 return true; 150 return true;
147# endif 151# endif
… …
259 int geom_flags = 0, changed = 0; 263 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 264 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 265 unsigned int w = 0, h = 0;
262 unsigned int n; 266 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 267 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 268 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 269# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 270
267 if (geom == NULL) 271 if (geom == NULL)
268 return false; 272 return false;
269 273
… …
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
450{ 454{
451 if (target == NULL) 455 if (target == NULL)
452 return false; 456 return false;
453 457
458 target->init_asv ();
459
460 ASImage *result = 0;
461
454 int target_width = (int)target->szHint.width; 462 int target_width = target->szHint.width;
455 int target_height = (int)target->szHint.height; 463 int target_height = target->szHint.height;
456 int new_pmap_width = target_width, new_pmap_height = target_height; 464 int new_pmap_width = target_width;
457 ASImage *result = NULL; 465 int new_pmap_height = target_height;
458 466
459 int x = 0; 467 int x = 0;
460 int y = 0; 468 int y = 0;
461 int w = h_scale * target_width / 100; 469 int w = h_scale * target_width / 100;
462 int h = v_scale * target_height / 100; 470 int h = v_scale * target_height / 100;
… …
491 new_pmap_height = background->height; 499 new_pmap_height = background->height;
492 result = background; 500 result = background;
493 501
494 if (background_tint != TINT_LEAVE_SAME) 502 if (background_tint != TINT_LEAVE_SAME)
495 { 503 {
496 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 504 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
497 target_width, target_height, background_tint, 505 target_width, target_height, background_tint,
498 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 506 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
499 if (tmp) 507 if (tmp)
500 result = tmp; 508 result = tmp;
501 } 509 }
… …
529 if (h_scale == 0 || v_scale == 0) 537 if (h_scale == 0 || v_scale == 0)
530 { 538 {
531 ASImage *tmp = tile_asimage (target->asv, result, 539 ASImage *tmp = tile_asimage (target->asv, result,
532 (h_scale > 0) ? 0 : (int)result->width - x, 540 (h_scale > 0) ? 0 : (int)result->width - x,
533 (v_scale > 0) ? 0 : (int)result->height - y, 541 (v_scale > 0) ? 0 : (int)result->height - y,
534 new_pmap_width, 542 new_pmap_width,
535 new_pmap_height, 543 new_pmap_height,
536 TINT_LEAVE_SAME, ASA_XImage, 544 TINT_LEAVE_SAME, ASA_XImage,
537 100, ASIMAGE_QUALITY_DEFAULT); 545 100, ASIMAGE_QUALITY_DEFAULT);
538 if (tmp) 546 if (tmp)
539 { 547 {
… …
546 } 554 }
547 else 555 else
548 { 556 {
549 /* if blending background and image - pixmap has to be sized same as target window */ 557 /* if blending background and image - pixmap has to be sized same as target window */
550 ASImageLayer *layers = create_image_layers (2); 558 ASImageLayer *layers = create_image_layers (2);
551 ASImage *merged_im = NULL;
552 559
553 layers[0].im = background; 560 layers[0].im = background;
554 layers[0].clip_width = target_width; 561 layers[0].clip_width = target_width;
555 layers[0].clip_height = target_height; 562 layers[0].clip_height = target_height;
556 layers[0].tint = background_tint; 563 layers[0].tint = background_tint;
… …
663# endif /* HAVE_AFTERIMAGE */ 670# endif /* HAVE_AFTERIMAGE */
664 671
665bool 672bool
666bgPixmap_t::set_file (const char *file) 673bgPixmap_t::set_file (const char *file)
667{ 674{
668 char *f;
669
670 assert (file); 675 assert (file);
671 676
672 if (*file) 677 if (*file)
673 { 678 {
674# ifdef HAVE_AFTERIMAGE 679# ifdef HAVE_AFTERIMAGE
675 if (target->asimman == NULL) 680 if (!target->asimman)
676 target->asimman = create_generic_imageman (target->rs[Rs_path]); 681 target->asimman = create_generic_imageman (target->rs[Rs_path]);
677 682
678 if ((f = strchr (file, ';')) == NULL) 683 if (const char *p = strchr (file, ';'))
679 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
680 else
681 { 684 {
682 size_t len = f - file; 685 size_t len = p - file;
683 f = (char *)malloc (len + 1); 686 char *f = rxvt_temp_buf<char> (len + 1);
684 memcpy (f, file, len); 687 memcpy (f, file, len);
685 f[len] = '\0'; 688 f[len] = '\0';
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 689 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
687 free (f);
688 } 690 }
691 else
692 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
689 693
690 return original_asim; 694 return original_asim;
691# endif 695# endif
692 } 696 }
693 697
… …
846 unsigned long result = 0; 850 unsigned long result = 0;
847 851
848 if (target == NULL) 852 if (target == NULL)
849 return 0; 853 return 0;
850 854
851 /* root dimentions may change from call to call - but Display structure should 855 /* root dimensions may change from call to call - but Display structure should
852 * be always up-to-date, so let's use it : 856 * be always up-to-date, so let's use it :
853 */ 857 */
854 Window root = target->display->root; 858 Window root = target->display->root;
855 int screen = target->display->screen; 859 int screen = target->display->screen;
856 Display *dpy = target->dpy; 860 Display *dpy = target->dpy;
… …
945 else 949 else
946 result |= transpPmapTiled; 950 result |= transpPmapTiled;
947 } 951 }
948 else 952 else
949 { 953 {
950 /* strightforward pixmap copy */ 954 /* straightforward pixmap copy */
951 gcv.tile = root_pixmap; 955 gcv.tile = root_pixmap;
952 gcv.fill_style = FillTiled; 956 gcv.fill_style = FillTiled;
953 957
954 while (sx < 0) sx += (int)root_width; 958 while (sx < 0) sx += (int)root_width;
955 while (sy < 0) sy += (int)root_height; 959 while (sy < 0) sy += (int)root_height;
… …
1106 return false; 1110 return false;
1107} 1111}
1108# endif /* ENABLE_TRANSPARENCY */ 1112# endif /* ENABLE_TRANSPARENCY */
1109 1113
1110# ifndef HAVE_AFTERIMAGE 1114# ifndef HAVE_AFTERIMAGE
1111static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1115static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1112# endif 1116# endif
1113 1117
1114bool 1118bool
1115bgPixmap_t::render () 1119bgPixmap_t::render ()
1116{ 1120{
… …
1119 if (target == NULL) 1123 if (target == NULL)
1120 return false; 1124 return false;
1121 1125
1122 TIMING_TEST_START (tp); 1126 TIMING_TEST_START (tp);
1123 1127
1124 invalidate(); 1128 invalidate ();
1125# ifdef ENABLE_TRANSPARENCY 1129# ifdef ENABLE_TRANSPARENCY
1126 if (flags & isTransparent) 1130 if (flags & isTransparent)
1127 { 1131 {
1128 /* we need to re-generate transparency pixmap in that case ! */ 1132 /* we need to re-generate transparency pixmap in that case ! */
1129 background_flags = make_transparency_pixmap (); 1133 background_flags = make_transparency_pixmap ();
… …
1138 XImage *result = NULL; 1142 XImage *result = NULL;
1139# ifdef HAVE_AFTERIMAGE 1143# ifdef HAVE_AFTERIMAGE
1140 if (original_asim 1144 if (original_asim
1141 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1145 || (background_flags & transpTransformations) != (flags & transpTransformations))
1142 { 1146 {
1147 target->init_asv ();
1148
1143 ASImage *background = NULL; 1149 ASImage *background = NULL;
1144 ARGB32 as_tint = TINT_LEAVE_SAME; 1150 ARGB32 as_tint = TINT_LEAVE_SAME;
1145 if (background_flags) 1151 if (background_flags)
1146 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1152 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1147 1153
1148# ifdef ENABLE_TRANSPARENCY 1154# ifdef ENABLE_TRANSPARENCY
1149 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1155 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1150 { 1156 {
1151 ShadingInfo as_shade; 1157 ShadingInfo as_shade;
… …
1158 as_shade.tintColor.green = c.g; 1164 as_shade.tintColor.green = c.g;
1159 as_shade.tintColor.blue = c.b; 1165 as_shade.tintColor.blue = c.b;
1160 1166
1161 as_tint = shading2tint32 (&as_shade); 1167 as_tint = shading2tint32 (&as_shade);
1162 } 1168 }
1169
1163 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1170 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1164 { 1171 {
1165 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1172 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1166 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1173 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1167 100, ASIMAGE_QUALITY_DEFAULT); 1174 100, ASIMAGE_QUALITY_DEFAULT);
1168 if (tmp) 1175 if (tmp)
1169 { 1176 {
1170 destroy_asimage (&background); 1177 destroy_asimage (&background);
… …
1174# endif 1181# endif
1175 1182
1176 if (render_asim (background, as_tint)) 1183 if (render_asim (background, as_tint))
1177 flags = flags & ~isInvalid; 1184 flags = flags & ~isInvalid;
1178 if (background) 1185 if (background)
1179 destroy_asimage (&background); 1186 destroy_asimage (&background);
1180 } 1187 }
1181 else if (background_flags && pmap_depth != target->depth) 1188 else if (background_flags && pmap_depth != target->depth)
1189 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1190
1191# elif !XFT /* our own client-side tinting */
1192
1193 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1194 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1195
1196 if (background_flags && (flags & isInvalid))
1182 { 1197 {
1183 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1198 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1184 }
1185 1199
1186# elif !XFT /* our own client-side tinting */
1187
1188 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1189 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1190
1191 if (background_flags && (flags & isInvalid))
1192 {
1193 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1194 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1200 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1195 { 1201 {
1196 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1202 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1197 if (flags & tintSet) 1203 if (flags & tintSet)
1198 tint.get (c); 1204 tint.get (c);
… …
1273# ifdef ENABLE_TRANSPARENCY 1279# ifdef ENABLE_TRANSPARENCY
1274 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1280 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1275# endif 1281# endif
1276 return true; 1282 return true;
1277 } 1283 }
1284
1278 return false; 1285 return false;
1279} 1286}
1280 1287
1281void 1288void
1282bgPixmap_t::apply () 1289bgPixmap_t::apply ()
… …
1322 1329
1323 /* don't want Expose on the parent or vt. It is better to use 1330 /* don't want Expose on the parent or vt. It is better to use
1324 scr_touch or we get a great deal of flicker otherwise: */ 1331 scr_touch or we get a great deal of flicker otherwise: */
1325 XClearWindow (target->dpy, target->parent[0]); 1332 XClearWindow (target->dpy, target->parent[0]);
1326 1333
1327 if (target->scrollBar.win) 1334 if (target->scrollBar.state && target->scrollBar.win)
1328 { 1335 {
1329 target->scrollBar.state = STATE_IDLE; 1336 target->scrollBar.state = STATE_IDLE;
1330 target->scrollbar_show (0); 1337 target->scrollBar.show (0);
1331 } 1338 }
1332 1339
1333 target->want_refresh = 1; 1340 target->want_refresh = 1;
1334 flags |= hasChanged; 1341 flags |= hasChanged;
1335 } 1342 }
… …
1341/* taken from aterm-0.4.2 */ 1348/* taken from aterm-0.4.2 */
1342 1349
1343typedef uint32_t RUINT32T; 1350typedef uint32_t RUINT32T;
1344 1351
1345static void 1352static void
1346ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1353ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1347{ 1354{
1348 int sh_r, sh_g, sh_b; 1355 int sh_r, sh_g, sh_b;
1349 RUINT32T mask_r, mask_g, mask_b; 1356 RUINT32T mask_r, mask_g, mask_b;
1350 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1357 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1351 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1358 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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