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.135 by root, Tue Jun 5 13:39:26 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
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
… …
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;
… …
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 >= 10))
479 flags |= DISPLAY_HAS_RENDER_10;
480
481 if (major > 0 || (major == 0 && minor >= 11))
482 flags |= DISPLAY_HAS_RENDER_MUL;
483
484 XFilters *filters = XRenderQueryFilters (dpy, root);
485 if (filters)
486 {
487 for (int i = 0; i < filters->nfilter; i++)
488 if (!strcmp (filters->filter[i], FilterConvolution))
489 flags |= DISPLAY_HAS_RENDER_CONV;
490
491 XFree (filters);
492 }
493 }
494#endif
495
470 int fd = XConnectionNumber (dpy); 496 int fd = XConnectionNumber (dpy);
471 497
472 // try to detect whether we have a local connection. 498 // try to detect whether we have a local connection.
473 // assume unix domain socket == local, everything else not 499 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 500 // TODO: might want to check for inet/127.0.0.1
… …
511#ifdef POINTER_BLANK 537#ifdef POINTER_BLANK
512 XFreeCursor (dpy, blank_cursor); 538 XFreeCursor (dpy, blank_cursor);
513#endif 539#endif
514 x_ev.stop (); 540 x_ev.stop ();
515 flush_ev.stop (); 541 flush_ev.stop ();
516#ifdef USE_XIM 542#if USE_XIM
517 xims.clear (); 543 xims.clear ();
518#endif 544#endif
519 XrmDestroyDatabase (XrmGetDatabase (dpy)); 545 XrmDestroyDatabase (XrmGetDatabase (dpy));
520 XCloseDisplay (dpy); 546 XCloseDisplay (dpy);
521} 547}
522 548
523#ifdef USE_XIM 549#if USE_XIM
524void rxvt_display::im_change_cb () 550void rxvt_display::im_change_cb ()
525{ 551{
526 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 552 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
527 (*i)->call (); 553 (*i)->call ();
528} 554}
… …
564 do 590 do
565 { 591 {
566 XEvent xev; 592 XEvent xev;
567 XNextEvent (dpy, &xev); 593 XNextEvent (dpy, &xev);
568 594
569#ifdef USE_XIM 595#if USE_XIM
570 if (!XFilterEvent (&xev, None)) 596 if (!XFilterEvent (&xev, None))
571 { 597 {
572 if (xev.type == PropertyNotify 598 if (xev.type == PropertyNotify
573 && xev.xany.window == root 599 && xev.xany.window == root
574 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 600 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
… …
582 if (!xw[i]) 608 if (!xw[i])
583 xw.erase_unordered (i); 609 xw.erase_unordered (i);
584 else if (xw[i]->window == xev.xany.window) 610 else if (xw[i]->window == xev.xany.window)
585 xw[i]->call (xev); 611 xw[i]->call (xev);
586 } 612 }
587#ifdef USE_XIM 613#if USE_XIM
588 } 614 }
589#endif 615#endif
590 } 616 }
591 while (XEventsQueued (dpy, QueuedAlready)); 617 while (XEventsQueued (dpy, QueuedAlready));
592 618
… …
623 } 649 }
624 650
625 cur_owner = owner; 651 cur_owner = owner;
626} 652}
627 653
628#ifdef USE_XIM 654#if USE_XIM
629 655
630void rxvt_display::reg (im_watcher *w) 656void rxvt_display::reg (im_watcher *w)
631{ 657{
632 imw.push_back (w); 658 imw.push_back (w);
633} 659}
… …
668Atom rxvt_display::atom (const char *name) 694Atom rxvt_display::atom (const char *name)
669{ 695{
670 return XInternAtom (dpy, name, False); 696 return XInternAtom (dpy, name, False);
671} 697}
672 698
699Pixmap
700rxvt_display::get_pixmap_property (Atom property)
701{
702 Pixmap pixmap = None;
703
704 int aformat;
705 unsigned long nitems, bytes_after;
706 Atom atype;
707 unsigned char *prop;
708 int result = XGetWindowProperty (dpy, root, property,
709 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
710 &nitems, &bytes_after, &prop);
711 if (result == Success)
712 {
713 if (atype == XA_PIXMAP)
714 pixmap = *(Pixmap *)prop;
715 XFree (prop);
716 }
717
718 return pixmap;
719}
720
673///////////////////////////////////////////////////////////////////////////// 721/////////////////////////////////////////////////////////////////////////////
674 722
675template class refcache<rxvt_display>; 723template class refcache<rxvt_display>;
676refcache<rxvt_display> displays; 724refcache<rxvt_display> displays;
677 725
… …
686 734
687bool 735bool
688rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 736rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
689{ 737{
690 //TODO: only supports 24 bit 738 //TODO: only supports 24 bit
691 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 739 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
692 740
693#if XFT 741#if XFT
694 XRenderPictFormat *format; 742 XRenderPictFormat *format;
695 743
696 // FUCKING Xft gets it wrong, of course, so work around it. 744 // FUCKING Xft gets it wrong, of course, so work around it.
… …
725 d.red = color.r; 773 d.red = color.r;
726 d.green = color.g; 774 d.green = color.g;
727 d.blue = color.b; 775 d.blue = color.b;
728 d.alpha = alpha; 776 d.alpha = alpha;
729 777
730 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 778 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
779 return true;
731 } 780 }
732#else 781#else
733 c.red = color.r; 782 c.red = color.r;
734 c.green = color.g; 783 c.green = color.g;
735 c.blue = color.b; 784 c.blue = color.b;
… …
742 791
743 return true; 792 return true;
744 } 793 }
745 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 794 else if (XAllocColor (screen->dpy, screen->cmap, &c))
746 return true; 795 return true;
747 else 796#endif
797
748 c.pixel = (color.r + color.g + color.b) > 128*3 798 c.pixel = (color.r + color.g + color.b) > 128*3
749 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 799 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
750 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 800 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
751#endif
752 801
753 return false; 802 return false;
754} 803}
755 804
756bool 805bool
… …
911 960
912 incr_buf = 0; 961 incr_buf = 0;
913 incr_buf_size = incr_buf_fill = 0; 962 incr_buf_size = incr_buf_fill = 0;
914 selection_wait = Sel_normal; 963 selection_wait = Sel_normal;
915 selection_type = selnum; 964 selection_type = selnum;
965 cb_sv = 0;
916} 966}
917 967
918void 968void
919rxvt_selection::stop () 969rxvt_selection::stop ()
920{ 970{
… …
960} 1010}
961 1011
962void 1012void
963rxvt_selection::finish (char *data, unsigned int len) 1013rxvt_selection::finish (char *data, unsigned int len)
964{ 1014{
965 if (term) 1015 if (!cb_sv)
966 { 1016 {
967 if (data) 1017 if (data)
968 term->paste (data, len); 1018 term->paste (data, len);
969 1019
970 term->selection_req = 0; 1020 term->selection_req = 0;

Diff Legend

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