… | |
… | |
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 | |
… | |
… | |
462 | XUnloadFont (dpy, f); |
464 | XUnloadFont (dpy, f); |
463 | #endif |
465 | #endif |
464 | |
466 | |
465 | int fd = XConnectionNumber (dpy); |
467 | int fd = XConnectionNumber (dpy); |
466 | |
468 | |
467 | // try to detect wether we have a local connection. |
469 | // try to detect whether we have a local connection. |
468 | // assume unix domain socket == local, everything else not |
470 | // assume unix domain socket == local, everything else not |
469 | // TODO: might want to check for inet/127.0.0.1 |
471 | // TODO: might want to check for inet/127.0.0.1 |
470 | is_local = 0; |
472 | is_local = 0; |
471 | sockaddr_un sa; |
473 | sockaddr_un sa; |
472 | socklen_t sl = sizeof (sa); |
474 | socklen_t sl = sizeof (sa); |
… | |
… | |
486 | } |
488 | } |
487 | |
489 | |
488 | void |
490 | void |
489 | rxvt_display::ref_next () |
491 | rxvt_display::ref_next () |
490 | { |
492 | { |
491 | // TODO: somehow check wether the database files/resources changed |
493 | // TODO: somehow check whether the database files/resources changed |
492 | // before affording re-loading/parsing |
494 | // before affording re-loading/parsing |
493 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
495 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
494 | XrmSetDatabase (dpy, get_resources (true)); |
496 | XrmSetDatabase (dpy, get_resources (true)); |
495 | } |
497 | } |
496 | |
498 | |
… | |
… | |
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 | |
|
|
553 | flush_ev.start (); |
|
|
554 | |
560 | |
555 | #ifdef USE_XIM |
561 | #ifdef USE_XIM |
556 | if (!XFilterEvent (&xev, None)) |
562 | if (!XFilterEvent (&xev, None)) |
557 | #endif |
|
|
558 | { |
563 | { |
559 | if (xev.type == PropertyNotify |
564 | if (xev.type == PropertyNotify |
560 | && xev.xany.window == root |
565 | && xev.xany.window == root |
561 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
566 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
562 | im_change_check (); |
567 | im_change_check (); |
|
|
568 | #endif |
563 | if (xev.type == MappingNotify) |
569 | if (xev.type == MappingNotify) |
564 | XRefreshKeyboardMapping (&xev.xmapping); |
570 | XRefreshKeyboardMapping (&xev.xmapping); |
565 | |
571 | |
566 | for (int i = xw.size (); i--; ) |
572 | for (int i = xw.size (); i--; ) |
567 | { |
573 | { |
568 | if (!xw[i]) |
574 | if (!xw[i]) |
569 | xw.erase_unordered (i); |
575 | xw.erase_unordered (i); |
570 | else if (xw[i]->window == xev.xany.window) |
576 | else if (xw[i]->window == xev.xany.window) |
571 | xw[i]->call (xev); |
577 | xw[i]->call (xev); |
572 | } |
578 | } |
|
|
579 | #ifdef USE_XIM |
573 | } |
580 | } |
|
|
581 | #endif |
574 | } |
582 | } |
|
|
583 | while (XEventsQueued (dpy, QueuedAlready)); |
575 | |
584 | |
576 | XFlush (dpy); |
|
|
577 | } |
|
|
578 | |
|
|
579 | void rxvt_display::flush_cb (ev::idle &w, int revents) |
|
|
580 | { |
|
|
581 | w.stop (); |
585 | w.stop (); |
582 | XFlush (dpy); |
|
|
583 | } |
586 | } |
584 | |
587 | |
585 | void rxvt_display::reg (xevent_watcher *w) |
588 | void rxvt_display::reg (xevent_watcher *w) |
586 | { |
589 | { |
587 | if (!w->active) |
590 | if (!w->active) |
… | |
… | |
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 | |
603 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
606 | void 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; |
612 | rxvt_term *term = cur_owner; |
608 | |
|
|
609 | owner->selection_clear (); |
613 | term->selection_clear (clipboard); |
610 | owner->flush (); |
614 | term->flush (); |
611 | } |
615 | } |
612 | |
616 | |
613 | selection_owner = owner; |
617 | cur_owner = owner; |
614 | } |
618 | } |
615 | |
619 | |
616 | #ifdef USE_XIM |
620 | #ifdef USE_XIM |
617 | |
621 | |
618 | void rxvt_display::reg (im_watcher *w) |
622 | void rxvt_display::reg (im_watcher *w) |
… | |
… | |
631 | int l, m; |
635 | int l, m; |
632 | |
636 | |
633 | l = strlen (locale); |
637 | l = strlen (locale); |
634 | m = strlen (modifiers); |
638 | m = strlen (modifiers); |
635 | |
639 | |
636 | if (!(id = (char *)malloc (l + m + 2))) |
640 | if (!(id = rxvt_temp_buf<char> (l + m + 2))) |
637 | return 0; |
641 | return 0; |
638 | |
642 | |
639 | memcpy (id, locale, l); id[l] = '\n'; |
643 | memcpy (id, locale, l); id[l] = '\n'; |
640 | memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; |
644 | memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; |
641 | |
645 | |
642 | rxvt_xim *xim = xims.get (id); |
646 | rxvt_xim *xim = xims.get (id); |
643 | |
|
|
644 | free (id); |
|
|
645 | |
647 | |
646 | return xim; |
648 | return xim; |
647 | } |
649 | } |
648 | |
650 | |
649 | void rxvt_display::put_xim (rxvt_xim *xim) |
651 | void rxvt_display::put_xim (rxvt_xim *xim) |
… | |
… | |
718 | c.green = color.g; |
720 | c.green = color.g; |
719 | c.blue = color.b; |
721 | c.blue = color.b; |
720 | |
722 | |
721 | if (screen->visual->c_class == TrueColor) |
723 | if (screen->visual->c_class == TrueColor) |
722 | { |
724 | { |
723 | 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 )) |
724 | | (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)) |
725 | | (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 )); |
726 | |
728 | |
727 | return true; |
729 | return true; |
728 | } |
730 | } |
729 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
731 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
730 | return true; |
732 | return true; |