… | |
… | |
26 | |
26 | |
27 | #include <unistd.h> |
27 | #include <unistd.h> |
28 | #include <fcntl.h> |
28 | #include <fcntl.h> |
29 | |
29 | |
30 | #include <sys/utsname.h> |
30 | #include <sys/utsname.h> |
31 | |
|
|
32 | #ifndef NO_SLOW_LINK_SUPPORT |
|
|
33 | # include <sys/socket.h> |
31 | #include <sys/socket.h> |
34 | # include <sys/un.h> |
32 | #include <sys/un.h> |
35 | #endif |
|
|
36 | |
33 | |
37 | #if XFT |
34 | #if XFT |
38 | # include <X11/extensions/Xrender.h> |
35 | # include <X11/extensions/Xrender.h> |
39 | #endif |
36 | #endif |
40 | |
37 | |
… | |
… | |
348 | #if XLIB_ILLEGAL_ACCESS |
345 | #if XLIB_ILLEGAL_ACCESS |
349 | if (dpy->xdefaults) |
346 | if (dpy->xdefaults) |
350 | XFree (dpy->xdefaults); |
347 | XFree (dpy->xdefaults); |
351 | #endif |
348 | #endif |
352 | |
349 | |
353 | if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, |
350 | if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER, |
354 | 0L, 100000000L, False, |
351 | 0L, 100000000L, False, |
355 | XA_STRING, &actual_type, &actual_format, |
352 | XA_STRING, &actual_type, &actual_format, |
356 | &nitems, &nremaining, |
353 | &nitems, &nremaining, |
357 | (unsigned char **)&val) == Success |
354 | (unsigned char **)&val) == Success |
358 | && actual_type == XA_STRING |
355 | && actual_type == XA_STRING |
… | |
… | |
463 | XUnloadFont (dpy, f); |
460 | XUnloadFont (dpy, f); |
464 | #endif |
461 | #endif |
465 | |
462 | |
466 | int fd = XConnectionNumber (dpy); |
463 | int fd = XConnectionNumber (dpy); |
467 | |
464 | |
468 | #ifndef NO_SLOW_LINK_SUPPORT |
|
|
469 | // try to detect wether we have a local connection. |
465 | // try to detect wether we have a local connection. |
470 | // assume unix domains socket == local, everything else not |
466 | // assume unix domains socket == local, everything else not |
471 | // TODO: might want to check for inet/127.0.0.1 |
467 | // TODO: might want to check for inet/127.0.0.1 |
472 | is_local = 0; |
468 | is_local = 0; |
473 | sockaddr_un sa; |
469 | sockaddr_un sa; |
474 | socklen_t sl = sizeof (sa); |
470 | socklen_t sl = sizeof (sa); |
475 | |
471 | |
476 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
472 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
477 | is_local = sa.sun_family == AF_LOCAL; |
473 | is_local = sa.sun_family == AF_LOCAL; |
478 | #endif |
|
|
479 | |
474 | |
480 | x_ev.start (fd, EVENT_READ); |
475 | x_ev.start (fd, EVENT_READ); |
481 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
476 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
482 | |
477 | |
483 | XSelectInput (dpy, root, PropertyChangeMask); |
478 | XSelectInput (dpy, root, PropertyChangeMask); |
… | |
… | |
838 | } |
833 | } |
839 | |
834 | |
840 | void |
835 | void |
841 | rxvt_color::free (rxvt_screen *screen) |
836 | rxvt_color::free (rxvt_screen *screen) |
842 | { |
837 | { |
|
|
838 | if (screen->visual->c_class == TrueColor) |
|
|
839 | return; // nothing to do |
|
|
840 | |
843 | #if XFT |
841 | #if XFT |
844 | XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); |
842 | XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); |
845 | #else |
843 | #else |
846 | XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); |
844 | XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); |
847 | #endif |
845 | #endif |