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.88 by root, Wed Jan 23 09:14:58 2008 UTC vs.
Revision 1.91 by root, Sat Jan 26 10:03:35 2008 UTC

548 while (XEventsQueued (dpy, QueuedAfterReading)) 548 while (XEventsQueued (dpy, QueuedAfterReading))
549 { 549 {
550 XEvent xev; 550 XEvent xev;
551 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
552 552
553 flush_ev.start ();
554
553#ifdef USE_XIM 555#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 556 if (!XFilterEvent (&xev, None))
557#endif
555 { 558 {
556 if (xev.type == PropertyNotify 559 if (xev.type == PropertyNotify
557 && xev.xany.window == root 560 && xev.xany.window == root
558 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 561 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
559 im_change_check (); 562 im_change_check ();
560#endif
561 if (xev.type == MappingNotify) 563 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping); 564 XRefreshKeyboardMapping (&xev.xmapping);
563 565
564 for (int i = xw.size (); i--; ) 566 for (int i = xw.size (); i--; )
565 { 567 {
566 if (!xw[i]) 568 if (!xw[i])
567 xw.erase_unordered (i); 569 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 570 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 571 xw[i]->call (xev);
570 } 572 }
571#ifdef USE_XIM
572 } 573 }
573#endif
574 } 574 }
575} 575}
576 576
577void rxvt_display::flush_cb (ev::prepare &w, int revents) 577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{ 578{
673} 673}
674 674
675bool 675bool
676rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 676rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
677{ 677{
678 //TODO: only supports 24 bit truecolour 678 //TODO: only supports 24 bit
679 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 679 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
680 680
681#if XFT 681#if XFT
682 XRenderPictFormat *format; 682 XRenderPictFormat *format;
683 683
740{ 740{
741 rgba c; 741 rgba c;
742 char eos; 742 char eos;
743 int skip; 743 int skip;
744 744
745 c.a = rgba::MAX_CC;
746
745 // parse the nonstandard "[alphapercent]" prefix 747 // parse the nonstandard "[alphapercent]" prefix
746 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 748 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
747 { 749 {
748 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 750 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
749 name += skip; 751 name += skip;
750 } 752 }
751 else
752 c.a = rgba::MAX_CC;
753 753
754 // parse the non-standard "#aarrggbb" format
755 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))
756 {
757 c.r <<= 8;
758 c.g <<= 8;
759 c.b <<= 8;
760 c.a <<= 8;
761 }
762 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 754 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
763 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)) 755 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
764 { 756 {
765 XColor xc; 757 XColor xc;
766 758
767 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 759 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
768 { 760 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines