ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.14 by root, Mon Jun 4 15:53:12 2012 UTC vs.
Revision 1.25 by sf-exg, Tue Jun 5 22:00:15 2012 UTC

… …
13} 13}
14 14
15rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) 15rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
16: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false) 16: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false)
17{ 17{
18}
19
20rxvt_img *
21rxvt_img::new_from_root (rxvt_screen *s)
22{
23 Display *dpy = s->display->dpy;
24 unsigned int root_pm_w, root_pm_h;
25 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
26 if (root_pixmap == None)
27 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
28
29 if (root_pixmap == None)
30 return 0;
31
32 Window wdummy;
33 int idummy;
34 unsigned int udummy;
35
36 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
37 return 0;
38
39 rxvt_img *img = new rxvt_img (
40 s,
41 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
42 root_pm_w,
43 root_pm_h,
44 root_pixmap
45 );
46
47 img->shared = true;
48
49 return img;
18} 50}
19 51
20rxvt_img * 52rxvt_img *
21rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 53rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
22{ 54{
… …
87 119
88 for (int i = 0; i < width; i++) 120 for (int i = 0; i < width; i++)
89 params[i+2] = XDoubleToFixed (kernel[i] / sum); 121 params[i+2] = XDoubleToFixed (kernel[i] / sum);
90} 122}
91 123
92void 124rxvt_img *
93rxvt_img::blur (int rh, int rv) 125rxvt_img::blur (int rh, int rv)
94{ 126{
95 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 127 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96 return; 128 return clone ();
97 129
98 Display *dpy = s->display->dpy; 130 Display *dpy = s->display->dpy;
99 int size = max (rh, rv) * 2 + 1; 131 int size = max (rh, rv) * 2 + 1;
100 double *kernel = (double *)malloc (size * sizeof (double)); 132 double *kernel = (double *)malloc (size * sizeof (double));
101 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 133 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
134 rxvt_img *img = new rxvt_img (s, format, w, h);
102 135
103 XRenderPictureAttributes pa; 136 XRenderPictureAttributes pa;
104 137
105 pa.repeat = RepeatPad; 138 pa.repeat = RepeatPad;
106 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 139 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
140 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
141
107 Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth); 142 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
108 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa); 143 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
109 XFreePixmap (dpy, tmp); 144 XFreePixmap (dpy, tmp_pm);
110 145
111 if (kernel && params) 146 if (kernel && params)
112 { 147 {
113 size = rh * 2 + 1; 148 size = rh * 2 + 1;
114 get_gaussian_kernel (rh, size, kernel, params); 149 get_gaussian_kernel (rh, size, kernel, params);
… …
116 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 151 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
117 XRenderComposite (dpy, 152 XRenderComposite (dpy,
118 PictOpSrc, 153 PictOpSrc,
119 src, 154 src,
120 None, 155 None,
121 dst, 156 tmp,
122 0, 0, 157 0, 0,
123 0, 0, 158 0, 0,
124 0, 0, 159 0, 0,
125 w, h); 160 w, h);
126
127 ::swap (src, dst);
128 161
129 size = rv * 2 + 1; 162 size = rv * 2 + 1;
130 get_gaussian_kernel (rv, size, kernel, params); 163 get_gaussian_kernel (rv, size, kernel, params);
131 ::swap (params[0], params[1]); 164 ::swap (params[0], params[1]);
132 165
133 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 166 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134 XRenderComposite (dpy, 167 XRenderComposite (dpy,
135 PictOpSrc, 168 PictOpSrc,
136 src, 169 tmp,
137 None, 170 None,
138 dst, 171 dst,
139 0, 0, 172 0, 0,
140 0, 0, 173 0, 0,
141 0, 0, 174 0, 0,
… …
144 177
145 free (kernel); 178 free (kernel);
146 free (params); 179 free (params);
147 XRenderFreePicture (dpy, src); 180 XRenderFreePicture (dpy, src);
148 XRenderFreePicture (dpy, dst); 181 XRenderFreePicture (dpy, dst);
182 XRenderFreePicture (dpy, tmp);
183
184 return img;
149} 185}
150 186
151static Picture 187static Picture
152create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 188create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
153{ 189{
… …
176 mask_c.blue = float_to_component (b); 212 mask_c.blue = float_to_component (b);
177 mask_c.alpha = float_to_component (a); 213 mask_c.alpha = float_to_component (a);
178 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 214 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179 215
180 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 216 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
217
218 XRenderFreePicture (dpy, src);
219 XRenderFreePicture (dpy, dst);
181} 220}
182 221
183void 222void
184rxvt_img::contrast (double r, double g, double b, double a) 223rxvt_img::contrast (double r, double g, double b, double a)
185{ 224{
… …
196 mask_c.blue = float_to_component (b); 235 mask_c.blue = float_to_component (b);
197 mask_c.alpha = float_to_component (a); 236 mask_c.alpha = float_to_component (a);
198 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 237 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199 238
200 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 239 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
240
241 XRenderFreePicture (dpy, src);
242 XRenderFreePicture (dpy, dst);
201} 243}
202 244
203bool 245bool
204rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) 246rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
205{ 247{
206 bool argb = format->id == PictStandardARGB32;
207
208 Display *dpy = s->display->dpy; 248 Display *dpy = s->display->dpy;
209 249
210 if (s->visual->c_class != TrueColor) 250 if (s->visual->c_class != TrueColor)
211 return false; 251 return false;
212 252
213 uint32_t red_mask, green_mask, blue_mask, alpha_mask; 253 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
214 254
215 if (argb) 255 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
216 { 256 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
217 red_mask = 0xff << 16; 257 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
218 green_mask = 0xff << 8;
219 blue_mask = 0xff;
220 alpha_mask = 0xff << 24;
221 }
222 else
223 {
224 red_mask = s->visual->red_mask;
225 green_mask = s->visual->green_mask;
226 blue_mask = s->visual->blue_mask;
227 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha; 258 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
228 }
229 259
230 int width_r = ecb_popcount32 (red_mask); 260 int width_r = ecb_popcount32 (red_mask);
231 int width_g = ecb_popcount32 (green_mask); 261 int width_g = ecb_popcount32 (green_mask);
232 int width_b = ecb_popcount32 (blue_mask); 262 int width_b = ecb_popcount32 (blue_mask);
233 int width_a = ecb_popcount32 (alpha_mask); 263 int width_a = ecb_popcount32 (alpha_mask);
… …
241 int sh_a = ecb_ctz32 (alpha_mask); 271 int sh_a = ecb_ctz32 (alpha_mask);
242 272
243 if (width > 32767 || height > 32767) 273 if (width > 32767 || height > 32767)
244 return false; 274 return false;
245 275
246 XImage *ximage = XCreateImage (dpy, s->visual, argb ? 32 : format->depth, ZPixmap, 0, 0, 276 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
247 width, height, 32, 0); 277 width, height, 32, 0);
248 if (!ximage) 278 if (!ximage)
249 return false; 279 return false;
250 280
251 if (height > INT_MAX / ximage->bytes_per_line 281 if (height > INT_MAX / ximage->bytes_per_line
… …
261 291
262 int rowstride = gdk_pixbuf_get_rowstride (pixbuf); 292 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
263 int channels = gdk_pixbuf_get_n_channels (pixbuf); 293 int channels = gdk_pixbuf_get_n_channels (pixbuf);
264 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 294 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
265 char *line = ximage->data; 295 char *line = ximage->data;
266
267 rgba c (0, 0, 0);
268
269 if (channels == 4 && alpha_mask == 0)
270 {
271 //pix_colors[Color_bg].get (c);
272 //TODO
273 c.r >>= 8;
274 c.g >>= 8;
275 c.b >>= 8;
276 }
277 296
278 for (int y = 0; y < height; y++) 297 for (int y = 0; y < height; y++)
279 { 298 {
280 for (int x = 0; x < width; x++) 299 for (int x = 0; x < width; x++)
281 { 300 {
… …
284 unsigned char r, g, b, a; 303 unsigned char r, g, b, a;
285 304
286 if (channels == 4) 305 if (channels == 4)
287 { 306 {
288 a = pixel[3]; 307 a = pixel[3];
289 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff; 308 r = pixel[0] * a / 0xff;
290 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff; 309 g = pixel[1] * a / 0xff;
291 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff; 310 b = pixel[2] * a / 0xff;
292 } 311 }
293 else 312 else
294 { 313 {
295 a = 0xff; 314 a = 0xff;
296 r = pixel[0]; 315 r = pixel[0];
… …
321} 340}
322 341
323rxvt_img * 342rxvt_img *
324rxvt_img::clone () 343rxvt_img::clone ()
325{ 344{
345 rxvt_img *img = new rxvt_img (s, format, w, h);
346
326 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 347 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
327 Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
328 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); 348 XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
329 XFreeGC (s->display->dpy, gc); 349 XFreeGC (s->display->dpy, gc);
330 return new rxvt_img (s, format, w, h, pm2);
331}
332 350
351 return img;
352}
353
333rxvt_img * 354rxvt_img *
334rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9]) 355rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)
335{ 356{
336 rxvt_img *img = new rxvt_img (s, format, new_width, new_height); 357 rxvt_img *img = new rxvt_img (s, format, width, height);
337 358
338 Display *dpy = s->display->dpy; 359 Display *dpy = s->display->dpy;
339 XRenderPictureAttributes pa; 360 XRenderPictureAttributes pa;
340 pa.repeat = repeat; 361 pa.repeat = repeat;
341 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 362 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
342 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 363 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
343 364
365 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
366
367 XRenderFreePicture (dpy, src);
368 XRenderFreePicture (dpy, dst);
369
370 return img;
371}
372
373rxvt_img *
374rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
375{
376 rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
377
378 Display *dpy = s->display->dpy;
379 XRenderPictureAttributes pa;
380 pa.repeat = repeat;
381 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
382 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
383
344 XTransform xfrm; 384 XTransform xfrm;
345 385
346 for (int i = 0; i < 3; ++i) 386 for (int i = 0; i < 3; ++i)
347 for (int j = 0; j < 3; ++j) 387 for (int j = 0; j < 3; ++j)
348 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 388 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
349 389
390 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
350 XRenderSetPictureTransform (dpy, src, &xfrm); 391 XRenderSetPictureTransform (dpy, src, &xfrm);
351 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 392 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
352 393
353 XRenderFreePicture (dpy, src); 394 XRenderFreePicture (dpy, src);
354 XRenderFreePicture (dpy, dst); 395 XRenderFreePicture (dpy, dst);
… …
358 399
359rxvt_img * 400rxvt_img *
360rxvt_img::scale (int new_width, int new_height) 401rxvt_img::scale (int new_width, int new_height)
361{ 402{
362 double matrix[9] = { 403 double matrix[9] = {
363 new_width / (double)w, 0, 0, 404 w / (double)new_width, 0, 0,
364 0, new_height / (double)h, 0, 405 0, h / (double)new_height, 0,
365 0, 0, 1 406 0, 0, 1
366 }; 407 };
367 408
368 return transform (new_width, new_height, RepeatNormal, matrix); 409 return transform (new_width, new_height, matrix);
410}
411
412rxvt_img *
413rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)
414{
415 double s = sin (phi);
416 double c = cos (phi);
417
418 double matrix[9] = {
419 c, -s, -c * x + s * y + x,
420 s, c, -s * x - c * y + y,
421 0, 0, 1
422 };
423
424 return transform (new_width, new_height, matrix, repeat);
369} 425}
370 426
371rxvt_img * 427rxvt_img *
372rxvt_img::convert_to (XRenderPictFormat *new_format) 428rxvt_img::convert_to (XRenderPictFormat *new_format)
373{ 429{
… …
383 XRenderFreePicture (dpy, dst); 439 XRenderFreePicture (dpy, dst);
384 440
385 return img; 441 return img;
386} 442}
387 443
444rxvt_img *
445rxvt_img::blend (rxvt_img *img, double factor)
446{
447 rxvt_img *img2 = clone ();
448 Display *dpy = s->display->dpy;
449 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
450 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
451 Picture mask = create_xrender_mask (dpy, img->pm, False);
452
453 XRenderColor mask_c;
454
455 mask_c.alpha = float_to_component (factor);
456 mask_c.red =
457 mask_c.green =
458 mask_c.blue = 0;
459 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
460
461 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
462
463 XRenderFreePicture (dpy, src);
464 XRenderFreePicture (dpy, dst);
465 XRenderFreePicture (dpy, mask);
466
467 return img2;
468}
469
388#endif 470#endif
389 471

Diff Legend

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