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.72 by ayin, Mon Aug 27 18:31:00 2007 UTC vs.
Revision 1.79 by root, Tue Dec 4 16:24:00 2007 UTC

… …
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{
… …
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_UNIX; 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
… …
567 } 567 }
568#ifdef USE_XIM 568#ifdef USE_XIM
569 } 569 }
570#endif 570#endif
571 } 571 }
572 while (XEventsQueued (dpy, QueuedAlready));
573 572
574 XFlush (dpy); 573 XFlush (dpy);
575} 574}
576 575
577void rxvt_display::flush () 576void rxvt_display::flush ()
578{ 577{
579 if (XEventsQueued (dpy, QueuedAlready))
580 x_cb (x_ev, EVENT_READ); 578 x_cb (x_ev, ev::READ);
581
582 XFlush (dpy);
583} 579}
584 580
585void rxvt_display::reg (xevent_watcher *w) 581void rxvt_display::reg (xevent_watcher *w)
586{ 582{
587 if (!w->active) 583 if (!w->active)
… …
666static unsigned int 662static unsigned int
667insert_component (unsigned int value, unsigned int mask, unsigned int shift) 663insert_component (unsigned int value, unsigned int mask, unsigned int shift)
668{ 664{
669 return (value * (mask + 1) >> 16) << shift; 665 return (value * (mask + 1) >> 16) << shift;
670} 666}
671 667
672bool 668bool
673rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 669rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
674{ 670{
675#if XFT 671#if XFT
676 XRenderPictFormat *format; 672 XRenderPictFormat *format;
… …
795 { 791 {
796 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
797 793
798 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
799 colors [i].pixel = i; 795 colors [i].pixel = i;
800 796
801 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
802 // many extra optimisations. 798 // many extra optimisations.
803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
804 800
805 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
… …
818 } 814 }
819 } 815 }
820 816
821 //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",
822 // 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);
823 819
824 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
825 821
826 delete [] colors; 822 delete [] colors;
827 } 823 }
828#endif 824#endif
… …
856 color.green = c.g; 852 color.green = c.g;
857 color.blue = c.b; 853 color.blue = c.b;
858 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
859} 855}
860 856
861void 857void
862rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
863{ 859{
864 if (screen->visual->c_class == TrueColor) 860 if (screen->visual->c_class == TrueColor)
865 return; // nothing to do 861 return; // nothing to do
866 862
… …
886 lerp (c.a, to.a, percent) 882 lerp (c.a, to.a, percent)
887 ) 883 )
888 ); 884 );
889} 885}
890 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