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.115 by sf-exg, Thu Nov 11 10:42:45 2010 UTC vs.
Revision 1.123 by sf-exg, Tue Nov 23 08:37:37 2010 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;
… …
172 return true; 173 return true;
173 } 174 }
174# endif 175# endif
175 176
176 return false; 177 return false;
177}; 178}
178 179
179bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
180{ 181{
181# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
182 if (original_asim) 183 if (original_asim)
… …
252 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
253 return src_pos; 254 return src_pos;
254} 255}
255 256
256bool 257bool
257bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
258{ 259{
259 bool changed = false; 260 bool changed = false;
260 int geom_flags = 0; 261 int geom_flags = 0;
261 int x = 0, y = 0; 262 int x = 0, y = 0;
262 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
263 unsigned int n; 264 unsigned int n;
264 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
265 const char *p; 266 const char *ops;
266# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
267 268
268 if (geom == NULL) 269 if (geom == NULL)
269 return false; 270 return false;
270 271
271 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
272 273
273 while (isspace(*geom)) ++geom;
274 if ((p = strchr (geom, ';')) == NULL)
275 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
276 275 if (ops == NULL)
276 n = strlen (geom);
277 else
277 n = (p - geom); 278 n = ops - geom;
279
278 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
279 { 281 return false;
280 char *ops;
281 new_flags |= geometrySet;
282 282
283 memcpy (str, geom, n); 283 memcpy (str, geom, n);
284 str[n] = '\0'; 284 str[n] = '\0';
285 if (str[0] == ':') 285 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 286
301 if (ops > str || ops == NULL) 287 if (str[0])
302 { 288 {
303 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
304 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 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 */ 291 } /* done parsing geometry string */
361 else if (!(flags & geometrySet)) 292
362 { 293 if (!update)
363 /* default geometry - scaled and centered */ 294 {
295 if (!(geom_flags & XValue))
364 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
365 w = h = defaultScale; 301 w = h = defaultScale;
366 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
367 306
368 if (!(flags & geometrySet))
369 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
370 309
371 if (ops) 310 if (ops)
372 { 311 {
373 while (*ops) 312 while (*ops)
374 { 313 {
375 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
376 315
377# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
378 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
379 { 318 {
380 w = h = noScale; 319 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
382 } 321 }
383 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
384 { 323 {
385 new_flags |= propScale; 324 new_flags |= propScale;
386 } 325 }
387 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
388 { 327 {
389 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
390 329
391 h = noScale; 330 h = noScale;
392 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
393 } 332 }
394 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
395 { 334 {
396 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
397 336
398 w = noScale; 337 w = noScale;
399 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
400 } 339 }
401 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
402 { 341 {
403 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
404 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
405 344
406 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
407 } 346 }
408 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
409 { 348 {
410 w = h = windowScale; 349 w = h = windowScale;
411 x = y = centerAlign; 350 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 352 }
414 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
415 { 354 {
416 new_flags |= rootAlign; 355 new_flags |= rootAlign;
417 w = h = noScale; 356 w = h = noScale;
418 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
419 } 358 }
420# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
421 360
422 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
423 } /* done parsing ops */ 362 } /* done parsing ops */
424 } 363 }
425 364
426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 365 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; 366 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; 367 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; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
430 }
431 369
432 if (new_flags != flags) 370 if (new_flags != flags)
433 { 371 {
434 flags = new_flags; 372 flags = new_flags;
435 changed = true; 373 changed = true;
… …
460 if (!w) w = image_width; 398 if (!w) w = image_width;
461 if (!h) h = image_height; 399 if (!h) h = image_height;
462 400
463 if (flags & rootAlign) 401 if (flags & rootAlign)
464 { 402 {
465 target->get_window_origin (x, y);
466 x = -x; 403 x = -target_x;
467 y = -y; 404 y = -target_y;
468 } 405 }
469 else 406 else
470 { 407 {
471 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
1004 941
1005 if (tint) 942 if (tint)
1006 { 943 {
1007 tint->get (c); 944 tint->get (c);
1008# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
946 if (!has_shade
1009 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
1010 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
1011 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
1012 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
1013# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
1014 } 952 }
1015 953
1016 if (has_shade) 954 if (has_shade || tint)
1017 flags |= bgPixmap_t::tintNeeded; 955 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 956
1027 return flags; 957 return flags;
1028} 958}
1029 959
1030bool 960bool
… …
1227 1157
1228 if (mask_pic && overlay_pic && back_pic) 1158 if (mask_pic && overlay_pic && back_pic)
1229 { 1159 {
1230 XRenderColor mask_c; 1160 XRenderColor mask_c;
1231 1161
1232 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1162 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1233 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1235 1165
1236 mask_c.alpha = 0; 1166 mask_c.alpha = 0;
1237 mask_c.red = 0xffff - c.r; 1167 mask_c.red = 0xffff - c.r;
… …
1277 int window_height = target->szHint.height; 1207 int window_height = target->szHint.height;
1278 int sx, sy; 1208 int sx, sy;
1279 XGCValues gcv; 1209 XGCValues gcv;
1280 GC gc; 1210 GC gc;
1281 1211
1282 target->get_window_origin (sx, sy); 1212 sx = target_x;
1213 sy = target_y;
1283 1214
1284 /* check if we are outside of the visible part of the virtual screen : */ 1215 /* check if we are outside of the visible part of the virtual screen : */
1285 if (sx + window_width <= 0 || sy + window_height <= 0 1216 if (sx + window_width <= 0 || sy + window_height <= 0
1286 || sx >= root_width || sy >= root_height) 1217 || sx >= root_width || sy >= root_height)
1287 return 0; 1218 return 0;
… …
1340 1271
1341 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1272 if (tiled_root_pmap == None) /* something really bad happened - abort */
1342 return 0; 1273 return 0;
1343 1274
1344 /* straightforward pixmap copy */ 1275 /* straightforward pixmap copy */
1276 while (sx < 0) sx += (int)root_width;
1277 while (sy < 0) sy += (int)root_height;
1278
1345 gcv.tile = recoded_root_pmap; 1279 gcv.tile = recoded_root_pmap;
1346 gcv.fill_style = FillTiled; 1280 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; 1281 gcv.ts_x_origin = -sx;
1352 gcv.ts_y_origin = -sy; 1282 gcv.ts_y_origin = -sy;
1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1283 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1354 1284
1355 if (gc) 1285 if (gc)
… …
1421 /* we need to re-generate transparency pixmap in that case ! */ 1351 /* we need to re-generate transparency pixmap in that case ! */
1422 background_flags = make_transparency_pixmap (); 1352 background_flags = make_transparency_pixmap ();
1423 if (background_flags == 0) 1353 if (background_flags == 0)
1424 return false; 1354 return false;
1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1355 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1426 flags = flags & ~isInvalid; 1356 flags &= ~isInvalid;
1427 } 1357 }
1428# endif 1358# endif
1429 1359
1430# ifdef BG_IMAGE_FROM_FILE 1360# ifdef BG_IMAGE_FROM_FILE
1431 if (have_image 1361 if (have_image
1432 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1362 || (background_flags & transpTransformations) != (flags & transpTransformations))
1433 { 1363 {
1434 if (render_image (background_flags)) 1364 if (render_image (background_flags))
1435 flags = flags & ~isInvalid; 1365 flags &= ~isInvalid;
1436 } 1366 }
1437# endif 1367# endif
1438 1368
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1369# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1440 XImage *result = NULL; 1370 XImage *result = NULL;
… …
1460 if (gc) 1390 if (gc)
1461 { 1391 {
1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1392 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1463 1393
1464 XFreeGC (target->dpy, gc); 1394 XFreeGC (target->dpy, gc);
1465 flags = flags & ~isInvalid; 1395 flags &= ~isInvalid;
1466 } 1396 }
1467 1397
1468 XDestroyImage (result); 1398 XDestroyImage (result);
1469 } 1399 }
1470# endif 1400# endif

Diff Legend

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