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.122 by root, Mon Feb 21 08:10:10 2011 UTC vs.
Revision 1.130 by sf-exg, Fri Jan 13 12:40:53 2012 UTC

… …
449 return false; 449 return false;
450 450
451 screen = DefaultScreen (dpy); 451 screen = DefaultScreen (dpy);
452 root = DefaultRootWindow (dpy); 452 root = DefaultRootWindow (dpy);
453 453
454 assert (ARRAY_LENGTH(xa_names) == NUM_XA); 454 assert (ecb_array_length (xa_names) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 456
457 XrmSetDatabase (dpy, get_resources (false)); 457 XrmSetDatabase (dpy, get_resources (false));
458 458
459#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
… …
686 686
687bool 687bool
688rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 688rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
689{ 689{
690 //TODO: only supports 24 bit 690 //TODO: only supports 24 bit
691 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 691 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
692 692
693#if XFT 693#if XFT
694 XRenderPictFormat *format; 694 XRenderPictFormat *format;
695 695
696 // FUCKING Xft gets it wrong, of course, so work around it. 696 // FUCKING Xft gets it wrong, of course, so work around it.
… …
703 c.color.red = color.r; 703 c.color.red = color.r;
704 c.color.green = color.g; 704 c.color.green = color.g;
705 c.color.blue = color.b; 705 c.color.blue = color.b;
706 c.color.alpha = alpha; 706 c.color.alpha = alpha;
707 707
708 // Xft wants premultiplied alpha, but abuses the alpha channel
709 // as blend factor, and doesn't allow us to set the alpha channel
710 c.color.red = c.color.red * alpha / 0xffff;
711 c.color.green = c.color.green * alpha / 0xffff;
712 c.color.blue = c.color.blue * alpha / 0xffff;
713
708 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 714 c.pixel = insert_component (c.color.red , format->direct.redMask , format->direct.red )
709 | insert_component (color.g, format->direct.greenMask, format->direct.green) 715 | insert_component (c.color.green, format->direct.greenMask, format->direct.green)
710 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 716 | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue )
711 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha); 717 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
712 718
713 return true; 719 return true;
714 } 720 }
715 else 721 else
716 { 722 {
… …
719 d.red = color.r; 725 d.red = color.r;
720 d.green = color.g; 726 d.green = color.g;
721 d.blue = color.b; 727 d.blue = color.b;
722 d.alpha = alpha; 728 d.alpha = alpha;
723 729
724 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 730 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
731 return true;
725 } 732 }
726#else 733#else
727 c.red = color.r; 734 c.red = color.r;
728 c.green = color.g; 735 c.green = color.g;
729 c.blue = color.b; 736 c.blue = color.b;
730 737
731 if (screen->visual->c_class == TrueColor) 738 if (screen->visual->c_class == TrueColor)
732 { 739 {
733 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask )) 740 c.pixel = (color.r >> (16 - ecb_popcount32 (screen->visual->red_mask )) << ecb_ctz32 (screen->visual->red_mask ))
734 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask)) 741 | (color.g >> (16 - ecb_popcount32 (screen->visual->green_mask)) << ecb_ctz32 (screen->visual->green_mask))
735 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask )); 742 | (color.b >> (16 - ecb_popcount32 (screen->visual->blue_mask )) << ecb_ctz32 (screen->visual->blue_mask ));
736 743
737 return true; 744 return true;
738 } 745 }
739 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 746 else if (XAllocColor (screen->dpy, screen->cmap, &c))
740 return true; 747 return true;
741 else 748#endif
749
742 c.pixel = (color.r + color.g + color.b) > 128*3 750 c.pixel = (color.r + color.g + color.b) > 128*3
743 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 751 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
744 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 752 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
745#endif
746 753
747 return false; 754 return false;
748} 755}
749 756
750bool 757bool
… …
905 912
906 incr_buf = 0; 913 incr_buf = 0;
907 incr_buf_size = incr_buf_fill = 0; 914 incr_buf_size = incr_buf_fill = 0;
908 selection_wait = Sel_normal; 915 selection_wait = Sel_normal;
909 selection_type = selnum; 916 selection_type = selnum;
917 cb_sv = 0;
910} 918}
911 919
912void 920void
913rxvt_selection::stop () 921rxvt_selection::stop ()
914{ 922{
… …
925 933
926void 934void
927rxvt_selection::run () 935rxvt_selection::run ()
928{ 936{
929 int selnum = selection_type; 937 int selnum = selection_type;
938
939#if ENABLE_FRILLS
940 if (selnum == Sel_Primary && display->selection_owner)
941 {
942 /* internal selection */
943 char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
944 finish (str, strlen (str));
945 free (str);
946 return;
947 }
948#endif
930 949
931#if X_HAVE_UTF8_STRING 950#if X_HAVE_UTF8_STRING
932 selection_type = Sel_UTF8String; 951 selection_type = Sel_UTF8String;
933 if (request (display->xa[XA_UTF8_STRING], selnum)) 952 if (request (display->xa[XA_UTF8_STRING], selnum))
934 return; 953 return;
… …
943} 962}
944 963
945void 964void
946rxvt_selection::finish (char *data, unsigned int len) 965rxvt_selection::finish (char *data, unsigned int len)
947{ 966{
948 if (term) 967 if (!cb_sv)
949 { 968 {
950 if (data) 969 if (data)
951 term->paste (data, len); 970 term->paste (data, len);
952 971
953 term->selection_req = 0; 972 term->selection_req = 0;
… …
1160 handle_selection (xev.xproperty.window, xev.xproperty.atom, true); 1179 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1161 break; 1180 break;
1162 1181
1163 case SelectionNotify: 1182 case SelectionNotify:
1164 if (selection_wait == Sel_normal 1183 if (selection_wait == Sel_normal
1165 && xev.xselection.time == request_time 1184 && xev.xselection.time == request_time)
1166 && xev.xselection.property == request_prop)
1167 { 1185 {
1168 timer_ev.stop (); 1186 timer_ev.stop ();
1169 handle_selection (xev.xselection.requestor, xev.xselection.property, true); 1187 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1170 } 1188 }
1171 break; 1189 break;

Diff Legend

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