X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=4c8387f27074cfdde17c1854cf8aaa50e3035602;hb=efd9be3bdbee0d9866fd09837770c768f3010708;hp=0df1a4c6b404baae306a415d4c46feee3aaa4bdc;hpb=be5998f89cee01002e6bed80ccb866331dc5cb9b;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 0df1a4c..4c8387f 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -194,13 +194,13 @@ u_int32_t		swm_debug = 0
 #define BORDER(w)		(w->bordered ? border_width : 0)
 #define MAX_X(r)		((r)->g.x + (r)->g.w)
 #define MAX_Y(r)		((r)->g.y + (r)->g.h)
-#define SH_MIN(w)		(w)->sh_mask & PMinSize
+#define SH_MIN(w)		(w)->sh.flags & XCB_SIZE_HINT_P_MIN_SIZE
 #define SH_MIN_W(w)		(w)->sh.min_width
 #define SH_MIN_H(w)		(w)->sh.min_height
-#define SH_MAX(w)		(w)->sh_mask & PMaxSize
+#define SH_MAX(w)		(w)->sh.flags & XCB_SIZE_HINT_P_MAX_SIZE
 #define SH_MAX_W(w)		(w)->sh.max_width
 #define SH_MAX_H(w)		(w)->sh.max_height
-#define SH_INC(w)		(w)->sh_mask & PResizeInc
+#define SH_INC(w)		(w)->sh.flags & XCB_SIZE_HINT_P_RESIZE_INC
 #define SH_INC_W(w)		(w)->sh.width_inc
 #define SH_INC_H(w)		(w)->sh.height_inc
 #define SWM_MAX_FONT_STEPS	(3)
@@ -387,10 +387,9 @@ struct ws_win {
 	unsigned long		quirks;
 	struct workspace	*ws;	/* always valid */
 	struct swm_screen	*s;	/* always valid, never changes */
-	XWindowAttributes	wa;
-	XSizeHints		sh;
-	long			sh_mask;
-	XClassHint		ch;
+	xcb_get_geometry_reply_t	*wa;
+	xcb_size_hints_t	sh;
+	xcb_get_wm_class_reply_t	ch;
 	xcb_wm_hints_t		hints;
 };
 TAILQ_HEAD(ws_win_list, ws_win);
@@ -1518,8 +1517,8 @@ bar_class_name(char *s, size_t sz, struct swm_region *r)
 {
 	if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
 		return;
-	if (r->ws->focus->ch.res_class != NULL)
-		strlcat(s, r->ws->focus->ch.res_class, sz);
+	if (r->ws->focus->ch.class_name != NULL)
+		strlcat(s, r->ws->focus->ch.class_name, sz);
 }
 
 void
@@ -1527,8 +1526,8 @@ bar_title_name(char *s, size_t sz, struct swm_region *r)
 {
 	if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
 		return;
-	if (r->ws->focus->ch.res_name != NULL)
-		strlcat(s, r->ws->focus->ch.res_name, sz);
+	if (r->ws->focus->ch.instance_name != NULL)
+		strlcat(s, r->ws->focus->ch.instance_name, sz);
 }
 
 void
@@ -2045,8 +2044,9 @@ void
 drain_enter_notify(void)
 {
 	int			i = 0;
+	XEvent			cne;
 
-	while (xcb_poll_for_event(conn))
+	while (XCheckMaskEvent(display, EnterWindowMask, &cne))
 		i++;
 
 	DNPRINTF(SWM_D_EVENT, "drain_enter_notify: drained: %d\n", i);
@@ -2147,10 +2147,10 @@ config_win(struct ws_win *win, XConfigureRequestEvent  *ev)
 		ce.window = ev->window;
 
 		/* make response appear more WM_SIZE_HINTS-compliant */
-		if (win->sh_mask)
+		if (win->sh.flags)
 			DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%x,"
-			    " sh_mask: %ld, min: %d x %d, max: %d x %d, inc: "
-			    "%d x %d\n", win->id, win->sh_mask, SH_MIN_W(win),
+			    " sh.flags: %u, min: %d x %d, max: %d x %d, inc: "
+			    "%d x %d\n", win->id, win->sh.flags, SH_MIN_W(win),
 			    SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win),
 			    SH_INC_W(win), SH_INC_H(win));
 
@@ -2305,7 +2305,8 @@ restart(struct swm_region *r, union arg *args)
 	bar_extra_stop();
 	bar_extra = 1;
 	unmap_all();
