| … | |
… | |
| 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", |
| … | |
… | |
| 445 | screen = DefaultScreen (dpy); |
445 | screen = DefaultScreen (dpy); |
| 446 | root = DefaultRootWindow (dpy); |
446 | root = DefaultRootWindow (dpy); |
| 447 | |
447 | |
| 448 | #ifdef HAVE_AFTERIMAGE |
448 | #ifdef HAVE_AFTERIMAGE |
| 449 | ::dpy = dpy; /* init global var from libAfter... */ |
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 ); |
450 | asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen), |
|
|
451 | XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL); |
| 451 | #endif |
452 | #endif |
| 452 | |
453 | |
| 453 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
454 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
| 454 | XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); |
455 | XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); |
| 455 | |
456 | |
| … | |
… | |
| 474 | is_local = 0; |
475 | is_local = 0; |
| 475 | sockaddr_un sa; |
476 | sockaddr_un sa; |
| 476 | socklen_t sl = sizeof (sa); |
477 | socklen_t sl = sizeof (sa); |
| 477 | |
478 | |
| 478 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
479 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
| 479 | is_local = sa.sun_family == AF_LOCAL; |
480 | is_local = sa.sun_family == AF_UNIX; |
| 480 | |
481 | |
| 481 | x_ev.start (fd, EVENT_READ); |
482 | x_ev.start (fd, EVENT_READ); |
| 482 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
483 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
| 483 | |
484 | |
| 484 | XSelectInput (dpy, root, PropertyChangeMask); |
485 | XSelectInput (dpy, root, PropertyChangeMask); |
| … | |
… | |
| 558 | if (xev.type == PropertyNotify |
559 | if (xev.type == PropertyNotify |
| 559 | && xev.xany.window == root |
560 | && xev.xany.window == root |
| 560 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
561 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
| 561 | im_change_check (); |
562 | im_change_check (); |
| 562 | #endif |
563 | #endif |
|
|
564 | if (xev.type == MappingNotify) |
|
|
565 | XRefreshKeyboardMapping (&xev.xmapping); |
|
|
566 | |
| 563 | for (int i = xw.size (); i--; ) |
567 | for (int i = xw.size (); i--; ) |
| 564 | { |
568 | { |
| 565 | if (!xw[i]) |
569 | if (!xw[i]) |
| 566 | xw.erase_unordered (i); |
570 | xw.erase_unordered (i); |
| 567 | else if (xw[i]->window == xev.xany.window) |
571 | else if (xw[i]->window == xev.xany.window) |
