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.87 by root, Mon Dec 24 08:21:39 2007 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.
… …
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_UNIX; 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
… …
567 } 570 }
568#ifdef USE_XIM 571#ifdef USE_XIM
569 } 572 }
570#endif 573#endif
571 } 574 }
572 while (XEventsQueued (dpy, QueuedAlready));
573
574 XFlush (dpy);
575} 575}
576 576
577void rxvt_display::flush () 577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{ 578{
579 if (XEventsQueued (dpy, QueuedAlready)) 579 w.stop ();
580 x_cb (x_ev, EVENT_READ);
581
582 XFlush (dpy); 580 XFlush (dpy);
583} 581}
584 582
585void rxvt_display::reg (xevent_watcher *w) 583void rxvt_display::reg (xevent_watcher *w)
586{ 584{
… …
601} 599}
602 600
603void rxvt_display::set_selection_owner (rxvt_term *owner) 601void rxvt_display::set_selection_owner (rxvt_term *owner)
604{ 602{
605 if (selection_owner && selection_owner != owner) 603 if (selection_owner && selection_owner != owner)
604 {
605 rxvt_term *owner = selection_owner;
606
606 selection_owner->selection_clear (); 607 owner->selection_clear ();
608 owner->flush ();
609 }
607 610
608 selection_owner = owner; 611 selection_owner = owner;
609} 612}
610 613
611#ifdef USE_XIM 614#ifdef USE_XIM
… …
666static unsigned int 669static unsigned int
667insert_component (unsigned int value, unsigned int mask, unsigned int shift) 670insert_component (unsigned int value, unsigned int mask, unsigned int shift)
668{ 671{
669 return (value * (mask + 1) >> 16) << shift; 672 return (value * (mask + 1) >> 16) << shift;
670} 673}
671 674
672bool 675bool
673rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 676rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
674{ 677{
675#if XFT 678#if XFT
676 XRenderPictFormat *format; 679 XRenderPictFormat *format;
… …
795 { 798 {
796 XColor *colors = new XColor [screen->visual->map_entries]; 799 XColor *colors = new XColor [screen->visual->map_entries];
797 800
798 for (int i = 0; i < cmap_size; i++) 801 for (int i = 0; i < cmap_size; i++)
799 colors [i].pixel = i; 802 colors [i].pixel = i;
800 803
801 // many kilobytes transfer per colour, but pseudocolor isn't worth 804 // many kilobytes transfer per colour, but pseudocolor isn't worth
802 // many extra optimisations. 805 // many extra optimisations.
803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 806 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
804 807
805 int diff = 0x7fffffffUL; 808 int diff = 0x7fffffffUL;
… …
818 } 821 }
819 } 822 }
820 823
821 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 824 //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); 825 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
823 826
824 got = alloc (screen, rgba (best->red, best->green, best->blue)); 827 got = alloc (screen, rgba (best->red, best->green, best->blue));
825 828
826 delete [] colors; 829 delete [] colors;
827 } 830 }
828#endif 831#endif
… …
856 color.green = c.g; 859 color.green = c.g;
857 color.blue = c.b; 860 color.blue = c.b;
858 color.pixel = (Pixel)*this; 861 color.pixel = (Pixel)*this;
859} 862}
860 863
861void 864void
862rxvt_color::free (rxvt_screen *screen) 865rxvt_color::free (rxvt_screen *screen)
863{ 866{
864 if (screen->visual->c_class == TrueColor) 867 if (screen->visual->c_class == TrueColor)
865 return; // nothing to do 868 return; // nothing to do
866 869
… …
886 lerp (c.a, to.a, percent) 889 lerp (c.a, to.a, percent)
887 ) 890 )
888 ); 891 );
889} 892}
890 893
894#if TRACE_PIXMAPS
895# undef XCreatePixmap
896# undef XFreePixmap
897Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
898{
899 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
900 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
901 return res;
902}
903
904void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
905{
906 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
907 XFreePixmap (dpy,p);
908}
909#endif

Diff Legend

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