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.26 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.46 by root, Wed Feb 1 18:36:48 2006 UTC

… …
32#ifndef NO_SLOW_LINK_SUPPORT 32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 33# include <sys/socket.h>
34# include <sys/un.h> 34# include <sys/un.h>
35#endif 35#endif
36 36
37#if XFT
38# include <X11/extensions/Xrender.h>
39#endif
40
37const char *const xa_names[] = 41const char *const xa_names[] =
38 { 42{
39 "TEXT", 43 "TEXT",
40 "COMPOUND_TEXT", 44 "COMPOUND_TEXT",
41 "UTF8_STRING", 45 "UTF8_STRING",
42 "MULTIPLE", 46 "MULTIPLE",
43 "TARGETS", 47 "TARGETS",
44 "TIMESTAMP", 48 "TIMESTAMP",
45 "VT_SELECTION", 49 "VT_SELECTION",
46 "INCR", 50 "INCR",
47 "WM_PROTOCOLS", 51 "WM_PROTOCOLS",
48 "WM_DELETE_WINDOW", 52 "WM_DELETE_WINDOW",
49 "CLIPBOARD", 53 "CLIPBOARD",
54 "AVERAGE_WIDTH",
55 "WEIGHT_NAME",
56 "SLANT",
57 "CHARSET_REGISTRY",
58 "CHARSET_ENCODING",
50#if ENABLE_FRILLS 59#if ENABLE_FRILLS
51 "_MOTIF_WM_HINTS", 60 "_MOTIF_WM_HINTS",
52#endif 61#endif
53#if ENABLE_EWMH 62#if ENABLE_EWMH
54 "_NET_WM_PID", 63 "_NET_WM_PID",
55 "_NET_WM_NAME", 64 "_NET_WM_NAME",
56 "_NET_WM_ICON_NAME", 65 "_NET_WM_ICON_NAME",
57 "_NET_WM_PING", 66 "_NET_WM_PING",
58#endif 67#endif
59#if USE_XIM 68#if USE_XIM
60 "WM_LOCALE_NAME", 69 "WM_LOCALE_NAME",
61 "XIM_SERVERS", 70 "XIM_SERVERS",
62#endif 71#endif
63#ifdef TRANSPARENT 72#ifdef TRANSPARENT
64 "_XROOTPMAP_ID", 73 "_XROOTPMAP_ID",
65 "ESETROOT_PMAP_ID", 74 "ESETROOT_PMAP_ID",
66#endif 75#endif
67#if ENABLE_XEMBED 76#if ENABLE_XEMBED
68 "_XEMBED", 77 "_XEMBED",
69 "_XEMBED_INFO", 78 "_XEMBED_INFO",
79#endif
80#if !ENABLE_MINIMAL
81 "SCREEN_RESOURCES",
82 "XDCCC_LINEAR_RGB_CORRECTION",
83 "XDCCC_LINEAR_RGB_MATRICES",
84 "WM_COLORMAP_WINDOWS",
85 "WM_STATE",
86 "cursor",
87# if USE_XIM
88 "TRANSPORT",
89 "LOCALES",
90 "_XIM_PROTOCOL",
91 "_XIM_XCONNECT",
92 "_XIM_MOREDATA",
70#endif 93# endif
71 }; 94#endif
95};
72 96
73///////////////////////////////////////////////////////////////////////////// 97/////////////////////////////////////////////////////////////////////////////
74 98
75refcounted::refcounted (const char *id) 99refcounted::refcounted (const char *id)
76{ 100{
… …
181 205
182void 206void
183rxvt_screen::set (rxvt_display *disp) 207rxvt_screen::set (rxvt_display *disp)
184{ 208{
185 display = disp; 209 display = disp;
186
187 xdisp = disp->display; 210 xdisp = disp->display;
188 211
189 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 212 Screen *screen = ScreenOfDisplay (xdisp, disp->screen);
190 213
191 depth = DefaultDepthOfScreen (screen); 214 depth = DefaultDepthOfScreen (screen);
192 visual = DefaultVisualOfScreen (screen); 215 visual = DefaultVisualOfScreen (screen);
193 cmap = DefaultColormapOfScreen (screen); 216 cmap = DefaultColormapOfScreen (screen);
194} 217}
195 218
196void 219void
197rxvt_screen::set (rxvt_display *disp, int depth) 220rxvt_screen::set (rxvt_display *disp, int bitdepth)
198{ 221{
199 set (disp); 222 set (disp);
200 223
224#if XFT
201 XVisualInfo vinfo; 225 XVisualInfo vinfo;
202 226
203 if (XMatchVisualInfo (xdisp, display->screen, depth, TrueColor, &vinfo)) 227 if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo))
204 { 228 {
205 this->depth = depth; 229 depth = bitdepth;
206 this->visual = vinfo.visual; 230 visual = vinfo.visual;
207 this->cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); 231 cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone);
208 } 232 }
233#endif
209} 234}
210 235
211void 236void
212rxvt_screen::clear () 237rxvt_screen::clear ()
213{ 238{
… …
370 395
371void 396void
372rxvt_display::ref_next () 397rxvt_display::ref_next ()
373{ 398{
374 // TODO: somehow check wether the database files/resources changed 399 // TODO: somehow check wether the database files/resources changed
375 // before re-loading/parsing 400 // before affording re-loading/parsing
376 XrmDestroyDatabase (XrmGetDatabase (display)); 401 XrmDestroyDatabase (XrmGetDatabase (display));
377 XrmSetDatabase (display, get_resources ()); 402 XrmSetDatabase (display, get_resources ());
403 printf ("next\n");//D
378} 404}
379 405
380rxvt_display::~rxvt_display () 406rxvt_display::~rxvt_display ()
381{ 407{
382 if (!display) 408 if (!display)
… …
483 509
484 selection_owner = owner; 510 selection_owner = owner;
485} 511}
486 512
487#ifdef USE_XIM 513#ifdef USE_XIM
514
488void rxvt_display::reg (im_watcher *w) 515void rxvt_display::reg (im_watcher *w)
489{ 516{
490 imw.push_back (w); 517 imw.push_back (w);
491} 518}
492 519
… …
516 return xim; 543 return xim;
517} 544}
518 545
519void rxvt_display::put_xim (rxvt_xim *xim) 546void rxvt_display::put_xim (rxvt_xim *xim)
520{ 547{
521#if XLIB_IS_RACEFREE 548# if XLIB_IS_RACEFREE
522 xims.put (xim); 549 xims.put (xim);
523#endif 550# endif
524} 551}
552
525#endif 553#endif
526 554
527Atom rxvt_display::atom (const char *name) 555Atom rxvt_display::atom (const char *name)
528{ 556{
529 return XInternAtom (display, name, False); 557 return XInternAtom (display, name, False);
… …
533 561
534template class refcache<rxvt_display>; 562template class refcache<rxvt_display>;
535refcache<rxvt_display> displays; 563refcache<rxvt_display> displays;
536 564
537///////////////////////////////////////////////////////////////////////////// 565/////////////////////////////////////////////////////////////////////////////
538 566
539bool 567bool
540rxvt_color::set (rxvt_screen *screen, Pixel p) 568rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
541{ 569{
542#if XFT 570#if XFT
543 XColor xc; 571 XRenderPictFormat *format;
544 572
545 xc.pixel = p; 573 // FUCKING Xft gets it wrong, of course, so work around it
546 if (!XQueryColor (screen->xdisp, screen->cmap, &xc)) 574 // transparency users should eat shit and die, and then
547 return false; 575 // XRenderQueryPictIndexValues themselves plenty.
576 if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor)
577 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual)))
578 {
579 // the fun lies in doing everything manually...
580 c.color.red = color.r;
581 c.color.green = color.g;
582 c.color.blue = color.b;
583 c.color.alpha = color.a;
548 584
585 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red )
586 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green)
587 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue )
588 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha);
589
590 return true;
591 }
592 else
593 {
549 XRenderColor d; 594 XRenderColor d;
550 595
551 d.red = xc.red; 596 d.red = color.r;
552 d.green = xc.green; 597 d.green = color.g;
553 d.blue = xc.blue; 598 d.blue = color.b;
554 d.alpha = 0xffff; 599 d.alpha = color.a;
555 600
556 return 601 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c);
557 XftColorAllocValue (screen->xdisp, 602 }
558 screen->visual,
559 screen->cmap,
560 &d, &c);
561#else 603#else
562 this->p = p; 604 c.red = color.r;
563#endif 605 c.green = color.g;
606 c.blue = color.b;
564 607
608 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor)
609 {
610 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))
611 / rgba::MAX_CC) << ctz (screen->visual->red_mask )
612 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
613 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
614 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask ))
615 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
616
617 return true;
618 }
619 else if (XAllocColor (screen->xdisp, screen->cmap, &c))
565 return true; 620 return true;
621 else
622 c.pixel = (color.r + color.g + color.b) > 128*3
623 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp))
624 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp));
625#endif
626
627 return false;
566} 628}
567 629
568bool 630bool
569rxvt_color::set (rxvt_screen *screen, const char *name) 631rxvt_color::set (rxvt_screen *screen, const char *name)
570{ 632{
633 rgba c;
634 char eos;
635 int skip;
636
637 // parse the nonstandard "[alphapercent]" prefix
638 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
639 {
640 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
641 name += skip;
642 }
643 else
644 c.a = rgba::MAX_CC;
645
646 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
647 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
648 {
649 XColor xc, xc_exact;
650
651 if (XParseColor (screen->xdisp, screen->cmap, name, &xc))
652 {
653 c.r = xc.red;
654 c.g = xc.green;
655 c.b = xc.blue;
656 }
657 else
658 {
659 c.r = 0xffff;
660 c.g = 0x6969;
661 c.b = 0xb4b4;
662
663 rxvt_warn ("unable to parse color '%s', using pink instead.\n", name);
664 }
665 }
666
667 return set (screen, c);
668}
669
670bool
671rxvt_color::set (rxvt_screen *screen, const rgba &color)
672{
673 bool got = alloc (screen, color);
674
675#if !ENABLE_MINIMAL
676 int cmap_size = screen->visual->map_entries;
677
678 if (!got
679 && screen->visual->c_class == PseudoColor
680 && cmap_size < 4096)
681 {
682 XColor *colors = new XColor [screen->visual->map_entries];
683
684 for (int i = 0; i < cmap_size; i++)
685 colors [i].pixel = i;
686
687 // many kilobytes transfer per colour, but pseudocolor isn't worth
688 // many extra optimisations.
689 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size);
690
691 int diff = 0x7fffffffUL;
692 XColor *best = colors;
693
694 for (int i = 0; i < cmap_size; i++)
695 {
696 int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
697 + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
698 + (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
699
700 if (d < diff)
701 {
702 diff = d;
703 best = colors + i;
704 }
705 }
706
707 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
708 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
709
710 got = alloc (screen, rgba (best->red, best->green, best->blue));
711
712 delete colors;
713 }
714#endif
715
716 return got;
717}
718
719void
720rxvt_color::get (rgba &color)
721{
571#if XFT 722#if XFT
572 return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); 723 color.r = c.color.red;
724 color.g = c.color.green;
725 color.b = c.color.blue;
726 color.a = c.color.alpha;
573#else 727#else
574 XColor xc; 728 color.r = c.red;
575 729 color.g = c.green;
576 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 730 color.b = c.blue;
577 return set (screen, xc.red, xc.green, xc.blue); 731 color.a = rgba::MAX_CC;
578
579 return false;
580#endif 732#endif
581} 733}
582 734
583bool
584rxvt_color::set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb)
585{
586 XColor xc;
587
588 xc.red = cr;
589 xc.green = cg;
590 xc.blue = cb;
591 xc.flags = DoRed | DoGreen | DoBlue;
592
593 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
594 return set (screen, xc.pixel);
595
596 return false;
597}
598
599void 735void
600rxvt_color::get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb) 736rxvt_color::get (XColor &color)
601{ 737{
602#if XFT 738 rgba c;
603 cr = c.color.red; 739 get (c);
604 cg = c.color.green;
605 cb = c.color.blue;
606#else
607 XColor c;
608 740
609 c.pixel = p; 741 color.red = c.r;
610 XQueryColor (screen->xdisp, screen->cmap, &c); 742 color.green = c.g;
611 743 color.blue = c.b;
612 cr = c.red; 744 color.pixel = (Pixel)*this;
613 cg = c.green;
614 cb = c.blue;
615#endif
616} 745}
617 746
618void 747void
619rxvt_color::free (rxvt_screen *screen) 748rxvt_color::free (rxvt_screen *screen)
620{ 749{
621#if XFT 750#if XFT
622 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 751 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);
623#else 752#else
624 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); 753 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes);
625#endif 754#endif
626} 755}
627 756
628rxvt_color 757void
629rxvt_color::fade (rxvt_screen *screen, int percent) 758rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
630{ 759{
631 percent = 100 - percent; 760 rgba c;
761 get (c);
632 762
633 unsigned short cr, cg, cb; 763 result.set (
634 rxvt_color faded;
635
636 get (screen, cr, cg, cb);
637
638 faded.set (
639 screen, 764 screen,
640 cr * percent / 100, 765 rgba (
641 cg * percent / 100, 766 lerp (c.r, to.r, percent),
642 cb * percent / 100 767 lerp (c.g, to.g, percent),
768 lerp (c.b, to.b, percent),
769 lerp (c.a, to.a, percent)
770 )
643 ); 771 );
644
645 return faded;
646} 772}
647 773
648#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
649
650rxvt_color
651rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto)
652{
653 percent = 100 - percent;
654
655 unsigned short cr, cg, cb;
656 unsigned short fcr, fcg, fcb;
657 rxvt_color faded;
658
659 get (screen, cr, cg, cb);
660 fadeto.get (screen, fcr, fcg, fcb);
661
662 faded.set (
663 screen,
664 LERP (cr, fcr, percent),
665 LERP (cg, fcg, percent),
666 LERP (cb, fcb, percent)
667 );
668
669 return faded;
670}
671

Diff Legend

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