summaryrefslogtreecommitdiff
path: root/app/cwm/calmwm.c
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2012-05-16 01:17:15 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2012-05-16 01:17:15 +0000
commit92c96d6f2e48b6fb7e06ab9d712da22dc8d65873 (patch)
tree8253544c0714c880a89ec64a5e9dae679aeb092d /app/cwm/calmwm.c
parent290795ee7121cede5cf358c79176a205891a566b (diff)
instead of using the menu window for _NET_SUPPORTING_WM_CHECK, create a
dummy one to use instead; allows us to not have to wait for menu_init(), so re-shuffle _NET_SUPPORTED slightly. ok sthen@
Diffstat (limited to 'app/cwm/calmwm.c')
-rw-r--r--app/cwm/calmwm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c
index d12ebe5ab..30cf99f6f 100644
--- a/app/cwm/calmwm.c
+++ b/app/cwm/calmwm.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: calmwm.c,v 1.60 2012/05/13 15:15:54 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.61 2012/05/16 01:17:14 okan Exp $
*/
#include <sys/param.h>
@@ -163,6 +163,9 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
sc->which = which;
sc->rootwin = RootWindow(X_Dpy, sc->which);
+ xu_ewmh_net_supported(sc);
+ xu_ewmh_net_supported_wm_check(sc);
+
conf_gap(&Conf, sc);
screen_update_geometry(sc, DisplayWidth(X_Dpy, sc->which),
DisplayHeight(X_Dpy, sc->which));
@@ -177,8 +180,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
/* Initialize menu window. */
menu_init(sc);
- xu_setwmname(sc);
-
rootattr.cursor = Cursor_normal;
rootattr.event_mask = CHILDMASK|PropertyChangeMask|EnterWindowMask|
LeaveWindowMask|ColormapChangeMask|BUTTONMASK;