From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 2 Oct 2011 15:11:55 +0000 (+0100)
Subject: i3-msg: use socket_path_from_x11 from libi3
X-Git-Tag: 4.1~129^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6af8b0941cff8578303cfc96b1e40b3e0ff95b68;p=i3%2Fi3

i3-msg: use socket_path_from_x11 from libi3
---

diff --git a/i3-msg/main.c b/i3-msg/main.c
index 2d7cef0e..124663d6 100644
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -32,46 +32,11 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
 
+#include "libi3.h"
 #include <i3/ipc.h>
 
 static char *socket_path;
 
-/*
- * Try to get the socket path from X11 and return NULL if it doesn’t work.
- * As i3-msg is a short-running tool, we don’t bother with cleaning up the
- * connection and leave it up to the operating system on exit.
- *
- */
-static char *socket_path_from_x11() {
-    xcb_connection_t *conn;
-    int screen;
-    if ((conn = xcb_connect(NULL, &screen)) == NULL ||
-        xcb_connection_has_error(conn))
-        return NULL;
-    xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screen);
-    xcb_window_t root = root_screen->root;
-
-    xcb_intern_atom_cookie_t atom_cookie;
-    xcb_intern_atom_reply_t *atom_reply;
-
-    atom_cookie = xcb_intern_atom(conn, 0, strlen("I3_SOCKET_PATH"), "I3_SOCKET_PATH");
-    atom_reply = xcb_intern_atom_reply(conn, atom_cookie, NULL);
-    if (atom_reply == NULL)
-        return NULL;
-
-    xcb_get_property_cookie_t prop_cookie;
-    xcb_get_property_reply_t *prop_reply;
-    prop_cookie = xcb_get_property_unchecked(conn, false, root, atom_reply->atom,
-                                             XCB_GET_PROPERTY_TYPE_ANY, 0, PATH_MAX);
-    prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL);
-    if (prop_reply == NULL || xcb_get_property_value_length(prop_reply) == 0)
-        return NULL;
-    if (asprintf(&socket_path, "%.*s", xcb_get_property_value_length(prop_reply),
-                 (char*)xcb_get_property_value(prop_reply)) == -1)
-        return NULL;
-    return socket_path;
-}
-
 /*
  * Formats a message (payload) of the given size and type and sends it to i3 via
  * the given socket file descriptor.