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.170 by sf-exg, Sun Aug 21 11:00:02 2011 UTC vs.
Revision 1.177 by sf-exg, Wed Dec 14 12:07:12 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 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
247 } 249 }
248 else if (!strcasecmp (arr[i], "hscale")) 250 else if (!strcasecmp (arr[i], "hscale"))
249 { 251 {
250 new_flags |= BG_TILE; 252 new_flags |= BG_TILE;
251 w = windowScale; 253 w = windowScale;
… …
322 int target_height = szHint.height; 324 int target_height = szHint.height;
323 325
324 w = h_scale * target_width / 100; 326 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100; 327 h = v_scale * target_height / 100;
326 328
327 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
328 { 330 {
329 float scale = (float)w / image_width; 331 float scale = (float)w / image_width;
330 min_it (scale, (float)h / image_height); 332 min_it (scale, (float)h / image_height);
331 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
332 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
… …
412 414
413 if (!original_asim 415 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 417 && (x >= target_width
416 || y >= target_height 418 || y >= target_height
417 || (x + w <= 0) 419 || x + w <= 0
418 || (y + h <= 0)))) 420 || y + h <= 0)))
419 { 421 {
420 if (background) 422 if (background)
421 { 423 {
422 new_pmap_width = background->width; 424 new_pmap_width = background->width;
423 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
437 } 439 }
438 else 440 else
439 { 441 {
440 result = original_asim; 442 result = original_asim;
441 443
442 if ((w != original_asim->width) 444 if (w != original_asim->width
443 || (h != original_asim->height)) 445 || h != original_asim->height)
444 { 446 {
445 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
446 w, h, 448 w, h,
447 ASA_XImage, 449 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
… …
702 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
703 705
704 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 707 && (x >= target_width
706 || y >= target_height 708 || y >= target_height
707 || (x + w <= 0) 709 || x + w <= 0
708 || (y + h <= 0))) 710 || y + h <= 0))
709 return false; 711 return false;
710 712
711 result = pixbuf; 713 result = pixbuf;
712 714
713 if ((w != image_width) 715 if (w != image_width
714 || (h != image_height)) 716 || h != image_height)
715 { 717 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 719 w, h,
718 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
719 } 721 }
… …
1341 { 1343 {
1342 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1343 tr_flags = make_transparency_pixmap (); 1345 tr_flags = make_transparency_pixmap ();
1344 if (tr_flags == 0) 1346 if (tr_flags == 0)
1345 return false; 1347 return false;
1346 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1347 bg_flags |= BG_IS_VALID; 1348 bg_flags |= BG_IS_VALID;
1348 } 1349 }
1349# endif 1350# endif
1350 1351
1351# ifdef BG_IMAGE_FROM_FILE 1352# ifdef BG_IMAGE_FROM_FILE
1352 if ((bg_flags & BG_IS_FROM_FILE) 1353 if ((bg_flags & BG_IS_FROM_FILE)
… …
1358# endif 1359# endif
1359 1360
1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1361# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1361 XImage *result = NULL; 1362 XImage *result = NULL;
1362 1363
1363 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1364 if (tr_flags & BG_NEEDS_TINT)
1364 { 1365 {
1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1366 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1366 } 1367 }
1367 1368
1368 if (result) 1369 if (result)
1369 { 1370 {
1370 /* our own client-side tinting */ 1371 /* our own client-side tinting */
1371 if (tr_flags & BG_NEEDS_TINT) 1372 //if (tr_flags & BG_NEEDS_TINT)
1373 if (1)
1372 { 1374 {
1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1374 if (bg_flags & BG_TINT_SET) 1376 if (bg_flags & BG_TINT_SET)
1375 tint.get (c); 1377 tint.get (c);
1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1381 if (gc) 1383 if (gc)
1382 { 1384 {
1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1384 1386
1385 XFreeGC (dpy, gc); 1387 XFreeGC (dpy, gc);
1386 bg_flags |= BG_IS_VALID;
1387 } 1388 }
1388 1389
1389 XDestroyImage (result); 1390 XDestroyImage (result);
1390 } 1391 }
1391# endif 1392# endif

Diff Legend

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