Fix #3535 - Check for DISPLAY when requesting version information

[i3/i3] / src / display_version.c

diff --git a/src/display_version.c b/src/display_version.c
index 0e650e817378174f39a7bd5def167b144a508769..da11bff33587b772f273edf9dca591a2ff13ae3e 100644 (file)
--- a/src/display_version.c
+++ b/src/display_version.c
@@ -55,9 +55,12 @@ static yajl_callbacks version_callbacks = {
  *
  */
 void display_running_version(void) {
-    char *socket_path = root_atom_contents("I3_SOCKET_PATH", conn, conn_screen);
-    if (socket_path == NULL)
-        exit(EXIT_SUCCESS);
+    if (getenv("DISPLAY") == NULL) {
+        fprintf(stderr, "\nYour DISPLAY environment variable is not set.\n");
+        fprintf(stderr, "Are you running i3 via SSH or on a virtual console?\n");
+        fprintf(stderr, "Try DISPLAY=:0 i3 --moreversion\n");
+        exit(EXIT_FAILURE);
+    }
 
     char *pid_from_atom = root_atom_contents("I3_PID", conn, conn_screen);
     if (pid_from_atom == NULL) {
@@ -71,18 +74,7 @@ void display_running_version(void) {
     printf("(Getting version from running i3, press ctrl-c to abort…)");
     fflush(stdout);
 
-    /* TODO: refactor this with the code for sending commands */
-    int sockfd = socket(AF_LOCAL, SOCK_STREAM, 0);
-    if (sockfd == -1)
-        err(EXIT_FAILURE, "Could not create socket");
-
-    struct sockaddr_un addr;
-    memset(&addr, 0, sizeof(struct sockaddr_un));
-    addr.sun_family = AF_LOCAL;
-    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
-    if (connect(sockfd, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0)
-        err(EXIT_FAILURE, "Could not connect to i3");
-
+    int sockfd = ipc_connect(NULL);
     if (ipc_send_message(sockfd, 0, I3_IPC_MESSAGE_TYPE_GET_VERSION,
                          (uint8_t *)"") == -1)
         err(EXIT_FAILURE, "IPC: write()");
@@ -182,4 +174,6 @@ void display_running_version(void) {
 #endif
 
     yajl_free(handle);
+    free(reply);
+    free(pid_from_atom);
 }