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.169 by sf-exg, Fri Aug 19 18:04:01 2011 UTC vs.
Revision 1.182 by sf-exg, Sun Dec 25 17:01:21 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;
… …
383 } 385 }
384 386
385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
386 { 388 {
387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
389 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
390 if (tmp) 392 if (tmp)
391 { 393 {
392 destroy_asimage (&background); 394 destroy_asimage (&background);
393 background = tmp; 395 background = tmp;
… …
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 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
449 } 451 }
450 452
451 if (background == NULL) 453 if (background == NULL)
452 { 454 {
… …
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 }
… …
951} 953}
952 954
953void 955void
954rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
955{ 957{
956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
957 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
958 960
959 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
960 962
961 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1031bool 1033bool
1032rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1033{ 1035{
1034 bool ret = false; 1036 bool ret = false;
1035#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1036 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1037 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1038 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1039 1044
1040 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
… …
1113 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1114 ret = true; 1119 ret = true;
1115 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1116 } 1121 }
1117 } 1122 }
1118 else
1119 {
1120# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1121 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1122 1127
1123 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1124 tint.get (c); 1129 tint.get (c);
1125 1130
… …
1180 ret = true; 1185 ret = true;
1181 1186
1182 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1183 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1184 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1185# endif 1191# endif
1186 }
1187 1192
1188 return ret; 1193 return ret;
1189} 1194}
1190 1195
1191/* 1196/*
… …
1275 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1277 } 1282 }
1278 1283
1279 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1280 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1281 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1282 1287
1283 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1284 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1285 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1286 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1292 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1293 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1294 1299
1295 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1296 { 1301 {
1297 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1298 && (bg_flags & BG_HAS_RENDER_CONV))
1299 { 1303 {
1300 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1301 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1302 } 1306 }
1303 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1304 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1305 { 1308 {
1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1307 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1308 } 1311 }
1309 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1341 { 1344 {
1342 /* we need to re-generate transparency pixmap in that case ! */ 1345 /* we need to re-generate transparency pixmap in that case ! */
1343 tr_flags = make_transparency_pixmap (); 1346 tr_flags = make_transparency_pixmap ();
1344 if (tr_flags == 0) 1347 if (tr_flags == 0)
1345 return false; 1348 return false;
1346 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1347 bg_flags |= BG_IS_VALID; 1349 bg_flags |= BG_IS_VALID;
1348 } 1350 }
1349# endif 1351# endif
1350 1352
1351# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
1352 if ((bg_flags & BG_IS_FROM_FILE) 1354 if ((bg_flags & BG_IS_FROM_FILE)
… …
1358# endif 1360# endif
1359 1361
1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1361 XImage *result = NULL; 1363 XImage *result = NULL;
1362 1364
1363 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1365 if (tr_flags & BG_NEEDS_TINT)
1364 { 1366 {
1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1366 } 1368 }
1367 1369
1368 if (result) 1370 if (result)
1369 { 1371 {
1370 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1371 if (tr_flags & BG_NEEDS_TINT) 1373 //if (tr_flags & BG_NEEDS_TINT)
1374 if (1)
1372 { 1375 {
1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1374 if (bg_flags & BG_TINT_SET) 1377 if (bg_flags & BG_TINT_SET)
1375 tint.get (c); 1378 tint.get (c);
1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1381 if (gc) 1384 if (gc)
1382 { 1385 {
1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1384 1387
1385 XFreeGC (dpy, gc); 1388 XFreeGC (dpy, gc);
1386 bg_flags |= BG_IS_VALID;
1387 } 1389 }
1388 1390
1389 XDestroyImage (result); 1391 XDestroyImage (result);
1390 } 1392 }
1391# endif 1393# endif
… …
1434#endif /* HAVE_BG_PIXMAP */ 1436#endif /* HAVE_BG_PIXMAP */
1435 1437
1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1437/* based on code from aterm-0.4.2 */ 1439/* based on code from aterm-0.4.2 */
1438 1440
1441static inline void
1442fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1443{
1444 for (int i = 0; i <= mask >> sh; i++)
1445 {
1446 uint32_t tmp;
1447 tmp = i * high;
1448 tmp += (mask >> sh) * low;
1449 lookup[i] = (tmp / 0xffff) << sh;
1450 }
1451}
1452
1439static void 1453static void
1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1454shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1441{ 1455{
1442 int sh_r, sh_g, sh_b; 1456 int sh_r, sh_g, sh_b;
1443 uint32_t mask_r, mask_g, mask_b; 1457 uint32_t mask_r, mask_g, mask_b;
1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1458 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1445 rgba low; 1459 unsigned short low;
1446 rgba high; 1460 rgba high;
1447 int i;
1448 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1461 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1449 1462
1450 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1463 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1451 1464
1452 /* for convenience */ 1465 /* for convenience */
… …
1520 1533
1521 high.r = c.r * shade / 100; 1534 high.r = c.r * shade / 100;
1522 high.g = c.g * shade / 100; 1535 high.g = c.g * shade / 100;
1523 high.b = c.b * shade / 100; 1536 high.b = c.b * shade / 100;
1524 1537
1525 low.r = 65535 * (100 - shade) / 100; 1538 low = 0xffff * (100 - shade) / 100;
1526 low.g = 65535 * (100 - shade) / 100;
1527 low.b = 65535 * (100 - shade) / 100;
1528 } 1539 }
1529 else 1540 else
1530 { 1541 {
1531 high.r = c.r * shade / 100; 1542 high.r = c.r * shade / 100;
1532 high.g = c.g * shade / 100; 1543 high.g = c.g * shade / 100;
1533 high.b = c.b * shade / 100; 1544 high.b = c.b * shade / 100;
1534 1545
1535 low.r = low.g = low.b = 0; 1546 low = 0;
1536 } 1547 }
1537 1548
1538 /* fill our lookup tables */ 1549 /* fill our lookup tables */
1539 for (i = 0; i <= mask_r>>sh_r; i++) 1550 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1540 { 1551 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1541 uint32_t tmp; 1552 fill_lut (lookup_b, mask_b, sh_b, low, high.b);
1542 tmp = i * high.r;
1543 tmp += (mask_r>>sh_r) * low.r;
1544 lookup_r[i] = (tmp/65535)<<sh_r;
1545 }
1546 for (i = 0; i <= mask_g>>sh_g; i++)
1547 {
1548 uint32_t tmp;
1549 tmp = i * high.g;
1550 tmp += (mask_g>>sh_g) * low.g;
1551 lookup_g[i] = (tmp/65535)<<sh_g;
1552 }
1553 for (i = 0; i <= mask_b>>sh_b; i++)
1554 {
1555 uint32_t tmp;
1556 tmp = i * high.b;
1557 tmp += (mask_b>>sh_b) * low.b;
1558 lookup_b[i] = (tmp/65535)<<sh_b;
1559 }
1560 1553
1561 /* apply table to input image (replacing colors by newly calculated ones) */ 1554 /* apply table to input image (replacing colors by newly calculated ones) */
1562 if (ximage->bits_per_pixel == 32 1555 if (ximage->bits_per_pixel == 32
1563 && (ximage->depth == 24 || ximage->depth == 32) 1556 && (ximage->depth == 24 || ximage->depth == 32)
1564 && ximage->byte_order == host_byte_order) 1557 && ximage->byte_order == host_byte_order)

Diff Legend

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