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.53 by root, Sun Feb 19 16:25:13 2006 UTC

… …
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;
… …
234} 281}
235 282
236void 283void
237rxvt_screen::clear () 284rxvt_screen::clear ()
238{ 285{
286#if XFT
287 if (scratch_area)
288 {
289 XFreePixmap (dpy, scratch_area->drawable);
290 delete scratch_area;
291 }
292#endif
293
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen))) 294 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (dpy, cmap); 295 XFreeColormap (dpy, cmap);
241} 296}
242 297
243///////////////////////////////////////////////////////////////////////////// 298/////////////////////////////////////////////////////////////////////////////
… …
405 XUnloadFont (dpy, f); 460 XUnloadFont (dpy, f);
406#endif 461#endif
407 462
408 int fd = XConnectionNumber (dpy); 463 int fd = XConnectionNumber (dpy);
409 464
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 465 // try to detect wether we have a local connection.
412 // assume unix domains socket == local, everything else not 466 // assume unix domains socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 467 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 468 is_local = 0;
415 sockaddr_un sa; 469 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 470 socklen_t sl = sizeof (sa);
417 471
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 472 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 473 is_local = sa.sun_family == AF_LOCAL;
420#endif
421 474
422 x_ev.start (fd, EVENT_READ); 475 x_ev.start (fd, EVENT_READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 476 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 477
425 XSelectInput (dpy, root, PropertyChangeMask); 478 XSelectInput (dpy, root, PropertyChangeMask);
… …
780} 833}
781 834
782void 835void
783rxvt_color::free (rxvt_screen *screen) 836rxvt_color::free (rxvt_screen *screen)
784{ 837{
838 if (screen->visual->c_class == TrueColor)
839 return; // nothing to do
840
785#if XFT 841#if XFT
786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 842 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 843#else
788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 844 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 845#endif

Diff Legend

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