| … | |
… | |
| 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 | |
| 298 | rxvt_display::rxvt_display (const char *id) |
299 | rxvt_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 | |
| 546 | void rxvt_display::x_cb (ev::io &w, int revents) |
548 | void rxvt_display::x_cb (ev::io &w, int revents) |
| 547 | { |
549 | { |
|
|
550 | flush_ev.start (); |
|
|
551 | } |
|
|
552 | |
|
|
553 | void 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 | } |
583 | while (XEventsQueued (dpy, QueuedAlready)); |
| 575 | |
584 | |
| 576 | void rxvt_display::flush_cb (ev::prepare &w, int revents) |
|
|
| 577 | { |
|
|
| 578 | w.stop (); |
585 | w.stop (); |
| 579 | XFlush (dpy); |
|
|
| 580 | } |
586 | } |
| 581 | |
587 | |
| 582 | void rxvt_display::reg (xevent_watcher *w) |
588 | void rxvt_display::reg (xevent_watcher *w) |
| 583 | { |
589 | { |
| 584 | if (!w->active) |
590 | if (!w->active) |
| … | |
… | |
| 595 | xw[w->active - 1] = 0; |
601 | xw[w->active - 1] = 0; |
| 596 | w->active = 0; |
602 | w->active = 0; |
| 597 | } |
603 | } |
| 598 | } |
604 | } |
| 599 | |
605 | |
| 600 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
606 | void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard) |
| 601 | { |
607 | { |
|
|
608 | rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner; |
|
|
609 | |
| 602 | if (selection_owner && selection_owner != owner) |
610 | if (cur_owner && cur_owner != owner) |
| 603 | { |
611 | { |
| 604 | rxvt_term *owner = selection_owner; |
|
|
| 605 | |
|
|
| 606 | owner->selection_clear (); |
612 | cur_owner->selection_clear (clipboard); |
| 607 | owner->flush (); |
613 | cur_owner->flush (); |
| 608 | } |
614 | } |
| 609 | |
615 | |
| 610 | selection_owner = owner; |
616 | cur_owner = owner; |
| 611 | } |
617 | } |
| 612 | |
618 | |
| 613 | #ifdef USE_XIM |
619 | #ifdef USE_XIM |
| 614 | |
620 | |
| 615 | void rxvt_display::reg (im_watcher *w) |
621 | void rxvt_display::reg (im_watcher *w) |
| … | |
… | |
| 715 | c.green = color.g; |
721 | c.green = color.g; |
| 716 | c.blue = color.b; |
722 | c.blue = color.b; |
| 717 | |
723 | |
| 718 | if (screen->visual->c_class == TrueColor) |
724 | if (screen->visual->c_class == TrueColor) |
| 719 | { |
725 | { |
| 720 | 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 )) |
| 721 | | (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)) |
| 722 | | (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 )); |
| 723 | |
729 | |
| 724 | return true; |
730 | return true; |
| 725 | } |
731 | } |
| 726 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
732 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
| 727 | return true; |
733 | return true; |
