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.127 by sf-exg, Mon May 30 18:39:03 2011 UTC vs.
Revision 1.129 by sf-exg, Mon Jan 2 19:30:50 2012 UTC

… …
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.
… …
911 911
912 incr_buf = 0; 912 incr_buf = 0;
913 incr_buf_size = incr_buf_fill = 0; 913 incr_buf_size = incr_buf_fill = 0;
914 selection_wait = Sel_normal; 914 selection_wait = Sel_normal;
915 selection_type = selnum; 915 selection_type = selnum;
916 cb_sv = 0;
916} 917}
917 918
918void 919void
919rxvt_selection::stop () 920rxvt_selection::stop ()
920{ 921{
… …
960} 961}
961 962
962void 963void
963rxvt_selection::finish (char *data, unsigned int len) 964rxvt_selection::finish (char *data, unsigned int len)
964{ 965{
965 if (term) 966 if (!cb_sv)
966 { 967 {
967 if (data) 968 if (data)
968 term->paste (data, len); 969 term->paste (data, len);
969 970
970 term->selection_req = 0; 971 term->selection_req = 0;

Diff Legend

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