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.76 by root, Sun Nov 11 18:05:19 2007 UTC vs.
Revision 1.102 by root, Tue Nov 4 11:03:29 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.
… …
59#if ENABLE_EWMH 59#if ENABLE_EWMH
60 "_NET_WM_PID", 60 "_NET_WM_PID",
61 "_NET_WM_NAME", 61 "_NET_WM_NAME",
62 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
63 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
64#endif 65#endif
65#if USE_XIM 66#if USE_XIM
66 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 68 "XIM_SERVERS",
68#endif 69#endif
… …
295 296
296///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
297 298
298rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 300: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 301, selection_owner (0)
302{ 302{
303 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
304 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 305}
304 306
305XrmDatabase 307XrmDatabase
306rxvt_display::get_resources (bool refresh) 308rxvt_display::get_resources (bool refresh)
307{ 309{
308 char *homedir = (char *)getenv ("HOME"); 310 char *homedir = getenv ("HOME");
309 char fname[1024]; 311 char fname[1024];
310 312
311 /* 313 /*
312 * get resources using the X library function 314 * get resources using the X library function
313 */ 315 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 320 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 321
320 // 6. System wide per application default file. 322 // 6. System wide per application default file.
321 323
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 324 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 325 if ((xe = getenv ("XAPPLRESDIR")))
324 { 326 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 327 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 328
327 if ((rdb1 = XrmGetFileDatabase (fname))) 329 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 330 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 402 XFree (displayResource);
401 } 403 }
402 404
403 // 3. User's per host defaults file 405 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 406 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 407 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 408 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 409 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 410 else if (homedir)
409 { 411 {
410 struct utsname un; 412 struct utsname un;
… …
471 socklen_t sl = sizeof (sa); 473 socklen_t sl = sizeof (sa);
472 474
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 475 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_UNIX; 476 is_local = sa.sun_family == AF_UNIX;
475 477
478 flush_ev.start ();
476 x_ev.start (fd, ev::READ); 479 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 480 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 481
479 XSelectInput (dpy, root, PropertyChangeMask); 482 XSelectInput (dpy, root, PropertyChangeMask);
480 483
… …
499 502
500#ifdef POINTER_BLANK 503#ifdef POINTER_BLANK
501 XFreeCursor (dpy, blank_cursor); 504 XFreeCursor (dpy, blank_cursor);
502#endif 505#endif
503 x_ev.stop (); 506 x_ev.stop ();
507 flush_ev.stop ();
504#ifdef USE_XIM 508#ifdef USE_XIM
505 xims.clear (); 509 xims.clear ();
506#endif 510#endif
507 XCloseDisplay (dpy); 511 XCloseDisplay (dpy);
508} 512}
… …
540} 544}
541#endif 545#endif
542 546
543void rxvt_display::x_cb (ev::io &w, int revents) 547void rxvt_display::x_cb (ev::io &w, int revents)
544{ 548{
549 flush_ev.start ();
550}
551
552void rxvt_display::flush_cb (ev::prepare &w, int revents)
553{
554 while (XEventsQueued (dpy, QueuedAfterFlush))
545 do 555 do
546 { 556 {
547 XEvent xev; 557 XEvent xev;
548 XNextEvent (dpy, &xev); 558 XNextEvent (dpy, &xev);
549 559
550#ifdef USE_XIM 560#ifdef USE_XIM
551 if (!XFilterEvent (&xev, None)) 561 if (!XFilterEvent (&xev, None))
552 { 562 {
553 if (xev.type == PropertyNotify 563 if (xev.type == PropertyNotify
554 && xev.xany.window == root 564 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 565 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 566 im_change_check ();
557#endif 567#endif
558 if (xev.type == MappingNotify) 568 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping); 569 XRefreshKeyboardMapping (&xev.xmapping);
560 570
561 for (int i = xw.size (); i--; ) 571 for (int i = xw.size (); i--; )
562 { 572 {
563 if (!xw[i]) 573 if (!xw[i])
564 xw.erase_unordered (i); 574 xw.erase_unordered (i);
565 else if (xw[i]->window == xev.xany.window) 575 else if (xw[i]->window == xev.xany.window)
566 xw[i]->call (xev); 576 xw[i]->call (xev);
567 } 577 }
568#ifdef USE_XIM 578#ifdef USE_XIM
569 } 579 }
570#endif 580#endif
571 } 581 }
572 while (XEventsQueued (dpy, QueuedAlready)); 582 while (XEventsQueued (dpy, QueuedAlready));
573 583
574 XFlush (dpy); 584 w.stop ();
575}
576
577void rxvt_display::flush ()
578{
579 if (XEventsQueued (dpy, QueuedAlready))
580 x_cb (x_ev, ev::READ);
581
582 XFlush (dpy);
583} 585}
584 586
585void rxvt_display::reg (xevent_watcher *w) 587void rxvt_display::reg (xevent_watcher *w)
586{ 588{
587 if (!w->active) 589 if (!w->active)
… …
601} 603}
602 604
603void rxvt_display::set_selection_owner (rxvt_term *owner) 605void rxvt_display::set_selection_owner (rxvt_term *owner)
604{ 606{
605 if (selection_owner && selection_owner != owner) 607 if (selection_owner && selection_owner != owner)
608 {
609 rxvt_term *owner = selection_owner;
610
606 selection_owner->selection_clear (); 611 owner->selection_clear ();
612 owner->flush ();
613 }
607 614
608 selection_owner = owner; 615 selection_owner = owner;
609} 616}
610 617
611#ifdef USE_XIM 618#ifdef USE_XIM
… …
670} 677}
671 678
672bool 679bool
673rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
674{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
675#if XFT 685#if XFT
676 XRenderPictFormat *format; 686 XRenderPictFormat *format;
677 687
678 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
679 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
683 { 693 {
684 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
685 c.color.red = color.r; 695 c.color.red = color.r;
686 c.color.green = color.g; 696 c.color.green = color.g;
687 c.color.blue = color.b; 697 c.color.blue = color.b;
688 c.color.alpha = color.a; 698 c.color.alpha = alpha;
689 699
690 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 700 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
691 | insert_component (color.g, format->direct.greenMask, format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
692 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
693 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
694 704
695 return true; 705 return true;
696 } 706 }
697 else 707 else
698 { 708 {
699 XRenderColor d; 709 XRenderColor d;
700 710
701 d.red = color.r; 711 d.red = color.r;
702 d.green = color.g; 712 d.green = color.g;
703 d.blue = color.b; 713 d.blue = color.b;
704 d.alpha = color.a; 714 d.alpha = alpha;
705 715
706 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
707 } 717 }
708#else 718#else
709 c.red = color.r; 719 c.red = color.r;
… …
734{ 744{
735 rgba c; 745 rgba c;
736 char eos; 746 char eos;
737 int skip; 747 int skip;
738 748
749 c.a = rgba::MAX_CC;
750
739 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
740 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
741 { 753 {
742 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 754 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
743 name += skip; 755 name += skip;
744 } 756 }
745 else
746 c.a = rgba::MAX_CC;
747 757
748 // parse the non-standard "#aarrggbb" format
749 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))
750 {
751 if (c.r)
752 c.r = (c.r << 8) | 0x0ff;
753 if (c.g)
754 c.g = (c.g << 8) | 0x0ff;
755 if (c.b)
756 c.b = (c.b << 8) | 0x0ff;
757 if (c.a)
758 c.a = (c.a << 8) | 0x0ff;
759 }
760 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
761 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)) 759 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
762 { 760 {
763 XColor xc; 761 XColor xc;
764 762
765 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
766 { 764 {
… …
886 lerp (c.a, to.a, percent) 884 lerp (c.a, to.a, percent)
887 ) 885 )
888 ); 886 );
889} 887}
890 888
889#if TRACE_PIXMAPS
890# undef XCreatePixmap
891# undef XFreePixmap
892Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
893{
894 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
895 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
896 return res;
897}
898
899void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
900{
901 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
902 XFreePixmap (dpy,p);
903}
904#endif

Diff Legend

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