Merge branch 'less-xlib' into next

Closes #14

src/c2.c

@@ -1463,7 +1463,13 @@ c2_match_once_leaf(session_t *ps, win *w, const c2_l_t *pleaf,
               idx, 1L, c2_get_atom_type(pleaf), pleaf->format);
           Atom atom = winprop_get_int(prop);
           if (atom) {
-            tgt_free = XGetAtomName(ps->dpy, atom);
+            xcb_get_atom_name_reply_t *reply =
+              xcb_get_atom_name_reply(ps->c, xcb_get_atom_name(ps->c, atom), NULL);
+            if (reply) {
+              tgt_free = strndup(
+                  xcb_get_atom_name_name(reply), xcb_get_atom_name_name_length(reply));
+              free(reply);
+            }
           }
           if (tgt_free) {
             tgt = tgt_free;

src/common.h

@@ -777,6 +777,8 @@ typedef struct session {
   Display *dpy;
   /// Default screen.
   int scr;
+  /// XCB connection.
+  xcb_connection_t *c;
   /// Default visual.
   xcb_visualid_t vis;
   /// Pict formats info
@@ -1696,12 +1698,29 @@ cxfree(void *data) {
     XFree(data);
 }
 
+static inline void _Noreturn
+die(const char *msg) {
+  puts(msg);
+  exit(1);
+}
+
 /**
  * Wrapper of XInternAtom() for convenience.
  */
-static inline Atom
+static inline xcb_atom_t
 get_atom(session_t *ps, const char *atom_name) {
-  return XInternAtom(ps->dpy, atom_name, False);
+  xcb_intern_atom_reply_t *reply =
+    xcb_intern_atom_reply(ps->c,
+        xcb_intern_atom(ps->c, False, strlen(atom_name), atom_name),
+        NULL);
+
+  xcb_atom_t atom = XCB_NONE;
+  if (reply) {
+    atom = reply->atom;
+    free(reply);
+  } else
+    die("Failed to intern atoms, bail out");
+  return atom;
 }
 
 /**
@@ -2072,7 +2091,7 @@ xr_sync_(session_t *ps, Drawable d
   if (!ps->o.xrender_sync)
     return;
 
-  XSync(ps->dpy, False);
+  x_sync(ps->c);
 #ifdef CONFIG_XSYNC
   if (ps->o.xrender_sync_fence && ps->xsync_exists) {
     // TODO: If everybody just follows the rules stated in X Sync prototype,