… | |
… | |
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", |
… | |
… | |
362 | XA_STRING, &actual_type, &actual_format, |
362 | XA_STRING, &actual_type, &actual_format, |
363 | &nitems, &nremaining, |
363 | &nitems, &nremaining, |
364 | (unsigned char **)&val) == Success |
364 | (unsigned char **)&val) == Success |
365 | && actual_type == XA_STRING |
365 | && actual_type == XA_STRING |
366 | && actual_format == 8) |
366 | && actual_format == 8) |
367 | displayResource = val; |
367 | displayResource = val; |
368 | else |
368 | else |
369 | { |
369 | { |
370 | displayResource = 0; |
370 | displayResource = 0; |
371 | |
371 | |
372 | if (val) |
372 | if (val) |
373 | XFree(val); |
373 | XFree (val); |
374 | } |
374 | } |
375 | |
375 | |
376 | #if XLIB_ILLEGAL_ACCESS |
376 | #if XLIB_ILLEGAL_ACCESS |
377 | dpy->xdefaults = displayResource; |
377 | dpy->xdefaults = displayResource; |
378 | #endif |
378 | #endif |
379 | } |
379 | } |
… | |
… | |
528 | unsigned long nitems, bytes_after; |
528 | unsigned long nitems, bytes_after; |
529 | |
529 | |
530 | if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, |
530 | if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, |
531 | False, XA_ATOM, &actual_type, &actual_format, |
531 | False, XA_ATOM, &actual_type, &actual_format, |
532 | &nitems, &bytes_after, (unsigned char **)&atoms) |
532 | &nitems, &bytes_after, (unsigned char **)&atoms) |
533 | != Success ) |
533 | != Success) |
534 | return; |
534 | return; |
535 | |
535 | |
536 | if (actual_type == XA_ATOM && actual_format == 32) |
536 | if (actual_type == XA_ATOM && actual_format == 32) |
537 | for (int i = 0; i < nitems; i++) |
537 | for (int i = 0; i < nitems; i++) |
538 | if (XGetSelectionOwner (dpy, atoms[i])) |
538 | if (XGetSelectionOwner (dpy, atoms[i])) |
539 | { |
539 | { |
540 | im_change_cb (); |
540 | im_change_cb (); |
541 | break; |
541 | break; |