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.144 by sf-exg, Sun Nov 2 15:52:39 2014 UTC

… …
6 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 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 3 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 HAVE_IMG || 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 ("no visual found for requested 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 >= 11))
496 {
497 flags |= DISPLAY_HAS_RENDER;
498
499 if (XFilters *filters = XRenderQueryFilters (dpy, root))
500 {
501 for (int i = 0; i < filters->nfilter; i++)
502 if (!strcmp (filters->filter [i], FilterConvolution))
503 flags |= DISPLAY_HAS_RENDER_CONV;
504
505 XFree (filters);
506 }
507 }
508#endif
509
470 int fd = XConnectionNumber (dpy); 510 int fd = XConnectionNumber (dpy);
471 511
472 // try to detect whether we have a local connection. 512 // try to detect whether we have a local connection.
473 // assume unix domain socket == local, everything else not 513 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 514 // TODO: might want to check for inet/127.0.0.1
… …
511#ifdef POINTER_BLANK 551#ifdef POINTER_BLANK
512 XFreeCursor (dpy, blank_cursor); 552 XFreeCursor (dpy, blank_cursor);
513#endif 553#endif
514 x_ev.stop (); 554 x_ev.stop ();
515 flush_ev.stop (); 555 flush_ev.stop ();
516#ifdef USE_XIM 556#if USE_XIM
517 xims.clear (); 557 xims.clear ();
518#endif 558#endif
519 XrmDestroyDatabase (XrmGetDatabase (dpy)); 559 XrmDestroyDatabase (XrmGetDatabase (dpy));
520 XCloseDisplay (dpy); 560 XCloseDisplay (dpy);
521} 561}
522 562
523#ifdef USE_XIM 563#if USE_XIM
524void rxvt_display::im_change_cb () 564void rxvt_display::im_change_cb ()
525{ 565{
526 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 566 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
527 (*i)->call (); 567 (*i)->call ();
528} 568}
… …
564 do 604 do
565 { 605 {
566 XEvent xev; 606 XEvent xev;
567 XNextEvent (dpy, &xev); 607 XNextEvent (dpy, &xev);
568 608
569#ifdef USE_XIM 609#if USE_XIM
570 if (!XFilterEvent (&xev, None)) 610 if (!XFilterEvent (&xev, None))
571 { 611 {
572 if (xev.type == PropertyNotify 612 if (xev.type == PropertyNotify
573 && xev.xany.window == root 613 && xev.xany.window == root
574 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 614 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
… …
582 if (!xw[i]) 622 if (!xw[i])
583 xw.erase_unordered (i); 623 xw.erase_unordered (i);
584 else if (xw[i]->window == xev.xany.window) 624 else if (xw[i]->window == xev.xany.window)
585 xw[i]->call (xev); 625 xw[i]->call (xev);
586 } 626 }
587#ifdef USE_XIM 627#if USE_XIM
588 } 628 }
589#endif 629#endif
590 } 630 }
591 while (XEventsQueued (dpy, QueuedAlready)); 631 while (XEventsQueued (dpy, QueuedAlready));
592 632
… …
623 } 663 }
624 664
625 cur_owner = owner; 665 cur_owner = owner;
626} 666}
627 667
628#ifdef USE_XIM 668#if USE_XIM
629 669
630void rxvt_display::reg (im_watcher *w) 670void rxvt_display::reg (im_watcher *w)
631{ 671{
632 imw.push_back (w); 672 imw.push_back (w);
633} 673}
… …
668Atom rxvt_display::atom (const char *name) 708Atom rxvt_display::atom (const char *name)
669{ 709{
670 return XInternAtom (dpy, name, False); 710 return XInternAtom (dpy, name, False);
671} 711}
672 712
713Pixmap
714rxvt_display::get_pixmap_property (Atom property)
715{
716 Pixmap pixmap = None;
717
718 int aformat;
719 unsigned long nitems, bytes_after;
720 Atom atype;
721 unsigned char *prop;
722 int result = XGetWindowProperty (dpy, root, property,
723 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
724 &nitems, &bytes_after, &prop);
725 if (result == Success)
726 {
727 if (atype == XA_PIXMAP)
728 pixmap = *(Pixmap *)prop;
729 XFree (prop);
730 }
731
732 return pixmap;
733}
734
673///////////////////////////////////////////////////////////////////////////// 735/////////////////////////////////////////////////////////////////////////////
674 736
675template class refcache<rxvt_display>; 737template class refcache<rxvt_display>;
676refcache<rxvt_display> displays; 738refcache<rxvt_display> displays;
677 739
… …
686 748
687bool 749bool
688rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 750rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
689{ 751{
690 //TODO: only supports 24 bit 752 //TODO: only supports 24 bit
691 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 753 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
692 754
693#if XFT 755#if XFT
694 XRenderPictFormat *format; 756 XRenderPictFormat *format;
695 757
696 // FUCKING Xft gets it wrong, of course, so work around it. 758 // FUCKING Xft gets it wrong, of course, so work around it.
… …
725 d.red = color.r; 787 d.red = color.r;
726 d.green = color.g; 788 d.green = color.g;
727 d.blue = color.b; 789 d.blue = color.b;
728 d.alpha = alpha; 790 d.alpha = alpha;
729 791
730 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 792 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
793 return true;
731 } 794 }
732#else 795#else
733 c.red = color.r; 796 c.red = color.r;
734 c.green = color.g; 797 c.green = color.g;
735 c.blue = color.b; 798 c.blue = color.b;
… …
742 805
743 return true; 806 return true;
744 } 807 }
745 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 808 else if (XAllocColor (screen->dpy, screen->cmap, &c))
746 return true; 809 return true;
747 else 810#endif
811
748 c.pixel = (color.r + color.g + color.b) > 128*3 812 c.pixel = (color.r + color.g + color.b) > 128*3
749 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 813 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
750 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 814 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
751#endif
752 815
753 return false; 816 return false;
754} 817}
755 818
756bool 819bool
… …
841 904
842 return got; 905 return got;
843} 906}
844 907
845void 908void
846rxvt_color::get (rgba &color) 909rxvt_color::get (rgba &color) const
847{ 910{
848#if XFT 911#if XFT
849 color.r = c.color.red; 912 color.r = c.color.red;
850 color.g = c.color.green; 913 color.g = c.color.green;
851 color.b = c.color.blue; 914 color.b = c.color.blue;
… …
857 color.a = rgba::MAX_CC; 920 color.a = rgba::MAX_CC;
858#endif 921#endif
859} 922}
860 923
861void 924void
862rxvt_color::get (XColor &color) 925rxvt_color::get (XColor &color) const
863{ 926{
864 rgba c; 927 rgba c;
865 get (c); 928 get (c);
866 929
867 color.red = c.r; 930 color.red = c.r;
… …
911 974
912 incr_buf = 0; 975 incr_buf = 0;
913 incr_buf_size = incr_buf_fill = 0; 976 incr_buf_size = incr_buf_fill = 0;
914 selection_wait = Sel_normal; 977 selection_wait = Sel_normal;
915 selection_type = selnum; 978 selection_type = selnum;
979 cb_sv = 0;
916} 980}
917 981
918void 982void
919rxvt_selection::stop () 983rxvt_selection::stop ()
920{ 984{
… …
960} 1024}
961 1025
962void 1026void
963rxvt_selection::finish (char *data, unsigned int len) 1027rxvt_selection::finish (char *data, unsigned int len)
964{ 1028{
965 if (term) 1029 if (!cb_sv)
966 { 1030 {
967 if (data) 1031 if (data)
968 term->paste (data, len); 1032 term->paste (data, len);
969 1033
970 term->selection_req = 0; 1034 term->selection_req = 0;

Diff Legend

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