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.64 by root, Mon Feb 12 19:26:10 2007 UTC vs.
Revision 1.97 by root, Sat Jan 26 12:15:11 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
551 if (!XFilterEvent (&xev, None)) 554 if (!XFilterEvent (&xev, None))
555#endif
552 { 556 {
553 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
554 && xev.xany.window == root 558 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 559 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 560 im_change_check ();
557#endif 561
562 if (xev.type == MappingNotify)
563 XRefreshKeyboardMapping (&xev.xmapping);
564
558 for (int i = xw.size (); i--; ) 565 for (int i = xw.size (); i--; )
559 { 566 {
560 if (!xw[i]) 567 if (!xw[i])
561 xw.erase_unordered (i); 568 xw.erase_unordered (i);
562 else if (xw[i]->window == xev.xany.window) 569 else if (xw[i]->window == xev.xany.window)
563 xw[i]->call (xev); 570 xw[i]->call (xev);
564 } 571 }
565#ifdef USE_XIM
566 } 572 }
567#endif
568 } 573 }
574}
575
576void rxvt_display::flush_cb (ev::prepare &w, int revents)
577{
569 while (XEventsQueued (dpy, QueuedAlready)); 578 while (XEventsQueued (dpy, QueuedAfterFlush))
579 {
580 x_cb(x_ev,0);//D
581 }
570 582
571 XFlush (dpy); 583 w.stop ();
572}
573
574void rxvt_display::flush ()
575{
576 if (XEventsQueued (dpy, QueuedAlready))
577 x_cb (x_ev, EVENT_READ);
578
579 XFlush (dpy);
580} 584}
581 585
582void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
583{ 587{
584 if (!w->active) 588 if (!w->active)
… …
598} 602}
599 603
600void rxvt_display::set_selection_owner (rxvt_term *owner) 604void rxvt_display::set_selection_owner (rxvt_term *owner)
601{ 605{
602 if (selection_owner && selection_owner != owner) 606 if (selection_owner && selection_owner != owner)
607 {
608 rxvt_term *owner = selection_owner;
609
603 selection_owner->selection_clear (); 610 owner->selection_clear ();
611 owner->flush ();
612 }
604 613
605 selection_owner = owner; 614 selection_owner = owner;
606} 615}
607 616
608#ifdef USE_XIM 617#ifdef USE_XIM
… …
663static unsigned int 672static unsigned int
664insert_component (unsigned int value, unsigned int mask, unsigned int shift) 673insert_component (unsigned int value, unsigned int mask, unsigned int shift)
665{ 674{
666 return (value * (mask + 1) >> 16) << shift; 675 return (value * (mask + 1) >> 16) << shift;
667} 676}
668 677
669bool 678bool
670rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 679rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
671{ 680{
681 //TODO: only supports 24 bit
682 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
683
672#if XFT 684#if XFT
673 XRenderPictFormat *format; 685 XRenderPictFormat *format;
674 686
675 // FUCKING Xft gets it wrong, of course, so work around it. 687 // FUCKING Xft gets it wrong, of course, so work around it.
676 // Transparency users should eat shit and die, and then 688 // Transparency users should eat shit and die, and then
… …
680 { 692 {
681 // the fun lies in doing everything manually... 693 // the fun lies in doing everything manually...
682 c.color.red = color.r; 694 c.color.red = color.r;
683 c.color.green = color.g; 695 c.color.green = color.g;
684 c.color.blue = color.b; 696 c.color.blue = color.b;
685 c.color.alpha = color.a; 697 c.color.alpha = alpha;
686 698
687 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 699 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
688 | insert_component (color.g, format->direct.greenMask, format->direct.green) 700 | insert_component (color.g, format->direct.greenMask, format->direct.green)
689 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 701 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
690 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 702 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
691 703
692 return true; 704 return true;
693 } 705 }
694 else 706 else
695 { 707 {
696 XRenderColor d; 708 XRenderColor d;
697 709
698 d.red = color.r; 710 d.red = color.r;
699 d.green = color.g; 711 d.green = color.g;
700 d.blue = color.b; 712 d.blue = color.b;
701 d.alpha = color.a; 713 d.alpha = alpha;
702 714
703 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 715 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
704 } 716 }
705#else 717#else
706 c.red = color.r; 718 c.red = color.r;
… …
731{ 743{
732 rgba c; 744 rgba c;
733 char eos; 745 char eos;
734 int skip; 746 int skip;
735 747
748 c.a = rgba::MAX_CC;
749
736 // parse the nonstandard "[alphapercent]" prefix 750 // parse the nonstandard "[alphapercent]" prefix
737 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 751 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
738 { 752 {
739 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 753 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
740 name += skip; 754 name += skip;
741 } 755 }
742 else
743 c.a = rgba::MAX_CC;
744 756
745 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 757 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
746 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 758 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
747 { 759 {
748 XColor xc, xc_exact; 760 XColor xc;
749 761
750 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 762 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
751 { 763 {
752 c.r = xc.red; 764 c.r = xc.red;
753 c.g = xc.green; 765 c.g = xc.green;
… …
780 { 792 {
781 XColor *colors = new XColor [screen->visual->map_entries]; 793 XColor *colors = new XColor [screen->visual->map_entries];
782 794
783 for (int i = 0; i < cmap_size; i++) 795 for (int i = 0; i < cmap_size; i++)
784 colors [i].pixel = i; 796 colors [i].pixel = i;
785 797
786 // many kilobytes transfer per colour, but pseudocolor isn't worth 798 // many kilobytes transfer per colour, but pseudocolor isn't worth
787 // many extra optimisations. 799 // many extra optimisations.
788 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 800 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
789 801
790 int diff = 0x7fffffffUL; 802 int diff = 0x7fffffffUL;
… …
803 } 815 }
804 } 816 }
805 817
806 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 818 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
807 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 819 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
808 820
809 got = alloc (screen, rgba (best->red, best->green, best->blue)); 821 got = alloc (screen, rgba (best->red, best->green, best->blue));
810 822
811 delete [] colors; 823 delete [] colors;
812 } 824 }
813#endif 825#endif
… …
841 color.green = c.g; 853 color.green = c.g;
842 color.blue = c.b; 854 color.blue = c.b;
843 color.pixel = (Pixel)*this; 855 color.pixel = (Pixel)*this;
844} 856}
845 857
846void 858void
847rxvt_color::free (rxvt_screen *screen) 859rxvt_color::free (rxvt_screen *screen)
848{ 860{
849 if (screen->visual->c_class == TrueColor) 861 if (screen->visual->c_class == TrueColor)
850 return; // nothing to do 862 return; // nothing to do
851 863
… …
871 lerp (c.a, to.a, percent) 883 lerp (c.a, to.a, percent)
872 ) 884 )
873 ); 885 );
874} 886}
875 887
888#if TRACE_PIXMAPS
889# undef XCreatePixmap
890# undef XFreePixmap
891Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
892{
893 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
894 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
895 return res;
896}
897
898void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
899{
900 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
901 XFreePixmap (dpy,p);
902}
903#endif

Diff Legend

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