… | |
… | |
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 | |
… | |
… | |
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; |
|
|
609 | |
|
|
610 | owner->selection_clear (); |
612 | cur_owner->selection_clear (clipboard); |
611 | owner->flush (); |
613 | cur_owner->flush (); |
612 | } |
614 | } |
613 | |
615 | |
614 | selection_owner = owner; |
616 | cur_owner = owner; |
615 | } |
617 | } |
616 | |
618 | |
617 | #ifdef USE_XIM |
619 | #ifdef USE_XIM |
618 | |
620 | |
619 | void rxvt_display::reg (im_watcher *w) |
621 | void rxvt_display::reg (im_watcher *w) |
… | |
… | |
632 | int l, m; |
634 | int l, m; |
633 | |
635 | |
634 | l = strlen (locale); |
636 | l = strlen (locale); |
635 | m = strlen (modifiers); |
637 | m = strlen (modifiers); |
636 | |
638 | |
637 | if (!(id = (char *)malloc (l + m + 2))) |
639 | if (!(id = rxvt_temp_buf<char> (l + m + 2))) |
638 | return 0; |
640 | return 0; |
639 | |
641 | |
640 | memcpy (id, locale, l); id[l] = '\n'; |
642 | memcpy (id, locale, l); id[l] = '\n'; |
641 | memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; |
643 | memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; |
642 | |
644 | |
643 | rxvt_xim *xim = xims.get (id); |
645 | rxvt_xim *xim = xims.get (id); |
644 | |
|
|
645 | free (id); |
|
|
646 | |
646 | |
647 | return xim; |
647 | return xim; |
648 | } |
648 | } |
649 | |
649 | |
650 | void rxvt_display::put_xim (rxvt_xim *xim) |
650 | void rxvt_display::put_xim (rxvt_xim *xim) |
… | |
… | |
719 | c.green = color.g; |
719 | c.green = color.g; |
720 | c.blue = color.b; |
720 | c.blue = color.b; |
721 | |
721 | |
722 | if (screen->visual->c_class == TrueColor) |
722 | if (screen->visual->c_class == TrueColor) |
723 | { |
723 | { |
724 | 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 )) |
725 | | (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)) |
726 | | (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 )); |
727 | |
727 | |
728 | return true; |
728 | return true; |
729 | } |
729 | } |
730 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
730 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
731 | return true; |
731 | return true; |