… | |
… | |
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; |
… | |
… | |
951 | } |
953 | } |
952 | |
954 | |
953 | void |
955 | void |
954 | rxvt_term::set_tint_shade_flags () |
956 | rxvt_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) |
… | |
… | |
1031 | bool |
1033 | bool |
1032 | rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) |
1034 | rxvt_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 */ |
… | |
… | |
1323 | new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); |
1326 | new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); |
1324 | |
1327 | |
1325 | root_pixmap = new_root_pixmap; |
1328 | root_pixmap = new_root_pixmap; |
1326 | } |
1329 | } |
1327 | # endif /* ENABLE_TRANSPARENCY */ |
1330 | # endif /* ENABLE_TRANSPARENCY */ |
1328 | |
|
|
1329 | #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
|
|
1330 | static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c); |
|
|
1331 | # endif |
|
|
1332 | |
1331 | |
1333 | bool |
1332 | bool |
1334 | rxvt_term::bg_render () |
1333 | rxvt_term::bg_render () |
1335 | { |
1334 | { |
1336 | unsigned long tr_flags = 0; |
1335 | unsigned long tr_flags = 0; |
… | |
… | |
1367 | if (result) |
1366 | if (result) |
1368 | { |
1367 | { |
1369 | /* our own client-side tinting */ |
1368 | /* our own client-side tinting */ |
1370 | //if (tr_flags & BG_NEEDS_TINT) |
1369 | //if (tr_flags & BG_NEEDS_TINT) |
1371 | if (1) |
1370 | if (1) |
1372 | { |
|
|
1373 | rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); |
|
|
1374 | if (bg_flags & BG_TINT_SET) |
|
|
1375 | tint.get (c); |
|
|
1376 | shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); |
1371 | tint_ximage (DefaultVisual (dpy, display->screen), result); |
1377 | } |
|
|
1378 | |
1372 | |
1379 | GC gc = XCreateGC (dpy, vt, 0UL, NULL); |
1373 | GC gc = XCreateGC (dpy, vt, 0UL, NULL); |
1380 | |
1374 | |
1381 | if (gc) |
1375 | if (gc) |
1382 | { |
1376 | { |
… | |
… | |
1433 | #endif /* HAVE_BG_PIXMAP */ |
1427 | #endif /* HAVE_BG_PIXMAP */ |
1434 | |
1428 | |
1435 | #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
1429 | #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
1436 | /* based on code from aterm-0.4.2 */ |
1430 | /* based on code from aterm-0.4.2 */ |
1437 | |
1431 | |
1438 | static void |
1432 | static inline void |
1439 | shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) |
1433 | fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) |
|
|
1434 | { |
|
|
1435 | for (int i = 0; i <= mask >> sh; i++) |
|
|
1436 | { |
|
|
1437 | uint32_t tmp; |
|
|
1438 | tmp = i * high; |
|
|
1439 | tmp += (mask >> sh) * low; |
|
|
1440 | lookup[i] = (tmp / 0xffff) << sh; |
|
|
1441 | } |
|
|
1442 | } |
|
|
1443 | |
|
|
1444 | void |
|
|
1445 | rxvt_term::tint_ximage (Visual *visual, XImage *ximage) |
1440 | { |
1446 | { |
1441 | int sh_r, sh_g, sh_b; |
1447 | int sh_r, sh_g, sh_b; |
1442 | uint32_t mask_r, mask_g, mask_b; |
1448 | uint32_t mask_r, mask_g, mask_b; |
1443 | uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; |
1449 | uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; |
1444 | rgba low; |
1450 | unsigned short low; |
1445 | rgba high; |
|
|
1446 | int i; |
|
|
1447 | int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; |
1451 | int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; |
1448 | |
1452 | |
1449 | if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; |
1453 | if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; |
1450 | |
1454 | |
1451 | /* for convenience */ |
1455 | /* for convenience */ |
… | |
… | |
1510 | break; |
1514 | break; |
1511 | default: |
1515 | default: |
1512 | return; /* we do not support this color depth */ |
1516 | return; /* we do not support this color depth */ |
1513 | } |
1517 | } |
1514 | |
1518 | |
|
|
1519 | rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); |
|
|
1520 | |
|
|
1521 | if (bg_flags & BG_TINT_SET) |
|
|
1522 | tint.get (c); |
|
|
1523 | |
1515 | /* prepare limits for color transformation (each channel is handled separately) */ |
1524 | /* prepare limits for color transformation (each channel is handled separately) */ |
1516 | if (shade > 100) |
1525 | if (shade > 100) |
1517 | { |
1526 | { |
1518 | shade = 200 - shade; |
|
|
1519 | |
|
|
1520 | high.r = c.r * shade / 100; |
|
|
1521 | high.g = c.g * shade / 100; |
|
|
1522 | high.b = c.b * shade / 100; |
|
|
1523 | |
|
|
1524 | low.r = 65535 * (100 - shade) / 100; |
1527 | c.r = c.r * (200 - shade) / 100; |
1525 | low.g = 65535 * (100 - shade) / 100; |
1528 | c.g = c.g * (200 - shade) / 100; |
1526 | low.b = 65535 * (100 - shade) / 100; |
1529 | c.b = c.b * (200 - shade) / 100; |
|
|
1530 | |
|
|
1531 | low = 0xffff * (shade - 100) / 100; |
1527 | } |
1532 | } |
1528 | else |
1533 | else |
1529 | { |
1534 | { |
1530 | high.r = c.r * shade / 100; |
1535 | c.r = c.r * shade / 100; |
1531 | high.g = c.g * shade / 100; |
1536 | c.g = c.g * shade / 100; |
1532 | high.b = c.b * shade / 100; |
1537 | c.b = c.b * shade / 100; |
1533 | |
1538 | |
1534 | low.r = low.g = low.b = 0; |
1539 | low = 0; |
1535 | } |
1540 | } |
1536 | |
1541 | |
1537 | /* fill our lookup tables */ |
1542 | /* fill our lookup tables */ |
1538 | for (i = 0; i <= mask_r>>sh_r; i++) |
1543 | fill_lut (lookup_r, mask_r, sh_r, low, c.r); |
1539 | { |
1544 | fill_lut (lookup_g, mask_g, sh_g, low, c.g); |
1540 | uint32_t tmp; |
1545 | fill_lut (lookup_b, mask_b, sh_b, low, c.b); |
1541 | tmp = i * high.r; |
|
|
1542 | tmp += (mask_r>>sh_r) * low.r; |
|
|
1543 | lookup_r[i] = (tmp/65535)<<sh_r; |
|
|
1544 | } |
|
|
1545 | for (i = 0; i <= mask_g>>sh_g; i++) |
|
|
1546 | { |
|
|
1547 | uint32_t tmp; |
|
|
1548 | tmp = i * high.g; |
|
|
1549 | tmp += (mask_g>>sh_g) * low.g; |
|
|
1550 | lookup_g[i] = (tmp/65535)<<sh_g; |
|
|
1551 | } |
|
|
1552 | for (i = 0; i <= mask_b>>sh_b; i++) |
|
|
1553 | { |
|
|
1554 | uint32_t tmp; |
|
|
1555 | tmp = i * high.b; |
|
|
1556 | tmp += (mask_b>>sh_b) * low.b; |
|
|
1557 | lookup_b[i] = (tmp/65535)<<sh_b; |
|
|
1558 | } |
|
|
1559 | |
1546 | |
1560 | /* apply table to input image (replacing colors by newly calculated ones) */ |
1547 | /* apply table to input image (replacing colors by newly calculated ones) */ |
1561 | if (ximage->bits_per_pixel == 32 |
1548 | if (ximage->bits_per_pixel == 32 |
1562 | && (ximage->depth == 24 || ximage->depth == 32) |
1549 | && (ximage->depth == 24 || ximage->depth == 32) |
1563 | && ximage->byte_order == host_byte_order) |
1550 | && ximage->byte_order == host_byte_order) |