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.158 by sf-exg, Wed Aug 10 07:28:36 2011 UTC vs.
Revision 1.173 by sf-exg, Sun Nov 20 11:09:21 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 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * scale Scale both up and down
58 */
59
60#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
61void 38void
62rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
63{ 40{
64#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
173 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
174 151
175 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
176 return diff * align / 100; 153 return diff * align / 100;
177 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
178 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
179 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
180 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
181 return 0; 158 return 0;
182} 159}
183 160
184static inline int 161static inline int
185make_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)
… …
204{ 181{
205 bool changed = false; 182 bool changed = false;
206 int geom_flags = 0; 183 int geom_flags = 0;
207 int x = 0, y = 0; 184 int x = 0, y = 0;
208 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
209 unsigned int n;
210 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
211 const char *ops;
212 187
213 if (geom == NULL) 188 if (geom == NULL)
214 return false; 189 return false;
215 190
216 char str[256]; 191 if (geom[0])
217
218 ops = strchr (geom, ':');
219 if (ops == NULL)
220 n = strlen (geom);
221 else
222 n = ops - geom;
223
224 if (n >= sizeof (str))
225 return false;
226
227 memcpy (str, geom, n);
228 str[n] = '\0';
229 rxvt_strtrim (str);
230
231 if (str[0])
232 { 192 {
233 /* 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
234 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
235 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
236 286
237 if (!update) 287 if (!update)
238 { 288 {
239 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
240 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
249 w = h; 299 w = h;
250 300
251 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
252 } 302 }
253 303
254 if (ops)
255 {
256 char **arr = rxvt_strsplit (':', ops + 1);
257
258 for (int i = 0; arr[i]; i++)
259 {
260 if (!strcasecmp (arr[i], "tile"))
261 {
262 new_flags |= BG_TILE;
263 w = h = noScale;
264 geom_flags |= WidthValue|HeightValue;
265 }
266 else if (!strcasecmp (arr[i], "propscale"))
267 {
268 new_flags |= BG_PROP_SCALE;
269 }
270 else if (!strcasecmp (arr[i], "scale"))
271 {
272 if (h == 0) h = windowScale;
273 if (w == 0) w = windowScale;
274
275 geom_flags |= WidthValue|HeightValue;
276 }
277 else if (!strcasecmp (arr[i], "root"))
278 {
279 new_flags |= BG_TILE|BG_ROOT_ALIGN;
280 w = h = noScale;
281 geom_flags |= WidthValue|HeightValue;
282 }
283 } /* done parsing ops */
284
285 rxvt_free_strsplit (arr);
286 }
287
288 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)) changed = true;
289 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 305 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
290 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 306 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
291 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
292 308
… …
303rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
304{ 320{
305 int target_width = szHint.width; 321 int target_width = szHint.width;
306 int target_height = szHint.height; 322 int target_height = szHint.height;
307 323
324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
308 if (bg_flags & BG_PROP_SCALE) 327 if (bg_flags & BG_PROP_SCALE)
309 { 328 {
310 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
311 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
312 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
313 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
314 } 333 }
315 else
316 {
317 w = h_scale * target_width / 100;
318 h = v_scale * target_height / 100;
319 }
320 334
321 if (!w) w = image_width; 335 if (!w) w = image_width;
322 if (!h) h = image_height; 336 if (!h) h = image_height;
323 337
324 if (bg_flags & BG_ROOT_ALIGN) 338 if (bg_flags & BG_ROOT_ALIGN)
… …
332 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
333 } 347 }
334 348
335 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
336 if (!(bg_flags & BG_TILE) 350 if (!(bg_flags & BG_TILE)
337 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 351 || h_scale || v_scale
338 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
339 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
340 bg_flags |= BG_IS_SIZE_SENSITIVE; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
341} 355}
342 356
… …
369 } 383 }
370 384
371 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
372 { 386 {
373 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
374 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 ASA_XImage,
375 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
376 if (tmp) 390 if (tmp)
377 { 391 {
378 destroy_asimage (&background); 392 destroy_asimage (&background);
379 background = tmp; 393 background = tmp;
… …
398 412
399 if (!original_asim 413 if (!original_asim
400 || (!(bg_flags & BG_ROOT_ALIGN) 414 || (!(bg_flags & BG_ROOT_ALIGN)
401 && (x >= target_width 415 && (x >= target_width
402 || y >= target_height 416 || y >= target_height
403 || (x + w <= 0) 417 || x + w <= 0
404 || (y + h <= 0)))) 418 || y + h <= 0)))
405 { 419 {
406 if (background) 420 if (background)
407 { 421 {
408 new_pmap_width = background->width; 422 new_pmap_width = background->width;
409 new_pmap_height = background->height; 423 new_pmap_height = background->height;
… …
423 } 437 }
424 else 438 else
425 { 439 {
426 result = original_asim; 440 result = original_asim;
427 441
428 if ((w != original_asim->width) 442 if (w != original_asim->width
429 || (h != original_asim->height)) 443 || h != original_asim->height)
430 { 444 {
431 result = scale_asimage (asv, original_asim, 445 result = scale_asimage (asv, original_asim,
432 w, h, 446 w, h,
433 background ? ASA_ASImage : ASA_XImage, 447 ASA_XImage,
434 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
435 } 449 }
436 450
437 if (background == NULL) 451 if (background == NULL)
438 { 452 {
… …
688 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
689 703
690 if (!(bg_flags & BG_ROOT_ALIGN) 704 if (!(bg_flags & BG_ROOT_ALIGN)
691 && (x >= target_width 705 && (x >= target_width
692 || y >= target_height 706 || y >= target_height
693 || (x + w <= 0) 707 || x + w <= 0
694 || (y + h <= 0))) 708 || y + h <= 0))
695 return false; 709 return false;
696 710
697 result = pixbuf; 711 result = pixbuf;
698 712
699 if ((w != image_width) 713 if (w != image_width
700 || (h != image_height)) 714 || h != image_height)
701 { 715 {
702 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
703 w, h, 717 w, h,
704 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
705 } 719 }
… …
834rxvt_term::bg_set_file (const char *file) 848rxvt_term::bg_set_file (const char *file)
835{ 849{
836 if (!file || !*file) 850 if (!file || !*file)
837 return false; 851 return false;
838 852
853 bool ret = false;
839 if (const char *p = strchr (file, ';')) 854 const char *p = strchr (file, ';');
855
856 if (p)
840 { 857 {
841 size_t len = p - file; 858 size_t len = p - file;
842 char *f = rxvt_temp_buf<char> (len + 1); 859 char *f = rxvt_temp_buf<char> (len + 1);
843 memcpy (f, file, len); 860 memcpy (f, file, len);
844 f[len] = '\0'; 861 f[len] = '\0';
… …
853 { 870 {
854 if (original_asim) 871 if (original_asim)
855 safe_asimage_destroy (original_asim); 872 safe_asimage_destroy (original_asim);
856 original_asim = image; 873 original_asim = image;
857 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 874 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
858 return true; 875 ret = true;
859 } 876 }
860# endif 877# endif
861 878
862# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
863 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
865 { 882 {
866 if (pixbuf) 883 if (pixbuf)
867 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
868 pixbuf = image; 885 pixbuf = image;
869 bg_flags |= BG_IS_FROM_FILE; 886 bg_flags |= BG_IS_FROM_FILE;
870 return true; 887 ret = true;
871 } 888 }
872# endif 889# endif
873 890
891 if (ret)
892 {
893 if (p)
894 bg_set_geometry (p + 1);
895 else
896 bg_set_default_geometry ();
897 }
898
874 return false; 899 return ret;
875} 900}
876 901
877# endif /* BG_IMAGE_FROM_FILE */ 902# endif /* BG_IMAGE_FROM_FILE */
878 903
879# ifdef ENABLE_TRANSPARENCY 904# ifdef ENABLE_TRANSPARENCY
… …
1316 { 1341 {
1317 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1318 tr_flags = make_transparency_pixmap (); 1343 tr_flags = make_transparency_pixmap ();
1319 if (tr_flags == 0) 1344 if (tr_flags == 0)
1320 return false; 1345 return false;
1321 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1322 bg_flags |= BG_IS_VALID; 1346 bg_flags |= BG_IS_VALID;
1323 } 1347 }
1324# endif 1348# endif
1325 1349
1326# ifdef BG_IMAGE_FROM_FILE 1350# ifdef BG_IMAGE_FROM_FILE
1327 if ((bg_flags & BG_IS_FROM_FILE) 1351 if ((bg_flags & BG_IS_FROM_FILE)
… …
1333# endif 1357# endif
1334 1358
1335# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1359# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336 XImage *result = NULL; 1360 XImage *result = NULL;
1337 1361
1338 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1362 if (tr_flags & BG_NEEDS_TINT)
1339 { 1363 {
1340 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1364 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1341 } 1365 }
1342 1366
1343 if (result) 1367 if (result)
1344 { 1368 {
1345 /* our own client-side tinting */ 1369 /* our own client-side tinting */
1346 if (tr_flags & BG_NEEDS_TINT) 1370 //if (tr_flags & BG_NEEDS_TINT)
1371 if (1)
1347 { 1372 {
1348 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1349 if (bg_flags & BG_TINT_SET) 1374 if (bg_flags & BG_TINT_SET)
1350 tint.get (c); 1375 tint.get (c);
1351 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1356 if (gc) 1381 if (gc)
1357 { 1382 {
1358 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1359 1384
1360 XFreeGC (dpy, gc); 1385 XFreeGC (dpy, gc);
1361 bg_flags |= BG_IS_VALID;
1362 } 1386 }
1363 1387
1364 XDestroyImage (result); 1388 XDestroyImage (result);
1365 } 1389 }
1366# endif 1390# endif
… …
1407} 1431}
1408 1432
1409#endif /* HAVE_BG_PIXMAP */ 1433#endif /* HAVE_BG_PIXMAP */
1410 1434
1411#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1435#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1412/* taken from aterm-0.4.2 */ 1436/* based on code from aterm-0.4.2 */
1413 1437
1414static void 1438static void
1415shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1439shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1416{ 1440{
1417 int sh_r, sh_g, sh_b; 1441 int sh_r, sh_g, sh_b;

Diff Legend

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