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.120 by root, Mon Feb 21 07:18:19 2011 UTC vs.
Revision 1.129 by sf-exg, Mon Jan 2 19:30:50 2012 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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2011 Emanuele Giaquinta <e.giaquinta@glauco.it> 7 * Copyright (c) 2011 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
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 {
… …
728 c.green = color.g; 734 c.green = color.g;
729 c.blue = color.b; 735 c.blue = color.b;
730 736
731 if (screen->visual->c_class == TrueColor) 737 if (screen->visual->c_class == TrueColor)
732 { 738 {
733 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask )) 739 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)) 740 | (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 )); 741 | (color.b >> (16 - ecb_popcount32 (screen->visual->blue_mask )) << ecb_ctz32 (screen->visual->blue_mask ));
736 742
737 return true; 743 return true;
738 } 744 }
739 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 745 else if (XAllocColor (screen->dpy, screen->cmap, &c))
740 return true; 746 return true;
… …
892 lerp (c.a, to.a, percent) 898 lerp (c.a, to.a, percent)
893 ) 899 )
894 ); 900 );
895} 901}
896 902
897rxvt_selection::rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term, void *cb_sv) 903rxvt_selection::rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term)
898: display (disp), request_time (tm), request_win (win), request_prop (prop), term (term), cb_sv (cb_sv) 904: display (disp), request_time (tm), request_win (win), request_prop (prop), term (term)
899{ 905{
900 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard); 906 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard);
901 907
902 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this); 908 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this);
903 timer_ev.repeat = 10.; 909 timer_ev.repeat = 10.;
… …
905 911
906 incr_buf = 0; 912 incr_buf = 0;
907 incr_buf_size = incr_buf_fill = 0; 913 incr_buf_size = incr_buf_fill = 0;
908 selection_wait = Sel_normal; 914 selection_wait = Sel_normal;
909 selection_type = selnum; 915 selection_type = selnum;
916 cb_sv = 0;
910} 917}
911 918
912void 919void
913rxvt_selection::stop () 920rxvt_selection::stop ()
914{ 921{
… …
925 932
926void 933void
927rxvt_selection::run () 934rxvt_selection::run ()
928{ 935{
929 int selnum = selection_type; 936 int selnum = selection_type;
937
938#if ENABLE_FRILLS
939 if (selnum == Sel_Primary && display->selection_owner)
940 {
941 /* internal selection */
942 char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
943 finish (str, strlen (str));
944 free (str);
945 return;
946 }
947#endif
930 948
931#if X_HAVE_UTF8_STRING 949#if X_HAVE_UTF8_STRING
932 selection_type = Sel_UTF8String; 950 selection_type = Sel_UTF8String;
933 if (request (display->xa[XA_UTF8_STRING], selnum)) 951 if (request (display->xa[XA_UTF8_STRING], selnum))
934 return; 952 return;
… …
943} 961}
944 962
945void 963void
946rxvt_selection::finish (char *data, unsigned int len) 964rxvt_selection::finish (char *data, unsigned int len)
947{ 965{
948 if (term) 966 if (!cb_sv)
949 { 967 {
950 if (data) 968 if (data)
951 term->paste (data, len); 969 term->paste (data, len);
952 970
953 term->selection_req = 0; 971 term->selection_req = 0;
954 delete this; 972 delete this;
955 } 973 }
956#if ENABLE_PERL 974#if ENABLE_PERL
957 else 975 else
958 { 976 {
959 stop (); 977 stop (); // we do not really trust perl callbacks
960 abort (); //TODO 978 rxvt_perl.selection_finish (this, data, len);
961 } 979 }
962#endif 980#endif
963} 981}
964 982
965bool 983bool
… …
1160 handle_selection (xev.xproperty.window, xev.xproperty.atom, true); 1178 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1161 break; 1179 break;
1162 1180
1163 case SelectionNotify: 1181 case SelectionNotify:
1164 if (selection_wait == Sel_normal 1182 if (selection_wait == Sel_normal
1165 && xev.xselection.time == request_time 1183 && xev.xselection.time == request_time)
1166 && xev.xselection.property == request_prop)
1167 { 1184 {
1168 timer_ev.stop (); 1185 timer_ev.stop ();
1169 handle_selection (xev.xselection.requestor, xev.xselection.property, true); 1186 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1170 } 1187 }
1171 break; 1188 break;

Diff Legend

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