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.119 by root, Mon Feb 21 07:12:03 2011 UTC vs.
Revision 1.132 by sf-exg, Sun Jun 3 15:50:22 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
… …
430bool rxvt_display::ref_init () 430bool rxvt_display::ref_init ()
431{ 431{
432#ifdef LOCAL_X_IS_UNIX 432#ifdef LOCAL_X_IS_UNIX
433 if (id[0] == ':') 433 if (id[0] == ':')
434 { 434 {
435 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1))) 435 char *val = rxvt_temp_buf<char> (5 + strlen (id) + 1);
436 return false; 436
437 strcpy (val, "unix/"); 437 strcpy (val, "unix/");
438 strcat (val, id); 438 strcat (val, id);
439
439 dpy = XOpenDisplay (val); 440 dpy = XOpenDisplay (val);
440 } 441 }
441 else 442 else
442#endif 443#endif
443 dpy = 0; 444 dpy = 0;
… …
449 return false; 450 return false;
450 451
451 screen = DefaultScreen (dpy); 452 screen = DefaultScreen (dpy);
452 root = DefaultRootWindow (dpy); 453 root = DefaultRootWindow (dpy);
453 454
454 assert (ARRAY_LENGTH(xa_names) == NUM_XA); 455 assert (ecb_array_length (xa_names) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 456 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 457
457 XrmSetDatabase (dpy, get_resources (false)); 458 XrmSetDatabase (dpy, get_resources (false));
458 459
459#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
… …
465 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ', 466 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
466 &blackcolour, &blackcolour); 467 &blackcolour, &blackcolour);
467 XUnloadFont (dpy, f); 468 XUnloadFont (dpy, f);
468#endif 469#endif
469 470
471 flags = 0;
472#if XRENDER
473 int major, minor;
474 if (XRenderQueryVersion (dpy, &major, &minor))
475 {
476 flags |= DISPLAY_HAS_RENDER;
477
478 if (major > 0 || (major == 0 && minor >= 11))
479 flags |= DISPLAY_HAS_RENDER_MUL;
480
481 XFilters *filters = XRenderQueryFilters (dpy, root);
482 if (filters)
483 {
484 for (int i = 0; i < filters->nfilter; i++)
485 if (!strcmp (filters->filter[i], FilterConvolution))
486 flags |= DISPLAY_HAS_RENDER_CONV;
487
488 XFree (filters);
489 }
490 }
491#endif
492
470 int fd = XConnectionNumber (dpy); 493 int fd = XConnectionNumber (dpy);
471 494
472 // try to detect whether we have a local connection. 495 // try to detect whether we have a local connection.
473 // assume unix domain socket == local, everything else not 496 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 497 // TODO: might want to check for inet/127.0.0.1
… …
686 709
687bool 710bool
688rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 711rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
689{ 712{
690 //TODO: only supports 24 bit 713 //TODO: only supports 24 bit
691 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 714 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
692 715
693#if XFT 716#if XFT
694 XRenderPictFormat *format; 717 XRenderPictFormat *format;
695 718
696 // FUCKING Xft gets it wrong, of course, so work around it. 719 // FUCKING Xft gets it wrong, of course, so work around it.
… …
703 c.color.red = color.r; 726 c.color.red = color.r;
704 c.color.green = color.g; 727 c.color.green = color.g;
705 c.color.blue = color.b; 728 c.color.blue = color.b;
706 c.color.alpha = alpha; 729 c.color.alpha = alpha;
707 730
731 // Xft wants premultiplied alpha, but abuses the alpha channel
732 // as blend factor, and doesn't allow us to set the alpha channel
733 c.color.red = c.color.red * alpha / 0xffff;
734 c.color.green = c.color.green * alpha / 0xffff;
735 c.color.blue = c.color.blue * alpha / 0xffff;
736
708 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 737 c.pixel = insert_component (c.color.red , format->direct.redMask , format->direct.red )
709 | insert_component (color.g, format->direct.greenMask, format->direct.green) 738 | insert_component (c.color.green, format->direct.greenMask, format->direct.green)
710 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 739 | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue )
711 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha); 740 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
712 741
713 return true; 742 return true;
714 } 743 }
715 else 744 else
716 { 745 {
… …
719 d.red = color.r; 748 d.red = color.r;
720 d.green = color.g; 749 d.green = color.g;
721 d.blue = color.b; 750 d.blue = color.b;
722 d.alpha = alpha; 751 d.alpha = alpha;
723 752
724 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 753 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
754 return true;
725 } 755 }
726#else 756#else
727 c.red = color.r; 757 c.red = color.r;
728 c.green = color.g; 758 c.green = color.g;
729 c.blue = color.b; 759 c.blue = color.b;
730 760
731 if (screen->visual->c_class == TrueColor) 761 if (screen->visual->c_class == TrueColor)
732 { 762 {
733 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask )) 763 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)) 764 | (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 )); 765 | (color.b >> (16 - ecb_popcount32 (screen->visual->blue_mask )) << ecb_ctz32 (screen->visual->blue_mask ));
736 766
737 return true; 767 return true;
738 } 768 }
739 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 769 else if (XAllocColor (screen->dpy, screen->cmap, &c))
740 return true; 770 return true;
741 else 771#endif
772
742 c.pixel = (color.r + color.g + color.b) > 128*3 773 c.pixel = (color.r + color.g + color.b) > 128*3
743 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 774 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
744 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 775 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
745#endif
746 776
747 return false; 777 return false;
748} 778}
749 779
750bool 780bool
… …
892 lerp (c.a, to.a, percent) 922 lerp (c.a, to.a, percent)
893 ) 923 )
894 ); 924 );
895} 925}
896 926
897rxvt_selection::rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term, void *cb_sv) 927rxvt_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) 928: display (disp), request_time (tm), request_win (win), request_prop (prop), term (term)
899{ 929{
900 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard); 930 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard);
901 931
902 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this); 932 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this);
903 timer_ev.repeat = 10.; 933 timer_ev.repeat = 10.;
… …
905 935
906 incr_buf = 0; 936 incr_buf = 0;
907 incr_buf_size = incr_buf_fill = 0; 937 incr_buf_size = incr_buf_fill = 0;
908 selection_wait = Sel_normal; 938 selection_wait = Sel_normal;
909 selection_type = selnum; 939 selection_type = selnum;
940 cb_sv = 0;
941}
942
943void
944rxvt_selection::stop ()
945{
946 free (incr_buf);
947 incr_buf = 0;
948 timer_ev.stop ();
949 x_ev.stop (display);
950}
951
952rxvt_selection::~rxvt_selection ()
953{
954 stop ();
910} 955}
911 956
912void 957void
913rxvt_selection::run () 958rxvt_selection::run ()
914{ 959{
915 int selnum = selection_type; 960 int selnum = selection_type;
961
962#if ENABLE_FRILLS
963 if (selnum == Sel_Primary && display->selection_owner)
964 {
965 /* internal selection */
966 char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
967 finish (str, strlen (str));
968 free (str);
969 return;
970 }
971#endif
916 972
917#if X_HAVE_UTF8_STRING 973#if X_HAVE_UTF8_STRING
918 selection_type = Sel_UTF8String; 974 selection_type = Sel_UTF8String;
919 if (request (display->xa[XA_UTF8_STRING], selnum)) 975 if (request (display->xa[XA_UTF8_STRING], selnum))
920 return; 976 return;
… …
926 982
927 // fallback to CUT_BUFFER0 if the requested property has no owner 983 // fallback to CUT_BUFFER0 if the requested property has no owner
928 handle_selection (display->root, XA_CUT_BUFFER0, false); 984 handle_selection (display->root, XA_CUT_BUFFER0, false);
929} 985}
930 986
931rxvt_selection::~rxvt_selection ()
932{
933 stop ();
934}
935
936void 987void
937rxvt_selection::finish (char *data, unsigned int len) 988rxvt_selection::finish (char *data, unsigned int len)
938{ 989{
939 if (term) 990 if (!cb_sv)
940 { 991 {
941 if (data) 992 if (data)
942 term->paste (data, len); 993 term->paste (data, len);
943 994
944 term->selection_req = 0; 995 term->selection_req = 0;
945 delete this; 996 delete this;
946 } 997 }
947#if ENABLE_PERL 998#if ENABLE_PERL
948 else 999 else
949 { 1000 {
950 stop (); 1001 stop (); // we do not really trust perl callbacks
951 abort (); //TODO 1002 rxvt_perl.selection_finish (this, data, len);
952 } 1003 }
953#endif 1004#endif
954}
955
956void
957rxvt_selection::stop ()
958{
959 free (incr_buf);
960 incr_buf = 0;
961 timer_ev.stop ();
962 x_ev.stop (display);
963} 1005}
964 1006
965bool 1007bool
966rxvt_selection::request (Atom target, int selnum) 1008rxvt_selection::request (Atom target, int selnum)
967{ 1009{
… …
1160 handle_selection (xev.xproperty.window, xev.xproperty.atom, true); 1202 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1161 break; 1203 break;
1162 1204
1163 case SelectionNotify: 1205 case SelectionNotify:
1164 if (selection_wait == Sel_normal 1206 if (selection_wait == Sel_normal
1165 && xev.xselection.time == request_time 1207 && xev.xselection.time == request_time)
1166 && xev.xselection.property == request_prop)
1167 { 1208 {
1168 timer_ev.stop (); 1209 timer_ev.stop ();
1169 handle_selection (xev.xselection.requestor, xev.xselection.property, true); 1210 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1170 } 1211 }
1171 break; 1212 break;

Diff Legend

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