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.64 by sf-exg, Mon Oct 4 14:31:00 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 }
… …
247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248{ 244{
249 int src_pos = 0; 245 int src_pos = 0;
250 dst_pos = 0; 246 dst_pos = 0;
251 dst_size = size; 247 dst_size = size;
252 if (pos < 0 && size > target_size) 248 if (pos < 0)
253 { 249 {
254 src_pos = -pos; 250 src_pos = -pos;
255 dst_size += pos; 251 dst_size += pos;
256 } 252 }
257 else if (pos > 0) 253 else if (pos > 0)
… …
388 w = h = noScale; 384 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 385 geom_flags |= WidthValue|HeightValue;
390 } 386 }
391 else if (CHECK_GEOM_OPS ("propscale")) 387 else if (CHECK_GEOM_OPS ("propscale"))
392 { 388 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 389 new_flags |= propScale;
399 } 390 }
400 else if (CHECK_GEOM_OPS ("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
401 { 392 {
402 if (w == 0) w = windowScale; 393 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 415 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 417 }
427 else if (CHECK_GEOM_OPS ("root")) 418 else if (CHECK_GEOM_OPS ("root"))
428 { 419 {
420 new_flags |= rootAlign;
429 w = h = noScale; 421 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue;
432 } 423 }
433# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
434 425
435 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 427 } /* done parsing ops */
… …
449 } 440 }
450 441
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align); 443 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 444 return (changed > 0);
445}
446
447void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{
450 int target_width = target->szHint.width;
451 int target_height = target->szHint.height;
452
453 if (flags & propScale)
454 {
455 float scale = (float)target_width / image_width;
456 min_it (scale, (float)target_height / image_height);
457 w = image_width * scale + 0.5;
458 h = image_height * scale + 0.5;
459 }
460 else
461 {
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464 }
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 > 0 ? w : image_width);
475 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || image_width > target_width || image_height > 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
531 || x >= target_width 547 || x >= target_width
532 || y >= target_height 548 || y >= target_height
533 || (w > 0 && x + w <= 0) 549 || (w > 0 && x + w <= 0)
… …
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
756 if (h_align != 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 766
762 if (x >= target_width 767 if (x >= target_width
763 || y >= target_height 768 || y >= target_height
764 || (w > 0 && x + w <= 0) 769 || (w > 0 && x + w <= 0)
765 || (h > 0 && y + h <= 0)) 770 || (h > 0 && y + h <= 0))
… …
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)
1054{
1055 Window root = target->display->root;
1056 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width;
1058 int window_height = target->szHint.height;
1059 bool ret = false;
1060
1061 if (flags & tintWholesome)
1062 {
1063 XGCValues gcv;
1064 GC gc;
1065
1066 /* In this case we can tint image server-side getting significant
1067 * performance improvements, as we eliminate XImage transfer
1068 */
1069 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand;
1071 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc)
1074 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1076 ret = true;
1077 XFreeGC (dpy, gc);
1078 }
1079 }
1080 else
1081 {
1082# if XFT
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084
1085 if (flags & tintSet)
1086 tint.get (c);
1087
1088 if (shade > 0 && shade < 100)
1089 {
1090 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100;
1093 }
1094 else if (shade > 100 && shade < 200)
1095 {
1096 c.r = (c.r * (200 - shade)) / 100;
1097 c.g = (c.g * (200 - shade)) / 100;
1098 c.b = (c.b * (200 - shade)) / 100;
1099 }
1100
1101 XRenderPictFormat pf;
1102 pf.type = PictTypeDirect;
1103 pf.depth = 32;
1104 pf.direct.redMask = 0xff;
1105 pf.direct.greenMask = 0xff;
1106 pf.direct.blueMask = 0xff;
1107 pf.direct.alphaMask = 0xff;
1108
1109 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1110 (PictFormatType|
1111 PictFormatDepth|
1112 PictFormatRedMask|
1113 PictFormatGreenMask|
1114 PictFormatBlueMask|
1115 PictFormatAlphaMask),
1116 &pf,
1117 0);
1118 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1119 XRenderPictureAttributes pa;
1120
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1122
1123 pa.repeat = True;
1124
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap);
1128
1129 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap);
1133
1134 if (mask_pic && overlay_pic && back_pic)
1135 {
1136 XRenderColor mask_c;
1137
1138 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1139 mask_c.alpha = 0xffff;
1140 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1141
1142 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1147 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1148 ret = true;
1149 }
1150
1151 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic);
1153 XRenderFreePicture (dpy, back_pic);
1154# if DO_TIMING_TEST
1155 XSync (dpy, False);
1156# endif
1157# endif
1158 }
1159
1160 return ret;
1045} 1161}
1046 1162
1047/* make_transparency_pixmap() 1163/* make_transparency_pixmap()
1048 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1164 * 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 1165 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
1179 { 1295 {
1180 if (!need_client_side_rendering ()) 1296 if (!need_client_side_rendering ())
1181 { 1297 {
1182 if ((flags & tintNeeded)) 1298 if ((flags & tintNeeded))
1183 { 1299 {
1184 if (flags & tintWholesome) 1300 if (tint_pixmap (tiled_root_pmap))
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; 1301 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 } 1302 }
1283 } /* server side rendering completed */ 1303 } /* server side rendering completed */
1284 1304
1285 if (pixmap) 1305 if (pixmap)
1286 XFreePixmap (dpy, pixmap); 1306 XFreePixmap (dpy, pixmap);

Diff Legend

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