… | |
… | |
33 | |
33 | |
34 | #if XFT |
34 | #if XFT |
35 | # include <X11/extensions/Xrender.h> |
35 | # include <X11/extensions/Xrender.h> |
36 | #endif |
36 | #endif |
37 | |
37 | |
38 | const char *const xa_names[] = |
38 | static const char *const xa_names[] = |
39 | { |
39 | { |
40 | "TEXT", |
40 | "TEXT", |
41 | "COMPOUND_TEXT", |
41 | "COMPOUND_TEXT", |
42 | "UTF8_STRING", |
42 | "UTF8_STRING", |
43 | "MULTIPLE", |
43 | "MULTIPLE", |
… | |
… | |
446 | return false; |
446 | return false; |
447 | |
447 | |
448 | screen = DefaultScreen (dpy); |
448 | screen = DefaultScreen (dpy); |
449 | root = DefaultRootWindow (dpy); |
449 | root = DefaultRootWindow (dpy); |
450 | |
450 | |
451 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
451 | assert (ARRAY_LENGTH(xa_names) == NUM_XA); |
452 | XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); |
452 | XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); |
453 | |
453 | |
454 | XrmSetDatabase (dpy, get_resources (false)); |
454 | XrmSetDatabase (dpy, get_resources (false)); |
455 | |
455 | |
456 | #ifdef POINTER_BLANK |
456 | #ifdef POINTER_BLANK |
… | |
… | |
507 | x_ev.stop (); |
507 | x_ev.stop (); |
508 | flush_ev.stop (); |
508 | flush_ev.stop (); |
509 | #ifdef USE_XIM |
509 | #ifdef USE_XIM |
510 | xims.clear (); |
510 | xims.clear (); |
511 | #endif |
511 | #endif |
|
|
512 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
512 | XCloseDisplay (dpy); |
513 | XCloseDisplay (dpy); |
513 | } |
514 | } |
514 | |
515 | |
515 | #ifdef USE_XIM |
516 | #ifdef USE_XIM |
516 | void rxvt_display::im_change_cb () |
517 | void rxvt_display::im_change_cb () |