| … | |
… | |
| 66 | #endif |
66 | #endif |
| 67 | #if USE_XIM |
67 | #if USE_XIM |
| 68 | "WM_LOCALE_NAME", |
68 | "WM_LOCALE_NAME", |
| 69 | "XIM_SERVERS", |
69 | "XIM_SERVERS", |
| 70 | #endif |
70 | #endif |
| 71 | #ifdef ENABLE_TRANSPARENCY |
71 | #if ENABLE_TRANSPARENCY |
| 72 | "_XROOTPMAP_ID", |
72 | "_XROOTPMAP_ID", |
| 73 | "ESETROOT_PMAP_ID", |
73 | "ESETROOT_PMAP_ID", |
| 74 | #endif |
74 | #endif |
| 75 | #if ENABLE_XEMBED |
75 | #if ENABLE_XEMBED |
| 76 | "_XEMBED", |
76 | "_XEMBED", |
| … | |
… | |
| 153 | put (*this->begin ()); |
153 | put (*this->begin ()); |
| 154 | } |
154 | } |
| 155 | |
155 | |
| 156 | ///////////////////////////////////////////////////////////////////////////// |
156 | ///////////////////////////////////////////////////////////////////////////// |
| 157 | |
157 | |
| 158 | #ifdef USE_XIM |
158 | #if USE_XIM |
| 159 | |
159 | |
| 160 | static void |
160 | static void |
| 161 | #if XIMCB_PROTO_BROKEN |
161 | #if XIMCB_PROTO_BROKEN |
| 162 | im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) |
162 | im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) |
| 163 | #else |
163 | #else |
| … | |
… | |
| 534 | #ifdef POINTER_BLANK |
534 | #ifdef POINTER_BLANK |
| 535 | XFreeCursor (dpy, blank_cursor); |
535 | XFreeCursor (dpy, blank_cursor); |
| 536 | #endif |
536 | #endif |
| 537 | x_ev.stop (); |
537 | x_ev.stop (); |
| 538 | flush_ev.stop (); |
538 | flush_ev.stop (); |
| 539 | #ifdef USE_XIM |
539 | #if USE_XIM |
| 540 | xims.clear (); |
540 | xims.clear (); |
| 541 | #endif |
541 | #endif |
| 542 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
542 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
| 543 | XCloseDisplay (dpy); |
543 | XCloseDisplay (dpy); |
| 544 | } |
544 | } |
| 545 | |
545 | |
| 546 | #ifdef USE_XIM |
546 | #if USE_XIM |
| 547 | void rxvt_display::im_change_cb () |
547 | void rxvt_display::im_change_cb () |
| 548 | { |
548 | { |
| 549 | for (im_watcher **i = imw.begin (); i != imw.end (); ++i) |
549 | for (im_watcher **i = imw.begin (); i != imw.end (); ++i) |
| 550 | (*i)->call (); |
550 | (*i)->call (); |
| 551 | } |
551 | } |
| … | |
… | |
| 587 | do |
587 | do |
| 588 | { |
588 | { |
| 589 | XEvent xev; |
589 | XEvent xev; |
| 590 | XNextEvent (dpy, &xev); |
590 | XNextEvent (dpy, &xev); |
| 591 | |
591 | |
| 592 | #ifdef USE_XIM |
592 | #if USE_XIM |
| 593 | if (!XFilterEvent (&xev, None)) |
593 | if (!XFilterEvent (&xev, None)) |
| 594 | { |
594 | { |
| 595 | if (xev.type == PropertyNotify |
595 | if (xev.type == PropertyNotify |
| 596 | && xev.xany.window == root |
596 | && xev.xany.window == root |
| 597 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
597 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
| … | |
… | |
| 605 | if (!xw[i]) |
605 | if (!xw[i]) |
| 606 | xw.erase_unordered (i); |
606 | xw.erase_unordered (i); |
| 607 | else if (xw[i]->window == xev.xany.window) |
607 | else if (xw[i]->window == xev.xany.window) |
| 608 | xw[i]->call (xev); |
608 | xw[i]->call (xev); |
| 609 | } |
609 | } |
| 610 | #ifdef USE_XIM |
610 | #if USE_XIM |
| 611 | } |
611 | } |
| 612 | #endif |
612 | #endif |
| 613 | } |
613 | } |
| 614 | while (XEventsQueued (dpy, QueuedAlready)); |
614 | while (XEventsQueued (dpy, QueuedAlready)); |
| 615 | |
615 | |
| … | |
… | |
| 646 | } |
646 | } |
| 647 | |
647 | |
| 648 | cur_owner = owner; |
648 | cur_owner = owner; |
| 649 | } |
649 | } |
| 650 | |
650 | |
| 651 | #ifdef USE_XIM |
651 | #if USE_XIM |
| 652 | |
652 | |
| 653 | void rxvt_display::reg (im_watcher *w) |
653 | void rxvt_display::reg (im_watcher *w) |
| 654 | { |
654 | { |
| 655 | imw.push_back (w); |
655 | imw.push_back (w); |
| 656 | } |
656 | } |
