| … | |
… | |
| 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 | |
| 577 | void rxvt_display::flush_cb (ev::prepare &w, int revents) |
576 | void rxvt_display::flush_cb (ev::prepare &w, int revents) |
| 578 | { |
577 | { |
| … | |
… | |
| 673 | } |
672 | } |
| 674 | |
673 | |
| 675 | bool |
674 | bool |
| 676 | rxvt_color::alloc (rxvt_screen *screen, const rgba &color) |
675 | rxvt_color::alloc (rxvt_screen *screen, const rgba &color) |
| 677 | { |
676 | { |
|
|
677 | //TODO: only supports 24 bit |
|
|
678 | int alpha = color.a >= 0xff00 ? 0xffff : color.a; |
|
|
679 | |
| 678 | #if XFT |
680 | #if XFT |
| 679 | XRenderPictFormat *format; |
681 | XRenderPictFormat *format; |
| 680 | |
682 | |
| 681 | // FUCKING Xft gets it wrong, of course, so work around it. |
683 | // FUCKING Xft gets it wrong, of course, so work around it. |
| 682 | // Transparency users should eat shit and die, and then |
684 | // Transparency users should eat shit and die, and then |
| … | |
… | |
| 686 | { |
688 | { |
| 687 | // the fun lies in doing everything manually... |
689 | // the fun lies in doing everything manually... |
| 688 | c.color.red = color.r; |
690 | c.color.red = color.r; |
| 689 | c.color.green = color.g; |
691 | c.color.green = color.g; |
| 690 | c.color.blue = color.b; |
692 | c.color.blue = color.b; |
| 691 | c.color.alpha = color.a; |
693 | c.color.alpha = alpha; |
| 692 | |
694 | |
| 693 | c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) |
695 | c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) |
| 694 | | insert_component (color.g, format->direct.greenMask, format->direct.green) |
696 | | insert_component (color.g, format->direct.greenMask, format->direct.green) |
| 695 | | insert_component (color.b, format->direct.blueMask , format->direct.blue ) |
697 | | insert_component (color.b, format->direct.blueMask , format->direct.blue ) |
| 696 | | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); |
698 | | insert_component (alpha , format->direct.alphaMask, format->direct.alpha); |
| 697 | |
699 | |
| 698 | return true; |
700 | return true; |
| 699 | } |
701 | } |
| 700 | else |
702 | else |
| 701 | { |
703 | { |
| 702 | XRenderColor d; |
704 | XRenderColor d; |
| 703 | |
705 | |
| 704 | d.red = color.r; |
706 | d.red = color.r; |
| 705 | d.green = color.g; |
707 | d.green = color.g; |
| 706 | d.blue = color.b; |
708 | d.blue = color.b; |
| 707 | d.alpha = color.a; |
709 | d.alpha = alpha; |
| 708 | |
710 | |
| 709 | return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); |
711 | return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); |
| 710 | } |
712 | } |
| 711 | #else |
713 | #else |
| 712 | c.red = color.r; |
714 | c.red = color.r; |
| … | |
… | |
| 737 | { |
739 | { |
| 738 | rgba c; |
740 | rgba c; |
| 739 | char eos; |
741 | char eos; |
| 740 | int skip; |
742 | int skip; |
| 741 | |
743 | |
|
|
744 | c.a = rgba::MAX_CC; |
|
|
745 | |
| 742 | // parse the nonstandard "[alphapercent]" prefix |
746 | // parse the nonstandard "[alphapercent]" prefix |
| 743 | if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) |
747 | if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) |
| 744 | { |
748 | { |
| 745 | c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); |
749 | c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); |
| 746 | name += skip; |
750 | name += skip; |
| 747 | } |
751 | } |
| 748 | else |
|
|
| 749 | c.a = rgba::MAX_CC; |
|
|
| 750 | |
752 | |
| 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 |
753 | // 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)) |
754 | 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 | { |
755 | { |
| 766 | XColor xc; |
756 | XColor xc; |
| 767 | |
757 | |
| 768 | if (XParseColor (screen->dpy, screen->cmap, name, &xc)) |
758 | if (XParseColor (screen->dpy, screen->cmap, name, &xc)) |
| 769 | { |
759 | { |
