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.96 by root, Sat Jan 26 12:12:38 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.
… …
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 ();
… …
505 501
506#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
507 XFreeCursor (dpy, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
508#endif 504#endif
509 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
510#ifdef USE_XIM 507#ifdef USE_XIM
511 xims.clear (); 508 xims.clear ();
512#endif 509#endif
513 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
514} 511}
… …
544 541
545 XFree (atoms); 542 XFree (atoms);
546} 543}
547#endif 544#endif
548 545
549void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
550{ 547{
551 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
552 { 549 {
553 XEvent xev; 550 XEvent xev;
554 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
555 552
556#ifdef USE_XIM 553#ifdef USE_XIM
557 if (!XFilterEvent (&xev, None)) 554 if (!XFilterEvent (&xev, None))
555#endif
558 { 556 {
559 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
560 && xev.xany.window == root 558 && xev.xany.window == root
561 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 559 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
562 im_change_check (); 560 im_change_check ();
563#endif 561
564 if (xev.type == MappingNotify) 562 if (xev.type == MappingNotify)
565 XRefreshKeyboardMapping (&xev.xmapping); 563 XRefreshKeyboardMapping (&xev.xmapping);
566 564
567 for (int i = xw.size (); i--; ) 565 for (int i = xw.size (); i--; )
568 { 566 {
569 if (!xw[i]) 567 if (!xw[i])
570 xw.erase_unordered (i); 568 xw.erase_unordered (i);
571 else if (xw[i]->window == xev.xany.window) 569 else if (xw[i]->window == xev.xany.window)
572 xw[i]->call (xev); 570 xw[i]->call (xev);
573 } 571 }
574#ifdef USE_XIM
575 } 572 }
576#endif
577 } 573 }
578 while (XEventsQueued (dpy, QueuedAlready)); 574}
579 575
576void rxvt_display::flush_cb (ev::prepare &w, int revents)
577{
580 XFlush (dpy); 578 XFlush (dpy);
581}
582
583void rxvt_display::flush ()
584{
585 if (XEventsQueued (dpy, QueuedAlready)) 579 if (XEventsQueued (dpy, QueuedAfterReading))
586 x_cb (x_ev, EVENT_READ); 580 x_cb(x_ev,0);//D
587
588 XFlush (dpy); 581 XFlush (dpy);
582 if (XEventsQueued (dpy, QueuedAfterReading))
583 x_cb(x_ev,0);//D
584 XFlush (dpy);
585 w.stop ();
589} 586}
590 587
591void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
592{ 589{
593 if (!w->active) 590 if (!w->active)
… …
607} 604}
608 605
609void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner)
610{ 607{
611 if (selection_owner && selection_owner != owner) 608 if (selection_owner && selection_owner != owner)
609 {
610 rxvt_term *owner = selection_owner;
611
612 selection_owner->selection_clear (); 612 owner->selection_clear ();
613 owner->flush ();
614 }
613 615
614 selection_owner = owner; 616 selection_owner = owner;
615} 617}
616 618
617#ifdef USE_XIM 619#ifdef USE_XIM
… …
672static unsigned int 674static unsigned int
673insert_component (unsigned int value, unsigned int mask, unsigned int shift) 675insert_component (unsigned int value, unsigned int mask, unsigned int shift)
674{ 676{
675 return (value * (mask + 1) >> 16) << shift; 677 return (value * (mask + 1) >> 16) << shift;
676} 678}
677 679
678bool 680bool
679rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 681rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
680{ 682{
683 //TODO: only supports 24 bit
684 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
685
681#if XFT 686#if XFT
682 XRenderPictFormat *format; 687 XRenderPictFormat *format;
683 688
684 // FUCKING Xft gets it wrong, of course, so work around it. 689 // FUCKING Xft gets it wrong, of course, so work around it.
685 // Transparency users should eat shit and die, and then 690 // Transparency users should eat shit and die, and then
… …
689 { 694 {
690 // the fun lies in doing everything manually... 695 // the fun lies in doing everything manually...
691 c.color.red = color.r; 696 c.color.red = color.r;
692 c.color.green = color.g; 697 c.color.green = color.g;
693 c.color.blue = color.b; 698 c.color.blue = color.b;
694 c.color.alpha = color.a; 699 c.color.alpha = alpha;
695 700
696 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 701 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
697 | insert_component (color.g, format->direct.greenMask, format->direct.green) 702 | insert_component (color.g, format->direct.greenMask, format->direct.green)
698 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 703 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
699 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 704 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
700 705
701 return true; 706 return true;
702 } 707 }
703 else 708 else
704 { 709 {
705 XRenderColor d; 710 XRenderColor d;
706 711
707 d.red = color.r; 712 d.red = color.r;
708 d.green = color.g; 713 d.green = color.g;
709 d.blue = color.b; 714 d.blue = color.b;
710 d.alpha = color.a; 715 d.alpha = alpha;
711 716
712 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 717 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
713 } 718 }
714#else 719#else
715 c.red = color.r; 720 c.red = color.r;
… …
740{ 745{
741 rgba c; 746 rgba c;
742 char eos; 747 char eos;
743 int skip; 748 int skip;
744 749
750 c.a = rgba::MAX_CC;
751
745 // parse the nonstandard "[alphapercent]" prefix 752 // parse the nonstandard "[alphapercent]" prefix
746 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 753 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
747 { 754 {
748 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 755 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
749 name += skip; 756 name += skip;
750 } 757 }
751 else
752 c.a = rgba::MAX_CC;
753 758
754 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 759 // 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)) 760 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 { 761 {
757 XColor xc, xc_exact; 762 XColor xc;
758 763
759 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 764 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
760 { 765 {
761 c.r = xc.red; 766 c.r = xc.red;
762 c.g = xc.green; 767 c.g = xc.green;
… …
789 { 794 {
790 XColor *colors = new XColor [screen->visual->map_entries]; 795 XColor *colors = new XColor [screen->visual->map_entries];
791 796
792 for (int i = 0; i < cmap_size; i++) 797 for (int i = 0; i < cmap_size; i++)
793 colors [i].pixel = i; 798 colors [i].pixel = i;
794 799
795 // many kilobytes transfer per colour, but pseudocolor isn't worth 800 // many kilobytes transfer per colour, but pseudocolor isn't worth
796 // many extra optimisations. 801 // many extra optimisations.
797 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 802 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
798 803
799 int diff = 0x7fffffffUL; 804 int diff = 0x7fffffffUL;
… …
812 } 817 }
813 } 818 }
814 819
815 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 820 //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); 821 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
817 822
818 got = alloc (screen, rgba (best->red, best->green, best->blue)); 823 got = alloc (screen, rgba (best->red, best->green, best->blue));
819 824
820 delete [] colors; 825 delete [] colors;
821 } 826 }
822#endif 827#endif
… …
850 color.green = c.g; 855 color.green = c.g;
851 color.blue = c.b; 856 color.blue = c.b;
852 color.pixel = (Pixel)*this; 857 color.pixel = (Pixel)*this;
853} 858}
854 859
855void 860void
856rxvt_color::free (rxvt_screen *screen) 861rxvt_color::free (rxvt_screen *screen)
857{ 862{
858 if (screen->visual->c_class == TrueColor) 863 if (screen->visual->c_class == TrueColor)
859 return; // nothing to do 864 return; // nothing to do
860 865
… …
880 lerp (c.a, to.a, percent) 885 lerp (c.a, to.a, percent)
881 ) 886 )
882 ); 887 );
883} 888}
884 889
890#if TRACE_PIXMAPS
891# undef XCreatePixmap
892# undef XFreePixmap
893Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
894{
895 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
896 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
897 return res;
898}
899
900void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
901{
902 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
903 XFreePixmap (dpy,p);
904}
905#endif

Diff Legend

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