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.58 by sf-exg, Fri Sep 3 22:57:31 2010 UTC vs.
Revision 1.72 by sf-exg, Sat Oct 9 14:57:50 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 (!w) w = image_width;
464 if (!h) h = image_height;
465
466 if (flags & rootAlign)
467 {
468 target->get_window_origin (x, y);
469 x = -x;
470 y = -y;
471 }
472 else
473 {
474 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || w > target_width || h > target_height)
482 flags |= sizeSensitive;
454} 483}
455 484
456# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
457bool 486bool
458bgPixmap_t::render_image (unsigned long background_flags) 487bgPixmap_t::render_image (unsigned long background_flags)
… …
504 int new_pmap_width = target_width; 533 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 534 int new_pmap_height = target_height;
506 535
507 int x = 0; 536 int x = 0;
508 int y = 0; 537 int y = 0;
509 int w = h_scale * target_width / 100; 538 int w = 0;
510 int h = v_scale * target_height / 100; 539 int h = 0;
511 540
512 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
513 542
514 if (original_asim) 543 if (original_asim)
515 { 544 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 545
530 if (!original_asim 546 if (!original_asim
547 || (!(flags & rootAlign)
531 || x >= target_width 548 && (x >= target_width
532 || y >= target_height 549 || y >= target_height
533 || (w > 0 && x + w <= 0) 550 || (x + w <= 0)
534 || (h > 0 && y + h <= 0)) 551 || (y + h <= 0))))
535 { 552 {
536 if (background) 553 if (background)
537 { 554 {
538 new_pmap_width = background->width; 555 new_pmap_width = background->width;
539 new_pmap_height = background->height; 556 new_pmap_height = background->height;
… …
553 } 570 }
554 else 571 else
555 { 572 {
556 result = original_asim; 573 result = original_asim;
557 574
558 if ((w > 0 && w != original_asim->width) 575 if ((w != original_asim->width)
559 || (h > 0 && h != original_asim->height)) 576 || (h != original_asim->height))
560 { 577 {
561 result = scale_asimage (target->asv, original_asim, 578 result = scale_asimage (target->asv, original_asim,
562 w > 0 ? w : original_asim->width, 579 w, h,
563 h > 0 ? h : original_asim->height,
564 background ? ASA_ASImage : ASA_XImage, 580 background ? ASA_ASImage : ASA_XImage,
565 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
566 } 582 }
567 583
568 if (background == NULL) 584 if (background == NULL)
… …
600 layers[0].clip_width = target_width; 616 layers[0].clip_width = target_width;
601 layers[0].clip_height = target_height; 617 layers[0].clip_height = target_height;
602 layers[0].tint = background_tint; 618 layers[0].tint = background_tint;
603 layers[1].im = result; 619 layers[1].im = result;
604 620
605 if (w <= 0) 621 if (h_scale == 0 || v_scale == 0)
606 { 622 {
607 /* tile horizontally */ 623 /* tile horizontally */
608 while (x > 0) x -= (int)result->width; 624 while (x > 0) x -= (int)result->width;
609 layers[1].dst_x = x; 625 layers[1].dst_x = x;
610 layers[1].clip_width = result->width+target_width; 626 layers[1].clip_width = result->width+target_width;
… …
614 /* clip horizontally */ 630 /* clip horizontally */
615 layers[1].dst_x = x; 631 layers[1].dst_x = x;
616 layers[1].clip_width = result->width; 632 layers[1].clip_width = result->width;
617 } 633 }
618 634
619 if (h <= 0) 635 if (h_scale == 0 || v_scale == 0)
620 { 636 {
621 while (y > 0) y -= (int)result->height; 637 while (y > 0) y -= (int)result->height;
622 layers[1].dst_y = y; 638 layers[1].dst_y = y;
623 layers[1].clip_height = result->height + target_height; 639 layers[1].clip_height = result->height + target_height;
624 } 640 }
… …
741 int new_pmap_width = target_width; 757 int new_pmap_width = target_width;
742 int new_pmap_height = target_height; 758 int new_pmap_height = target_height;
743 759
744 int x = 0; 760 int x = 0;
745 int y = 0; 761 int y = 0;
746 int w = h_scale * target_width / 100; 762 int w = 0;
747 int h = v_scale * target_height / 100; 763 int h = 0;
748 764
749 if (h_align == rootAlign || v_align == rootAlign) 765 get_image_geometry (image_width, image_height, w, h, x, y);
750 {
751 target->get_window_origin (x, y);
752 x = -x;
753 y = -y;
754 }
755 766
756 if (h_align != rootAlign) 767 if (!(flags & rootAlign)
757 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
758
759 if (v_align != rootAlign)
760 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
761
762 if (x >= target_width 768 && (x >= target_width
763 || y >= target_height 769 || y >= target_height
764 || (w > 0 && x + w <= 0) 770 || (x + w <= 0)
765 || (h > 0 && y + h <= 0)) 771 || (y + h <= 0)))
766 return false; 772 return false;
767 773
768 result = pixbuf; 774 result = pixbuf;
769 775
770 if ((w > 0 && w != image_width) 776 if ((w != image_width)
771 || (h > 0 && h != image_height)) 777 || (h != image_height))
772 { 778 {
773 result = gdk_pixbuf_scale_simple (pixbuf, 779 result = gdk_pixbuf_scale_simple (pixbuf,
774 w > 0 ? w : image_width, 780 w, h,
775 h > 0 ? h : image_height,
776 GDK_INTERP_BILINEAR); 781 GDK_INTERP_BILINEAR);
777 } 782 }
778 783
779 bool ret = false; 784 bool ret = false;
780 785
… …
1040 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1045 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1041 return true; 1046 return true;
1042 } 1047 }
1043 1048
1044 return false; 1049 return false;
1050}
1051
1052bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height)
1054{
1055 Display *dpy = target->dpy;
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, width, 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 = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - 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, width, 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;
1045} 1158}
1046 1159
1047/* make_transparency_pixmap() 1160/* make_transparency_pixmap()
1048 * 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
1049 * 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
… …
1179 { 1292 {
1180 if (!need_client_side_rendering ()) 1293 if (!need_client_side_rendering ())
1181 { 1294 {
1182 if ((flags & tintNeeded)) 1295 if ((flags & tintNeeded))
1183 { 1296 {
1184 if (flags & tintWholesome) 1297 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height))
1185 {
1186 /* In this case we can tint image server-side getting significant
1187 * performance improvements, as we eliminate XImage transfer
1188 */
1189 gcv.foreground = Pixel (tint);
1190 gcv.function = GXand;
1191 gcv.fill_style = FillSolid;
1192 if (gc)
1193 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1194 else
1195 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1196 if (gc)
1197 {
1198 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1199 result |= transpPmapTinted; 1298 result |= transpPmapTinted;
1200 }
1201 }
1202 else
1203 {
1204# if XFT
1205 Picture back_pic = 0;
1206 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1207
1208 if (flags & tintSet)
1209 tint.get (c);
1210
1211 if (shade > 0 && shade < 100)
1212 {
1213 c.r = (c.r * shade) / 100;
1214 c.g = (c.g * shade) / 100;
1215 c.b = (c.b * shade) / 100;
1216 }
1217 else if (shade > 100 && shade < 200)
1218 {
1219 c.r = (c.r * (200 - shade)) / 100;
1220 c.g = (c.g * (200 - shade)) / 100;
1221 c.b = (c.b * (200 - shade)) / 100;
1222 }
1223
1224 XRenderPictFormat pf;
1225 pf.type = PictTypeDirect;
1226 pf.depth = 32;
1227 pf.direct.redMask = 0xff;
1228 pf.direct.greenMask = 0xff;
1229 pf.direct.blueMask = 0xff;
1230 pf.direct.alphaMask = 0xff;
1231
1232 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1233 (PictFormatType|
1234 PictFormatDepth|
1235 PictFormatRedMask|
1236 PictFormatGreenMask|
1237 PictFormatBlueMask|
1238 PictFormatAlphaMask),
1239 &pf,
1240 0);
1241 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1242 XRenderPictureAttributes pa ;
1243
1244 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1245
1246 pa.repeat = True;
1247
1248 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1249 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1250 XFreePixmap (dpy, overlay_pmap);
1251
1252 pa.component_alpha = True;
1253 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1254 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1255 XFreePixmap (dpy, mask_pmap);
1256
1257 if (mask_pic && overlay_pic && back_pic)
1258 {
1259 XRenderColor mask_c;
1260
1261 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1262 mask_c.alpha = 0xffff;
1263 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1264
1265 mask_c.alpha = 0;
1266 mask_c.red = 0xffff - c.r;
1267 mask_c.green = 0xffff - c.g;
1268 mask_c.blue = 0xffff - c.b;
1269 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1270 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1271 result |= transpPmapTinted;
1272 }
1273
1274 XRenderFreePicture (dpy, mask_pic);
1275 XRenderFreePicture (dpy, overlay_pic);
1276 XRenderFreePicture (dpy, back_pic);
1277# if DO_TIMING_TEST
1278 XSync (dpy, False);
1279# endif
1280# endif
1281 }
1282 } 1299 }
1283 } /* server side rendering completed */ 1300 } /* server side rendering completed */
1284 1301
1285 if (pixmap) 1302 if (pixmap)
1286 XFreePixmap (dpy, pixmap); 1303 XFreePixmap (dpy, pixmap);

Diff Legend

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