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.85 by root, Sun Dec 16 19:44:48 2007 UTC vs.
Revision 1.105 by sf-exg, Sat Jan 30 20:26:04 2010 UTC

… …
59#if ENABLE_EWMH 59#if ENABLE_EWMH
60 "_NET_WM_PID", 60 "_NET_WM_PID",
61 "_NET_WM_NAME", 61 "_NET_WM_NAME",
62 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
63 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
64#endif 65#endif
65#if USE_XIM 66#if USE_XIM
66 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 68 "XIM_SERVERS",
68#endif 69#endif
… …
296///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
297 298
298rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 300: refcounted (id)
300, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
301{ 303{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 306}
305 307
… …
425bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
426{ 428{
427#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
428 if (id[0] == ':') 430 if (id[0] == ':')
429 { 431 {
430 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
431 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
432 strcat (val, id); 435 strcat (val, id);
433 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
434 free (val);
435 } 437 }
436 else 438 else
437#endif 439#endif
438 dpy = 0; 440 dpy = 0;
439 441
… …
543} 545}
544#endif 546#endif
545 547
546void rxvt_display::x_cb (ev::io &w, int revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
547{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 555 while (XEventsQueued (dpy, QueuedAfterFlush))
556 do
549 { 557 {
550 XEvent xev; 558 XEvent xev;
551 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
552 560
553#ifdef USE_XIM 561#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
555 { 563 {
556 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
557 && xev.xany.window == root 565 && xev.xany.window == root
558 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
559 im_change_check (); 567 im_change_check ();
560#endif 568#endif
561 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
563 571
564 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
565 { 573 {
566 if (!xw[i]) 574 if (!xw[i])
567 xw.erase_unordered (i); 575 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 577 xw[i]->call (xev);
570 } 578 }
571#ifdef USE_XIM 579#ifdef USE_XIM
572 } 580 }
573#endif 581#endif
574 } 582 }
575} 583 while (XEventsQueued (dpy, QueuedAlready));
576 584
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 w.stop (); 585 w.stop ();
580 XFlush (dpy);
581} 586}
582 587
583void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
584{ 589{
585 if (!w->active) 590 if (!w->active)
… …
596 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
597 w->active = 0; 602 w->active = 0;
598 } 603 }
599} 604}
600 605
601void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
602{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
603 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
611 {
604 selection_owner->selection_clear (); 612 cur_owner->selection_clear (clipboard);
613 cur_owner->flush ();
614 }
605 615
606 selection_owner = owner; 616 cur_owner = owner;
607} 617}
608 618
609#ifdef USE_XIM 619#ifdef USE_XIM
610 620
611void rxvt_display::reg (im_watcher *w) 621void rxvt_display::reg (im_watcher *w)
… …
624 int l, m; 634 int l, m;
625 635
626 l = strlen (locale); 636 l = strlen (locale);
627 m = strlen (modifiers); 637 m = strlen (modifiers);
628 638
629 if (!(id = (char *)malloc (l + m + 2))) 639 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
630 return 0; 640 return 0;
631 641
632 memcpy (id, locale, l); id[l] = '\n'; 642 memcpy (id, locale, l); id[l] = '\n';
633 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 643 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
634 644
635 rxvt_xim *xim = xims.get (id); 645 rxvt_xim *xim = xims.get (id);
636
637 free (id);
638 646
639 return xim; 647 return xim;
640} 648}
641 649
642void rxvt_display::put_xim (rxvt_xim *xim) 650void rxvt_display::put_xim (rxvt_xim *xim)
… …
668} 676}
669 677
670bool 678bool
671rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 679rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
672{ 680{
681 //TODO: only supports 24 bit
682 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
683
673#if XFT 684#if XFT
674 XRenderPictFormat *format; 685 XRenderPictFormat *format;
675 686
676 // FUCKING Xft gets it wrong, of course, so work around it. 687 // FUCKING Xft gets it wrong, of course, so work around it.
677 // Transparency users should eat shit and die, and then 688 // Transparency users should eat shit and die, and then
… …
681 { 692 {
682 // the fun lies in doing everything manually... 693 // the fun lies in doing everything manually...
683 c.color.red = color.r; 694 c.color.red = color.r;
684 c.color.green = color.g; 695 c.color.green = color.g;
685 c.color.blue = color.b; 696 c.color.blue = color.b;
686 c.color.alpha = color.a; 697 c.color.alpha = alpha;
687 698
688 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 )
689 | insert_component (color.g, format->direct.greenMask, format->direct.green) 700 | insert_component (color.g, format->direct.greenMask, format->direct.green)
690 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 701 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
691 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 702 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
692 703
693 return true; 704 return true;
694 } 705 }
695 else 706 else
696 { 707 {
697 XRenderColor d; 708 XRenderColor d;
698 709
699 d.red = color.r; 710 d.red = color.r;
700 d.green = color.g; 711 d.green = color.g;
701 d.blue = color.b; 712 d.blue = color.b;
702 d.alpha = color.a; 713 d.alpha = alpha;
703 714
704 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 715 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
705 } 716 }
706#else 717#else
707 c.red = color.r; 718 c.red = color.r;
708 c.green = color.g; 719 c.green = color.g;
709 c.blue = color.b; 720 c.blue = color.b;
710 721
711 if (screen->visual->c_class == TrueColor) 722 if (screen->visual->c_class == TrueColor)
712 { 723 {
713 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 724 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
714 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 725 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
715 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 726 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
716 727
717 return true; 728 return true;
718 } 729 }
719 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 730 else if (XAllocColor (screen->dpy, screen->cmap, &c))
720 return true; 731 return true;
… …
732{ 743{
733 rgba c; 744 rgba c;
734 char eos; 745 char eos;
735 int skip; 746 int skip;
736 747
748 c.a = rgba::MAX_CC;
749
737 // parse the nonstandard "[alphapercent]" prefix 750 // parse the nonstandard "[alphapercent]" prefix
738 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 751 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
739 { 752 {
740 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);
741 name += skip; 754 name += skip;
742 } 755 }
743 else
744 c.a = rgba::MAX_CC;
745 756
746 // parse the non-standard "#aarrggbb" format
747 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))
748 {
749 if (c.r)
750 c.r = (c.r << 8) | 0x0ff;
751 if (c.g)
752 c.g = (c.g << 8) | 0x0ff;
753 if (c.b)
754 c.b = (c.b << 8) | 0x0ff;
755 if (c.a)
756 c.a = (c.a << 8) | 0x0ff;
757 }
758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 757 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
759 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))
760 { 759 {
761 XColor xc; 760 XColor xc;
762 761
763 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 762 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
764 { 763 {

Diff Legend

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