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.167 by sf-exg, Fri Aug 19 17:42:09 2011 UTC vs.
Revision 1.174 by sf-exg, Wed Nov 23 16:53:53 2011 UTC

… …
150 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
151 151
152 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
153 return diff * align / 100; 153 return diff * align / 100;
154 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
155 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
156 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
157 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
158 return 0; 158 return 0;
159} 159}
160 160
161static inline int 161static inline int
162make_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)
… …
181{ 181{
182 bool changed = false; 182 bool changed = false;
183 int geom_flags = 0; 183 int geom_flags = 0;
184 int x = 0, y = 0; 184 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
186 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
187 187
188 if (geom == NULL) 188 if (geom == NULL)
189 return false; 189 return false;
190 190
191 if (geom[0]) 191 if (geom[0])
192 { 192 {
193 char **arr = rxvt_strsplit (':', geom); 193 char **arr = rxvt_strsplit (':', geom);
194 194
195 for (int i = 0; arr[i]; i++) 195 for (int i = 0; arr[i]; i++)
196 { 196 {
197 if (!strcasecmp (arr[i], "style=tiled")) 197 if (!strcasecmp (arr[i], "style=tiled"))
198 { 198 {
199 new_flags = BG_TILE; 199 new_flags = BG_TILE;
200 w = h = noScale; 200 w = h = noScale;
… …
299 w = h; 299 w = h;
300 300
301 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
302 } 302 }
303 303
304 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)
305 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 305 || check_set_scale_value (geom_flags, HeightValue, v_scale, h)
306 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 306 || check_set_align_value (geom_flags, XValue, h_align, x)
307 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;
308 309
309 if (new_flags != bg_flags) 310 if (new_flags != bg_flags)
310 { 311 {
311 bg_flags = new_flags; 312 bg_flags = new_flags;
312 changed = true; 313 changed = true;
… …
383 } 384 }
384 385
385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 386 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
386 { 387 {
387 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,
388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 389 ASA_XImage,
389 100, ASIMAGE_QUALITY_DEFAULT); 390 100, ASIMAGE_QUALITY_DEFAULT);
390 if (tmp) 391 if (tmp)
391 { 392 {
392 destroy_asimage (&background); 393 destroy_asimage (&background);
393 background = tmp; 394 background = tmp;
… …
412 413
413 if (!original_asim 414 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 415 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 416 && (x >= target_width
416 || y >= target_height 417 || y >= target_height
417 || (x + w <= 0) 418 || x + w <= 0
418 || (y + h <= 0)))) 419 || y + h <= 0)))
419 { 420 {
420 if (background) 421 if (background)
421 { 422 {
422 new_pmap_width = background->width; 423 new_pmap_width = background->width;
423 new_pmap_height = background->height; 424 new_pmap_height = background->height;
… …
437 } 438 }
438 else 439 else
439 { 440 {
440 result = original_asim; 441 result = original_asim;
441 442
442 if ((w != original_asim->width) 443 if (w != original_asim->width
443 || (h != original_asim->height)) 444 || h != original_asim->height)
444 { 445 {
445 result = scale_asimage (asv, original_asim, 446 result = scale_asimage (asv, original_asim,
446 w, h, 447 w, h,
447 background ? ASA_ASImage : ASA_XImage, 448 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 449 100, ASIMAGE_QUALITY_DEFAULT);
449 } 450 }
450 451
451 if (background == NULL) 452 if (background == NULL)
452 { 453 {
… …
702 get_image_geometry (image_width, image_height, w, h, x, y); 703 get_image_geometry (image_width, image_height, w, h, x, y);
703 704
704 if (!(bg_flags & BG_ROOT_ALIGN) 705 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 706 && (x >= target_width
706 || y >= target_height 707 || y >= target_height
707 || (x + w <= 0) 708 || x + w <= 0
708 || (y + h <= 0))) 709 || y + h <= 0))
709 return false; 710 return false;
710 711
711 result = pixbuf; 712 result = pixbuf;
712 713
713 if ((w != image_width) 714 if (w != image_width
714 || (h != image_height)) 715 || h != image_height)
715 { 716 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 717 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 718 w, h,
718 GDK_INTERP_BILINEAR); 719 GDK_INTERP_BILINEAR);
719 } 720 }
… …
1341 { 1342 {
1342 /* we need to re-generate transparency pixmap in that case ! */ 1343 /* we need to re-generate transparency pixmap in that case ! */
1343 tr_flags = make_transparency_pixmap (); 1344 tr_flags = make_transparency_pixmap ();
1344 if (tr_flags == 0) 1345 if (tr_flags == 0)
1345 return false; 1346 return false;
1346 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1347 bg_flags |= BG_IS_VALID; 1347 bg_flags |= BG_IS_VALID;
1348 } 1348 }
1349# endif 1349# endif
1350 1350
1351# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1352 if ((bg_flags & BG_IS_FROM_FILE) 1352 if ((bg_flags & BG_IS_FROM_FILE)
… …
1358# endif 1358# endif
1359 1359
1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1361 XImage *result = NULL; 1361 XImage *result = NULL;
1362 1362
1363 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1363 if (tr_flags & BG_NEEDS_TINT)
1364 { 1364 {
1365 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);
1366 } 1366 }
1367 1367
1368 if (result) 1368 if (result)
1369 { 1369 {
1370 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1371 if (tr_flags & BG_NEEDS_TINT) 1371 //if (tr_flags & BG_NEEDS_TINT)
1372 if (1)
1372 { 1373 {
1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1374 if (bg_flags & BG_TINT_SET) 1375 if (bg_flags & BG_TINT_SET)
1375 tint.get (c); 1376 tint.get (c);
1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1377 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1381 if (gc) 1382 if (gc)
1382 { 1383 {
1383 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);
1384 1385
1385 XFreeGC (dpy, gc); 1386 XFreeGC (dpy, gc);
1386 bg_flags |= BG_IS_VALID;
1387 } 1387 }
1388 1388
1389 XDestroyImage (result); 1389 XDestroyImage (result);
1390 } 1390 }
1391# endif 1391# endif
… …
1427 bg_flags |= BG_HAS_RENDER_CONV; 1427 bg_flags |= BG_HAS_RENDER_CONV;
1428 1428
1429 XFree (filters); 1429 XFree (filters);
1430 } 1430 }
1431#endif 1431#endif
1432
1433#ifdef HAVE_AFTERIMAGE
1434 set_application_name ((char *)rs[Rs_name]);
1435 set_output_threshold (OUTPUT_LEVEL_WARNING);
1436#endif
1437
1438#ifdef HAVE_PIXBUF
1439 g_type_init ();
1440#endif
1441} 1432}
1442 1433
1443#endif /* HAVE_BG_PIXMAP */ 1434#endif /* HAVE_BG_PIXMAP */
1444 1435
1445#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1446/* taken from aterm-0.4.2 */ 1437/* based on code from aterm-0.4.2 */
1447 1438
1448static void 1439static void
1449shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1450{ 1441{
1451 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