From 6c0c2a8505a1bf5670b034a57335d5885990666f Mon Sep 17 00:00:00 2001 From: okan Date: Mon, 12 Sep 2016 13:48:41 +0000 Subject: Switch to just malloc since we need initialize most everything anyway. --- client.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/client.c b/client.c index f780889..042ae9b 100644 --- a/client.c +++ b/client.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: client.c,v 1.217 2016/09/02 15:08:44 okan Exp $ + * $OpenBSD: client.c,v 1.218 2016/09/12 13:48:41 okan Exp $ */ #include @@ -67,12 +67,18 @@ client_init(Window win, struct screen_ctx *sc) mapped = wattr.map_state != IsUnmapped; } - cc = xcalloc(1, sizeof(*cc)); + cc = xmalloc(sizeof(*cc)); XGrabServer(X_Dpy); cc->sc = sc; cc->win = win; + cc->gc = NULL; + cc->flags = 0; + cc->stackingorder = 0; + memset(&cc->hint, 0, sizeof(cc->hint)); + cc->ptr.x = -1; + cc->ptr.y = -1; TAILQ_INIT(&cc->nameq); client_setname(cc); @@ -85,10 +91,6 @@ client_init(Window win, struct screen_ctx *sc) client_getsizehints(cc); client_mwm_hints(cc); - /* Saved pointer position */ - cc->ptr.x = -1; - cc->ptr.y = -1; - cc->geom.x = wattr.x; cc->geom.y = wattr.y; cc->geom.w = wattr.width; -- cgit v1.2.3-2-gb3c3