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.56 by sf-exg, Thu Sep 2 23:40:56 2010 UTC vs.
Revision 1.66 by sf-exg, Mon Oct 4 20:46:20 2010 UTC

… …
138# endif 138# endif
139 139
140# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
141 if (have_image) 141 if (have_image)
142 { 142 {
143 if (h_scale != 0 || v_scale != 0 143 if (flags & sizeSensitive)
144 || h_align != 0 || v_align != 0)
145 return true; 144 return true;
146 } 145 }
147# endif 146# endif
148 147
149 return false; 148 return false;
… …
158# endif 157# endif
159 158
160# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
161 if (have_image) 160 if (have_image)
162 { 161 {
163 if (h_align == rootAlign || v_align == rootAlign) 162 if (flags & rootAlign)
164 return true; 163 return true;
165 } 164 }
166# endif 165# endif
167 166
168 return false; 167 return false;
… …
208static inline bool 207static inline bool
209check_set_align_value (int geom_flags, int flag, int &align, int new_value) 208check_set_align_value (int geom_flags, int flag, int &align, int new_value)
210{ 209{
211 if (geom_flags & flag) 210 if (geom_flags & flag)
212 { 211 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
215 if (new_value < -100) 212 if (new_value < -100)
216 new_value = -100; 213 new_value = -100;
217 else if (new_value > 200) 214 else if (new_value > 200)
218 new_value = 200; 215 new_value = 200;
219 }
220 if (new_value != align) 216 if (new_value != align)
221 { 217 {
222 align = new_value; 218 align = new_value;
223 return true; 219 return true;
224 } 220 }
… …
230make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
231{ 227{
232 int diff = window_size - image_size; 228 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 229 int smaller = min (image_size, window_size);
234 230
235 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
236 return diff * align / 100; 232 return diff * align / 100;
237 else if (align > 50 && align <= 100)
238 return window_size - image_size - diff * (100 - align) / 100;
239 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
240 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
241 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
242 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
243 return 0; 237 return 0;
244} 238}
245 239
246static inline int 240static inline int
247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 241make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248{ 242{
249 int src_pos = 0; 243 int src_pos = 0;
250 dst_pos = 0; 244 dst_pos = pos;
251 dst_size = size; 245 dst_size = size;
252 if (pos < 0 && size > target_size) 246 if (pos < 0)
253 { 247 {
254 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
255 dst_size += pos; 250 dst_size += pos;
256 } 251 }
257 else if (pos > 0)
258 dst_pos = pos;
259 252
260 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
261 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
262 return src_pos; 255 return src_pos;
263} 256}
… …
388 w = h = noScale; 381 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
390 } 383 }
391 else if (CHECK_GEOM_OPS ("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
392 { 385 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 386 new_flags |= propScale;
399 } 387 }
400 else if (CHECK_GEOM_OPS ("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
401 { 389 {
402 if (w == 0) w = windowScale; 390 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 412 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 414 }
427 else if (CHECK_GEOM_OPS ("root")) 415 else if (CHECK_GEOM_OPS ("root"))
428 { 416 {
417 new_flags |= rootAlign;
429 w = h = noScale; 418 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
432 } 420 }
433# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
434 422
435 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 424 } /* done parsing ops */
… …
449 } 437 }
450 438
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 441 return (changed > 0);
442}
443
444void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{
447 int target_width = target->szHint.width;
448 int target_height = target->szHint.height;
449
450 if (flags & propScale)
451 {
452 float scale = (float)target_width / image_width;
453 min_it (scale, (float)target_height / image_height);
454 w = image_width * scale + 0.5;
455 h = image_height * scale + 0.5;
456 }
457 else
458 {
459 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100;
461 }
462
463 if (flags & rootAlign)
464 {
465 target->get_window_origin (x, y);
466 x = -x;
467 y = -y;
468 }
469 else
470 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
473 }
474
475 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0
477 || h_align != 0 || v_align != 0
478 || image_width > target_width || image_height > target_height)
479 flags |= sizeSensitive;
454} 480}
455 481
456# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
457bool 483bool
458bgPixmap_t::render_image (unsigned long background_flags) 484bgPixmap_t::render_image (unsigned long background_flags)
… …
504 int new_pmap_width = target_width; 530 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 531 int new_pmap_height = target_height;
506 532
507 int x = 0; 533 int x = 0;
508 int y = 0; 534 int y = 0;
509 int w = h_scale * target_width / 100; 535 int w = 0;
510 int h = v_scale * target_height / 100; 536 int h = 0;
511 537
512 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
513 539
514 if (original_asim) 540 if (original_asim)
515 { 541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
516 if (h_align == rootAlign || v_align == rootAlign)
517 {
518 target->get_window_origin (x, y);
519 x = -x;
520 y = -y;
521 }
522
523 if (h_align != rootAlign)
524 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
525
526 if (v_align != rootAlign)
527 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
528 }
529 542
530 if (!original_asim 543 if (!original_asim
531 || x >= target_width 544 || x >= target_width
532 || y >= target_height 545 || y >= target_height
533 || (w > 0 && x + w <= 0) 546 || (w > 0 && x + w <= 0)
… …
565 100, ASIMAGE_QUALITY_DEFAULT); 578 100, ASIMAGE_QUALITY_DEFAULT);
566 } 579 }
567 580
568 if (background == NULL) 581 if (background == NULL)
569 { 582 {
570 /* if tiling - pixmap has to be sized exactly as the image,
571 but there is no need to make it bigger than the window! */
572 if (h_scale == 0)
573 new_pmap_width = min (result->width, target_width);
574 if (v_scale == 0)
575 new_pmap_height = min (result->height, target_height);
576 /* we also need to tile our image in one or both directions */
577 if (h_scale == 0 || v_scale == 0) 583 if (h_scale == 0 || v_scale == 0)
578 { 584 {
585 /* if tiling - pixmap has to be sized exactly as the image,
586 but there is no need to make it bigger than the window! */
587 new_pmap_width = min (result->width, target_width);
588 new_pmap_height = min (result->height, target_height);
589
590 /* we also need to tile our image in both directions */
579 ASImage *tmp = tile_asimage (target->asv, result, 591 ASImage *tmp = tile_asimage (target->asv, result,
580 (h_scale > 0) ? 0 : (int)result->width - x, 592 (int)result->width - x,
581 (v_scale > 0) ? 0 : (int)result->height - y, 593 (int)result->height - y,
582 new_pmap_width, 594 new_pmap_width,
583 new_pmap_height, 595 new_pmap_height,
584 TINT_LEAVE_SAME, ASA_XImage, 596 TINT_LEAVE_SAME, ASA_XImage,
585 100, ASIMAGE_QUALITY_DEFAULT); 597 100, ASIMAGE_QUALITY_DEFAULT);
586 if (tmp) 598 if (tmp)
… …
684 696
685 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 697 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
686 int dst_width = result->width, dst_height = result->height; 698 int dst_width = result->width, dst_height = result->height;
687 if (background == NULL) 699 if (background == NULL)
688 { 700 {
701 if (!(h_scale == 0 || v_scale == 0))
702 {
689 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 703 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
690 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 704 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
705 }
691 706
692 if (dst_x > 0 || dst_y > 0 707 if (dst_x > 0 || dst_y > 0
693 || dst_x + dst_width < new_pmap_width 708 || dst_x + dst_width < new_pmap_width
694 || dst_y + dst_height < new_pmap_height) 709 || dst_y + dst_height < new_pmap_height)
695 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 710 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
739 int new_pmap_width = target_width; 754 int new_pmap_width = target_width;
740 int new_pmap_height = target_height; 755 int new_pmap_height = target_height;
741 756
742 int x = 0; 757 int x = 0;
743 int y = 0; 758 int y = 0;
744 int w = h_scale * target_width / 100; 759 int w = 0;
745 int h = v_scale * target_height / 100; 760 int h = 0;
746 761
747 if (h_align == rootAlign || v_align == rootAlign) 762 get_image_geometry (image_width, image_height, w, h, x, y);
748 {
749 target->get_window_origin (x, y);
750 x = -x;
751 y = -y;
752 }
753
754 if (h_align != rootAlign)
755 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
756
757 if (v_align != rootAlign)
758 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
759 763
760 if (x >= target_width 764 if (x >= target_width
761 || y >= target_height 765 || y >= target_height
762 || (w > 0 && x + w <= 0) 766 || (w > 0 && x + w <= 0)
763 || (h > 0 && y + h <= 0)) 767 || (h > 0 && y + h <= 0))
… …
782 GC gc; 786 GC gc;
783 787
784 image_width = gdk_pixbuf_get_width (result); 788 image_width = gdk_pixbuf_get_width (result);
785 image_height = gdk_pixbuf_get_height (result); 789 image_height = gdk_pixbuf_get_height (result);
786 790
787 if (h_scale == 0) 791 if (h_scale == 0 || v_scale == 0)
792 {
788 new_pmap_width = min (image_width, target_width); 793 new_pmap_width = min (image_width, target_width);
789 if (v_scale == 0)
790 new_pmap_height = min (image_height, target_height); 794 new_pmap_height = min (image_height, target_height);
795 }
791 796
792 if (pixmap) 797 if (pixmap)
793 { 798 {
794 if (pmap_width != new_pmap_width 799 if (pmap_width != new_pmap_width
795 || pmap_height != new_pmap_height 800 || pmap_height != new_pmap_height
… …
1037 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1042 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1038 return true; 1043 return true;
1039 } 1044 }
1040 1045
1041 return false; 1046 return false;
1047}
1048
1049bool
1050bgPixmap_t::tint_pixmap (Pixmap pixmap)
1051{
1052 Window root = target->display->root;
1053 Display *dpy = target->dpy;
1054 int window_width = target->szHint.width;
1055 int window_height = target->szHint.height;
1056 bool ret = false;
1057
1058 if (flags & tintWholesome)
1059 {
1060 XGCValues gcv;
1061 GC gc;
1062
1063 /* In this case we can tint image server-side getting significant
1064 * performance improvements, as we eliminate XImage transfer
1065 */
1066 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand;
1068 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc)
1071 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1073 ret = true;
1074 XFreeGC (dpy, gc);
1075 }
1076 }
1077 else
1078 {
1079# if XFT
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081
1082 if (flags & tintSet)
1083 tint.get (c);
1084
1085 if (shade > 0 && shade < 100)
1086 {
1087 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100;
1090 }
1091 else if (shade > 100 && shade < 200)
1092 {
1093 c.r = (c.r * (200 - shade)) / 100;
1094 c.g = (c.g * (200 - shade)) / 100;
1095 c.b = (c.b * (200 - shade)) / 100;
1096 }
1097
1098 XRenderPictFormat pf;
1099 pf.type = PictTypeDirect;
1100 pf.depth = 32;
1101 pf.direct.redMask = 0xff;
1102 pf.direct.greenMask = 0xff;
1103 pf.direct.blueMask = 0xff;
1104 pf.direct.alphaMask = 0xff;
1105
1106 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1107 (PictFormatType|
1108 PictFormatDepth|
1109 PictFormatRedMask|
1110 PictFormatGreenMask|
1111 PictFormatBlueMask|
1112 PictFormatAlphaMask),
1113 &pf,
1114 0);
1115 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1116 XRenderPictureAttributes pa;
1117
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1119
1120 pa.repeat = True;
1121
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap);
1125
1126 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap);
1130
1131 if (mask_pic && overlay_pic && back_pic)
1132 {
1133 XRenderColor mask_c;
1134
1135 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1136 mask_c.alpha = 0xffff;
1137 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1138
1139 mask_c.alpha = 0;
1140 mask_c.red = 0xffff - c.r;
1141 mask_c.green = 0xffff - c.g;
1142 mask_c.blue = 0xffff - c.b;
1143 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1144 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1145 ret = true;
1146 }
1147
1148 XRenderFreePicture (dpy, mask_pic);
1149 XRenderFreePicture (dpy, overlay_pic);
1150 XRenderFreePicture (dpy, back_pic);
1151# if DO_TIMING_TEST
1152 XSync (dpy, False);
1153# endif
1154# endif
1155 }
1156
1157 return ret;
1042} 1158}
1043 1159
1044/* make_transparency_pixmap() 1160/* make_transparency_pixmap()
1045 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1161 * Builds a pixmap sized the same as terminal window, with depth same as the root window
1046 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1162 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
1176 { 1292 {
1177 if (!need_client_side_rendering ()) 1293 if (!need_client_side_rendering ())
1178 { 1294 {
1179 if ((flags & tintNeeded)) 1295 if ((flags & tintNeeded))
1180 { 1296 {
1181 if (flags & tintWholesome) 1297 if (tint_pixmap (tiled_root_pmap))
1182 {
1183 /* In this case we can tint image server-side getting significant
1184 * performance improvements, as we eliminate XImage transfer
1185 */
1186 gcv.foreground = Pixel (tint);
1187 gcv.function = GXand;
1188 gcv.fill_style = FillSolid;
1189 if (gc)
1190 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1191 else
1192 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1193 if (gc)
1194 {
1195 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1196 result |= transpPmapTinted; 1298 result |= transpPmapTinted;
1197 }
1198 }
1199 else
1200 {
1201# if XFT
1202 Picture back_pic = 0;
1203 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204
1205 if (flags & tintSet)
1206 tint.get (c);
1207
1208 if (shade > 0 && shade < 100)
1209 {
1210 c.r = (c.r * shade) / 100;
1211 c.g = (c.g * shade) / 100;
1212 c.b = (c.b * shade) / 100;
1213 }
1214 else if (shade > 100 && shade < 200)
1215 {
1216 c.r = (c.r * (200 - shade)) / 100;
1217 c.g = (c.g * (200 - shade)) / 100;
1218 c.b = (c.b * (200 - shade)) / 100;
1219 }
1220
1221 XRenderPictFormat pf;
1222 pf.type = PictTypeDirect;
1223 pf.depth = 32;
1224 pf.direct.redMask = 0xff;
1225 pf.direct.greenMask = 0xff;
1226 pf.direct.blueMask = 0xff;
1227 pf.direct.alphaMask = 0xff;
1228
1229 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1230 (PictFormatType|
1231 PictFormatDepth|
1232 PictFormatRedMask|
1233 PictFormatGreenMask|
1234 PictFormatBlueMask|
1235 PictFormatAlphaMask),
1236 &pf,
1237 0);
1238 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1239 XRenderPictureAttributes pa ;
1240
1241 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1242
1243 pa.repeat = True;
1244
1245 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1246 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1247 XFreePixmap (dpy, overlay_pmap);
1248
1249 pa.component_alpha = True;
1250 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1251 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1252 XFreePixmap (dpy, mask_pmap);
1253
1254 if (mask_pic && overlay_pic && back_pic)
1255 {
1256 XRenderColor mask_c;
1257
1258 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1259 mask_c.alpha = 0xffff;
1260 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1261
1262 mask_c.alpha = 0;
1263 mask_c.red = 0xffff - c.r;
1264 mask_c.green = 0xffff - c.g;
1265 mask_c.blue = 0xffff - c.b;
1266 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1267 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1268 result |= transpPmapTinted;
1269 }
1270
1271 XRenderFreePicture (dpy, mask_pic);
1272 XRenderFreePicture (dpy, overlay_pic);
1273 XRenderFreePicture (dpy, back_pic);
1274# if DO_TIMING_TEST
1275 XSync (dpy, False);
1276# endif
1277# endif
1278 }
1279 } 1299 }
1280 } /* server side rendering completed */ 1300 } /* server side rendering completed */
1281 1301
1282 if (pixmap) 1302 if (pixmap)
1283 XFreePixmap (dpy, pixmap); 1303 XFreePixmap (dpy, pixmap);

Diff Legend

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