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.125 by root, Wed May 11 18:41:33 2011 UTC vs.
Revision 1.132 by sf-exg, Sun Jun 3 15:50:22 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
… …
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.
… …
725 d.red = color.r; 748 d.red = color.r;
726 d.green = color.g; 749 d.green = color.g;
727 d.blue = color.b; 750 d.blue = color.b;
728 d.alpha = alpha; 751 d.alpha = alpha;
729 752
730 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 753 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
754 return true;
731 } 755 }
732#else 756#else
733 c.red = color.r; 757 c.red = color.r;
734 c.green = color.g; 758 c.green = color.g;
735 c.blue = color.b; 759 c.blue = color.b;
736 760
737 if (screen->visual->c_class == TrueColor) 761 if (screen->visual->c_class == TrueColor)
738 { 762 {
739 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 ))
740 | (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))
741 | (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 ));
742 766
743 return true; 767 return true;
744 } 768 }
745 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 769 else if (XAllocColor (screen->dpy, screen->cmap, &c))
746 return true; 770 return true;
747 else 771#endif
772
748 c.pixel = (color.r + color.g + color.b) > 128*3 773 c.pixel = (color.r + color.g + color.b) > 128*3
749 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 774 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
750 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 775 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
751#endif
752 776
753 return false; 777 return false;
754} 778}
755 779
756bool 780bool
… …
911 935
912 incr_buf = 0; 936 incr_buf = 0;
913 incr_buf_size = incr_buf_fill = 0; 937 incr_buf_size = incr_buf_fill = 0;
914 selection_wait = Sel_normal; 938 selection_wait = Sel_normal;
915 selection_type = selnum; 939 selection_type = selnum;
940 cb_sv = 0;
916} 941}
917 942
918void 943void
919rxvt_selection::stop () 944rxvt_selection::stop ()
920{ 945{
… …
960} 985}
961 986
962void 987void
963rxvt_selection::finish (char *data, unsigned int len) 988rxvt_selection::finish (char *data, unsigned int len)
964{ 989{
965 if (term) 990 if (!cb_sv)
966 { 991 {
967 if (data) 992 if (data)
968 term->paste (data, len); 993 term->paste (data, len);
969 994
970 term->selection_req = 0; 995 term->selection_req = 0;
… …
1177 handle_selection (xev.xproperty.window, xev.xproperty.atom, true); 1202 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1178 break; 1203 break;
1179 1204
1180 case SelectionNotify: 1205 case SelectionNotify:
1181 if (selection_wait == Sel_normal 1206 if (selection_wait == Sel_normal
1182 && xev.xselection.time == request_time 1207 && xev.xselection.time == request_time)
1183 && xev.xselection.property == request_prop)
1184 { 1208 {
1185 timer_ev.stop (); 1209 timer_ev.stop ();
1186 handle_selection (xev.xselection.requestor, xev.xselection.property, true); 1210 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1187 } 1211 }
1188 break; 1212 break;

Diff Legend

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