nsxivd5f0a20
Fixed WMProtocols registration order (before mapping window)
+5 −4
2 files changed
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = git-20120514 | |
| 1 | + | VERSION = git-20120807 | |
| 2 | 2 | ||
| 3 | 3 | PREFIX = /usr/local | |
| 4 | 4 | MANPREFIX = $(PREFIX)/share/man | |
| @@ -128,6 +128,8 @@ void win_init(win_t *win) { | |||
| 128 | 128 | warn("no locale support"); | |
| 129 | 129 | ||
| 130 | 130 | win_init_font(e->dpy, BAR_FONT); | |
| 131 | + | ||
| 132 | + | wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False); | |
| 131 | 133 | } | |
| 132 | 134 | ||
| 133 | 135 | void win_set_sizehints(win_t *win) { | |
| @@ -209,6 +211,8 @@ void win_open(win_t *win) { | |||
| 209 | 211 | classhint.res_class = "Sxiv"; | |
| 210 | 212 | XSetClassHint(e->dpy, win->xwin, &classhint); | |
| 211 | 213 | ||
| 214 | + | XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1); | |
| 215 | + | ||
| 212 | 216 | if (!options->hide_bar) { | |
| 213 | 217 | win->barh = font.ascent + font.descent + 2 * V_TEXT_PAD; | |
| 214 | 218 | win->h -= win->barh; | |
| @@ -220,9 +224,6 @@ void win_open(win_t *win) { | |||
| 220 | 224 | XMapWindow(e->dpy, win->xwin); | |
| 221 | 225 | XFlush(e->dpy); | |
| 222 | 226 | ||
| 223 | − | wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False); | |
| 224 | − | XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1); | |
| 225 | − | ||
| 226 | 227 | if (options->fullscreen) | |
| 227 | 228 | win_toggle_fullscreen(win); | |
| 228 | 229 | } | |