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.61 by root, Mon Aug 7 15:12:48 2006 UTC vs.
Revision 1.80 by ayin, Fri Dec 7 01:29:00 2007 UTC

… …
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} 303}
304 304
305XrmDatabase 305XrmDatabase
306rxvt_display::get_resources (bool refresh) 306rxvt_display::get_resources (bool refresh)
307{ 307{
308 char *homedir = (char *)getenv ("HOME"); 308 char *homedir = getenv ("HOME");
309 char fname[1024]; 309 char fname[1024];
310 310
311 /* 311 /*
312 * get resources using the X library function 312 * get resources using the X library function
313 */ 313 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 318 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 319
320 // 6. System wide per application default file. 320 // 6. System wide per application default file.
321 321
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = getenv ("XAPPLRESDIR")))
324 { 324 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 326
327 if ((rdb1 = XrmGetFileDatabase (fname))) 327 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 328 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 400 XFree (displayResource);
401 } 401 }
402 402
403 // 3. User's per host defaults file 403 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 404 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 405 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 406 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 407 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 408 else if (homedir)
409 { 409 {
410 struct utsname un; 410 struct utsname un;
… …
462#endif 462#endif
463 463
464 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
465 465
466 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
467 // assume unix domains socket == local, everything else not 467 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 469 is_local = 0;
470 sockaddr_un sa; 470 sockaddr_un sa;
471 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
472 472
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_UNIX;
475 475
476 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 478
479 XSelectInput (dpy, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
480 480
481 flush (); 481 flush ();
… …
538 538
539 XFree (atoms); 539 XFree (atoms);
540} 540}
541#endif 541#endif
542 542
543void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (ev::io &w, int revents)
544{ 544{
545 do 545 while (XEventsQueued (dpy, QueuedAfterReading))
546 { 546 {
547 XEvent xev; 547 XEvent xev;
548 XNextEvent (dpy, &xev); 548 XNextEvent (dpy, &xev);
549 549
550#ifdef USE_XIM 550#ifdef USE_XIM
… …
553 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
554 && xev.xany.window == root 554 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 556 im_change_check ();
557#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
558 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
559 { 562 {
560 if (!xw[i]) 563 if (!xw[i])
561 xw.erase_unordered (i); 564 xw.erase_unordered (i);
562 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
564 } 567 }
565#ifdef USE_XIM 568#ifdef USE_XIM
566 } 569 }
567#endif 570#endif
568 } 571 }
569 while (XEventsQueued (dpy, QueuedAlready));
570 572
571 XFlush (dpy); 573 XFlush (dpy);
572} 574}
573 575
574void rxvt_display::flush () 576void rxvt_display::flush ()
575{ 577{
576 if (XEventsQueued (dpy, QueuedAlready))
577 x_cb (x_ev, EVENT_READ); 578 x_cb (x_ev, ev::READ);
578
579 XFlush (dpy);
580} 579}
581 580
582void rxvt_display::reg (xevent_watcher *w) 581void rxvt_display::reg (xevent_watcher *w)
583{ 582{
584 if (!w.active) 583 if (!w->active)
585 { 584 {
586 xw.push_back (w); 585 xw.push_back (w);
587 w->active = xw.size (); 586 w->active = xw.size ();
588 } 587 }
589} 588}
… …
663static unsigned int 662static unsigned int
664insert_component (unsigned int value, unsigned int mask, unsigned int shift) 663insert_component (unsigned int value, unsigned int mask, unsigned int shift)
665{ 664{
666 return (value * (mask + 1) >> 16) << shift; 665 return (value * (mask + 1) >> 16) << shift;
667} 666}
668 667
669bool 668bool
670rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 669rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
671{ 670{
672#if XFT 671#if XFT
673 XRenderPictFormat *format; 672 XRenderPictFormat *format;
… …
707 c.green = color.g; 706 c.green = color.g;
708 c.blue = color.b; 707 c.blue = color.b;
709 708
710 if (screen->visual->c_class == TrueColor) 709 if (screen->visual->c_class == TrueColor)
711 { 710 {
712 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 ))
713 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 712 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
714 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
715 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
716 | (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 ));
717 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
718 714
719 return true; 715 return true;
720 } 716 }
721 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 717 else if (XAllocColor (screen->dpy, screen->cmap, &c))
722 return true; 718 return true;
… …
743 name += skip; 739 name += skip;
744 } 740 }
745 else 741 else
746 c.a = rgba::MAX_CC; 742 c.a = rgba::MAX_CC;
747 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 }
748 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
749 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))
750 { 758 {
751 XColor xc, xc_exact; 759 XColor xc;
752 760
753 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
754 { 762 {
755 c.r = xc.red; 763 c.r = xc.red;
756 c.g = xc.green; 764 c.g = xc.green;
… …
783 { 791 {
784 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
785 793
786 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
787 colors [i].pixel = i; 795 colors [i].pixel = i;
788 796
789 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
790 // many extra optimisations. 798 // many extra optimisations.
791 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
792 800
793 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
… …
806 } 814 }
807 } 815 }
808 816
809 //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",
810 // 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);
811 819
812 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
813 821
814 delete colors; 822 delete [] colors;
815 } 823 }
816#endif 824#endif
817 825
818 return got; 826 return got;
819} 827}
… …
844 color.green = c.g; 852 color.green = c.g;
845 color.blue = c.b; 853 color.blue = c.b;
846 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
847} 855}
848 856
849void 857void
850rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
851{ 859{
852 if (screen->visual->c_class == TrueColor) 860 if (screen->visual->c_class == TrueColor)
853 return; // nothing to do 861 return; // nothing to do
854 862
… …
874 lerp (c.a, to.a, percent) 882 lerp (c.a, to.a, percent)
875 ) 883 )
876 ); 884 );
877} 885}
878 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