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.76 by root, Sun Nov 11 18:05:19 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
… …
67#endif 64#endif
68#if USE_XIM 65#if USE_XIM
69 "WM_LOCALE_NAME", 66 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 67 "XIM_SERVERS",
71#endif 68#endif
72#ifdef TRANSPARENT 69#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 70 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 71 "ESETROOT_PMAP_ID",
75#endif 72#endif
76#if ENABLE_XEMBED 73#if ENABLE_XEMBED
77 "_XEMBED", 74 "_XEMBED",
… …
186 183
187 XIMCallback ximcallback; 184 XIMCallback ximcallback;
188 ximcallback.client_data = (XPointer)this; 185 ximcallback.client_data = (XPointer)this;
189 ximcallback.callback = im_destroy_cb; 186 ximcallback.callback = im_destroy_cb;
190 187
191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192 189
193 return true; 190 return true;
194} 191}
195 192
196rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
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 domain 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_UNIX;
478#endif
479 475
480 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, ev::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);
484 480
485 flush (); 481 flush ();
… …
542 538
543 XFree (atoms); 539 XFree (atoms);
544} 540}
545#endif 541#endif
546 542
547void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (ev::io &w, int revents)
548{ 544{
549 do 545 do
550 { 546 {
551 XEvent xev; 547 XEvent xev;
552 XNextEvent (dpy, &xev); 548 XNextEvent (dpy, &xev);
… …
557 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
558 && xev.xany.window == root 554 && xev.xany.window == root
559 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
560 im_change_check (); 556 im_change_check ();
561#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
562 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
563 { 562 {
564 if (!xw[i]) 563 if (!xw[i])
565 xw.erase_unordered (i); 564 xw.erase_unordered (i);
566 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
576} 575}
577 576
578void rxvt_display::flush () 577void rxvt_display::flush ()
579{ 578{
580 if (XEventsQueued (dpy, QueuedAlready)) 579 if (XEventsQueued (dpy, QueuedAlready))
581 x_cb (x_ev, EVENT_READ); 580 x_cb (x_ev, ev::READ);
582 581
583 XFlush (dpy); 582 XFlush (dpy);
584} 583}
585 584
586void rxvt_display::reg (xevent_watcher *w) 585void rxvt_display::reg (xevent_watcher *w)
587{ 586{
587 if (!w->active)
588 {
588 xw.push_back (w); 589 xw.push_back (w);
589 w->active = xw.size (); 590 w->active = xw.size ();
591 }
590} 592}
591 593
592void rxvt_display::unreg (xevent_watcher *w) 594void rxvt_display::unreg (xevent_watcher *w)
593{ 595{
594 if (w->active) 596 if (w->active)
597 {
595 xw[w->active - 1] = 0; 598 xw[w->active - 1] = 0;
599 w->active = 0;
600 }
596} 601}
597 602
598void rxvt_display::set_selection_owner (rxvt_term *owner) 603void rxvt_display::set_selection_owner (rxvt_term *owner)
599{ 604{
600 if (selection_owner && selection_owner != owner) 605 if (selection_owner && selection_owner != owner)
… …
654 659
655template class refcache<rxvt_display>; 660template class refcache<rxvt_display>;
656refcache<rxvt_display> displays; 661refcache<rxvt_display> displays;
657 662
658///////////////////////////////////////////////////////////////////////////// 663/////////////////////////////////////////////////////////////////////////////
659 664//
665
666static unsigned int
667insert_component (unsigned int value, unsigned int mask, unsigned int shift)
668{
669 return (value * (mask + 1) >> 16) << shift;
670}
671
660bool 672bool
661rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 673rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
662{ 674{
663#if XFT 675#if XFT
664 XRenderPictFormat *format; 676 XRenderPictFormat *format;
… …
673 c.color.red = color.r; 685 c.color.red = color.r;
674 c.color.green = color.g; 686 c.color.green = color.g;
675 c.color.blue = color.b; 687 c.color.blue = color.b;
676 c.color.alpha = color.a; 688 c.color.alpha = color.a;
677 689
678 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 690 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
679 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 691 | insert_component (color.g, format->direct.greenMask, format->direct.green)
680 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 692 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
681 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 693 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
682 694
683 return true; 695 return true;
684 } 696 }
685 else 697 else
686 { 698 {
… …
698 c.green = color.g; 710 c.green = color.g;
699 c.blue = color.b; 711 c.blue = color.b;
700 712
701 if (screen->visual->c_class == TrueColor) 713 if (screen->visual->c_class == TrueColor)
702 { 714 {
703 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 715 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 716 | (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 )) 717 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709 718
710 return true; 719 return true;
711 } 720 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 721 else if (XAllocColor (screen->dpy, screen->cmap, &c))
713 return true; 722 return true;
… …
734 name += skip; 743 name += skip;
735 } 744 }
736 else 745 else
737 c.a = rgba::MAX_CC; 746 c.a = rgba::MAX_CC;
738 747
748 // parse the non-standard "#aarrggbb" format
749 if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
750 {
751 if (c.r)
752 c.r = (c.r << 8) | 0x0ff;
753 if (c.g)
754 c.g = (c.g << 8) | 0x0ff;
755 if (c.b)
756 c.b = (c.b << 8) | 0x0ff;
757 if (c.a)
758 c.a = (c.a << 8) | 0x0ff;
759 }
739 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 760 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
740 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 761 else if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
741 { 762 {
742 XColor xc, xc_exact; 763 XColor xc;
743 764
744 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 765 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
745 { 766 {
746 c.r = xc.red; 767 c.r = xc.red;
747 c.g = xc.green; 768 c.g = xc.green;
… …
774 { 795 {
775 XColor *colors = new XColor [screen->visual->map_entries]; 796 XColor *colors = new XColor [screen->visual->map_entries];
776 797
777 for (int i = 0; i < cmap_size; i++) 798 for (int i = 0; i < cmap_size; i++)
778 colors [i].pixel = i; 799 colors [i].pixel = i;
779 800
780 // many kilobytes transfer per colour, but pseudocolor isn't worth 801 // many kilobytes transfer per colour, but pseudocolor isn't worth
781 // many extra optimisations. 802 // many extra optimisations.
782 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
783 804
784 int diff = 0x7fffffffUL; 805 int diff = 0x7fffffffUL;
… …
797 } 818 }
798 } 819 }
799 820
800 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 821 //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); 822 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
802 823
803 got = alloc (screen, rgba (best->red, best->green, best->blue)); 824 got = alloc (screen, rgba (best->red, best->green, best->blue));
804 825
805 delete colors; 826 delete [] colors;
806 } 827 }
807#endif 828#endif
808 829
809 return got; 830 return got;
810} 831}
… …
835 color.green = c.g; 856 color.green = c.g;
836 color.blue = c.b; 857 color.blue = c.b;
837 color.pixel = (Pixel)*this; 858 color.pixel = (Pixel)*this;
838} 859}
839 860
840void 861void
841rxvt_color::free (rxvt_screen *screen) 862rxvt_color::free (rxvt_screen *screen)
842{ 863{
864 if (screen->visual->c_class == TrueColor)
865 return; // nothing to do
866
843#if XFT 867#if XFT
844 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 868 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
845#else 869#else
846 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 870 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
847#endif 871#endif

Diff Legend

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