Flush pending requests synchronously

xcb_flush() forces flushing requests and then returns, while xcb_aux_sync() waits for the server before returning, meaning the calls will be done synchronously.
wmutils · Jan 25, 2017 · dd268ec · dd268ec
1 parent 49d23ae
commit dd268ec
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 13 deletions.
diff --git a/chwb.c b/chwb.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
@@ -44,7 +45,7 @@ set_border(int width, int color, xcb_window_t win)
 		mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_BORDER_WIDTH ;
 		xcb_configure_window(conn, win, mask, values);
 
-		xcb_flush(conn);
+		xcb_aux_sync(conn);
 
 		free(geom);
 	}
@@ -54,7 +55,7 @@ set_border(int width, int color, xcb_window_t win)
 		mask = XCB_CW_BORDER_PIXEL;
 		xcb_change_window_attributes(conn, win, mask, values);
 
-		xcb_flush(conn);
+		xcb_aux_sync(conn);
 	}
 }
 
@@ -87,7 +88,7 @@ main(int argc, char **argv)
 	while (*argv)
 		set_border(width, color, strtoul(*argv++, NULL, 16));
 
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 

diff --git a/chwso.c b/chwso.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
@@ -58,7 +59,7 @@ main(int argc, char **argv)
 	} ARGEND
 
 	stack(win, values);
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 

diff --git a/config.mk b/config.mk
@@ -5,5 +5,5 @@ CC      = cc
 LD      = $(CC)
 
 CFLAGS  = -std=c99 -pedantic -Wall -Os
-LDFLAGS = -lxcb
+LDFLAGS = -lxcb -lxcb-util
 
diff --git a/ignw.c b/ignw.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <err.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "arg.h"
 #include "util.h"
@@ -46,7 +47,7 @@ main(int argc, char **argv)
 	while (*argv)
 		set_override(strtoul(*argv++, NULL, 16), setflag);
 
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 

diff --git a/killw.c b/killw.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <err.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "arg.h"
 #include "util.h"
@@ -46,7 +47,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 	kill_xcb(&conn);
 
 	return 0;

diff --git a/lsw.c b/lsw.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <err.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "arg.h"
 #include "util.h"

diff --git a/mapw.c b/mapw.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <err.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "arg.h"
 #include "util.h"
@@ -62,7 +63,7 @@ main(int argc, char **argv)
 			break;
 		}
 	}
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 

diff --git a/pfw.c b/pfw.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "util.h"
 

diff --git a/util.c b/util.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "util.h"
 

diff --git a/wattr.c b/wattr.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <err.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 
 #include "util.h"
 

diff --git a/wmp.c b/wmp.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
@@ -84,7 +85,7 @@ main(int argc, char **argv)
 			usage(argv0);
 	}
 
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 	return 0;

diff --git a/wmv.c b/wmv.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <err.h>
@@ -91,7 +92,7 @@ main(int argc, char **argv)
 	while (*argv)
 		move(strtoul(*argv++, NULL, 16), mode, x, y);
 
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 

diff --git a/wrs.c b/wrs.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <err.h>
@@ -84,7 +85,7 @@ main(int argc, char **argv)
 	while (*argv)
 		resize(strtoul(*argv++, NULL, 16), mode, x, y);
 
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);
 

diff --git a/wtf.c b/wtf.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -35,7 +36,7 @@ main(int argc, char **argv)
 		xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, win,
 				XCB_CURRENT_TIME);
 
-		xcb_flush(conn);
+		xcb_aux_sync(conn);
 	}
 
 	kill_xcb(&conn);

diff --git a/wtp.c b/wtp.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
@@ -52,7 +53,7 @@ main(int argc, char **argv)
 
 	teleport(win, atoi(argv[1]), atoi(argv[2]),
 			atoi(argv[3]), atoi(argv[4]));
-	xcb_flush(conn);
+	xcb_aux_sync(conn);
 
 	kill_xcb(&conn);