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.10 by sf-exg, Mon Jun 4 06:59:50 2012 UTC vs.
Revision 1.20 by root, Tue Jun 5 14:07:47 2012 UTC

… …
18} 18}
19 19
20rxvt_img * 20rxvt_img *
21rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 21rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
22{ 22{
23 GError *err; 23 GError *err = 0;
24 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 24 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
25 25
26 if (!pb) 26 if (!pb)
27 return 0; 27 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
28 28
29 rxvt_img *img = new rxvt_img ( 29 rxvt_img *img = new rxvt_img (
30 s, 30 s,
31 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24), 31 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
32 gdk_pixbuf_get_width (pb), 32 gdk_pixbuf_get_width (pb),
33 gdk_pixbuf_get_height (pb) 33 gdk_pixbuf_get_height (pb)
34 ); 34 );
35 35
36 img->render (pb, 0, 0, img->w, img->h, 0, 0); 36 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
37 37
38 return img; 38 return img;
39} 39}
40 40
41rxvt_img::~rxvt_img () 41rxvt_img::~rxvt_img ()
42{ 42{
43 if (!shared) 43 if (!shared)
44 XFreePixmap (s->display->dpy, pm); 44 XFreePixmap (s->display->dpy, pm);
45}
46
47void
48rxvt_img::unshare ()
49{
50 if (!shared)
51 return;
52
53 rxvt_img *img = clone ();
54
55 ::swap (pm , img->pm);
56 ::swap (shared, img->shared);
57
58 delete img;
45} 59}
46 60
47void 61void
48rxvt_img::fill (const rxvt_color &c) 62rxvt_img::fill (const rxvt_color &c)
49{ 63{
… …
87 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 101 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
88 102
89 XRenderPictureAttributes pa; 103 XRenderPictureAttributes pa;
90 104
91 pa.repeat = RepeatPad; 105 pa.repeat = RepeatPad;
92 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 106 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
93 Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth); 107 Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);
94 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa); 108 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
95 XFreePixmap (dpy, tmp); 109 XFreePixmap (dpy, tmp);
96 110
97 if (kernel && params) 111 if (kernel && params)
… …
184 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 198 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
185 199
186 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 200 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
187} 201}
188 202
189void 203bool
190rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) 204rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
191{ 205{
206 Display *dpy = s->display->dpy;
207
208 if (s->visual->c_class != TrueColor)
209 return false;
210
211 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
212
213 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
214 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
215 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
216 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
217
218 int width_r = ecb_popcount32 (red_mask);
219 int width_g = ecb_popcount32 (green_mask);
220 int width_b = ecb_popcount32 (blue_mask);
221 int width_a = ecb_popcount32 (alpha_mask);
222
223 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
224 return false;
225
226 int sh_r = ecb_ctz32 (red_mask);
227 int sh_g = ecb_ctz32 (green_mask);
228 int sh_b = ecb_ctz32 (blue_mask);
229 int sh_a = ecb_ctz32 (alpha_mask);
230
231 if (width > 32767 || height > 32767)
232 return false;
233
234 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
235 width, height, 32, 0);
236 if (!ximage)
237 return false;
238
239 if (height > INT_MAX / ximage->bytes_per_line
240 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
241 {
242 XDestroyImage (ximage);
243 return false;
244 }
245
246 GC gc = XCreateGC (dpy, pm, 0, 0);
247
248 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
249
250 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
251 int channels = gdk_pixbuf_get_n_channels (pixbuf);
252 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
253 char *line = ximage->data;
254
255 rgba c (0, 0, 0);
256
257 if (channels == 4 && alpha_mask == 0)
258 {
259 //pix_colors[Color_bg].get (c);
192 //TODO 260 //TODO
193} 261 c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
262 c.r >>= 8;
263 c.g >>= 8;
264 c.b >>= 8;
265 }
194 266
267 for (int y = 0; y < height; y++)
268 {
269 for (int x = 0; x < width; x++)
270 {
271 unsigned char *pixel = row + x * channels;
272 uint32_t value;
273 unsigned char r, g, b, a;
274
275 if (channels == 4)
276 {
277 a = pixel[3];
278 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
279 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
280 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
281 }
282 else
283 {
284 a = 0xff;
285 r = pixel[0];
286 g = pixel[1];
287 b = pixel[2];
288 }
289
290 value = ((r >> (8 - width_r)) << sh_r)
291 | ((g >> (8 - width_g)) << sh_g)
292 | ((b >> (8 - width_b)) << sh_b)
293 | ((a >> (8 - width_a)) << sh_a);
294
295 if (ximage->bits_per_pixel == 32)
296 ((uint32_t *)line)[x] = value;
297 else
298 XPutPixel (ximage, x, y, value);
299 }
300
301 row += rowstride;
302 line += ximage->bytes_per_line;
303 }
304
305 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
306 XDestroyImage (ximage);
307 XFreeGC (dpy, gc);
308
309 return true;
310}
311
195rxvt_img * 312rxvt_img *
196rxvt_img::copy () 313rxvt_img::clone ()
197{ 314{
315 rxvt_img *img = new rxvt_img (s, format, w, h);
316
198 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 317 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
199 Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
200 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); 318 XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
201 XFreeGC (s->display->dpy, gc); 319 XFreeGC (s->display->dpy, gc);
202 return new rxvt_img (s, format, w, h, pm2);
203}
204 320
205rxvt_img * 321 return img;
206rxvt_img::transform (int new_width, int new_height, double matrix[16])
207{
208 //TODO
209} 322}
210 323
211rxvt_img * 324rxvt_img *
212rxvt_img::scale (int new_width, int new_height) 325rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)
213{ 326{
214 // use transform
215 //TODO
216}
217
218rxvt_img *
219rxvt_img::convert_to (XRenderPictFormat *new_format)
220{
221 rxvt_img *img = new rxvt_img (s, new_format, w, h); 327 rxvt_img *img = new rxvt_img (s, format, width, height);
222 328
223 Display *dpy = s->display->dpy; 329 Display *dpy = s->display->dpy;
330 XRenderPictureAttributes pa;
331 pa.repeat = repeat;
224 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 332 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
225 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 333 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
226 334
227 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 335 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
228 336
229 XRenderFreePicture (dpy, src); 337 XRenderFreePicture (dpy, src);
230 XRenderFreePicture (dpy, dst); 338 XRenderFreePicture (dpy, dst);
231 339
232 return img; 340 return img;
233} 341}
234 342
343rxvt_img *
344rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
345{
346 rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
347
348 Display *dpy = s->display->dpy;
349 XRenderPictureAttributes pa;
350 pa.repeat = repeat;
351 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
352 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
353
354 XTransform xfrm;
355
356 for (int i = 0; i < 3; ++i)
357 for (int j = 0; j < 3; ++j)
358 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
359
360 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
361 XRenderSetPictureTransform (dpy, src, &xfrm);
362 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
363
364 XRenderFreePicture (dpy, src);
365 XRenderFreePicture (dpy, dst);
366
367 return img;
368}
369
370rxvt_img *
371rxvt_img::scale (int new_width, int new_height)
372{
373 double matrix[9] = {
374 w / (double)new_width, 0, 0,
375 0, h / (double)new_height, 0,
376 0, 0, 1
377 };
378
379 return transform (new_width, new_height, matrix);
380}
381
382rxvt_img *
383rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)
384{
385 double s = sin (phi);
386 double c = cos (phi);
387
388 double matrix[9] = {
389 c, -s, -c * x + s * y + x,
390 s, c, -s * x - c * y + y,
391 0, 0, 1
392 };
393
394 return transform (new_width, new_height, matrix, repeat);
395}
396
397rxvt_img *
398rxvt_img::convert_to (XRenderPictFormat *new_format)
399{
400 rxvt_img *img = new rxvt_img (s, new_format, w, h);
401
402 Display *dpy = s->display->dpy;
403 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
404 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
405
406 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
407
408 XRenderFreePicture (dpy, src);
409 XRenderFreePicture (dpy, dst);
410
411 return img;
412}
413
235#endif 414#endif
236 415

Diff Legend

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