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.118 by sf-exg, Sat Feb 12 00:50:04 2011 UTC vs.
Revision 1.126 by sf-exg, Wed May 25 08:55:52 2011 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
… …
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 {
… …
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, sel_cb cb, void *ptr) 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), request_cb (cb), user_data (ptr) 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.;
… …
908 selection_wait = Sel_normal; 914 selection_wait = Sel_normal;
909 selection_type = selnum; 915 selection_type = selnum;
910} 916}
911 917
912void 918void
919rxvt_selection::stop ()
920{
921 free (incr_buf);
922 incr_buf = 0;
923 timer_ev.stop ();
924 x_ev.stop (display);
925}
926
927rxvt_selection::~rxvt_selection ()
928{
929 stop ();
930}
931
932void
913rxvt_selection::run () 933rxvt_selection::run ()
914{ 934{
915 int selnum = selection_type; 935 int selnum = selection_type;
936
937#if ENABLE_FRILLS
938 if (selnum == Sel_Primary && display->selection_owner)
939 {
940 /* internal selection */
941 char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
942 finish (str, strlen (str));
943 free (str);
944 return;
945 }
946#endif
916 947
917#if X_HAVE_UTF8_STRING 948#if X_HAVE_UTF8_STRING
918 selection_type = Sel_UTF8String; 949 selection_type = Sel_UTF8String;
919 if (request (display->xa[XA_UTF8_STRING], selnum)) 950 if (request (display->xa[XA_UTF8_STRING], selnum))
920 return; 951 return;
… …
926 957
927 // fallback to CUT_BUFFER0 if the requested property has no owner 958 // fallback to CUT_BUFFER0 if the requested property has no owner
928 handle_selection (display->root, XA_CUT_BUFFER0, false); 959 handle_selection (display->root, XA_CUT_BUFFER0, false);
929} 960}
930 961
931rxvt_selection::~rxvt_selection ()
932{
933 stop ();
934}
935
936void 962void
937rxvt_selection::stop () 963rxvt_selection::finish (char *data, unsigned int len)
938{ 964{
939 free (incr_buf); 965 if (term)
940 incr_buf = 0; 966 {
941 timer_ev.stop (); 967 if (data)
942 x_ev.stop (display); 968 term->paste (data, len);
969
970 term->selection_req = 0;
971 delete this;
972 }
973#if ENABLE_PERL
974 else
975 {
976 stop (); // we do not really trust perl callbacks
977 rxvt_perl.selection_finish (this, data, len);
978 }
979#endif
943} 980}
944 981
945bool 982bool
946rxvt_selection::request (Atom target, int selnum) 983rxvt_selection::request (Atom target, int selnum)
947{ 984{
… …
1112bailout: 1149bailout:
1113 XFree (ct.value); 1150 XFree (ct.value);
1114 1151
1115 if (selection_wait == Sel_normal) 1152 if (selection_wait == Sel_normal)
1116 { 1153 {
1117 stop (); 1154 finish (data, data_len);
1118 request_cb (data, data_len, this);
1119 free (data); 1155 free (data);
1120 } 1156 }
1121} 1157}
1122 1158
1123void 1159void
1124rxvt_selection::timer_cb (ev::timer &w, int revents) 1160rxvt_selection::timer_cb (ev::timer &w, int revents)
1125{ 1161{
1126 if (selection_wait == Sel_incr) 1162 if (selection_wait == Sel_incr)
1127 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 1163 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
1128 1164
1129 stop (); 1165 finish ();
1130 request_cb (NULL, 0, this);
1131} 1166}
1132 1167
1133void 1168void
1134rxvt_selection::x_cb (XEvent &xev) 1169rxvt_selection::x_cb (XEvent &xev)
1135{ 1170{
… …
1142 handle_selection (xev.xproperty.window, xev.xproperty.atom, true); 1177 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1143 break; 1178 break;
1144 1179
1145 case SelectionNotify: 1180 case SelectionNotify:
1146 if (selection_wait == Sel_normal 1181 if (selection_wait == Sel_normal
1147 && xev.xselection.time == request_time 1182 && xev.xselection.time == request_time)
1148 && xev.xselection.property == request_prop)
1149 { 1183 {
1150 timer_ev.stop (); 1184 timer_ev.stop ();
1151 handle_selection (xev.xselection.requestor, xev.xselection.property, true); 1185 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1152 } 1186 }
1153 break; 1187 break;

Diff Legend

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