-	XCloseDisplay(display);
+	xcb_flush(conn);
+
 	execvp(start_argv[0], start_argv);
 	warn("execvp failed");
 	quit(NULL, NULL);
@@ -3305,7 +3306,6 @@ adjust_font(struct ws_win *win)
 void
 stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 {
-	XWindowAttributes	wa;
 	struct swm_geometry	win_g, r_g = *g;
 	struct ws_win		*win, *fs_win = NULL;
 	int			i, j, s, stacks;
@@ -3314,6 +3314,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	int			split, colno, winno, mwin, msize, mscale;
 	int			remain, missing, v_slice, reconfigure;
 	int			bordered = 1;
+	xcb_get_window_attributes_reply_t *war;
 
 	DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, "
 	    "flip: %s\n", ws->idx, YESNO(rot), YESNO(flip));
@@ -3476,9 +3477,14 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 			update_window(win);
 		}
 
-		if (XGetWindowAttributes(display, win->id, &wa))
-			if (wa.map_state == IsUnmapped)
+		war = xcb_get_window_attributes_reply(conn,
+			xcb_get_window_attributes(conn, win->id),
+			NULL);
+		if (war) {
+			if (war->map_state == XCB_MAP_STATE_UNMAPPED)
 				map_window_raised(win->id);
+			free(war);
+		}
 
 		last_h = win_g.h;
 		i++;
@@ -3778,14 +3784,15 @@ get_win_name(xcb_window_t win)
 
 	c = xcb_icccm_get_wm_name(conn, win);
 	if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
-		name = malloc(r.name_len + 1);
-		if (!name) {
-			xcb_get_text_property_reply_wipe(&r);
-			return (NULL);
+		if (r.name_len > 0) {
+			name = malloc(r.name_len + 1);
+			if (!name) {
+				xcb_get_text_property_reply_wipe(&r);
+				return (NULL);
+			}
+			memcpy(name, r.name, r.name_len);
+			name[r.name_len] = '\0';
 		}
-		memcpy(name, r.name, r.name_len);
-		name[r.name_len] = '\0';
-		
 		xcb_get_text_property_reply_wipe(&r);
 	}
 
@@ -5521,19 +5528,36 @@ setkeymapping(char *selector, char *value, int flags)
 void
 updatenumlockmask(void)
 {
-	unsigned int		i, j;
-	XModifierKeymap		*modmap;
+	unsigned int				i, j;
+	xcb_get_modifier_mapping_reply_t	*modmap_r;
+	xcb_keycode_t				*modmap, kc;
+	xcb_key_symbols_t			*syms;
 
 	DNPRINTF(SWM_D_MISC, "updatenumlockmask\n");
 	numlockmask = 0;
-	modmap = XGetModifierMapping(display);
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < modmap->max_keypermod; j++)
-			if (modmap->modifiermap[i * modmap->max_keypermod + j]
-			    == XKeysymToKeycode(display, XK_Num_Lock))
-				numlockmask = (1 << i);
 
-	XFreeModifiermap(modmap);
+	syms = xcb_key_symbols_alloc(conn);
+	if (!syms)
+		return;
+	
+	modmap_r = xcb_get_modifier_mapping_reply(conn,
+		xcb_get_modifier_mapping(conn),
+		NULL);
+	if (modmap_r) {
+		modmap = xcb_get_modifier_mapping_keycodes(modmap_r);
+		for (i = 0; i < 8; i++) {
+			for (j = 0; j < modmap_r->keycodes_per_modifier; j++) {
+				kc = modmap[i * modmap_r->keycodes_per_modifier
+					+ j];
+
+			     	if (kc == *((xcb_keycode_t *)xcb_key_symbols_get_keycode(syms,
+						XK_Num_Lock))) 
+					numlockmask = (1 << i);
+			}
+		}
+		free(modmap_r);
+	}
+	xcb_key_symbols_free(syms);
 }
 
 void
@@ -6320,7 +6344,7 @@ set_child_transient(struct ws_win *win, xcb_window_t *trans)
 		DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist"
 		    " for 0x%x trans 0x%x\n", win->id, win->transient);
 
