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.82 by root, Fri Dec 14 05:25:26 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
… …
501 503
502#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
503 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
504#endif 506#endif
505 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
506#ifdef USE_XIM 509#ifdef USE_XIM
507 xims.clear (); 510 xims.clear ();
508#endif 511#endif
509 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
510} 513}
… …
542} 545}
543#endif 546#endif
544 547
545void rxvt_display::x_cb (ev::io &w, int revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
546{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
547 while (XEventsQueued (dpy, QueuedAfterReading)) 555 while (XEventsQueued (dpy, QueuedAfterFlush))
556 do
548 { 557 {
549 XEvent xev; 558 XEvent xev;
550 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
551 560
552#ifdef USE_XIM 561#ifdef USE_XIM
553 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
554 { 563 {
555 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
556 && xev.xany.window == root 565 && xev.xany.window == root
557 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
558 im_change_check (); 567 im_change_check ();
559#endif 568#endif
560 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
561 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
562 571
563 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
564 { 573 {
565 if (!xw[i]) 574 if (!xw[i])
566 xw.erase_unordered (i); 575 xw.erase_unordered (i);
567 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
568 xw[i]->call (xev); 577 xw[i]->call (xev);
569 } 578 }
570#ifdef USE_XIM 579#ifdef USE_XIM
571 } 580 }
572#endif 581#endif
573 } 582 }
574} 583 while (XEventsQueued (dpy, QueuedAlready));
575 584
576void rxvt_display::flush () 585 w.stop ();
577{
578 XFlush (dpy);
579}
580
581void rxvt_display::flush_cb (ev::prepare &w, int revents)
582{
583 flush ();
584} 586}
585 587
586void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
587{ 589{
588 if (!w->active) 590 if (!w->active)
… …
599 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
600 w->active = 0; 602 w->active = 0;
601 } 603 }
602} 604}
603 605
604void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
605{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
606 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
611 {
607 selection_owner->selection_clear (); 612 cur_owner->selection_clear (clipboard);
613 cur_owner->flush ();
614 }
608 615
609 selection_owner = owner; 616 cur_owner = owner;
610} 617}
611 618
612#ifdef USE_XIM 619#ifdef USE_XIM
613 620
614void rxvt_display::reg (im_watcher *w) 621void rxvt_display::reg (im_watcher *w)
… …
627 int l, m; 634 int l, m;
628 635
629 l = strlen (locale); 636 l = strlen (locale);
630 m = strlen (modifiers); 637 m = strlen (modifiers);
631 638
632 if (!(id = (char *)malloc (l + m + 2))) 639 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
633 return 0; 640 return 0;
634 641
635 memcpy (id, locale, l); id[l] = '\n'; 642 memcpy (id, locale, l); id[l] = '\n';
636 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 643 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
637 644
638 rxvt_xim *xim = xims.get (id); 645 rxvt_xim *xim = xims.get (id);
639
640 free (id);
641 646
642 return xim; 647 return xim;
643} 648}
644 649
645void rxvt_display::put_xim (rxvt_xim *xim) 650void rxvt_display::put_xim (rxvt_xim *xim)
… …
671} 676}
672 677
673bool 678bool
674rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 679rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
675{ 680{
681 //TODO: only supports 24 bit
682 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
683
676#if XFT 684#if XFT
677 XRenderPictFormat *format; 685 XRenderPictFormat *format;
678 686
679 // FUCKING Xft gets it wrong, of course, so work around it. 687 // FUCKING Xft gets it wrong, of course, so work around it.
680 // Transparency users should eat shit and die, and then 688 // Transparency users should eat shit and die, and then
… …
684 { 692 {
685 // the fun lies in doing everything manually... 693 // the fun lies in doing everything manually...
686 c.color.red = color.r; 694 c.color.red = color.r;
687 c.color.green = color.g; 695 c.color.green = color.g;
688 c.color.blue = color.b; 696 c.color.blue = color.b;
689 c.color.alpha = color.a; 697 c.color.alpha = alpha;
690 698
691 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 )
692 | insert_component (color.g, format->direct.greenMask, format->direct.green) 700 | insert_component (color.g, format->direct.greenMask, format->direct.green)
693 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 701 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
694 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 702 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
695 703
696 return true; 704 return true;
697 } 705 }
698 else 706 else
699 { 707 {
700 XRenderColor d; 708 XRenderColor d;
701 709
702 d.red = color.r; 710 d.red = color.r;
703 d.green = color.g; 711 d.green = color.g;
704 d.blue = color.b; 712 d.blue = color.b;
705 d.alpha = color.a; 713 d.alpha = alpha;
706 714
707 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 715 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
708 } 716 }
709#else 717#else
710 c.red = color.r; 718 c.red = color.r;
711 c.green = color.g; 719 c.green = color.g;
712 c.blue = color.b; 720 c.blue = color.b;
713 721
714 if (screen->visual->c_class == TrueColor) 722 if (screen->visual->c_class == TrueColor)
715 { 723 {
716 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 ))
717 | (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))
718 | (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 ));
719 727
720 return true; 728 return true;
721 } 729 }
722 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 730 else if (XAllocColor (screen->dpy, screen->cmap, &c))
723 return true; 731 return true;
… …
735{ 743{
736 rgba c; 744 rgba c;
737 char eos; 745 char eos;
738 int skip; 746 int skip;
739 747
748 c.a = rgba::MAX_CC;
749
740 // parse the nonstandard "[alphapercent]" prefix 750 // parse the nonstandard "[alphapercent]" prefix
741 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 751 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
742 { 752 {
743 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);
744 name += skip; 754 name += skip;
745 } 755 }
746 else
747 c.a = rgba::MAX_CC;
748 756
749 // parse the non-standard "#aarrggbb" format
750 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))
751 {
752 if (c.r)
753 c.r = (c.r << 8) | 0x0ff;
754 if (c.g)
755 c.g = (c.g << 8) | 0x0ff;
756 if (c.b)
757 c.b = (c.b << 8) | 0x0ff;
758 if (c.a)
759 c.a = (c.a << 8) | 0x0ff;
760 }
761 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 757 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
762 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))
763 { 759 {
764 XColor xc; 760 XColor xc;
765 761
766 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 762 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
767 { 763 {

Diff Legend

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