From d5f0a20de0c204b81e422530921be0df41f6c6ce Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Tue, 7 Aug 2012 12:09:52 +0200 Subject: Fixed WMProtocols registration order (before mapping window) --- window.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index 11499cc..0d86925 100644 --- a/window.c +++ b/window.c @@ -128,6 +128,8 @@ void win_init(win_t *win) { warn("no locale support"); win_init_font(e->dpy, BAR_FONT); + + wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False); } void win_set_sizehints(win_t *win) { @@ -209,6 +211,8 @@ void win_open(win_t *win) { classhint.res_class = "Sxiv"; XSetClassHint(e->dpy, win->xwin, &classhint); + XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1); + if (!options->hide_bar) { win->barh = font.ascent + font.descent + 2 * V_TEXT_PAD; win->h -= win->barh; @@ -220,9 +224,6 @@ void win_open(win_t *win) { XMapWindow(e->dpy, win->xwin); XFlush(e->dpy); - wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False); - XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1); - if (options->fullscreen) win_toggle_fullscreen(win); } -- cgit v1.2.3-54-g00ecf