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.139 by sf-exg, Sun Oct 14 13:43:25 2012 UTC

… …
66#endif 66#endif
67#if USE_XIM 67#if USE_XIM
68 "WM_LOCALE_NAME", 68 "WM_LOCALE_NAME",
69 "XIM_SERVERS", 69 "XIM_SERVERS",
70#endif 70#endif
71#ifdef ENABLE_TRANSPARENCY 71#if ENABLE_TRANSPARENCY || ENABLE_PERL
72 "_XROOTPMAP_ID", 72 "_XROOTPMAP_ID",
73 "ESETROOT_PMAP_ID", 73 "ESETROOT_PMAP_ID",
74#endif 74#endif
75#if ENABLE_XEMBED 75#if ENABLE_XEMBED
76 "_XEMBED", 76 "_XEMBED",
… …
153 put (*this->begin ()); 153 put (*this->begin ());
154} 154}
155 155
156///////////////////////////////////////////////////////////////////////////// 156/////////////////////////////////////////////////////////////////////////////
157 157
158#ifdef USE_XIM 158#if USE_XIM
159 159
160static void 160static void
161#if XIMCB_PROTO_BROKEN 161#if XIMCB_PROTO_BROKEN
162im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) 162im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3)
163#else 163#else
… …
260 depth = DefaultDepthOfScreen (screen); 260 depth = DefaultDepthOfScreen (screen);
261 visual = DefaultVisualOfScreen (screen); 261 visual = DefaultVisualOfScreen (screen);
262 cmap = DefaultColormapOfScreen (screen); 262 cmap = DefaultColormapOfScreen (screen);
263} 263}
264 264
265#if ENABLE_FRILLS
266
265void 267void
266rxvt_screen::select_visual (int bitdepth) 268rxvt_screen::select_visual (int id)
267{ 269{
268#if XFT
269 XVisualInfo vinfo; 270 XVisualInfo vinfo;
271 vinfo.visualid = id;
272 int n;
273
274 if (XVisualInfo *vi = XGetVisualInfo (dpy, VisualIDMask, &vinfo, &n))
275 {
276 depth = vi->depth;
277 visual = vi->visual;
278
279 XFree (vi);
280
281 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
282 }
283 else
284 rxvt_warn ("cannot requested visual id 0x%02x, using default visual.\n", id);
285}
286
287void
288rxvt_screen::select_depth (int bitdepth)
289{
290 XVisualInfo vinfo;
270 291
271 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 292 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
272 {
273 depth = bitdepth;
274 visual = vinfo.visual; 293 select_visual (vinfo.visualid);
275 cmap = XCreateColormap (dpy, display->root, visual, AllocNone); 294 else
276 } 295 rxvt_warn ("no visual found for requested depth %d, using default visual.\n", bitdepth);
277#endif
278} 296}
297
298#endif
279 299
280void 300void
281rxvt_screen::clear () 301rxvt_screen::clear ()
282{ 302{
283#if XFT 303#if XFT
… …
430bool rxvt_display::ref_init () 450bool rxvt_display::ref_init ()
431{ 451{
432#ifdef LOCAL_X_IS_UNIX 452#ifdef LOCAL_X_IS_UNIX
433 if (id[0] == ':') 453 if (id[0] == ':')
434 { 454 {
435 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1))) 455 char *val = rxvt_temp_buf<char> (5 + strlen (id) + 1);
436 return false; 456
437 strcpy (val, "unix/"); 457 strcpy (val, "unix/");
438 strcat (val, id); 458 strcat (val, id);
459
439 dpy = XOpenDisplay (val); 460 dpy = XOpenDisplay (val);
440 } 461 }
441 else 462 else
442#endif 463#endif
443 dpy = 0; 464 dpy = 0;
… …
465 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ', 486 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
466 &blackcolour, &blackcolour); 487 &blackcolour, &blackcolour);
467 XUnloadFont (dpy, f); 488 XUnloadFont (dpy, f);
468#endif 489#endif
469 490
491 flags = 0;
492#if XRENDER
493 int major, minor;
494 if (XRenderQueryVersion (dpy, &major, &minor))
495 if (major > 0 || (major == 0 && minor >= 10))
496 {
497 flags |= DISPLAY_HAS_RENDER;
498
499#if 0
500 if (major > 0 || (major == 0 && minor >= 11))
501 flags |= DISPLAY_HAS_RENDER_MUL;
502#endif
503
504 if (XFilters *filters = XRenderQueryFilters (dpy, root))
505 {
506 for (int i = 0; i < filters->nfilter; i++)
507 if (!strcmp (filters->filter [i], FilterConvolution))
508 flags |= DISPLAY_HAS_RENDER_CONV;
509
510 XFree (filters);
511 }
512 }
513#endif
514
470 int fd = XConnectionNumber (dpy); 515 int fd = XConnectionNumber (dpy);
471 516
472 // try to detect whether we have a local connection. 517 // try to detect whether we have a local connection.
473 // assume unix domain socket == local, everything else not 518 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 519 // TODO: might want to check for inet/127.0.0.1
… …
511#ifdef POINTER_BLANK 556#ifdef POINTER_BLANK
512 XFreeCursor (dpy, blank_cursor); 557 XFreeCursor (dpy, blank_cursor);
513#endif 558#endif
514 x_ev.stop (); 559 x_ev.stop ();
515 flush_ev.stop (); 560 flush_ev.stop ();
516#ifdef USE_XIM 561#if USE_XIM
517 xims.clear (); 562 xims.clear ();
518#endif 563#endif
519 XrmDestroyDatabase (XrmGetDatabase (dpy)); 564 XrmDestroyDatabase (XrmGetDatabase (dpy));
520 XCloseDisplay (dpy); 565 XCloseDisplay (dpy);
521} 566}
522 567
523#ifdef USE_XIM 568#if USE_XIM
524void rxvt_display::im_change_cb () 569void rxvt_display::im_change_cb ()
525{ 570{
526 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 571 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
527 (*i)->call (); 572 (*i)->call ();
528} 573}
… …
564 do 609 do
565 { 610 {
566 XEvent xev; 611 XEvent xev;
567 XNextEvent (dpy, &xev); 612 XNextEvent (dpy, &xev);
568 613
569#ifdef USE_XIM 614#if USE_XIM
570 if (!XFilterEvent (&xev, None)) 615 if (!XFilterEvent (&xev, None))
571 { 616 {
572 if (xev.type == PropertyNotify 617 if (xev.type == PropertyNotify
573 && xev.xany.window == root 618 && xev.xany.window == root
574 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 619 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
… …
582 if (!xw[i]) 627 if (!xw[i])
583 xw.erase_unordered (i); 628 xw.erase_unordered (i);
584 else if (xw[i]->window == xev.xany.window) 629 else if (xw[i]->window == xev.xany.window)
585 xw[i]->call (xev); 630 xw[i]->call (xev);
586 } 631 }
587#ifdef USE_XIM 632#if USE_XIM
588 } 633 }
589#endif 634#endif
590 } 635 }
591 while (XEventsQueued (dpy, QueuedAlready)); 636 while (XEventsQueued (dpy, QueuedAlready));
592 637
… …
623 } 668 }
624 669
625 cur_owner = owner; 670 cur_owner = owner;
626} 671}
627 672
628#ifdef USE_XIM 673#if USE_XIM
629 674
630void rxvt_display::reg (im_watcher *w) 675void rxvt_display::reg (im_watcher *w)
631{ 676{
632 imw.push_back (w); 677 imw.push_back (w);
633} 678}
… …
668Atom rxvt_display::atom (const char *name) 713Atom rxvt_display::atom (const char *name)
669{ 714{
670 return XInternAtom (dpy, name, False); 715 return XInternAtom (dpy, name, False);
671} 716}
672 717
718Pixmap
719rxvt_display::get_pixmap_property (Atom property)
720{
721 Pixmap pixmap = None;
722
723 int aformat;
724 unsigned long nitems, bytes_after;
725 Atom atype;
726 unsigned char *prop;
727 int result = XGetWindowProperty (dpy, root, property,
728 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
729 &nitems, &bytes_after, &prop);
730 if (result == Success)
731 {
732 if (atype == XA_PIXMAP)
733 pixmap = *(Pixmap *)prop;
734 XFree (prop);
735 }
736
737 return pixmap;
738}
739
673///////////////////////////////////////////////////////////////////////////// 740/////////////////////////////////////////////////////////////////////////////
674 741
675template class refcache<rxvt_display>; 742template class refcache<rxvt_display>;
676refcache<rxvt_display> displays; 743refcache<rxvt_display> displays;
677 744
… …
686 753
687bool 754bool
688rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 755rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
689{ 756{
690 //TODO: only supports 24 bit 757 //TODO: only supports 24 bit
691 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 758 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
692 759
693#if XFT 760#if XFT
694 XRenderPictFormat *format; 761 XRenderPictFormat *format;
695 762
696 // FUCKING Xft gets it wrong, of course, so work around it. 763 // FUCKING Xft gets it wrong, of course, so work around it.
… …
725 d.red = color.r; 792 d.red = color.r;
726 d.green = color.g; 793 d.green = color.g;
727 d.blue = color.b; 794 d.blue = color.b;
728 d.alpha = alpha; 795 d.alpha = alpha;
729 796
730 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 797 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
798 return true;
731 } 799 }
732#else 800#else
733 c.red = color.r; 801 c.red = color.r;
734 c.green = color.g; 802 c.green = color.g;
735 c.blue = color.b; 803 c.blue = color.b;
… …
742 810
743 return true; 811 return true;
744 } 812 }
745 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 813 else if (XAllocColor (screen->dpy, screen->cmap, &c))
746 return true; 814 return true;
747 else 815#endif
816
748 c.pixel = (color.r + color.g + color.b) > 128*3 817 c.pixel = (color.r + color.g + color.b) > 128*3
749 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 818 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
750 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 819 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
751#endif
752 820
753 return false; 821 return false;
754} 822}
755 823
756bool 824bool
… …
841 909
842 return got; 910 return got;
843} 911}
844 912
845void 913void
846rxvt_color::get (rgba &color) 914rxvt_color::get (rgba &color) const
847{ 915{
848#if XFT 916#if XFT
849 color.r = c.color.red; 917 color.r = c.color.red;
850 color.g = c.color.green; 918 color.g = c.color.green;
851 color.b = c.color.blue; 919 color.b = c.color.blue;
… …
857 color.a = rgba::MAX_CC; 925 color.a = rgba::MAX_CC;
858#endif 926#endif
859} 927}
860 928
861void 929void
862rxvt_color::get (XColor &color) 930rxvt_color::get (XColor &color) const
863{ 931{
864 rgba c; 932 rgba c;
865 get (c); 933 get (c);
866 934
867 color.red = c.r; 935 color.red = c.r;
… …
911 979
912 incr_buf = 0; 980 incr_buf = 0;
913 incr_buf_size = incr_buf_fill = 0; 981 incr_buf_size = incr_buf_fill = 0;
914 selection_wait = Sel_normal; 982 selection_wait = Sel_normal;
915 selection_type = selnum; 983 selection_type = selnum;
984 cb_sv = 0;
916} 985}
917 986
918void 987void
919rxvt_selection::stop () 988rxvt_selection::stop ()
920{ 989{
… …
960} 1029}
961 1030
962void 1031void
963rxvt_selection::finish (char *data, unsigned int len) 1032rxvt_selection::finish (char *data, unsigned int len)
964{ 1033{
965 if (term) 1034 if (!cb_sv)
966 { 1035 {
967 if (data) 1036 if (data)
968 term->paste (data, len); 1037 term->paste (data, len);
969 1038
970 term->selection_req = 0; 1039 term->selection_req = 0;

Diff Legend

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