-		r = root_to_region(win->wa.root);
+		r = root_to_region(win->wa->root);
 		ws = r->ws;
 		/* parent doen't exist in our window list */
 		TAILQ_FOREACH(w, &ws->winlist, entry) {
@@ -6394,6 +6418,7 @@ manage_window(xcb_window_t id)
 	int			i, ws_idx, border_me = 0;
 	xcb_atom_t		ws_idx_atom = XCB_ATOM_NONE;
 	char			ws_idx_str[SWM_PROPLEN], *prop = NULL;
+	size_t			proplen;
 	struct swm_region	*r;
 	const char		*errstr;
 	struct pid_e		*p;
@@ -6449,24 +6474,32 @@ manage_window(xcb_window_t id)
 
 	/* Get all the window data in one shot */
 	ws_idx_atom = get_atom_from_string("_SWM_WS");
+	fprintf(stderr, "ws_idx_atom: %d\n", ws_idx_atom);
 	if (ws_idx_atom) {
 		gpr = xcb_get_property_reply(conn,
 			xcb_get_property(conn, False, id, ws_idx_atom,
 				XCB_ATOM_STRING, 0, SWM_PROPLEN),
 			NULL);
 		if (gpr) {
-			prop = malloc(xcb_get_property_value_length(gpr) + 1);
-			if (prop) {
-				memcpy(prop, xcb_get_property_value(gpr),
-					xcb_get_property_value_length(gpr));
-				prop[xcb_get_property_value_length(gpr)] = '\0';
+			proplen = xcb_get_property_value_length(gpr);
+			if (proplen > 0) {
+				prop = malloc(proplen + 1);
+				if (prop) {
+					memcpy(prop,
+					    xcb_get_property_value(gpr),
+					    proplen);	
+					prop[proplen] = '\0';
+				}
 			}
 			free(gpr);
 		}
-		
 	}
-	XGetWindowAttributes(display, id, &win->wa);
-	XGetWMNormalHints(display, id, &win->sh, &win->sh_mask);
+	win->wa = xcb_get_geometry_reply(conn,
+		xcb_get_geometry(conn, id),
+		NULL);	
+	xcb_get_wm_normal_hints_reply(conn,
+		xcb_get_wm_normal_hints(conn, id),
+		&win->sh, NULL);
 	xcb_icccm_get_wm_hints_reply(conn,
 		xcb_icccm_get_wm_hints(conn, id),
 		&win->hints, NULL);
@@ -6504,7 +6537,7 @@ manage_window(xcb_window_t id)
 	 * a workspace (either by spawn() or manually moving), and isn't
 	 * transient, * put it in the same workspace
 	 */
-	r = root_to_region(win->wa.root);
+	r = root_to_region(win->wa->root);
 	if (p) {
 		ws = &r->s->ws[p->ws];
 		TAILQ_REMOVE(&pidlist, p, entry);
@@ -6558,10 +6591,10 @@ manage_window(xcb_window_t id)
 	}
 
 	/* ignore window border if there is one. */
-	WIDTH(win) = win->wa.width;
-	HEIGHT(win) = win->wa.height;
-	X(win) = win->wa.x + win->wa.border_width;
-	Y(win) = win->wa.y + win->wa.border_width;
+	WIDTH(win) = win->wa->width;
+	HEIGHT(win) = win->wa->height;
+	X(win) = win->wa->x + win->wa->border_width;
+	Y(win) = win->wa->y + win->wa->border_width;
 	win->bordered = 0;
 	win->g_floatvalid = 0;
 	win->floatmaxed = 0;
@@ -6588,22 +6621,24 @@ manage_window(xcb_window_t id)
 
 	ewmh_autoquirk(win);
 
-	if (XGetClassHint(display, win->id, &win->ch)) {
+	if (xcb_get_wm_class_reply(conn,
+			xcb_get_wm_class(conn, win->id),
+			&win->ch, NULL)) {
 		DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
-		    win->ch.res_class, win->ch.res_name);
+		    win->ch.class_name, win->ch.instance_name);
 
 		/* java is retarded so treat it special */
-		if (strstr(win->ch.res_name, "sun-awt")) {
+		if (strstr(win->ch.instance_name, "sun-awt")) {
 			win->java = 1;
 			border_me = 1;
 		}
 
 		TAILQ_FOREACH(qp, &quirks, entry) {
-			if (!strcmp(win->ch.res_class, qp->class) &&
-			    !strcmp(win->ch.res_name, qp->name)) {
+			if (!strcmp(win->ch.class_name, qp->class) &&
+			    !strcmp(win->ch.instance_name, qp->name)) {
 				DNPRINTF(SWM_D_CLASS, "manage_window: found: "
-				    "class: %s, name: %s\n", win->ch.res_class,
-				    win->ch.res_name);
+				    "class: %s, name: %s\n", win->ch.class_name,
+				    win->ch.instance_name);
 				if (qp->quirk & SWM_Q_FLOAT) {
 					win->floating = 1;
 					border_me = 1;
@@ -6669,10 +6704,10 @@ free_window(struct ws_win *win)
 
 	TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
 
-	if (win->ch.res_class)
-		XFree(win->ch.res_class);
-	if (win->ch.res_name)
-		XFree(win->ch.res_name);
+	if (win->wa)
+		free(win->wa);
+	
+	xcb_get_wm_class_reply_wipe(&win->ch);
 
 	kill_refs(win);
 
@@ -6823,7 +6858,7 @@ configurerequest(XEvent *e)
 
 		XConfigureWindow(display, ev->window, ev->value_mask, &wc);
 	} else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
-	    !(win->sh_mask & EWMH_F_FULLSCREEN)) {
+	    !(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
 		win->g_float.x = ev->x - X(win->ws->r);
 		win->g_float.y = ev->y - Y(win->ws->r);
 		win->g_float.w = ev->width;
@@ -6853,7 +6888,9 @@ configurenotify(XEvent *e)
 
 	win = find_window(e->xconfigure.window);
 	if (win) {
-		XGetWMNormalHints(display, win->id, &win->sh, &win->sh_mask);
+		xcb_get_wm_normal_hints_reply(conn,
+			xcb_get_wm_normal_hints(conn, win->id),
+			&win->sh, NULL);
 		adjust_font(win);
 		if (font_adjusted)
 			stack();
@@ -7111,7 +7148,7 @@ maprequest(XEvent *e)
 	stack();
 
 	/* make new win focused */
-	r = root_to_region(win->wa.root);
+	r = root_to_region(win->wa->root);
 	if (win->ws == r->ws)
 		focus_magic(win);
 }
@@ -7122,15 +7159,28 @@ propertynotify(XEvent *e)
 	struct ws_win		*win;
 	XPropertyEvent		*ev = &e->xproperty;
 #ifdef SWM_DEBUG
-	xcb_get_atom_name_reply_t *r;
+	char				*name;
+	size_t				len;
+	xcb_get_atom_name_reply_t	*r;
 
 	r = xcb_get_atom_name_reply(conn,
 		xcb_get_atom_name(conn, ev->atom),
 		NULL);
 	if (r) {
-		DNPRINTF(SWM_D_EVENT,
-			 "propertynotify: window: 0x%x, atom: %s\n",
-	    		ev->window, );
+		len = xcb_get_atom_name_name_length(r);
+		if (len > 0) {
+			name = malloc(len + 1);
+			if (name) {
+				memcpy(name, xcb_get_atom_name_name(r), len);
+				name[len] = '\0';
+				
+				DNPRINTF(SWM_D_EVENT,
+				 	"propertynotify: window: 0x%lx, "
+					"atom: %s\n",
+	    				ev->window, name);
+				free(name);
+			}
+		}
 		free(r);
 	}
 #endif
@@ -7153,7 +7203,7 @@ propertynotify(XEvent *e)
 		long		mask;
 		XGetWMNormalHints(display, win->id, &win->sh, &mask);
 		warnx("normal hints: flag 0x%x", win->sh.flags);
-		if (win->sh.flags & PMinSize) {
+		if (win->sh.flags & XCB_SIZE_HINT_P_MIN_SIZE) {
 			WIDTH(win) = win->sh.min_width;
 			HEIGHT(win) = win->sh.min_height;
 			warnx("min %d %d", WIDTH(win), HEIGHT(win));
@@ -7161,8 +7211,8 @@ propertynotify(XEvent *e)
 		XMoveResizeWindow(display, win->id,
 		    X(win), Y(win), WIDTH(win), HEIGHT(win));
 #endif
-	case XA_WM_CLASS:
-	case XA_WM_NAME:
+	case XCB_ATOM_WM_CLASS:
+	case XCB_ATOM_WM_NAME:
 		bar_update();
 		break;
 	default:
@@ -7199,7 +7249,7 @@ unmapnotify(XEvent *e)
 		    SubstructureNotifyMask, &cne))
 			;
 		/* resend unmap because we ated it */
-		XUnmapWindow(display, e->xunmap.window);
+		xcb_unmap_window(conn, e->xunmap.window);
 	}
 
 	if (focus_mode == SWM_FOCUS_DEFAULT)
@@ -7919,7 +7969,6 @@ done:
 			xcb_free_gc(conn, screens[i].bar_gc);
 	XFreeFontSet(display, bar_fs);
 	xcb_disconnect(conn);
-	XCloseDisplay(display);
 
 	return (0);
 }