Merge branch 'master' into next

[i3/i3] / i3-msg / main.c

diff --git a/i3-msg/main.c b/i3-msg/main.c
index 5bc35b880cb64cd78aa56a577021f6c2c34dd2d5..ccf6e10f276a54ce8d2716b593db7d9895890442 100644 (file)
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -2,10 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-msg/main.c: Utility which sends messages to a running i3-instance using
  * IPC via UNIX domain sockets.
@@ -74,9 +71,11 @@ int main(int argc, char *argv[]) {
                 message_type = I3_IPC_MESSAGE_TYPE_GET_TREE;
             else if (strcasecmp(optarg, "get_marks") == 0)
                 message_type = I3_IPC_MESSAGE_TYPE_GET_MARKS;
+            else if (strcasecmp(optarg, "get_bar_config") == 0)
+                message_type = I3_IPC_MESSAGE_TYPE_GET_BAR_CONFIG;
             else {
                 printf("Unknown message type\n");
-                printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks\n");
+                printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config\n");
                 exit(EXIT_FAILURE);
             }
         } else if (o == 'q') {
@@ -92,7 +91,7 @@ int main(int argc, char *argv[]) {
     }
 
     if (socket_path == NULL)
-        socket_path = socket_path_from_x11();
+        socket_path = root_atom_contents("I3_SOCKET_PATH");
 
     /* Fall back to the default socket path */
     if (socket_path == NULL)