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.176 by sf-exg, Mon Dec 12 13:56:03 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;
201 x = y = 0; 201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue; 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 } 203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 { 205 {
206 new_flags = BG_PROP_SCALE; 206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale; 207 w = h = windowScale;
208 x = y = centerAlign; 208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue; 209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 } 210 }
211 else if (!strcasecmp (arr[i], "style=stretched")) 211 else if (!strcasecmp (arr[i], "style=stretched"))
… …
227 w = h = noScale; 227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue; 228 geom_flags = WidthValue|HeightValue;
229 } 229 }
230 else if (!strcasecmp (arr[i], "op=tile")) 230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE; 231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale")) 232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_PROP_SCALE; 233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root")) 234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN; 235 new_flags |= BG_ROOT_ALIGN;
236 236
237 // deprecated 237 // deprecated
238 else if (!strcasecmp (arr[i], "tile")) 238 else if (!strcasecmp (arr[i], "tile"))
239 { 239 {
… …
241 w = h = noScale; 241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue; 242 geom_flags |= WidthValue|HeightValue;
243 } 243 }
244 else if (!strcasecmp (arr[i], "propscale")) 244 else if (!strcasecmp (arr[i], "propscale"))
245 { 245 {
246 new_flags |= BG_PROP_SCALE; 246 new_flags |= BG_KEEP_ASPECT;
247 } 247 }
248 else if (!strcasecmp (arr[i], "hscale")) 248 else if (!strcasecmp (arr[i], "hscale"))
249 { 249 {
250 new_flags |= BG_TILE; 250 new_flags |= BG_TILE;
251 w = windowScale; 251 w = windowScale;
… …
322 int target_height = szHint.height; 322 int target_height = szHint.height;
323 323
324 w = h_scale * target_width / 100; 324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100; 325 h = v_scale * target_height / 100;
326 326
327 if (bg_flags & BG_PROP_SCALE) 327 if (bg_flags & BG_KEEP_ASPECT)
328 { 328 {
329 float scale = (float)w / image_width; 329 float scale = (float)w / image_width;
330 min_it (scale, (float)h / image_height); 330 min_it (scale, (float)h / image_height);
331 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
332 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
… …
383 } 383 }
384 384
385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
386 { 386 {
387 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,
388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 ASA_XImage,
389 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
390 if (tmp) 390 if (tmp)
391 { 391 {
392 destroy_asimage (&background); 392 destroy_asimage (&background);
393 background = tmp; 393 background = tmp;
… …
412 412
413 if (!original_asim 413 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 414 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 415 && (x >= target_width
416 || y >= target_height 416 || y >= target_height
417 || (x + w <= 0) 417 || x + w <= 0
418 || (y + h <= 0)))) 418 || y + h <= 0)))
419 { 419 {
420 if (background) 420 if (background)
421 { 421 {
422 new_pmap_width = background->width; 422 new_pmap_width = background->width;
423 new_pmap_height = background->height; 423 new_pmap_height = background->height;
… …
437 } 437 }
438 else 438 else
439 { 439 {
440 result = original_asim; 440 result = original_asim;
441 441
442 if ((w != original_asim->width) 442 if (w != original_asim->width
443 || (h != original_asim->height)) 443 || h != original_asim->height)
444 { 444 {
445 result = scale_asimage (asv, original_asim, 445 result = scale_asimage (asv, original_asim,
446 w, h, 446 w, h,
447 background ? ASA_ASImage : ASA_XImage, 447 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
449 } 449 }
450 450
451 if (background == NULL) 451 if (background == NULL)
452 { 452 {
… …
702 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
703 703
704 if (!(bg_flags & BG_ROOT_ALIGN) 704 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 705 && (x >= target_width
706 || y >= target_height 706 || y >= target_height
707 || (x + w <= 0) 707 || x + w <= 0
708 || (y + h <= 0))) 708 || y + h <= 0))
709 return false; 709 return false;
710 710
711 result = pixbuf; 711 result = pixbuf;
712 712
713 if ((w != image_width) 713 if (w != image_width
714 || (h != image_height)) 714 || h != image_height)
715 { 715 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 717 w, h,
718 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
719 } 719 }
… …
1341 { 1341 {
1342 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1343 tr_flags = make_transparency_pixmap (); 1343 tr_flags = make_transparency_pixmap ();
1344 if (tr_flags == 0) 1344 if (tr_flags == 0)
1345 return false; 1345 return false;
1346 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1347 bg_flags |= BG_IS_VALID; 1346 bg_flags |= BG_IS_VALID;
1348 } 1347 }
1349# endif 1348# endif
1350 1349
1351# ifdef BG_IMAGE_FROM_FILE 1350# ifdef BG_IMAGE_FROM_FILE
1352 if ((bg_flags & BG_IS_FROM_FILE) 1351 if ((bg_flags & BG_IS_FROM_FILE)
… …
1358# endif 1357# endif
1359 1358
1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1359# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1361 XImage *result = NULL; 1360 XImage *result = NULL;
1362 1361
1363 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1362 if (tr_flags & BG_NEEDS_TINT)
1364 { 1363 {
1365 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);
1366 } 1365 }
1367 1366
1368 if (result) 1367 if (result)
1369 { 1368 {
1370 /* our own client-side tinting */ 1369 /* our own client-side tinting */
1371 if (tr_flags & BG_NEEDS_TINT) 1370 //if (tr_flags & BG_NEEDS_TINT)
1371 if (1)
1372 { 1372 {
1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1374 if (bg_flags & BG_TINT_SET) 1374 if (bg_flags & BG_TINT_SET)
1375 tint.get (c); 1375 tint.get (c);
1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1381 if (gc) 1381 if (gc)
1382 { 1382 {
1383 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);
1384 1384
1385 XFreeGC (dpy, gc); 1385 XFreeGC (dpy, gc);
1386 bg_flags |= BG_IS_VALID;
1387 } 1386 }
1388 1387
1389 XDestroyImage (result); 1388 XDestroyImage (result);
1390 } 1389 }
1391# endif 1390# endif
… …
1427 bg_flags |= BG_HAS_RENDER_CONV; 1426 bg_flags |= BG_HAS_RENDER_CONV;
1428 1427
1429 XFree (filters); 1428 XFree (filters);
1430 } 1429 }
1431#endif 1430#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} 1431}
1442 1432
1443#endif /* HAVE_BG_PIXMAP */ 1433#endif /* HAVE_BG_PIXMAP */
1444 1434
1445#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1435#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1446/* taken from aterm-0.4.2 */ 1436/* based on code from aterm-0.4.2 */
1447 1437
1448static void 1438static void
1449shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1439shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1450{ 1440{
1451 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