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.69 by root, Sat Jun 30 18:10:41 2007 UTC vs.
Revision 1.84 by root, Fri Dec 14 06:17:27 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;
… …
442 if (!dpy) 443 if (!dpy)
443 return false; 444 return false;
444 445
445 screen = DefaultScreen (dpy); 446 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 447 root = DefaultRootWindow (dpy);
447
448#ifdef HAVE_AFTERIMAGE
449 ::dpy = dpy; /* init global var from libAfter... */
450 asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
451 XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
452#endif
453 448
454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 449 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 450 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 451
457 XrmSetDatabase (dpy, get_resources (false)); 452 XrmSetDatabase (dpy, get_resources (false));
… …
468#endif 463#endif
469 464
470 int fd = XConnectionNumber (dpy); 465 int fd = XConnectionNumber (dpy);
471 466
472 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
473 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
475 is_local = 0; 470 is_local = 0;
476 sockaddr_un sa; 471 sockaddr_un sa;
477 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
478 473
479 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
480 is_local = sa.sun_family == AF_UNIX; 475 is_local = sa.sun_family == AF_UNIX;
481 476
477 flush_ev.start ();
482 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
483 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
484 480
485 XSelectInput (dpy, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
486 482
487 flush (); 483 flush ();
… …
544 540
545 XFree (atoms); 541 XFree (atoms);
546} 542}
547#endif 543#endif
548 544
549void rxvt_display::x_cb (io_watcher &w, short revents) 545void rxvt_display::x_cb (ev::io &w, int revents)
550{ 546{
551 do 547 while (XEventsQueued (dpy, QueuedAfterReading))
552 { 548 {
553 XEvent xev; 549 XEvent xev;
554 XNextEvent (dpy, &xev); 550 XNextEvent (dpy, &xev);
555 551
556#ifdef USE_XIM 552#ifdef USE_XIM
… …
573 } 569 }
574#ifdef USE_XIM 570#ifdef USE_XIM
575 } 571 }
576#endif 572#endif
577 } 573 }
578 while (XEventsQueued (dpy, QueuedAlready));
579
580 XFlush (dpy);
581} 574}
582 575
583void rxvt_display::flush () 576void rxvt_display::flush_cb (ev::prepare &w, int revents)
584{ 577{
585 if (XEventsQueued (dpy, QueuedAlready)) 578 w.stop ();
586 x_cb (x_ev, EVENT_READ);
587
588 XFlush (dpy); 579 XFlush (dpy);
589} 580}
590 581
591void rxvt_display::reg (xevent_watcher *w) 582void rxvt_display::reg (xevent_watcher *w)
592{ 583{
… …
672static unsigned int 663static unsigned int
673insert_component (unsigned int value, unsigned int mask, unsigned int shift) 664insert_component (unsigned int value, unsigned int mask, unsigned int shift)
674{ 665{
675 return (value * (mask + 1) >> 16) << shift; 666 return (value * (mask + 1) >> 16) << shift;
676} 667}
677 668
678bool 669bool
679rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 670rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
680{ 671{
681#if XFT 672#if XFT
682 XRenderPictFormat *format; 673 XRenderPictFormat *format;
… …
749 name += skip; 740 name += skip;
750 } 741 }
751 else 742 else
752 c.a = rgba::MAX_CC; 743 c.a = rgba::MAX_CC;
753 744
745 // parse the non-standard "#aarrggbb" format
746 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))
747 {
748 if (c.r)
749 c.r = (c.r << 8) | 0x0ff;
750 if (c.g)
751 c.g = (c.g << 8) | 0x0ff;
752 if (c.b)
753 c.b = (c.b << 8) | 0x0ff;
754 if (c.a)
755 c.a = (c.a << 8) | 0x0ff;
756 }
754 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 757 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
755 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 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))
756 { 759 {
757 XColor xc, xc_exact; 760 XColor xc;
758 761
759 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 762 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
760 { 763 {
761 c.r = xc.red; 764 c.r = xc.red;
762 c.g = xc.green; 765 c.g = xc.green;
… …
789 { 792 {
790 XColor *colors = new XColor [screen->visual->map_entries]; 793 XColor *colors = new XColor [screen->visual->map_entries];
791 794
792 for (int i = 0; i < cmap_size; i++) 795 for (int i = 0; i < cmap_size; i++)
793 colors [i].pixel = i; 796 colors [i].pixel = i;
794 797
795 // many kilobytes transfer per colour, but pseudocolor isn't worth 798 // many kilobytes transfer per colour, but pseudocolor isn't worth
796 // many extra optimisations. 799 // many extra optimisations.
797 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 800 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
798 801
799 int diff = 0x7fffffffUL; 802 int diff = 0x7fffffffUL;
… …
812 } 815 }
813 } 816 }
814 817
815 //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",
816 // 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);
817 820
818 got = alloc (screen, rgba (best->red, best->green, best->blue)); 821 got = alloc (screen, rgba (best->red, best->green, best->blue));
819 822
820 delete [] colors; 823 delete [] colors;
821 } 824 }
822#endif 825#endif
… …
850 color.green = c.g; 853 color.green = c.g;
851 color.blue = c.b; 854 color.blue = c.b;
852 color.pixel = (Pixel)*this; 855 color.pixel = (Pixel)*this;
853} 856}
854 857
855void 858void
856rxvt_color::free (rxvt_screen *screen) 859rxvt_color::free (rxvt_screen *screen)
857{ 860{
858 if (screen->visual->c_class == TrueColor) 861 if (screen->visual->c_class == TrueColor)
859 return; // nothing to do 862 return; // nothing to do
860 863
… …
880 lerp (c.a, to.a, percent) 883 lerp (c.a, to.a, percent)
881 ) 884 )
882 ); 885 );
883} 886}
884 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