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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.50 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.59 by root, Wed Jul 5 20:31:48 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvttoolkit.C 2 * File: rxvttoolkit.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include <unistd.h> 27#include <unistd.h>
28#include <fcntl.h> 28#include <fcntl.h>
29 29
30#include <sys/utsname.h> 30#include <sys/utsname.h>
31
32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 31#include <sys/socket.h>
34# include <sys/un.h> 32#include <sys/un.h>
35#endif
36 33
37#if XFT 34#if XFT
38# include <X11/extensions/Xrender.h> 35# include <X11/extensions/Xrender.h>
39#endif 36#endif
40 37
… …
201 198
202#endif 199#endif
203 200
204///////////////////////////////////////////////////////////////////////////// 201/////////////////////////////////////////////////////////////////////////////
205 202
203#if XFT
204rxvt_drawable::~rxvt_drawable ()
205{
206 if (xftdrawable)
207 XftDrawDestroy (xftdrawable);
208}
209
210rxvt_drawable::operator XftDraw *()
211{
212 if (!xftdrawable)
213 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
214
215 return xftdrawable;
216}
217#endif
218
219/////////////////////////////////////////////////////////////////////////////
220
221#if XFT
222
223// not strictly necessary as it is only used with superclass of zero_initialised
224rxvt_screen::rxvt_screen ()
225: scratch_area (0)
226{
227}
228
229rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
230{
231 // it's actually faster to re-allocate every time. don't ask me
232 // why, but its likely no big deal there are no roundtrips
233 // (I think/hope).
234 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
235 {
236 if (scratch_area)
237 {
238 XFreePixmap (dpy, scratch_area->drawable);
239 delete scratch_area;
240 }
241
242 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
243 scratch_w = w, scratch_h = h, depth);
244
245 scratch_area = new rxvt_drawable (this, pm);
246 }
247
248 return *scratch_area;
249}
250
251#endif
252
206void 253void
207rxvt_screen::set (rxvt_display *disp) 254rxvt_screen::set (rxvt_display *disp)
208{ 255{
209 display = disp; 256 display = disp;
210 dpy = disp->dpy; 257 dpy = disp->dpy;
… …
215 visual = DefaultVisualOfScreen (screen); 262 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen); 263 cmap = DefaultColormapOfScreen (screen);
217} 264}
218 265
219void 266void
220rxvt_screen::set (rxvt_display *disp, int bitdepth) 267rxvt_screen::select_visual (int bitdepth)
221{ 268{
222 set (disp);
223
224#if XFT 269#if XFT
225 XVisualInfo vinfo; 270 XVisualInfo vinfo;
226 271
227 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 272 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 { 273 {
229 depth = bitdepth; 274 depth = bitdepth;
230 visual = vinfo.visual; 275 visual = vinfo.visual;
231 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 276 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232 } 277 }
233#endif 278#endif
234} 279}
235 280
236void 281void
237rxvt_screen::clear () 282rxvt_screen::clear ()
238{ 283{
284#if XFT
285 if (scratch_area)
286 {
287 XFreePixmap (dpy, scratch_area->drawable);
288 delete scratch_area;
289 }
290#endif
291
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen))) 292 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (dpy, cmap); 293 XFreeColormap (dpy, cmap);
241} 294}
242 295
243///////////////////////////////////////////////////////////////////////////// 296/////////////////////////////////////////////////////////////////////////////
… …
290#if XLIB_ILLEGAL_ACCESS 343#if XLIB_ILLEGAL_ACCESS
291 if (dpy->xdefaults) 344 if (dpy->xdefaults)
292 XFree (dpy->xdefaults); 345 XFree (dpy->xdefaults);
293#endif 346#endif
294 347
295 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 348 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
296 0L, 100000000L, False, 349 0L, 100000000L, False,
297 XA_STRING, &actual_type, &actual_format, 350 XA_STRING, &actual_type, &actual_format,
298 &nitems, &nremaining, 351 &nitems, &nremaining,
299 (unsigned char **)&val) == Success 352 (unsigned char **)&val) == Success
300 && actual_type == XA_STRING 353 && actual_type == XA_STRING
… …
405 XUnloadFont (dpy, f); 458 XUnloadFont (dpy, f);
406#endif 459#endif
407 460
408 int fd = XConnectionNumber (dpy); 461 int fd = XConnectionNumber (dpy);
409 462
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 463 // try to detect wether we have a local connection.
412 // assume unix domains socket == local, everything else not 464 // assume unix domains socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 465 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 466 is_local = 0;
415 sockaddr_un sa; 467 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 468 socklen_t sl = sizeof (sa);
417 469
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 470 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 471 is_local = sa.sun_family == AF_LOCAL;
420#endif
421 472
422 x_ev.start (fd, EVENT_READ); 473 x_ev.start (fd, EVENT_READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 474 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 475
425 XSelectInput (dpy, root, PropertyChangeMask); 476 XSelectInput (dpy, root, PropertyChangeMask);
… …
596 647
597template class refcache<rxvt_display>; 648template class refcache<rxvt_display>;
598refcache<rxvt_display> displays; 649refcache<rxvt_display> displays;
599 650
600///////////////////////////////////////////////////////////////////////////// 651/////////////////////////////////////////////////////////////////////////////
652//
653
654static unsigned int
655insert_component (unsigned int value, unsigned int mask, unsigned int shift)
656{
657 return (value * (mask + 1) >> 16) << shift;
658}
601 659
602bool 660bool
603rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 661rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
604{ 662{
605#if XFT 663#if XFT
… …
615 c.color.red = color.r; 673 c.color.red = color.r;
616 c.color.green = color.g; 674 c.color.green = color.g;
617 c.color.blue = color.b; 675 c.color.blue = color.b;
618 c.color.alpha = color.a; 676 c.color.alpha = color.a;
619 677
620 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 678 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
621 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 679 | insert_component (color.g, format->direct.greenMask, format->direct.green)
622 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 680 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
623 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 681 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
624 682
625 return true; 683 return true;
626 } 684 }
627 else 685 else
628 { 686 {
… …
780} 838}
781 839
782void 840void
783rxvt_color::free (rxvt_screen *screen) 841rxvt_color::free (rxvt_screen *screen)
784{ 842{
843 if (screen->visual->c_class == TrueColor)
844 return; // nothing to do
845
785#if XFT 846#if XFT
786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 847 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 848#else
788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 849 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 850#endif

Diff Legend

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