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.67 by ayin, Mon Jun 25 23:27:18 2007 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)
… …
444 if (!dpy) 442 if (!dpy)
445 return false; 443 return false;
446 444
447 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
448 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
447
448#ifdef HAVE_AFTERIMAGE
449 ::dpy = dpy; /* init global var from libAfter... */
450 asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
451 XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
452#endif
449 453
450 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
451 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
452 456
453 XrmSetDatabase (dpy, get_resources (false)); 457 XrmSetDatabase (dpy, get_resources (false));
… …
463 XUnloadFont (dpy, f); 467 XUnloadFont (dpy, f);
464#endif 468#endif
465 469
466 int fd = XConnectionNumber (dpy); 470 int fd = XConnectionNumber (dpy);
467 471
468#ifndef NO_SLOW_LINK_SUPPORT
469 // try to detect wether we have a local connection. 472 // try to detect wether we have a local connection.
470 // assume unix domains socket == local, everything else not 473 // assume unix domains socket == local, everything else not
471 // TODO: might want to check for inet/127.0.0.1 474 // TODO: might want to check for inet/127.0.0.1
472 is_local = 0; 475 is_local = 0;
473 sockaddr_un sa; 476 sockaddr_un sa;
474 socklen_t sl = sizeof (sa); 477 socklen_t sl = sizeof (sa);
475 478
476 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 479 if (!getsockname (fd, (sockaddr *)&sa, &sl))
477 is_local = sa.sun_family == AF_LOCAL; 480 is_local = sa.sun_family == AF_UNIX;
478#endif
479 481
480 x_ev.start (fd, EVENT_READ); 482 x_ev.start (fd, EVENT_READ);
481 fcntl (fd, F_SETFD, FD_CLOEXEC); 483 fcntl (fd, F_SETFD, FD_CLOEXEC);
482 484
483 XSelectInput (dpy, root, PropertyChangeMask); 485 XSelectInput (dpy, root, PropertyChangeMask);
… …
583 XFlush (dpy); 585 XFlush (dpy);
584} 586}
585 587
586void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
587{ 589{
590 if (!w->active)
591 {
588 xw.push_back (w); 592 xw.push_back (w);
589 w->active = xw.size (); 593 w->active = xw.size ();
594 }
590} 595}
591 596
592void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
593{ 598{
594 if (w->active) 599 if (w->active)
600 {
595 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
596} 604}
597 605
598void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner)
599{ 607{
600 if (selection_owner && selection_owner != owner) 608 if (selection_owner && selection_owner != owner)
… …
654 662
655template class refcache<rxvt_display>; 663template class refcache<rxvt_display>;
656refcache<rxvt_display> displays; 664refcache<rxvt_display> displays;
657 665
658///////////////////////////////////////////////////////////////////////////// 666/////////////////////////////////////////////////////////////////////////////
667//
668
669static unsigned int
670insert_component (unsigned int value, unsigned int mask, unsigned int shift)
671{
672 return (value * (mask + 1) >> 16) << shift;
673}
659 674
660bool 675bool
661rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 676rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
662{ 677{
663#if XFT 678#if XFT
… …
673 c.color.red = color.r; 688 c.color.red = color.r;
674 c.color.green = color.g; 689 c.color.green = color.g;
675 c.color.blue = color.b; 690 c.color.blue = color.b;
676 c.color.alpha = color.a; 691 c.color.alpha = color.a;
677 692
678 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 693 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
679 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 694 | insert_component (color.g, format->direct.greenMask, format->direct.green)
680 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 695 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
681 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 696 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
682 697
683 return true; 698 return true;
684 } 699 }
685 else 700 else
686 { 701 {
… …
698 c.green = color.g; 713 c.green = color.g;
699 c.blue = color.b; 714 c.blue = color.b;
700 715
701 if (screen->visual->c_class == TrueColor) 716 if (screen->visual->c_class == TrueColor)
702 { 717 {
703 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 718 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 719 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
705 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
706 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
707 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 720 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709 721
710 return true; 722 return true;
711 } 723 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 724 else if (XAllocColor (screen->dpy, screen->cmap, &c))
713 return true; 725 return true;
… …
800 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 812 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
801 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 813 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
802 814
803 got = alloc (screen, rgba (best->red, best->green, best->blue)); 815 got = alloc (screen, rgba (best->red, best->green, best->blue));
804 816
805 delete colors; 817 delete [] colors;
806 } 818 }
807#endif 819#endif
808 820
809 return got; 821 return got;
810} 822}
… …
838} 850}
839 851
840void 852void
841rxvt_color::free (rxvt_screen *screen) 853rxvt_color::free (rxvt_screen *screen)
842{ 854{
855 if (screen->visual->c_class == TrueColor)
856 return; // nothing to do
857
843#if XFT 858#if XFT
844 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 859 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
845#else 860#else
846 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 861 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
847#endif 862#endif

Diff Legend

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