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.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC vs.
Revision 1.174 by sf-exg, Wed Nov 23 16:53:53 2011 UTC

… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 */
52
53#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
54void 38void
55rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
56{ 40{
57#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
166 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
167 151
168 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
169 return diff * align / 100; 153 return diff * align / 100;
170 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
174 return 0; 158 return 0;
175} 159}
176 160
177static inline int 161static inline int
178make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
197{ 181{
198 bool changed = false; 182 bool changed = false;
199 int geom_flags = 0; 183 int geom_flags = 0;
200 int x = 0, y = 0; 184 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
202 unsigned int n;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
204 const char *ops;
205 187
206 if (geom == NULL) 188 if (geom == NULL)
207 return false; 189 return false;
208 190
209 char str[256]; 191 if (geom[0])
210
211 ops = strchr (geom, ':');
212 if (ops == NULL)
213 n = strlen (geom);
214 else
215 n = ops - geom;
216
217 if (n >= sizeof (str))
218 return false;
219
220 memcpy (str, geom, n);
221 str[n] = '\0';
222 rxvt_strtrim (str);
223
224 if (str[0])
225 { 192 {
226 /* we have geometry string - let's handle it prior to applying ops */ 193 char **arr = rxvt_strsplit (':', geom);
194
195 for (int i = 0; arr[i]; i++)
196 {
197 if (!strcasecmp (arr[i], "style=tiled"))
198 {
199 new_flags = BG_TILE;
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_PROP_SCALE;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
229 286
230 if (!update) 287 if (!update)
231 { 288 {
232 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
242 w = h; 299 w = h;
243 300
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 302 }
246 303
247 if (ops)
248 {
249 char **arr = rxvt_strsplit (':', ops + 1);
250
251 for (int i = 0; arr[i]; i++)
252 {
253 if (!strcasecmp (arr[i], "style=tiled"))
254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 else if (!strcasecmp (arr[i], "propscale"))
300 {
301 new_flags |= BG_PROP_SCALE;
302 }
303 else if (!strcasecmp (arr[i], "hscale"))
304 {
305 new_flags |= BG_TILE;
306 w = windowScale;
307 h = noScale;
308 geom_flags |= WidthValue|HeightValue;
309 }
310 else if (!strcasecmp (arr[i], "vscale"))
311 {
312 new_flags |= BG_TILE;
313 h = windowScale;
314 w = noScale;
315 geom_flags |= WidthValue|HeightValue;
316 }
317 else if (!strcasecmp (arr[i], "scale"))
318 {
319 w = h = windowScale;
320 geom_flags |= WidthValue|HeightValue;
321 }
322 else if (!strcasecmp (arr[i], "auto"))
323 {
324 w = h = windowScale;
325 x = y = centerAlign;
326 geom_flags |= WidthValue|HeightValue|XValue|YValue;
327 }
328 else if (!strcasecmp (arr[i], "root"))
329 {
330 new_flags |= BG_TILE|BG_ROOT_ALIGN;
331 w = h = noScale;
332 geom_flags |= WidthValue|HeightValue;
333 }
334 } /* done parsing ops */
335
336 rxvt_free_strsplit (arr);
337 }
338
339 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)
340 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 305 || check_set_scale_value (geom_flags, HeightValue, v_scale, h)
341 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 306 || check_set_align_value (geom_flags, XValue, h_align, x)
342 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 307 || check_set_align_value (geom_flags, YValue, v_align, y))
308 changed = true;
343 309
344 if (new_flags != bg_flags) 310 if (new_flags != bg_flags)
345 { 311 {
346 bg_flags = new_flags; 312 bg_flags = new_flags;
347 changed = true; 313 changed = true;
… …
354rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 320rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
355{ 321{
356 int target_width = szHint.width; 322 int target_width = szHint.width;
357 int target_height = szHint.height; 323 int target_height = szHint.height;
358 324
325 w = h_scale * target_width / 100;
326 h = v_scale * target_height / 100;
327
359 if (bg_flags & BG_PROP_SCALE) 328 if (bg_flags & BG_PROP_SCALE)
360 { 329 {
361 float scale = (float)target_width / image_width; 330 float scale = (float)w / image_width;
362 min_it (scale, (float)target_height / image_height); 331 min_it (scale, (float)h / image_height);
363 w = image_width * scale + 0.5; 332 w = image_width * scale + 0.5;
364 h = image_height * scale + 0.5; 333 h = image_height * scale + 0.5;
365 } 334 }
366 else
367 {
368 w = h_scale * target_width / 100;
369 h = v_scale * target_height / 100;
370 }
371 335
372 if (!w) w = image_width; 336 if (!w) w = image_width;
373 if (!h) h = image_height; 337 if (!h) h = image_height;
374 338
375 if (bg_flags & BG_ROOT_ALIGN) 339 if (bg_flags & BG_ROOT_ALIGN)
… …
383 y = make_align_position (v_align, target_height, h); 347 y = make_align_position (v_align, target_height, h);
384 } 348 }
385 349
386 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 350 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
387 if (!(bg_flags & BG_TILE) 351 if (!(bg_flags & BG_TILE)
388 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 352 || h_scale || v_scale
389 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 353 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
390 || w > target_width || h > target_height) 354 || w > target_width || h > target_height)
391 bg_flags |= BG_IS_SIZE_SENSITIVE; 355 bg_flags |= BG_IS_SIZE_SENSITIVE;
392} 356}
393 357
… …
420 } 384 }
421 385
422 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 386 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
423 { 387 {
424 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 388 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
425 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 389 ASA_XImage,
426 100, ASIMAGE_QUALITY_DEFAULT); 390 100, ASIMAGE_QUALITY_DEFAULT);
427 if (tmp) 391 if (tmp)
428 { 392 {
429 destroy_asimage (&background); 393 destroy_asimage (&background);
430 background = tmp; 394 background = tmp;
… …
449 413
450 if (!original_asim 414 if (!original_asim
451 || (!(bg_flags & BG_ROOT_ALIGN) 415 || (!(bg_flags & BG_ROOT_ALIGN)
452 && (x >= target_width 416 && (x >= target_width
453 || y >= target_height 417 || y >= target_height
454 || (x + w <= 0) 418 || x + w <= 0
455 || (y + h <= 0)))) 419 || y + h <= 0)))
456 { 420 {
457 if (background) 421 if (background)
458 { 422 {
459 new_pmap_width = background->width; 423 new_pmap_width = background->width;
460 new_pmap_height = background->height; 424 new_pmap_height = background->height;
… …
474 } 438 }
475 else 439 else
476 { 440 {
477 result = original_asim; 441 result = original_asim;
478 442
479 if ((w != original_asim->width) 443 if (w != original_asim->width
480 || (h != original_asim->height)) 444 || h != original_asim->height)
481 { 445 {
482 result = scale_asimage (asv, original_asim, 446 result = scale_asimage (asv, original_asim,
483 w, h, 447 w, h,
484 background ? ASA_ASImage : ASA_XImage, 448 ASA_XImage,
485 100, ASIMAGE_QUALITY_DEFAULT); 449 100, ASIMAGE_QUALITY_DEFAULT);
486 } 450 }
487 451
488 if (background == NULL) 452 if (background == NULL)
489 { 453 {
… …
739 get_image_geometry (image_width, image_height, w, h, x, y); 703 get_image_geometry (image_width, image_height, w, h, x, y);
740 704
741 if (!(bg_flags & BG_ROOT_ALIGN) 705 if (!(bg_flags & BG_ROOT_ALIGN)
742 && (x >= target_width 706 && (x >= target_width
743 || y >= target_height 707 || y >= target_height
744 || (x + w <= 0) 708 || x + w <= 0
745 || (y + h <= 0))) 709 || y + h <= 0))
746 return false; 710 return false;
747 711
748 result = pixbuf; 712 result = pixbuf;
749 713
750 if ((w != image_width) 714 if (w != image_width
751 || (h != image_height)) 715 || h != image_height)
752 { 716 {
753 result = gdk_pixbuf_scale_simple (pixbuf, 717 result = gdk_pixbuf_scale_simple (pixbuf,
754 w, h, 718 w, h,
755 GDK_INTERP_BILINEAR); 719 GDK_INTERP_BILINEAR);
756 } 720 }
… …
885rxvt_term::bg_set_file (const char *file) 849rxvt_term::bg_set_file (const char *file)
886{ 850{
887 if (!file || !*file) 851 if (!file || !*file)
888 return false; 852 return false;
889 853
854 bool ret = false;
890 if (const char *p = strchr (file, ';')) 855 const char *p = strchr (file, ';');
856
857 if (p)
891 { 858 {
892 size_t len = p - file; 859 size_t len = p - file;
893 char *f = rxvt_temp_buf<char> (len + 1); 860 char *f = rxvt_temp_buf<char> (len + 1);
894 memcpy (f, file, len); 861 memcpy (f, file, len);
895 f[len] = '\0'; 862 f[len] = '\0';
… …
904 { 871 {
905 if (original_asim) 872 if (original_asim)
906 safe_asimage_destroy (original_asim); 873 safe_asimage_destroy (original_asim);
907 original_asim = image; 874 original_asim = image;
908 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 875 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
909 return true; 876 ret = true;
910 } 877 }
911# endif 878# endif
912 879
913# ifdef HAVE_PIXBUF 880# ifdef HAVE_PIXBUF
914 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 881 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
916 { 883 {
917 if (pixbuf) 884 if (pixbuf)
918 g_object_unref (pixbuf); 885 g_object_unref (pixbuf);
919 pixbuf = image; 886 pixbuf = image;
920 bg_flags |= BG_IS_FROM_FILE; 887 bg_flags |= BG_IS_FROM_FILE;
921 return true; 888 ret = true;
922 } 889 }
923# endif 890# endif
924 891
892 if (ret)
893 {
894 if (p)
895 bg_set_geometry (p + 1);
896 else
897 bg_set_default_geometry ();
898 }
899
925 return false; 900 return ret;
926} 901}
927 902
928# endif /* BG_IMAGE_FROM_FILE */ 903# endif /* BG_IMAGE_FROM_FILE */
929 904
930# ifdef ENABLE_TRANSPARENCY 905# ifdef ENABLE_TRANSPARENCY
… …
1367 { 1342 {
1368 /* we need to re-generate transparency pixmap in that case ! */ 1343 /* we need to re-generate transparency pixmap in that case ! */
1369 tr_flags = make_transparency_pixmap (); 1344 tr_flags = make_transparency_pixmap ();
1370 if (tr_flags == 0) 1345 if (tr_flags == 0)
1371 return false; 1346 return false;
1372 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1373 bg_flags |= BG_IS_VALID; 1347 bg_flags |= BG_IS_VALID;
1374 } 1348 }
1375# endif 1349# endif
1376 1350
1377# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1378 if ((bg_flags & BG_IS_FROM_FILE) 1352 if ((bg_flags & BG_IS_FROM_FILE)
… …
1384# endif 1358# endif
1385 1359
1386# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1387 XImage *result = NULL; 1361 XImage *result = NULL;
1388 1362
1389 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1363 if (tr_flags & BG_NEEDS_TINT)
1390 { 1364 {
1391 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1392 } 1366 }
1393 1367
1394 if (result) 1368 if (result)
1395 { 1369 {
1396 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1397 if (tr_flags & BG_NEEDS_TINT) 1371 //if (tr_flags & BG_NEEDS_TINT)
1372 if (1)
1398 { 1373 {
1399 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1400 if (bg_flags & BG_TINT_SET) 1375 if (bg_flags & BG_TINT_SET)
1401 tint.get (c); 1376 tint.get (c);
1402 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1377 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1407 if (gc) 1382 if (gc)
1408 { 1383 {
1409 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1384 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1410 1385
1411 XFreeGC (dpy, gc); 1386 XFreeGC (dpy, gc);
1412 bg_flags |= BG_IS_VALID;
1413 } 1387 }
1414 1388
1415 XDestroyImage (result); 1389 XDestroyImage (result);
1416 } 1390 }
1417# endif 1391# endif
… …
1458} 1432}
1459 1433
1460#endif /* HAVE_BG_PIXMAP */ 1434#endif /* HAVE_BG_PIXMAP */
1461 1435
1462#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1463/* taken from aterm-0.4.2 */ 1437/* based on code from aterm-0.4.2 */
1464 1438
1465static void 1439static void
1466shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1467{ 1441{
1468 int sh_r, sh_g, sh_b; 1442 int sh_r, sh_g, sh_b;

Diff Legend

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