X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=e2ebcf699d01f31fe1e7dc55fb1edbde69e944b0;hb=2f1cecab3f7ec7ee292c8fa8501971fb9e179415;hp=c912e3f57e690df03c731680ccac694dc670ffb5;hpb=ff9fc42a008c56f255e9eabe5f79151c0232cf73;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index c912e3f..e2ebcf6 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -354,8 +354,8 @@ TAILQ_HEAD(swm_region_list, swm_region);
 
 struct ws_win {
 	TAILQ_ENTRY(ws_win)	entry;
-	Window			id;
-	Window			transient;
+	xcb_window_t		id;
+	xcb_window_t		transient;
 	struct ws_win		*child_trans;	/* transient child window */
 	struct swm_geometry	g;		/* current geometry */
 	struct swm_geometry	g_float;	/* region coordinates */
@@ -402,12 +402,12 @@ void	max_stack(struct workspace *, struct swm_geometry *);
 void	plain_stacker(struct workspace *);
 void	fancy_stacker(struct workspace *);
 
-struct ws_win *find_window(Window);
+struct ws_win *find_window(xcb_window_t);
 
 void	grabbuttons(struct ws_win *, int);
 void	new_region(struct swm_screen *, int, int, int, int);
 void	unmanage_window(struct ws_win *);
-long	getstate(Window);
+long	getstate(xcb_window_t);
 
 int	conf_load(char *, int);
 
@@ -479,7 +479,7 @@ struct swm_screen {
 	int			idx;	/* screen index */
 	struct swm_region_list	rl;	/* list of regions on this screen */
 	struct swm_region_list	orl;	/* list of old regions */
-	Window			root;
+	xcb_window_t		root;
 	struct workspace	ws[SWM_WS_MAX];
 
 	/* colors */
@@ -587,34 +587,34 @@ enum {
 };
 
 struct ewmh_hint {
-	char	*name;
-	Atom	 atom;
+	char		*name;
+	xcb_atom_t	atom;
 } ewmh[SWM_EWMH_HINT_MAX] =	{
     /* must be in same order as in the enum */
-    {"_NET_ACTIVE_WINDOW", None},
-    {"_NET_CLOSE_WINDOW", None},
-    {"_NET_MOVERESIZE_WINDOW", None},
-    {"_NET_WM_ACTION_CLOSE", None},
-    {"_NET_WM_ACTION_FULLSCREEN", None},
-    {"_NET_WM_ACTION_MOVE", None},
-    {"_NET_WM_ACTION_RESIZE", None},
-    {"_NET_WM_ALLOWED_ACTIONS", None},
-    {"_NET_WM_STATE", None},
-    {"_NET_WM_STATE_ABOVE", None},
-    {"_NET_WM_STATE_FULLSCREEN", None},
-    {"_NET_WM_STATE_HIDDEN", None},
-    {"_NET_WM_STATE_MAXIMIZED_HORZ", None},
-    {"_NET_WM_STATE_MAXIMIZED_VERT", None},
-    {"_NET_WM_STATE_SKIP_PAGER", None},
-    {"_NET_WM_STATE_SKIP_TASKBAR", None},
-    {"_NET_WM_WINDOW_TYPE", None},
-    {"_NET_WM_WINDOW_TYPE_DIALOG", None},
-    {"_NET_WM_WINDOW_TYPE_DOCK", None},
-    {"_NET_WM_WINDOW_TYPE_NORMAL", None},
-    {"_NET_WM_WINDOW_TYPE_SPLASH", None},
-    {"_NET_WM_WINDOW_TYPE_TOOLBAR", None},
-    {"_NET_WM_WINDOW_TYPE_UTILITY", None},
-    {"_SWM_WM_STATE_MANUAL", None},
+    {"_NET_ACTIVE_WINDOW", XCB_ATOM_NONE},
+    {"_NET_CLOSE_WINDOW", XCB_ATOM_NONE},
+    {"_NET_MOVERESIZE_WINDOW", XCB_ATOM_NONE},
+    {"_NET_WM_ACTION_CLOSE", XCB_ATOM_NONE},
+    {"_NET_WM_ACTION_FULLSCREEN", XCB_ATOM_NONE},
+    {"_NET_WM_ACTION_MOVE", XCB_ATOM_NONE},
+    {"_NET_WM_ACTION_RESIZE", XCB_ATOM_NONE},
+    {"_NET_WM_ALLOWED_ACTIONS", XCB_ATOM_NONE},
+    {"_NET_WM_STATE", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_ABOVE", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_FULLSCREEN", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_HIDDEN", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_MAXIMIZED_HORZ", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_MAXIMIZED_VERT", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_SKIP_PAGER", XCB_ATOM_NONE},
+    {"_NET_WM_STATE_SKIP_TASKBAR", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE_DIALOG", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE_DOCK", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE_NORMAL", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE_SPLASH", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE_TOOLBAR", XCB_ATOM_NONE},
+    {"_NET_WM_WINDOW_TYPE_UTILITY", XCB_ATOM_NONE},
+    {"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE},
 };
 
 void		 store_float_geom(struct ws_win *, struct swm_region *);
@@ -622,7 +622,7 @@ int		 floating_toggle_win(struct ws_win *);
 void		 constrain_window(struct ws_win *, struct swm_region *, int);
 void		 update_window(struct ws_win *);
 void		 spawn_select(struct swm_region *, union arg *, char *, int *);
-unsigned char	*get_win_name(Window);
+unsigned char	*get_win_name(xcb_window_t);
 
 int
 get_property(Window id, Atom atom, long count, Atom type, unsigned long *nitems,
@@ -850,7 +850,7 @@ ewmh_set_win_fullscreen(struct ws_win *win, int fs)
 void
 ewmh_update_actions(struct ws_win *win)
 {
-	Atom			actions[SWM_EWMH_ACTION_COUNT_MAX];
+	xcb_atom_t		actions[SWM_EWMH_ACTION_COUNT_MAX];
 	int			n = 0;
 
 	if (win == NULL)
@@ -863,8 +863,9 @@ ewmh_update_actions(struct ws_win *win)
 		actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom;
 	}
 
-	XChangeProperty(display, win->id, ewmh[_NET_WM_ALLOWED_ACTIONS].atom,
-	    XA_ATOM, 32, PropModeReplace, (unsigned char *)actions, n);
+	xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
+		ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1,
+		actions);
 }
 
 #define _NET_WM_STATE_REMOVE	0    /* remove/unset property */
@@ -1969,7 +1970,7 @@ set_win_state(struct ws_win *win, long state)
 }
 
 long
-getstate(Window w)
+getstate(xcb_window_t w)
 {
 	long			result = -1;
 	unsigned char		*p = NULL;
@@ -2247,7 +2248,7 @@ find_unmanaged_window(Window id)
 }
 
 struct ws_win *
-find_window(Window id)
+find_window(xcb_window_t id)
 {
 	struct ws_win		*win;
 	Window			wrr, wpr, *wcr = NULL;
@@ -2384,10 +2385,11 @@ validate_ws(struct workspace *testws)
 {
 	struct swm_region	*r;
 	struct workspace	*ws;
-	int			i, x;
+	int			i, x, num_screens;
 
 	/* validate all ws */
-	for (i = 0; i < ScreenCount(display); i++)
+	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+	for (i = 0; i < num_screens; i++)
 		TAILQ_FOREACH(r, &screens[i].rl, entry)
 			for (x = 0; x < workspace_limit; x++) {
 				ws = &r->s->ws[x];
@@ -2401,7 +2403,7 @@ void
 unfocus_win(struct ws_win *win)
 {
 	XEvent			cne;
-	Window			none = None;
+	xcb_window_t		none = XCB_WINDOW_NONE;
 
 	DNPRINTF(SWM_D_FOCUS, "unfocus_win: window: 0x%lx\n", WINID(win));
 
@@ -2443,20 +2445,21 @@ unfocus_win(struct ws_win *win)
 	XSetWindowBorder(display, win->id,
 	    win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
 
-	XChangeProperty(display, win->s->root,
-	    ewmh[_NET_ACTIVE_WINDOW].atom, XA_WINDOW, 32,
-	    PropModeReplace, (unsigned char *)&none, 1);
+	xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
+		ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
+		&none);
 }
 
 void
 unfocus_all(void)
 {
 	struct ws_win		*win;
-	int			i, j;
+	int			i, j, num_screens;
 
 	DNPRINTF(SWM_D_FOCUS, "unfocus_all\n");
 
-	for (i = 0; i < ScreenCount(display); i++)
+	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+	for (i = 0; i < num_screens; i++)
 		for (j = 0; j < workspace_limit; j++)
 			TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
 				unfocus_win(win);
@@ -3636,7 +3639,7 @@ iconify(struct swm_region *r, union arg *args)
 }
 
 unsigned char *
-get_win_name(Window win)
+get_win_name(xcb_window_t win)
 {
 	unsigned char		*prop = NULL;
 	unsigned long		nbytes, nitems;
@@ -3701,7 +3704,7 @@ uniconify(struct swm_region *r, union arg *args)
 		name = get_win_name(win->id);
 		if (name == NULL)
 			continue;
-		fprintf(lfile, "%s.%lu\n", name, win->id);
+		fprintf(lfile, "%s.%u\n", name, win->id);
 		XFree(name);
 	}
 
@@ -3858,7 +3861,7 @@ search_resp_uniconify(char *resp, unsigned long len)
 		name = get_win_name(win->id);
 		if (name == NULL)
 			continue;
-		if (asprintf(&s, "%s.%lu", name, win->id) == -1) {
+		if (asprintf(&s, "%s.%u", name, win->id) == -1) {
 			XFree(name);
 			continue;
 		}
@@ -5397,19 +5400,25 @@ grabbuttons(struct ws_win *win, int focused)
 	    { 0, LockMask, numlockmask, numlockmask|LockMask };
 
 	updatenumlockmask();
-	XUngrabButton(display, AnyButton, AnyModifier, win->id);
+	xcb_ungrab_button(conn, XCB_BUTTON_INDEX_ANY, win->id,
+		XCB_BUTTON_MASK_ANY);
 	if (focused) {
 		for (i = 0; i < LENGTH(buttons); i++)
 			if (buttons[i].action == client_click)
 				for (j = 0; j < LENGTH(modifiers); j++)
-					XGrabButton(display, buttons[i].button,
-					    buttons[i].mask | modifiers[j],
-					    win->id, False, BUTTONMASK,
-					    GrabModeAsync, GrabModeSync, None,
-					    None);
+					xcb_grab_button(conn, False, win->id,
+						BUTTONMASK,
+						XCB_GRAB_MODE_ASYNC,
+						XCB_GRAB_MODE_SYNC,
+						XCB_WINDOW_NONE,
+						XCB_CURSOR_NONE,
+						buttons[i].button,
+						buttons[i].mask);
 	} else
-		XGrabButton(display, AnyButton, AnyModifier, win->id, False,
-		    BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+		xcb_grab_button(conn, False, win->id, BUTTONMASK,
+			XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_SYNC,
+			XCB_WINDOW_NONE, XCB_CURSOR_NONE, XCB_BUTTON_INDEX_ANY,
+			XCB_BUTTON_MASK_ANY); 
 }
 
 const char *quirkname[] = {
@@ -6137,7 +6146,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 		    " for 0x%lx trans 0x%lx\n", win->id, win->transient);
 
 		if (win->hints == NULL) {
-			warnx("no hints for 0x%lx", win->id);
+			warnx("no hints for 0x%x", win->id);
 			return;
 		}
 
@@ -6149,7 +6158,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 				XFree(wmh);
 
 			if ((wmh = XGetWMHints(display, w->id)) == NULL) {
-				warnx("can't get hints for 0x%lx", w->id);
+				warnx("can't get hints for 0x%x", w->id);
 				continue;
 			}
 
@@ -6160,7 +6169,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 			win->transient = w->id;
 			*trans = w->id;
 			DNPRINTF(SWM_D_MISC, "set_child_transient: asjusting "
-			    "transient to 0x%lx\n", win->transient);
+			    "transient to 0x%x\n", win->transient);
 			break;
 		}
 	}