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.51 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.60 by root, Wed Jul 5 20:37:31 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
… …
265 visual = DefaultVisualOfScreen (screen); 262 visual = DefaultVisualOfScreen (screen);
266 cmap = DefaultColormapOfScreen (screen); 263 cmap = DefaultColormapOfScreen (screen);
267} 264}
268 265
269void 266void
270rxvt_screen::set (rxvt_display *disp, int bitdepth) 267rxvt_screen::select_visual (int bitdepth)
271{ 268{
272 set (disp);
273
274#if XFT 269#if XFT
275 XVisualInfo vinfo; 270 XVisualInfo vinfo;
276 271
277 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 272 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
278 { 273 {
279 depth = bitdepth; 274 depth = bitdepth;
280 visual = vinfo.visual; 275 visual = vinfo.visual;
281 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 276 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
282 } 277 }
283#endif 278#endif
284} 279}
285 280
286void 281void
… …
318 */ 313 */
319 char *displayResource, *xe; 314 char *displayResource, *xe;
320 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
321 316
322 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
318 // as opposed to "standard practise", we always read in ~/.Xdefaults
323 319
324 // 6. System wide per application default file. 320 // 6. System wide per application default file.
325 321
326 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
327 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
334 330
335 // 5. User's per application default file. 331 // 5. User's per application default file.
336 // none 332 // none
337 333
338 // 4. User's defaults file. 334 // 4. User's defaults file.
335 if (homedir)
336 {
337 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
338
339 if ((rdb1 = XrmGetFileDatabase (fname)))
340 XrmMergeDatabases (rdb1, &database);
341 }
342
339 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
340 if (refresh) 344 if (refresh)
341 { 345 {
342 // fucking xlib keeps a copy of the rm string 346 // fucking xlib keeps a copy of the rm string
343 Atom actual_type; 347 Atom actual_type;
… …
348#if XLIB_ILLEGAL_ACCESS 352#if XLIB_ILLEGAL_ACCESS
349 if (dpy->xdefaults) 353 if (dpy->xdefaults)
350 XFree (dpy->xdefaults); 354 XFree (dpy->xdefaults);
351#endif 355#endif
352 356
353 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 357 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
354 0L, 100000000L, False, 358 0L, 100000000L, False,
355 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
356 &nitems, &nremaining, 360 &nitems, &nremaining,
357 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
358 && actual_type == XA_STRING 362 && actual_type == XA_STRING
359 && actual_format == 8) 363 && actual_format == 8)
360 displayResource = val; 364 displayResource = val;
361 else 365 else
362 { 366 {
363 displayResource = 0; 367 displayResource = 0;
368
364 if (val) 369 if (val)
365 XFree(val); 370 XFree(val);
366 } 371 }
367 372
368#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
… …
373 displayResource = XResourceManagerString (dpy); 378 displayResource = XResourceManagerString (dpy);
374 379
375 if (displayResource) 380 if (displayResource)
376 { 381 {
377 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 if ((rdb1 = XrmGetStringDatabase (displayResource)))
378 XrmMergeDatabases (rdb1, &database);
379 }
380 else if (homedir)
381 {
382 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
383
384 if ((rdb1 = XrmGetFileDatabase (fname)))
385 XrmMergeDatabases (rdb1, &database); 383 XrmMergeDatabases (rdb1, &database);
386 } 384 }
387 385
388#if !XLIB_ILLEGAL_ACCESS 386#if !XLIB_ILLEGAL_ACCESS
389 if (refresh && displayResource) 387 if (refresh && displayResource)
… …
463 XUnloadFont (dpy, f); 461 XUnloadFont (dpy, f);
464#endif 462#endif
465 463
466 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
467 465
468#ifndef NO_SLOW_LINK_SUPPORT
469 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
470 // assume unix domains socket == local, everything else not 467 // assume unix domains socket == local, everything else not
471 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
472 is_local = 0; 469 is_local = 0;
473 sockaddr_un sa; 470 sockaddr_un sa;
474 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
475 472
476 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
477 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_LOCAL;
478#endif
479 475
480 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, EVENT_READ);
481 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
482 478
483 XSelectInput (dpy, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
… …
654 650
655template class refcache<rxvt_display>; 651template class refcache<rxvt_display>;
656refcache<rxvt_display> displays; 652refcache<rxvt_display> displays;
657 653
658///////////////////////////////////////////////////////////////////////////// 654/////////////////////////////////////////////////////////////////////////////
655//
656
657static unsigned int
658insert_component (unsigned int value, unsigned int mask, unsigned int shift)
659{
660 return (value * (mask + 1) >> 16) << shift;
661}
659 662
660bool 663bool
661rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 664rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
662{ 665{
663#if XFT 666#if XFT
… …
673 c.color.red = color.r; 676 c.color.red = color.r;
674 c.color.green = color.g; 677 c.color.green = color.g;
675 c.color.blue = color.b; 678 c.color.blue = color.b;
676 c.color.alpha = color.a; 679 c.color.alpha = color.a;
677 680
678 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 681 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
679 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 682 | insert_component (color.g, format->direct.greenMask, format->direct.green)
680 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 683 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
681 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 684 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
682 685
683 return true; 686 return true;
684 } 687 }
685 else 688 else
686 { 689 {
… …
838} 841}
839 842
840void 843void
841rxvt_color::free (rxvt_screen *screen) 844rxvt_color::free (rxvt_screen *screen)
842{ 845{
846 if (screen->visual->c_class == TrueColor)
847 return; // nothing to do
848
843#if XFT 849#if XFT
844 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 850 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
845#else 851#else
846 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 852 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
847#endif 853#endif

Diff Legend

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