… | |
… | |
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 | } |
… | |
… | |
464 | XUnloadFont (dpy, f); |
464 | XUnloadFont (dpy, f); |
465 | #endif |
465 | #endif |
466 | |
466 | |
467 | int fd = XConnectionNumber (dpy); |
467 | int fd = XConnectionNumber (dpy); |
468 | |
468 | |
469 | // try to detect wether we have a local connection. |
469 | // try to detect whether we have a local connection. |
470 | // assume unix domain socket == local, everything else not |
470 | // assume unix domain socket == local, everything else not |
471 | // TODO: might want to check for inet/127.0.0.1 |
471 | // TODO: might want to check for inet/127.0.0.1 |
472 | is_local = 0; |
472 | is_local = 0; |
473 | sockaddr_un sa; |
473 | sockaddr_un sa; |
474 | socklen_t sl = sizeof (sa); |
474 | socklen_t sl = sizeof (sa); |
… | |
… | |
488 | } |
488 | } |
489 | |
489 | |
490 | void |
490 | void |
491 | rxvt_display::ref_next () |
491 | rxvt_display::ref_next () |
492 | { |
492 | { |
493 | // TODO: somehow check wether the database files/resources changed |
493 | // TODO: somehow check whether the database files/resources changed |
494 | // before affording re-loading/parsing |
494 | // before affording re-loading/parsing |
495 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
495 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
496 | XrmSetDatabase (dpy, get_resources (true)); |
496 | XrmSetDatabase (dpy, get_resources (true)); |
497 | } |
497 | } |
498 | |
498 | |
… | |
… | |
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; |
… | |
… | |
884 | lerp (c.a, to.a, percent) |
884 | lerp (c.a, to.a, percent) |
885 | ) |
885 | ) |
886 | ); |
886 | ); |
887 | } |
887 | } |
888 | |
888 | |
889 | #if TRACE_PIXMAPS |
|
|
890 | # undef XCreatePixmap |
|
|
891 | # undef XFreePixmap |
|
|
892 | Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d) |
|
|
893 | { |
|
|
894 | Pixmap res = XCreatePixmap (dpy, r, w, h, d); |
|
|
895 | fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res); |
|
|
896 | return res; |
|
|
897 | } |
|
|
898 | |
|
|
899 | void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p) |
|
|
900 | { |
|
|
901 | fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p); |
|
|
902 | XFreePixmap (dpy,p); |
|
|
903 | } |
|
|
904 | #endif |
|
|