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.61 by sf-exg, Fri Jun 8 10:28:30 2012 UTC vs.
Revision 1.65 by root, Fri Jun 8 21:41:45 2012 UTC

… …
209rxvt_img::unshare () 209rxvt_img::unshare ()
210{ 210{
211 if (ref->cnt == 1 && ref->ours) 211 if (ref->cnt == 1 && ref->ours)
212 return; 212 return;
213 213
214 //TODO: maybe should reify instead
215 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);
216 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 215 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
217 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);
218 XFreeGC (s->display->dpy, gc); 217 XFreeGC (s->display->dpy, gc);
219 218
… …
331 330
332 return mask; 331 return mask;
333} 332}
334 333
335void 334void
336rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 335rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
337{ 336{
338 Display *dpy = s->display->dpy; 337 Display *dpy = s->display->dpy;
339 Picture src = create_xrender_mask (dpy, pm, True); 338 Picture src = create_xrender_mask (dpy, pm, True);
340 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
341 340
… …
351 XRenderFreePicture (dpy, src); 350 XRenderFreePicture (dpy, src);
352 XRenderFreePicture (dpy, dst); 351 XRenderFreePicture (dpy, dst);
353} 352}
354 353
355void 354void
356rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
357{ 356{
358 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 357 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
358 {
359 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
359 return; 360 return;
361 }
360 362
361 Display *dpy = s->display->dpy; 363 Display *dpy = s->display->dpy;
362 Picture src = create_xrender_mask (dpy, pm, True); 364 Picture src = create_xrender_mask (dpy, pm, True);
363 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
364 366
… …
407 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 409 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
408 return clone (); 410 return clone ();
409 411
410 Display *dpy = s->display->dpy; 412 Display *dpy = s->display->dpy;
411 413
414 // add an alpha channel if...
412 bool alpha = !format->direct.alphaMask 415 bool alpha = !format->direct.alphaMask // pixmap has none yet
413 && (x || y) 416 && (x || y) // we need one because of non-zero offset
414 && repeat == RepeatNone; 417 && repeat == RepeatNone; // and we have no good pixels to fill with
415 418
416 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 419 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
417 img->alloc (); 420 img->alloc ();
418 421
419 Picture src = src_picture (); 422 Picture src = src_picture ();

Diff Legend

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