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.124 by sf-exg, Thu Apr 21 00:16:25 2011 UTC vs.
Revision 1.131 by root, Fri Feb 24 07:10:54 2012 UTC

… …
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
… …
686 687
687bool 688bool
688rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 689rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
689{ 690{
690 //TODO: only supports 24 bit 691 //TODO: only supports 24 bit
691 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 692 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
692 693
693#if XFT 694#if XFT
694 XRenderPictFormat *format; 695 XRenderPictFormat *format;
695 696
696 // FUCKING Xft gets it wrong, of course, so work around it. 697 // FUCKING Xft gets it wrong, of course, so work around it.
… …
703 c.color.red = color.r; 704 c.color.red = color.r;
704 c.color.green = color.g; 705 c.color.green = color.g;
705 c.color.blue = color.b; 706 c.color.blue = color.b;
706 c.color.alpha = alpha; 707 c.color.alpha = alpha;
707 708
708 // ARGB visuals use premultiplied alpha 709 // Xft wants premultiplied alpha, but abuses the alpha channel
709 if (format->direct.alphaMask) 710 // as blend factor, and doesn't allow us to set the alpha channel
710 {
711 c.color.red = c.color.red * alpha / 0xffff; 711 c.color.red = c.color.red * alpha / 0xffff;
712 c.color.green = c.color.green * alpha / 0xffff; 712 c.color.green = c.color.green * alpha / 0xffff;
713 c.color.blue = c.color.blue * alpha / 0xffff; 713 c.color.blue = c.color.blue * alpha / 0xffff;
714 }
715 714
716 c.pixel = insert_component (c.color.red , format->direct.redMask , format->direct.red ) 715 c.pixel = insert_component (c.color.red , format->direct.redMask , format->direct.red )
717 | insert_component (c.color.green, format->direct.greenMask, format->direct.green) 716 | insert_component (c.color.green, format->direct.greenMask, format->direct.green)
718 | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue ) 717 | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue )
719 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha); 718 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
… …
727 d.red = color.r; 726 d.red = color.r;
728 d.green = color.g; 727 d.green = color.g;
729 d.blue = color.b; 728 d.blue = color.b;
730 d.alpha = alpha; 729 d.alpha = alpha;
731 730
732 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 731 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
732 return true;
733 } 733 }
734#else 734#else
735 c.red = color.r; 735 c.red = color.r;
736 c.green = color.g; 736 c.green = color.g;
737 c.blue = color.b; 737 c.blue = color.b;
738 738
739 if (screen->visual->c_class == TrueColor) 739 if (screen->visual->c_class == TrueColor)
740 { 740 {
741 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask )) 741 c.pixel = (color.r >> (16 - ecb_popcount32 (screen->visual->red_mask )) << ecb_ctz32 (screen->visual->red_mask ))
742 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask)) 742 | (color.g >> (16 - ecb_popcount32 (screen->visual->green_mask)) << ecb_ctz32 (screen->visual->green_mask))
743 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask )); 743 | (color.b >> (16 - ecb_popcount32 (screen->visual->blue_mask )) << ecb_ctz32 (screen->visual->blue_mask ));
744 744
745 return true; 745 return true;
746 } 746 }
747 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 747 else if (XAllocColor (screen->dpy, screen->cmap, &c))
748 return true; 748 return true;
749 else 749#endif
750
750 c.pixel = (color.r + color.g + color.b) > 128*3 751 c.pixel = (color.r + color.g + color.b) > 128*3
751 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 752 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
752 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 753 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
753#endif
754 754
755 return false; 755 return false;
756} 756}
757 757
758bool 758bool
… …
913 913
914 incr_buf = 0; 914 incr_buf = 0;
915 incr_buf_size = incr_buf_fill = 0; 915 incr_buf_size = incr_buf_fill = 0;
916 selection_wait = Sel_normal; 916 selection_wait = Sel_normal;
917 selection_type = selnum; 917 selection_type = selnum;
918 cb_sv = 0;
918} 919}
919 920
920void 921void
921rxvt_selection::stop () 922rxvt_selection::stop ()
922{ 923{
… …
962} 963}
963 964
964void 965void
965rxvt_selection::finish (char *data, unsigned int len) 966rxvt_selection::finish (char *data, unsigned int len)
966{ 967{
967 if (term) 968 if (!cb_sv)
968 { 969 {
969 if (data) 970 if (data)
970 term->paste (data, len); 971 term->paste (data, len);
971 972
972 term->selection_req = 0; 973 term->selection_req = 0;
… …
1179 handle_selection (xev.xproperty.window, xev.xproperty.atom, true); 1180 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1180 break; 1181 break;
1181 1182
1182 case SelectionNotify: 1183 case SelectionNotify:
1183 if (selection_wait == Sel_normal 1184 if (selection_wait == Sel_normal
1184 && xev.xselection.time == request_time 1185 && xev.xselection.time == request_time)
1185 && xev.xselection.property == request_prop)
1186 { 1186 {
1187 timer_ev.stop (); 1187 timer_ev.stop ();
1188 handle_selection (xev.xselection.requestor, xev.xselection.property, true); 1188 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1189 } 1189 }
1190 break; 1190 break;

Diff Legend

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