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.53 by root, Sun Feb 19 16:25:13 2006 UTC vs.
Revision 1.78 by root, Fri Nov 23 07:59:14 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.
… …
64#endif 64#endif
65#if USE_XIM 65#if USE_XIM
66 "WM_LOCALE_NAME", 66 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 67 "XIM_SERVERS",
68#endif 68#endif
69#ifdef TRANSPARENT 69#ifdef ENABLE_TRANSPARENCY
70 "_XROOTPMAP_ID", 70 "_XROOTPMAP_ID",
71 "ESETROOT_PMAP_ID", 71 "ESETROOT_PMAP_ID",
72#endif 72#endif
73#if ENABLE_XEMBED 73#if ENABLE_XEMBED
74 "_XEMBED", 74 "_XEMBED",
… …
183 183
184 XIMCallback ximcallback; 184 XIMCallback ximcallback;
185 ximcallback.client_data = (XPointer)this; 185 ximcallback.client_data = (XPointer)this;
186 ximcallback.callback = im_destroy_cb; 186 ximcallback.callback = im_destroy_cb;
187 187
188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
189 189
190 return true; 190 return true;
191} 191}
192 192
193rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
262 visual = DefaultVisualOfScreen (screen); 262 visual = DefaultVisualOfScreen (screen);
263 cmap = DefaultColormapOfScreen (screen); 263 cmap = DefaultColormapOfScreen (screen);
264} 264}
265 265
266void 266void
267rxvt_screen::set (rxvt_display *disp, int bitdepth) 267rxvt_screen::select_visual (int bitdepth)
268{ 268{
269 set (disp);
270
271#if XFT 269#if XFT
272 XVisualInfo vinfo; 270 XVisualInfo vinfo;
273 271
274 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 272 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
275 { 273 {
276 depth = bitdepth; 274 depth = bitdepth;
277 visual = vinfo.visual; 275 visual = vinfo.visual;
278 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 276 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
279 } 277 }
280#endif 278#endif
281} 279}
282 280
283void 281void
… …
315 */ 313 */
316 char *displayResource, *xe; 314 char *displayResource, *xe;
317 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
318 316
319 // 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
320 319
321 // 6. System wide per application default file. 320 // 6. System wide per application default file.
322 321
323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
324 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
331 330
332 // 5. User's per application default file. 331 // 5. User's per application default file.
333 // none 332 // none
334 333
335 // 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
336 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
337 if (refresh) 344 if (refresh)
338 { 345 {
339 // fucking xlib keeps a copy of the rm string 346 // fucking xlib keeps a copy of the rm string
340 Atom actual_type; 347 Atom actual_type;
… …
345#if XLIB_ILLEGAL_ACCESS 352#if XLIB_ILLEGAL_ACCESS
346 if (dpy->xdefaults) 353 if (dpy->xdefaults)
347 XFree (dpy->xdefaults); 354 XFree (dpy->xdefaults);
348#endif 355#endif
349 356
350 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 357 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
351 0L, 100000000L, False, 358 0L, 100000000L, False,
352 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
353 &nitems, &nremaining, 360 &nitems, &nremaining,
354 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
355 && actual_type == XA_STRING 362 && actual_type == XA_STRING
356 && actual_format == 8) 363 && actual_format == 8)
357 displayResource = val; 364 displayResource = val;
358 else 365 else
359 { 366 {
360 displayResource = 0; 367 displayResource = 0;
368
361 if (val) 369 if (val)
362 XFree(val); 370 XFree(val);
363 } 371 }
364 372
365#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
… …
370 displayResource = XResourceManagerString (dpy); 378 displayResource = XResourceManagerString (dpy);
371 379
372 if (displayResource) 380 if (displayResource)
373 { 381 {
374 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 if ((rdb1 = XrmGetStringDatabase (displayResource)))
375 XrmMergeDatabases (rdb1, &database);
376 }
377 else if (homedir)
378 {
379 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
380
381 if ((rdb1 = XrmGetFileDatabase (fname)))
382 XrmMergeDatabases (rdb1, &database); 383 XrmMergeDatabases (rdb1, &database);
383 } 384 }
384 385
385#if !XLIB_ILLEGAL_ACCESS 386#if !XLIB_ILLEGAL_ACCESS
386 if (refresh && displayResource) 387 if (refresh && displayResource)
… …
461#endif 462#endif
462 463
463 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
464 465
465 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
466 // assume unix domains socket == local, everything else not 467 // assume unix domain socket == local, everything else not
467 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
468 is_local = 0; 469 is_local = 0;
469 sockaddr_un sa; 470 sockaddr_un sa;
470 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
471 472
472 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
473 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_UNIX;
474 475
475 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, ev::READ);
476 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
477 478
478 XSelectInput (dpy, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
479 480
480 flush (); 481 flush ();
… …
537 538
538 XFree (atoms); 539 XFree (atoms);
539} 540}
540#endif 541#endif
541 542
542void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (ev::io &w, int revents)
543{ 544{
544 do 545 while (XEventsQueued (dpy, QueuedAfterReading))
545 { 546 {
546 XEvent xev; 547 XEvent xev;
547 XNextEvent (dpy, &xev); 548 XNextEvent (dpy, &xev);
548 549
549#ifdef USE_XIM 550#ifdef USE_XIM
… …
552 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
553 && xev.xany.window == root 554 && xev.xany.window == root
554 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
555 im_change_check (); 556 im_change_check ();
556#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
557 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
558 { 562 {
559 if (!xw[i]) 563 if (!xw[i])
560 xw.erase_unordered (i); 564 xw.erase_unordered (i);
561 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
563 } 567 }
564#ifdef USE_XIM 568#ifdef USE_XIM
565 } 569 }
566#endif 570#endif
567 } 571 }
568 while (XEventsQueued (dpy, QueuedAlready));
569 572
570 XFlush (dpy); 573 XFlush (dpy);
571} 574}
572 575
573void rxvt_display::flush () 576void rxvt_display::flush ()
574{ 577{
575 if (XEventsQueued (dpy, QueuedAlready))
576 x_cb (x_ev, EVENT_READ); 578 x_cb (x_ev, ev::READ);
577
578 XFlush (dpy);
579} 579}
580 580
581void rxvt_display::reg (xevent_watcher *w) 581void rxvt_display::reg (xevent_watcher *w)
582{ 582{
583 if (!w->active)
584 {
583 xw.push_back (w); 585 xw.push_back (w);
584 w->active = xw.size (); 586 w->active = xw.size ();
587 }
585} 588}
586 589
587void rxvt_display::unreg (xevent_watcher *w) 590void rxvt_display::unreg (xevent_watcher *w)
588{ 591{
589 if (w->active) 592 if (w->active)
593 {
590 xw[w->active - 1] = 0; 594 xw[w->active - 1] = 0;
595 w->active = 0;
596 }
591} 597}
592 598
593void rxvt_display::set_selection_owner (rxvt_term *owner) 599void rxvt_display::set_selection_owner (rxvt_term *owner)
594{ 600{
595 if (selection_owner && selection_owner != owner) 601 if (selection_owner && selection_owner != owner)
… …
649 655
650template class refcache<rxvt_display>; 656template class refcache<rxvt_display>;
651refcache<rxvt_display> displays; 657refcache<rxvt_display> displays;
652 658
653///////////////////////////////////////////////////////////////////////////// 659/////////////////////////////////////////////////////////////////////////////
654 660//
661
662static unsigned int
663insert_component (unsigned int value, unsigned int mask, unsigned int shift)
664{
665 return (value * (mask + 1) >> 16) << shift;
666}
667
655bool 668bool
656rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 669rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
657{ 670{
658#if XFT 671#if XFT
659 XRenderPictFormat *format; 672 XRenderPictFormat *format;
… …
668 c.color.red = color.r; 681 c.color.red = color.r;
669 c.color.green = color.g; 682 c.color.green = color.g;
670 c.color.blue = color.b; 683 c.color.blue = color.b;
671 c.color.alpha = color.a; 684 c.color.alpha = color.a;
672 685
673 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 686 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
674 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 687 | insert_component (color.g, format->direct.greenMask, format->direct.green)
675 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 688 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
676 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 689 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
677 690
678 return true; 691 return true;
679 } 692 }
680 else 693 else
681 { 694 {
… …
693 c.green = color.g; 706 c.green = color.g;
694 c.blue = color.b; 707 c.blue = color.b;
695 708
696 if (screen->visual->c_class == TrueColor) 709 if (screen->visual->c_class == TrueColor)
697 { 710 {
698 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 711 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
699 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 712 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
700 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
701 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
702 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 713 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
703 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
704 714
705 return true; 715 return true;
706 } 716 }
707 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 717 else if (XAllocColor (screen->dpy, screen->cmap, &c))
708 return true; 718 return true;
… …
729 name += skip; 739 name += skip;
730 } 740 }
731 else 741 else
732 c.a = rgba::MAX_CC; 742 c.a = rgba::MAX_CC;
733 743
744 // parse the non-standard "#aarrggbb" format
745 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))
746 {
747 if (c.r)
748 c.r = (c.r << 8) | 0x0ff;
749 if (c.g)
750 c.g = (c.g << 8) | 0x0ff;
751 if (c.b)
752 c.b = (c.b << 8) | 0x0ff;
753 if (c.a)
754 c.a = (c.a << 8) | 0x0ff;
755 }
734 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
735 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 757 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))
736 { 758 {
737 XColor xc, xc_exact; 759 XColor xc;
738 760
739 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
740 { 762 {
741 c.r = xc.red; 763 c.r = xc.red;
742 c.g = xc.green; 764 c.g = xc.green;
… …
769 { 791 {
770 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
771 793
772 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
773 colors [i].pixel = i; 795 colors [i].pixel = i;
774 796
775 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
776 // many extra optimisations. 798 // many extra optimisations.
777 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
778 800
779 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
… …
792 } 814 }
793 } 815 }
794 816
795 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 817 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
796 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 818 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
797 819
798 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
799 821
800 delete colors; 822 delete [] colors;
801 } 823 }
802#endif 824#endif
803 825
804 return got; 826 return got;
805} 827}
… …
830 color.green = c.g; 852 color.green = c.g;
831 color.blue = c.b; 853 color.blue = c.b;
832 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
833} 855}
834 856
835void 857void
836rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
837{ 859{
838 if (screen->visual->c_class == TrueColor) 860 if (screen->visual->c_class == TrueColor)
839 return; // nothing to do 861 return; // nothing to do
840 862
… …
860 lerp (c.a, to.a, percent) 882 lerp (c.a, to.a, percent)
861 ) 883 )
862 ); 884 );
863} 885}
864 886
887#if TRACE_PIXMAPS
888# undef XCreatePixmap
889# undef XFreePixmap
890Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
891{
892 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
893 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
894 return res;
895}
896
897void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
898{
899 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
900 XFreePixmap (dpy,p);
901}
902#endif

Diff Legend

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