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.98 by root, Sat Jan 26 13:13:20 2008 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#endif
556 { 563 {
557 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
558 && xev.xany.window == root 565 && xev.xany.window == root
559 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
560 im_change_check (); 567 im_change_check ();
561 568#endif
562 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
563 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
564 571
565 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
566 { 573 {
567 if (!xw[i]) 574 if (!xw[i])
568 xw.erase_unordered (i); 575 xw.erase_unordered (i);
569 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
570 xw[i]->call (xev); 577 xw[i]->call (xev);
571 } 578 }
579#ifdef USE_XIM
572 } 580 }
581#endif
573 } 582 }
574}
575
576void rxvt_display::flush_cb (ev::prepare &w, int revents)
577{
578 while (XEventsQueued (dpy, QueuedAfterFlush)) 583 while (XEventsQueued (dpy, QueuedAlready));
579 x_cb (x_ev, EV_READ);
580 584
581 w.stop (); 585 w.stop ();
582} 586}
583 587
584void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
… …
597 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
598 w->active = 0; 602 w->active = 0;
599 } 603 }
600} 604}
601 605
602void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
603{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
604 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
605 { 611 {
606 rxvt_term *owner = selection_owner;
607
608 owner->selection_clear (); 612 cur_owner->selection_clear (clipboard);
609 owner->flush (); 613 cur_owner->flush ();
610 } 614 }
611 615
612 selection_owner = owner; 616 cur_owner = owner;
613} 617}
614 618
615#ifdef USE_XIM 619#ifdef USE_XIM
616 620
617void rxvt_display::reg (im_watcher *w) 621void rxvt_display::reg (im_watcher *w)
… …
630 int l, m; 634 int l, m;
631 635
632 l = strlen (locale); 636 l = strlen (locale);
633 m = strlen (modifiers); 637 m = strlen (modifiers);
634 638
635 if (!(id = (char *)malloc (l + m + 2))) 639 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
636 return 0; 640 return 0;
637 641
638 memcpy (id, locale, l); id[l] = '\n'; 642 memcpy (id, locale, l); id[l] = '\n';
639 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 643 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
640 644
641 rxvt_xim *xim = xims.get (id); 645 rxvt_xim *xim = xims.get (id);
642
643 free (id);
644 646
645 return xim; 647 return xim;
646} 648}
647 649
648void rxvt_display::put_xim (rxvt_xim *xim) 650void rxvt_display::put_xim (rxvt_xim *xim)
… …
717 c.green = color.g; 719 c.green = color.g;
718 c.blue = color.b; 720 c.blue = color.b;
719 721
720 if (screen->visual->c_class == TrueColor) 722 if (screen->visual->c_class == TrueColor)
721 { 723 {
722 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 ))
723 | (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))
724 | (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 ));
725 727
726 return true; 728 return true;
727 } 729 }
728 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 730 else if (XAllocColor (screen->dpy, screen->cmap, &c))
729 return true; 731 return true;

Diff Legend

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