… | |
… | |
13 | rxvt_img::rxvt_img (const rxvt_img &img) |
13 | rxvt_img::rxvt_img (const rxvt_img &img) |
14 | : s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) |
14 | : s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) |
15 | { |
15 | { |
16 | ++ref->cnt; |
16 | ++ref->cnt; |
17 | } |
17 | } |
18 | |
|
|
19 | #if 0 |
|
|
20 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) |
|
|
21 | : s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap) |
|
|
22 | { |
|
|
23 | } |
|
|
24 | #endif |
|
|
25 | |
18 | |
26 | rxvt_img * |
19 | rxvt_img * |
27 | rxvt_img::new_from_root (rxvt_screen *s) |
20 | rxvt_img::new_from_root (rxvt_screen *s) |
28 | { |
21 | { |
29 | Display *dpy = s->display->dpy; |
22 | Display *dpy = s->display->dpy; |
… | |
… | |
134 | uint32_t v = *(uint32_t *)src; src += 4; |
127 | uint32_t v = *(uint32_t *)src; src += 4; |
135 | |
128 | |
136 | if (ecb_big_endian ()) |
129 | if (ecb_big_endian ()) |
137 | v = ecb_bswap32 (v); |
130 | v = ecb_bswap32 (v); |
138 | |
131 | |
139 | v = ecb_rotl32 (v, 8); |
132 | v = ecb_rotl32 (v, 8); // abgr to bgra |
140 | |
133 | |
141 | if (!byte_order_mismatch) |
134 | if (!byte_order_mismatch) |
142 | v = ecb_bswap32 (v); |
135 | v = ecb_bswap32 (v); |
143 | |
136 | |
144 | *dst++ = v; |
137 | *dst++ = v; |
… | |
… | |
216 | rxvt_img::unshare () |
209 | rxvt_img::unshare () |
217 | { |
210 | { |
218 | if (ref->cnt == 1 && ref->ours) |
211 | if (ref->cnt == 1 && ref->ours) |
219 | return; |
212 | return; |
220 | |
213 | |
221 | //TODO: maybe should reify instead |
|
|
222 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
214 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
223 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
215 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
224 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
216 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
225 | XFreeGC (s->display->dpy, gc); |
217 | XFreeGC (s->display->dpy, gc); |
226 | |
218 | |
… | |
… | |
272 | double *kernel = (double *)malloc (size * sizeof (double)); |
264 | double *kernel = (double *)malloc (size * sizeof (double)); |
273 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
265 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
274 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
266 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
275 | img->alloc (); |
267 | img->alloc (); |
276 | |
268 | |
277 | Picture src = src_picture (); |
|
|
278 | |
|
|
279 | XRenderPictureAttributes pa; |
269 | XRenderPictureAttributes pa; |
280 | pa.repeat = RepeatPad; |
270 | pa.repeat = RepeatPad; |
281 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); |
271 | Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); |
|
|
272 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
282 | |
273 | |
283 | Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); |
274 | Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); |
284 | Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); |
275 | Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); |
285 | XFreePixmap (dpy, tmp_pm); |
276 | XFreePixmap (dpy, tmp_pm); |
286 | |
277 | |
… | |
… | |
302 | |
293 | |
303 | size = rv * 2 + 1; |
294 | size = rv * 2 + 1; |
304 | get_gaussian_kernel (rv, size, kernel, params); |
295 | get_gaussian_kernel (rv, size, kernel, params); |
305 | ::swap (params[0], params[1]); |
296 | ::swap (params[0], params[1]); |
306 | |
297 | |
307 | XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); |
298 | XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2); |
308 | XRenderComposite (dpy, |
299 | XRenderComposite (dpy, |
309 | PictOpSrc, |
300 | PictOpSrc, |
310 | tmp, |
301 | tmp, |
311 | None, |
302 | None, |
312 | dst, |
303 | dst, |
… | |
… | |
338 | XFreePixmap (dpy, pixmap); |
329 | XFreePixmap (dpy, pixmap); |
339 | |
330 | |
340 | return mask; |
331 | return mask; |
341 | } |
332 | } |
342 | |
333 | |
|
|
334 | static void |
|
|
335 | extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) |
|
|
336 | { |
|
|
337 | int32_t x = clamp (c, cl0, cl1); |
|
|
338 | c -= x; |
|
|
339 | xc = x; |
|
|
340 | } |
|
|
341 | |
|
|
342 | static bool |
|
|
343 | extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa) |
|
|
344 | { |
|
|
345 | extract (cl0, cl1, r, xr); |
|
|
346 | extract (cl0, cl1, g, xg); |
|
|
347 | extract (cl0, cl1, b, xb); |
|
|
348 | extract (cl0, cl1, a, xa); |
|
|
349 | |
|
|
350 | return xr | xg | xb | xa; |
|
|
351 | } |
|
|
352 | |
343 | void |
353 | void |
344 | rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) |
354 | rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) |
345 | { |
355 | { |
|
|
356 | unshare (); |
|
|
357 | |
346 | Display *dpy = s->display->dpy; |
358 | Display *dpy = s->display->dpy; |
347 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
348 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
359 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
349 | |
360 | |
|
|
361 | // loop should not be needed for brightness, as only -1..1 makes sense |
|
|
362 | //while (r | g | b | a) |
|
|
363 | { |
|
|
364 | unsigned short xr, xg, xb, xa; |
350 | XRenderColor mask_c; |
365 | XRenderColor mask_c; |
351 | mask_c.red = r; |
366 | |
352 | mask_c.green = g; |
367 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
353 | mask_c.blue = b; |
|
|
354 | mask_c.alpha = a; |
|
|
355 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
368 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
356 | |
369 | |
357 | XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
370 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
371 | { |
|
|
372 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
|
|
373 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
374 | mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing |
|
|
375 | mask_c.green = -mask_c.green; |
|
|
376 | mask_c.blue = -mask_c.blue; |
|
|
377 | mask_c.alpha = -mask_c.alpha; |
|
|
378 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
|
|
379 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
380 | } |
|
|
381 | } |
358 | |
382 | |
359 | XRenderFreePicture (dpy, src); |
383 | |
360 | XRenderFreePicture (dpy, dst); |
384 | XRenderFreePicture (dpy, dst); |
361 | } |
385 | } |
362 | |
386 | |
363 | void |
387 | void |
364 | rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) |
388 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
365 | { |
389 | { |
366 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
390 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
|
|
391 | { |
|
|
392 | rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); |
367 | return; |
393 | return; |
|
|
394 | } |
|
|
395 | |
|
|
396 | unshare (); |
368 | |
397 | |
369 | Display *dpy = s->display->dpy; |
398 | Display *dpy = s->display->dpy; |
370 | Picture src = create_xrender_mask (dpy, pm, True); |
399 | Picture src = create_xrender_mask (dpy, pm, True); |
371 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
400 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
372 | |
401 | |
… | |
… | |
415 | if (x == 0 && y == 0 && w == ref->w && h == ref->h) |
444 | if (x == 0 && y == 0 && w == ref->w && h == ref->h) |
416 | return clone (); |
445 | return clone (); |
417 | |
446 | |
418 | Display *dpy = s->display->dpy; |
447 | Display *dpy = s->display->dpy; |
419 | |
448 | |
|
|
449 | // add an alpha channel if... |
420 | bool alpha = !format->direct.alphaMask |
450 | bool alpha = !format->direct.alphaMask // pixmap has none yet |
421 | && (x || y) |
451 | && (x || y) // we need one because of non-zero offset |
422 | && repeat == RepeatNone; |
452 | && repeat == RepeatNone; // and we have no good pixels to fill with |
423 | |
453 | |
424 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
454 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
425 | img->alloc (); |
455 | img->alloc (); |
426 | |
456 | |
427 | Picture src = src_picture (); |
457 | Picture src = src_picture (); |
… | |
… | |
477 | |
507 | |
478 | for (int i = 0; i < 3; ++i) |
508 | for (int i = 0; i < 3; ++i) |
479 | for (int j = 0; j < 3; ++j) |
509 | for (int j = 0; j < 3; ++j) |
480 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
510 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
481 | |
511 | |
482 | #if 0 |
|
|
483 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
512 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
484 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
513 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
485 | #endif |
|
|
486 | |
514 | |
487 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
515 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
488 | XRenderSetPictureTransform (dpy, src, &xfrm); |
516 | XRenderSetPictureTransform (dpy, src, &xfrm); |
489 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
517 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
490 | |
518 | |