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.87 by root, Mon Dec 24 08:21:39 2007 UTC vs.
Revision 1.97 by root, Sat Jan 26 12:15:11 2008 UTC

… …
550 XEvent xev; 550 XEvent xev;
551 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
552 552
553#ifdef USE_XIM 553#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 554 if (!XFilterEvent (&xev, None))
555#endif
555 { 556 {
556 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
557 && xev.xany.window == root 558 && xev.xany.window == root
558 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 559 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
559 im_change_check (); 560 im_change_check ();
560#endif 561
561 if (xev.type == MappingNotify) 562 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping); 563 XRefreshKeyboardMapping (&xev.xmapping);
563 564
564 for (int i = xw.size (); i--; ) 565 for (int i = xw.size (); i--; )
565 { 566 {
566 if (!xw[i]) 567 if (!xw[i])
567 xw.erase_unordered (i); 568 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 569 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 570 xw[i]->call (xev);
570 } 571 }
571#ifdef USE_XIM
572 } 572 }
573#endif
574 } 573 }
575} 574}
576 575
577void rxvt_display::flush_cb (ev::prepare &w, int revents) 576void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{ 577{
578 while (XEventsQueued (dpy, QueuedAfterFlush))
579 {
580 x_cb(x_ev,0);//D
581 }
582
579 w.stop (); 583 w.stop ();
580 XFlush (dpy);
581} 584}
582 585
583void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
584{ 587{
585 if (!w->active) 588 if (!w->active)
… …
673} 676}
674 677
675bool 678bool
676rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 679rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
677{ 680{
681 //TODO: only supports 24 bit
682 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
683
678#if XFT 684#if XFT
679 XRenderPictFormat *format; 685 XRenderPictFormat *format;
680 686
681 // FUCKING Xft gets it wrong, of course, so work around it. 687 // FUCKING Xft gets it wrong, of course, so work around it.
682 // Transparency users should eat shit and die, and then 688 // Transparency users should eat shit and die, and then
… …
686 { 692 {
687 // the fun lies in doing everything manually... 693 // the fun lies in doing everything manually...
688 c.color.red = color.r; 694 c.color.red = color.r;
689 c.color.green = color.g; 695 c.color.green = color.g;
690 c.color.blue = color.b; 696 c.color.blue = color.b;
691 c.color.alpha = color.a; 697 c.color.alpha = alpha;
692 698
693 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 699 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
694 | insert_component (color.g, format->direct.greenMask, format->direct.green) 700 | insert_component (color.g, format->direct.greenMask, format->direct.green)
695 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 701 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
696 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 702 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
697 703
698 return true; 704 return true;
699 } 705 }
700 else 706 else
701 { 707 {
702 XRenderColor d; 708 XRenderColor d;
703 709
704 d.red = color.r; 710 d.red = color.r;
705 d.green = color.g; 711 d.green = color.g;
706 d.blue = color.b; 712 d.blue = color.b;
707 d.alpha = color.a; 713 d.alpha = alpha;
708 714
709 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 715 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
710 } 716 }
711#else 717#else
712 c.red = color.r; 718 c.red = color.r;
… …
737{ 743{
738 rgba c; 744 rgba c;
739 char eos; 745 char eos;
740 int skip; 746 int skip;
741 747
748 c.a = rgba::MAX_CC;
749
742 // parse the nonstandard "[alphapercent]" prefix 750 // parse the nonstandard "[alphapercent]" prefix
743 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 751 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
744 { 752 {
745 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 753 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
746 name += skip; 754 name += skip;
747 } 755 }
748 else
749 c.a = rgba::MAX_CC;
750 756
751 // parse the non-standard "#aarrggbb" format
752 if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
753 {
754 if (c.r)
755 c.r = (c.r << 8) | 0x0ff;
756 if (c.g)
757 c.g = (c.g << 8) | 0x0ff;
758 if (c.b)
759 c.b = (c.b << 8) | 0x0ff;
760 if (c.a)
761 c.a = (c.a << 8) | 0x0ff;
762 }
763 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 757 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
764 else if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 758 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
765 { 759 {
766 XColor xc; 760 XColor xc;
767 761
768 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 762 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
769 { 763 {

Diff Legend

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