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.60 by root, Wed Jul 5 20:37:31 2006 UTC vs.
Revision 1.100 by root, Sat Jan 26 13:31:13 2008 UTC

1/*----------------------------------------------------------------------* 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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 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 ()
… …
295 295
296///////////////////////////////////////////////////////////////////////////// 296/////////////////////////////////////////////////////////////////////////////
297 297
298rxvt_display::rxvt_display (const char *id) 298rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 299: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 300, selection_owner (0)
302{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 304}
304 305
305XrmDatabase 306XrmDatabase
306rxvt_display::get_resources (bool refresh) 307rxvt_display::get_resources (bool refresh)
307{ 308{
308 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
309 char fname[1024]; 310 char fname[1024];
310 311
311 /* 312 /*
312 * get resources using the X library function 313 * get resources using the X library function
313 */ 314 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 319 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 320
320 // 6. System wide per application default file. 321 // 6. System wide per application default file.
321 322
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 324 if ((xe = getenv ("XAPPLRESDIR")))
324 { 325 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 327
327 if ((rdb1 = XrmGetFileDatabase (fname))) 328 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 329 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 401 XFree (displayResource);
401 } 402 }
402 403
403 // 3. User's per host defaults file 404 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 405 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 406 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 407 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 408 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 409 else if (homedir)
409 { 410 {
410 struct utsname un; 411 struct utsname un;
… …
462#endif 463#endif
463 464
464 int fd = XConnectionNumber (dpy); 465 int fd = XConnectionNumber (dpy);
465 466
466 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
467 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 470 is_local = 0;
470 sockaddr_un sa; 471 sockaddr_un sa;
471 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
472 473
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_LOCAL; 475 is_local = sa.sun_family == AF_UNIX;
475 476
477 flush_ev.start ();
476 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 480
479 XSelectInput (dpy, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
480 482
481 flush (); 483 flush ();
… …
499 501
500#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
501 XFreeCursor (dpy, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
502#endif 504#endif
503 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
504#ifdef USE_XIM 507#ifdef USE_XIM
505 xims.clear (); 508 xims.clear ();
506#endif 509#endif
507 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
508} 511}
… …
538 541
539 XFree (atoms); 542 XFree (atoms);
540} 543}
541#endif 544#endif
542 545
543void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
544{ 547{
545 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
546 { 549 {
547 XEvent xev; 550 XEvent xev;
548 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
549 552
550#ifdef USE_XIM 553#ifdef USE_XIM
… …
553 if (xev.type == PropertyNotify 556 if (xev.type == PropertyNotify
554 && xev.xany.window == root 557 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 558 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 559 im_change_check ();
557#endif 560#endif
561 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping);
563
558 for (int i = xw.size (); i--; ) 564 for (int i = xw.size (); i--; )
559 { 565 {
560 if (!xw[i]) 566 if (!xw[i])
561 xw.erase_unordered (i); 567 xw.erase_unordered (i);
562 else if (xw[i]->window == xev.xany.window) 568 else if (xw[i]->window == xev.xany.window)
… …
564 } 570 }
565#ifdef USE_XIM 571#ifdef USE_XIM
566 } 572 }
567#endif 573#endif
568 } 574 }
575}
576
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
569 while (XEventsQueued (dpy, QueuedAlready)); 579 while (XEventsQueued (dpy, QueuedAfterFlush))
570
571 XFlush (dpy);
572}
573
574void rxvt_display::flush ()
575{
576 if (XEventsQueued (dpy, QueuedAlready))
577 x_cb (x_ev, EVENT_READ); 580 x_cb (x_ev, EV_READ);
578 581
579 XFlush (dpy); 582 w.stop ();
580} 583}
581 584
582void rxvt_display::reg (xevent_watcher *w) 585void rxvt_display::reg (xevent_watcher *w)
583{ 586{
587 if (!w->active)
588 {
584 xw.push_back (w); 589 xw.push_back (w);
585 w->active = xw.size (); 590 w->active = xw.size ();
591 }
586} 592}
587 593
588void rxvt_display::unreg (xevent_watcher *w) 594void rxvt_display::unreg (xevent_watcher *w)
589{ 595{
590 if (w->active) 596 if (w->active)
597 {
591 xw[w->active - 1] = 0; 598 xw[w->active - 1] = 0;
599 w->active = 0;
600 }
592} 601}
593 602
594void rxvt_display::set_selection_owner (rxvt_term *owner) 603void rxvt_display::set_selection_owner (rxvt_term *owner)
595{ 604{
596 if (selection_owner && selection_owner != owner) 605 if (selection_owner && selection_owner != owner)
606 {
607 rxvt_term *owner = selection_owner;
608
597 selection_owner->selection_clear (); 609 owner->selection_clear ();
610 owner->flush ();
611 }
598 612
599 selection_owner = owner; 613 selection_owner = owner;
600} 614}
601 615
602#ifdef USE_XIM 616#ifdef USE_XIM
… …
657static unsigned int 671static unsigned int
658insert_component (unsigned int value, unsigned int mask, unsigned int shift) 672insert_component (unsigned int value, unsigned int mask, unsigned int shift)
659{ 673{
660 return (value * (mask + 1) >> 16) << shift; 674 return (value * (mask + 1) >> 16) << shift;
661} 675}
662 676
663bool 677bool
664rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 678rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
665{ 679{
680 //TODO: only supports 24 bit
681 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
682
666#if XFT 683#if XFT
667 XRenderPictFormat *format; 684 XRenderPictFormat *format;
668 685
669 // FUCKING Xft gets it wrong, of course, so work around it. 686 // FUCKING Xft gets it wrong, of course, so work around it.
670 // Transparency users should eat shit and die, and then 687 // Transparency users should eat shit and die, and then
… …
674 { 691 {
675 // the fun lies in doing everything manually... 692 // the fun lies in doing everything manually...
676 c.color.red = color.r; 693 c.color.red = color.r;
677 c.color.green = color.g; 694 c.color.green = color.g;
678 c.color.blue = color.b; 695 c.color.blue = color.b;
679 c.color.alpha = color.a; 696 c.color.alpha = alpha;
680 697
681 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 698 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
682 | insert_component (color.g, format->direct.greenMask, format->direct.green) 699 | insert_component (color.g, format->direct.greenMask, format->direct.green)
683 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 700 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
684 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 701 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
685 702
686 return true; 703 return true;
687 } 704 }
688 else 705 else
689 { 706 {
690 XRenderColor d; 707 XRenderColor d;
691 708
692 d.red = color.r; 709 d.red = color.r;
693 d.green = color.g; 710 d.green = color.g;
694 d.blue = color.b; 711 d.blue = color.b;
695 d.alpha = color.a; 712 d.alpha = alpha;
696 713
697 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 714 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
698 } 715 }
699#else 716#else
700 c.red = color.r; 717 c.red = color.r;
701 c.green = color.g; 718 c.green = color.g;
702 c.blue = color.b; 719 c.blue = color.b;
703 720
704 if (screen->visual->c_class == TrueColor) 721 if (screen->visual->c_class == TrueColor)
705 { 722 {
706 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 723 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
707 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 724 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
708 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
709 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
710 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 725 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
711 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
712 726
713 return true; 727 return true;
714 } 728 }
715 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
716 return true; 730 return true;
… …
728{ 742{
729 rgba c; 743 rgba c;
730 char eos; 744 char eos;
731 int skip; 745 int skip;
732 746
747 c.a = rgba::MAX_CC;
748
733 // parse the nonstandard "[alphapercent]" prefix 749 // parse the nonstandard "[alphapercent]" prefix
734 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 750 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
735 { 751 {
736 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 752 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
737 name += skip; 753 name += skip;
738 } 754 }
739 else
740 c.a = rgba::MAX_CC;
741 755
742 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
743 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 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
744 { 758 {
745 XColor xc, xc_exact; 759 XColor xc;
746 760
747 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
748 { 762 {
749 c.r = xc.red; 763 c.r = xc.red;
750 c.g = xc.green; 764 c.g = xc.green;
… …
777 { 791 {
778 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
779 793
780 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
781 colors [i].pixel = i; 795 colors [i].pixel = i;
782 796
783 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
784 // many extra optimisations. 798 // many extra optimisations.
785 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
786 800
787 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
… …
800 } 814 }
801 } 815 }
802 816
803 //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",
804 // 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);
805 819
806 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
807 821
808 delete colors; 822 delete [] colors;
809 } 823 }
810#endif 824#endif
811 825
812 return got; 826 return got;
813} 827}
… …
838 color.green = c.g; 852 color.green = c.g;
839 color.blue = c.b; 853 color.blue = c.b;
840 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
841} 855}
842 856
843void 857void
844rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
845{ 859{
846 if (screen->visual->c_class == TrueColor) 860 if (screen->visual->c_class == TrueColor)
847 return; // nothing to do 861 return; // nothing to do
848 862
… …
868 lerp (c.a, to.a, percent) 882 lerp (c.a, to.a, percent)
869 ) 883 )
870 ); 884 );
871} 885}
872 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