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.100 by root, Sat Jan 26 13:31:13 2008 UTC vs.
Revision 1.104 by sf-exg, Sun Jan 24 21:53:13 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
… …
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}
576
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 while (XEventsQueued (dpy, QueuedAfterFlush)) 583 while (XEventsQueued (dpy, QueuedAlready));
580 x_cb (x_ev, EV_READ);
581 584
582 w.stop (); 585 w.stop ();
583} 586}
584 587
585void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
… …
598 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
599 w->active = 0; 602 w->active = 0;
600 } 603 }
601} 604}
602 605
603void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
604{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
605 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
606 { 611 {
607 rxvt_term *owner = selection_owner;
608
609 owner->selection_clear (); 612 cur_owner->selection_clear (clipboard);
610 owner->flush (); 613 cur_owner->flush ();
611 } 614 }
612 615
613 selection_owner = owner; 616 cur_owner = owner;
614} 617}
615 618
616#ifdef USE_XIM 619#ifdef USE_XIM
617 620
618void rxvt_display::reg (im_watcher *w) 621void rxvt_display::reg (im_watcher *w)
… …
718 c.green = color.g; 721 c.green = color.g;
719 c.blue = color.b; 722 c.blue = color.b;
720 723
721 if (screen->visual->c_class == TrueColor) 724 if (screen->visual->c_class == TrueColor)
722 { 725 {
723 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 726 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
724 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 727 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
725 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 728 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
726 729
727 return true; 730 return true;
728 } 731 }
729 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 732 else if (XAllocColor (screen->dpy, screen->cmap, &c))
730 return true; 733 return true;

Diff Legend

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