… | |
… | |
64 | #endif |
64 | #endif |
65 | #if USE_XIM |
65 | #if USE_XIM |
66 | "WM_LOCALE_NAME", |
66 | "WM_LOCALE_NAME", |
67 | "XIM_SERVERS", |
67 | "XIM_SERVERS", |
68 | #endif |
68 | #endif |
69 | #ifdef TRANSPARENT |
69 | #ifdef ENABLE_TRANSPARENCY |
70 | "_XROOTPMAP_ID", |
70 | "_XROOTPMAP_ID", |
71 | "ESETROOT_PMAP_ID", |
71 | "ESETROOT_PMAP_ID", |
72 | #endif |
72 | #endif |
73 | #if ENABLE_XEMBED |
73 | #if ENABLE_XEMBED |
74 | "_XEMBED", |
74 | "_XEMBED", |
… | |
… | |
443 | return false; |
443 | return false; |
444 | |
444 | |
445 | screen = DefaultScreen (dpy); |
445 | screen = DefaultScreen (dpy); |
446 | root = DefaultRootWindow (dpy); |
446 | root = DefaultRootWindow (dpy); |
447 | |
447 | |
448 | #ifdef HAVE_AFTERIMAGE |
|
|
449 | ::dpy = dpy; /* init global var from libAfter... */ |
|
|
450 | asv = create_asvisual_for_id( dpy, screen, DefaultDepth(dpy,screen), XVisualIDFromVisual(DefaultVisual(dpy,screen)), None, NULL ); |
|
|
451 | #endif |
|
|
452 | |
|
|
453 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
448 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
454 | XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); |
449 | XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); |
455 | |
450 | |
456 | XrmSetDatabase (dpy, get_resources (false)); |
451 | XrmSetDatabase (dpy, get_resources (false)); |
457 | |
452 | |
… | |
… | |
474 | is_local = 0; |
469 | is_local = 0; |
475 | sockaddr_un sa; |
470 | sockaddr_un sa; |
476 | socklen_t sl = sizeof (sa); |
471 | socklen_t sl = sizeof (sa); |
477 | |
472 | |
478 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
473 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
479 | is_local = sa.sun_family == AF_LOCAL; |
474 | is_local = sa.sun_family == AF_UNIX; |
480 | |
475 | |
481 | x_ev.start (fd, EVENT_READ); |
476 | x_ev.start (fd, EVENT_READ); |
482 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
477 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
483 | |
478 | |
484 | XSelectInput (dpy, root, PropertyChangeMask); |
479 | XSelectInput (dpy, root, PropertyChangeMask); |
… | |
… | |
558 | if (xev.type == PropertyNotify |
553 | if (xev.type == PropertyNotify |
559 | && xev.xany.window == root |
554 | && xev.xany.window == root |
560 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
555 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
561 | im_change_check (); |
556 | im_change_check (); |
562 | #endif |
557 | #endif |
|
|
558 | if (xev.type == MappingNotify) |
|
|
559 | XRefreshKeyboardMapping (&xev.xmapping); |
|
|
560 | |
563 | for (int i = xw.size (); i--; ) |
561 | for (int i = xw.size (); i--; ) |
564 | { |
562 | { |
565 | if (!xw[i]) |
563 | if (!xw[i]) |
566 | xw.erase_unordered (i); |
564 | xw.erase_unordered (i); |
567 | else if (xw[i]->window == xev.xany.window) |
565 | else if (xw[i]->window == xev.xany.window) |