… | |
… | |
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 | |
… | |
… | |
425 | bool rxvt_display::ref_init () |
427 | bool 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 | |
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 | } |
|
|
575 | |
|
|
576 | void rxvt_display::flush_cb (ev::prepare &w, int revents) |
|
|
577 | { |
|
|
578 | while (XEventsQueued (dpy, QueuedAfterFlush)) |
583 | while (XEventsQueued (dpy, QueuedAlready)); |
579 | { |
|
|
580 | x_cb(x_ev,0);//D |
|
|
581 | } |
|
|
582 | |
584 | |
583 | w.stop (); |
585 | w.stop (); |
584 | } |
586 | } |
585 | |
587 | |
586 | void rxvt_display::reg (xevent_watcher *w) |
588 | void rxvt_display::reg (xevent_watcher *w) |
… | |
… | |
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 | |
604 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
606 | void 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) |
607 | { |
611 | { |
608 | rxvt_term *owner = selection_owner; |
612 | rxvt_term *term = cur_owner; |
609 | |
|
|
610 | owner->selection_clear (); |
613 | term->selection_clear (clipboard); |
611 | owner->flush (); |
614 | term->flush (); |
612 | } |
615 | } |
613 | |
616 | |
614 | selection_owner = owner; |
617 | cur_owner = owner; |
615 | } |
618 | } |
616 | |
619 | |
617 | #ifdef USE_XIM |
620 | #ifdef USE_XIM |
618 | |
621 | |
619 | void rxvt_display::reg (im_watcher *w) |
622 | void rxvt_display::reg (im_watcher *w) |
… | |
… | |
632 | int l, m; |
635 | int l, m; |
633 | |
636 | |
634 | l = strlen (locale); |
637 | l = strlen (locale); |
635 | m = strlen (modifiers); |
638 | m = strlen (modifiers); |
636 | |
639 | |
637 | if (!(id = (char *)malloc (l + m + 2))) |
640 | if (!(id = rxvt_temp_buf<char> (l + m + 2))) |
638 | return 0; |
641 | return 0; |
639 | |
642 | |
640 | memcpy (id, locale, l); id[l] = '\n'; |
643 | memcpy (id, locale, l); id[l] = '\n'; |
641 | memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; |
644 | memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; |
642 | |
645 | |
643 | rxvt_xim *xim = xims.get (id); |
646 | rxvt_xim *xim = xims.get (id); |
644 | |
|
|
645 | free (id); |
|
|
646 | |
647 | |
647 | return xim; |
648 | return xim; |
648 | } |
649 | } |
649 | |
650 | |
650 | void rxvt_display::put_xim (rxvt_xim *xim) |
651 | void rxvt_display::put_xim (rxvt_xim *xim) |
… | |
… | |
719 | c.green = color.g; |
720 | c.green = color.g; |
720 | c.blue = color.b; |
721 | c.blue = color.b; |
721 | |
722 | |
722 | if (screen->visual->c_class == TrueColor) |
723 | if (screen->visual->c_class == TrueColor) |
723 | { |
724 | { |
724 | c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) |
725 | c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask )) |
725 | | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) |
726 | | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask)) |
726 | | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); |
727 | | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask )); |
727 | |
728 | |
728 | return true; |
729 | return true; |
729 | } |
730 | } |
730 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
731 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
731 | return true; |
732 | return true; |