X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=6fd39be48f5172745c37d429af9711f3c0e68853;hb=cd59d61775ade249974eae9bd17d58b95967253d;hp=4f171bbe9d1ee87f34cfb47107f4d5176ef1afa2;hpb=4f722a6f9afee06b802d77cd1da824a055d170c9;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 4f171bb..6fd39be 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -8,6 +8,7 @@
  * Copyright (c) 2011-2012 Reginald Kennedy <rk@rejii.com>
  * Copyright (c) 2011-2012 Lawrence Teo <lteo@lteo.net>
  * Copyright (c) 2011-2012 Tiago Cunha <tcunha@gmx.com>
+ * Copyright (c) 2012 David Hill <dhill@mindcry.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -828,9 +829,8 @@ teardown_ewmh(void)
 			xcb_destroy_window(conn, id);
 			xcb_delete_property(conn, screens[i].root, sup_check);
 			xcb_delete_property(conn, screens[i].root, sup_list);
-
-			free(pr);
 		}
+		free(pr);
 	}
 }
 
@@ -4285,7 +4285,6 @@ resize(struct ws_win *win, union arg *args)
 	xcb_cursor_t		cursor;
 	xcb_font_t		cursor_font;
 	xcb_grab_pointer_cookie_t	gpc;
-	xcb_grab_pointer_reply_t	*gpr;
 	xcb_query_pointer_reply_t	*xpr;
 	xcb_generic_event_t		*evt;
 	xcb_motion_notify_event_t	*mne;
@@ -4372,13 +4371,6 @@ resize(struct ws_win *win, union arg *args)
 	gpc = xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
 	    XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
 	    XCB_CURRENT_TIME),
-	gpr = xcb_grab_pointer_reply(conn, gpc, NULL);
-	if (!gpr) {
-		xcb_free_cursor(conn, cursor);
-		xcb_close_font(conn, cursor_font);
-		free(xpr);
-		return;
-	}
 
 	xcb_flush(conn);
 	resizing = 1;
@@ -4458,7 +4450,6 @@ resize(struct ws_win *win, union arg *args)
 	xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
 	xcb_free_cursor(conn, cursor);
 	xcb_close_font(conn, cursor_font);
-	free(gpr);
 	free(xpr);
 	DNPRINTF(SWM_D_EVENT, "resize: done\n");
 }
@@ -4487,7 +4478,6 @@ move(struct ws_win *win, union arg *args)
 	xcb_font_t			cursor_font;
 	xcb_cursor_t			cursor;
 	xcb_grab_pointer_cookie_t	gpc;
-	xcb_grab_pointer_reply_t	*gpr;
 	xcb_query_pointer_reply_t	*qpr;
 	xcb_generic_event_t		*evt;
 	xcb_motion_notify_event_t	*mne;
@@ -4555,13 +4545,6 @@ move(struct ws_win *win, union arg *args)
 	gpc = xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
 	    XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
 	    XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
-	gpr = xcb_grab_pointer_reply(conn, gpc, NULL);
-	if (!gpr) {
-		xcb_free_cursor(conn, cursor);
-		xcb_close_font(conn, cursor_font);
-		return;
-	}
-	free(gpr);
 
 	/* get cursor offset from window root */
 	qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
@@ -6641,7 +6624,7 @@ manage_window(xcb_window_t id)
 		win->ch.class_name = tmpch.class_name;
 		win->ch.instance_name = tmpch.instance_name;
 
-		xcb_get_wm_class_reply_wipe(&tmpch);
+		xcb_icccm_get_wm_class_reply_wipe(&tmpch);
 
 		DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
 		    win->ch.class_name, win->ch.instance_name);