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.86 by root, Mon Dec 24 08:00:18 2007 UTC vs.
Revision 1.104 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

… …
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
… …
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, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
301{ 303{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 306}
305 307
… …
543} 545}
544#endif 546#endif
545 547
546void rxvt_display::x_cb (ev::io &w, int revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
547{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 555 while (XEventsQueued (dpy, QueuedAfterFlush))
556 do
549 { 557 {
550 XEvent xev; 558 XEvent xev;
551 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
552 560
553#ifdef USE_XIM 561#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
555 { 563 {
556 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
557 && xev.xany.window == root 565 && xev.xany.window == root
558 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
559 im_change_check (); 567 im_change_check ();
560#endif 568#endif
561 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
563 571
564 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
565 { 573 {
566 if (!xw[i]) 574 if (!xw[i])
567 xw.erase_unordered (i); 575 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 577 xw[i]->call (xev);
570 } 578 }
571#ifdef USE_XIM 579#ifdef USE_XIM
572 } 580 }
573#endif 581#endif
574 } 582 }
575} 583 while (XEventsQueued (dpy, QueuedAlready));
576 584
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 w.stop (); 585 w.stop ();
580 XFlush (dpy);
581} 586}
582 587
583void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
584{ 589{
585 if (!w->active) 590 if (!w->active)
… …
596 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
597 w->active = 0; 602 w->active = 0;
598 } 603 }
599} 604}
600 605
601void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
602{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
603 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
604 {
605 selection_owner->selection_clear ();
606 flush ();
607 } 611 {
612 cur_owner->selection_clear (clipboard);
613 cur_owner->flush ();
614 }
608 615
609 selection_owner = owner; 616 cur_owner = owner;
610} 617}
611 618
612#ifdef USE_XIM 619#ifdef USE_XIM
613 620
614void rxvt_display::reg (im_watcher *w) 621void rxvt_display::reg (im_watcher *w)
… …
671} 678}
672 679
673bool 680bool
674rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 681rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
675{ 682{
683 //TODO: only supports 24 bit
684 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
685
676#if XFT 686#if XFT
677 XRenderPictFormat *format; 687 XRenderPictFormat *format;
678 688
679 // FUCKING Xft gets it wrong, of course, so work around it. 689 // FUCKING Xft gets it wrong, of course, so work around it.
680 // Transparency users should eat shit and die, and then 690 // Transparency users should eat shit and die, and then
… …
684 { 694 {
685 // the fun lies in doing everything manually... 695 // the fun lies in doing everything manually...
686 c.color.red = color.r; 696 c.color.red = color.r;
687 c.color.green = color.g; 697 c.color.green = color.g;
688 c.color.blue = color.b; 698 c.color.blue = color.b;
689 c.color.alpha = color.a; 699 c.color.alpha = alpha;
690 700
691 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 )
692 | insert_component (color.g, format->direct.greenMask, format->direct.green) 702 | insert_component (color.g, format->direct.greenMask, format->direct.green)
693 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 703 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
694 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 704 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
695 705
696 return true; 706 return true;
697 } 707 }
698 else 708 else
699 { 709 {
700 XRenderColor d; 710 XRenderColor d;
701 711
702 d.red = color.r; 712 d.red = color.r;
703 d.green = color.g; 713 d.green = color.g;
704 d.blue = color.b; 714 d.blue = color.b;
705 d.alpha = color.a; 715 d.alpha = alpha;
706 716
707 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 717 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
708 } 718 }
709#else 719#else
710 c.red = color.r; 720 c.red = color.r;
711 c.green = color.g; 721 c.green = color.g;
712 c.blue = color.b; 722 c.blue = color.b;
713 723
714 if (screen->visual->c_class == TrueColor) 724 if (screen->visual->c_class == TrueColor)
715 { 725 {
716 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 726 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
717 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 727 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
718 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 728 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
719 729
720 return true; 730 return true;
721 } 731 }
722 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 732 else if (XAllocColor (screen->dpy, screen->cmap, &c))
723 return true; 733 return true;
… …
735{ 745{
736 rgba c; 746 rgba c;
737 char eos; 747 char eos;
738 int skip; 748 int skip;
739 749
750 c.a = rgba::MAX_CC;
751
740 // parse the nonstandard "[alphapercent]" prefix 752 // parse the nonstandard "[alphapercent]" prefix
741 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 753 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
742 { 754 {
743 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);
744 name += skip; 756 name += skip;
745 } 757 }
746 else
747 c.a = rgba::MAX_CC;
748 758
749 // parse the non-standard "#aarrggbb" format
750 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))
751 {
752 if (c.r)
753 c.r = (c.r << 8) | 0x0ff;
754 if (c.g)
755 c.g = (c.g << 8) | 0x0ff;
756 if (c.b)
757 c.b = (c.b << 8) | 0x0ff;
758 if (c.a)
759 c.a = (c.a << 8) | 0x0ff;
760 }
761 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 759 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
762 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)) 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))
763 { 761 {
764 XColor xc; 762 XColor xc;
765 763
766 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 764 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
767 { 765 {

Diff Legend

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