5 files changed, 57 insertions, 56 deletions
diff --git a/lib/sway/ipc.vala b/lib/sway/ipc.vala
index 3fb4650..d0c219d 100644
--- a/lib/sway/ipc.vala
+++ b/lib/sway/ipc.vala
@@ -1,40 +1,11 @@
 namespace AstalSway {
 private const string IPC_MAGIC = "i3-ipc";
 
-public enum PayloadType {
-    MESSAGE_RUN_COMMAND = 0,
-    MESSAGE_GET_WORKSPACES = 1,
-    MESSAGE_SUBSCRIBE = 2,
-    MESSAGE_GET_OUTPUTS = 3,
-    MESSAGE_GET_TREE = 4,
-    MESSAGE_GET_MARKS = 5,
-    MESSAGE_GET_BAR_CONFIG = 6,
-    MESSAGE_GET_VERSION = 7,
-    MESSAGE_GET_BINDING_NODES = 8,
-    MESSAGE_GET_CONFIG = 9,
-    MESSAGE_SEND_TICK = 10,
-    MESSAGE_SYNC = 11,
-    MESSAGE_GET_BINDING_STATE = 12,
-    MESSAGE_GET_INPUTS = 100,
-    MESSAGE_GET_SEATS = 101,
-    EVENT_WORKSPACE = 0x80000000,
-    EVENT_OUTPUT = 0x80000001,
-    EVENT_MODE = 0x80000002,
-    EVENT_WINDOW = 0x80000003,
-    EVENT_BARCONFIG_UPDATE = 0x80000004,
-    EVENT_BINDING = 0x80000005,
-    EVENT_SHUTDOWN = 0x80000006,
-    EVENT_TICK = 0x80000007,
-    EVENT_BAR_STATE_UPDATE = 0x80000014,
-    EVENT_INPUT = 0x80000015,
-}
-
 private struct IpcReponse {
     public PayloadType type;
     public string payload;
 }
 
-
 // Basic interface to send and receive data through Sway IPjC
 private class Ipc : Object {
     private string SWAYSOCK = GLib.Environment.get_variable("SWAYSOCK");
diff --git a/lib/sway/meson.build b/lib/sway/meson.build
index 34cd880..2e9377b 100644
--- a/lib/sway/meson.build
+++ b/lib/sway/meson.build
@@ -49,6 +49,7 @@ sources = [config] + files(
   'window.vala',
   'sway.vala',
   'ipc.vala',
+  'structs.vala',
 )
 
 if get_option('lib')
diff --git a/lib/sway/node.vala b/lib/sway/node.vala
index 69cc0c1..4f6990b 100644
--- a/lib/sway/node.vala
+++ b/lib/sway/node.vala
@@ -1,30 +1,4 @@
 namespace AstalSway {
-public enum NodeType {
-    ROOT,
-    WORKSPACE,
-    CONTAINER,
-    WINDOW,
-    OUTPUT,
-    SCRATCHPAD
-}
-
-public struct Rectangle {
-    public static Rectangle from_json(Json.Object obj) {
-        return Rectangle() {
-            x = (int)obj.get_int_member("x"),
-            y = (int)obj.get_int_member("y"),
-            width = (int)obj.get_int_member("width"),
-            height = (int)obj.get_int_member("height"),
-        };
-
-    }
-
-    public int x;
-    public int y;
-    public int width;
-    public int height;
-}
-
 public class Node : Object {
     public int id {get; private set; }
     public bool urgent { get; private set; }
diff --git a/lib/sway/structs.vala b/lib/sway/structs.vala
new file mode 100644
index 0000000..24e243b
--- /dev/null
+++ b/lib/sway/structs.vala
@@ -0,0 +1,56 @@
+namespace AstalSway {
+public enum PayloadType {
+    MESSAGE_RUN_COMMAND = 0,
+    MESSAGE_GET_WORKSPACES = 1,
+    MESSAGE_SUBSCRIBE = 2,
+    MESSAGE_GET_OUTPUTS = 3,
+    MESSAGE_GET_TREE = 4,
+    MESSAGE_GET_MARKS = 5,
+    MESSAGE_GET_BAR_CONFIG = 6,
+    MESSAGE_GET_VERSION = 7,
+    MESSAGE_GET_BINDING_NODES = 8,
+    MESSAGE_GET_CONFIG = 9,
+    MESSAGE_SEND_TICK = 10,
+    MESSAGE_SYNC = 11,
+    MESSAGE_GET_BINDING_STATE = 12,
+    MESSAGE_GET_INPUTS = 100,
+    MESSAGE_GET_SEATS = 101,
+    EVENT_WORKSPACE = 0x80000000,
+    EVENT_OUTPUT = 0x80000001,
+    EVENT_MODE = 0x80000002,
+    EVENT_WINDOW = 0x80000003,
+    EVENT_BARCONFIG_UPDATE = 0x80000004,
+    EVENT_BINDING = 0x80000005,
+    EVENT_SHUTDOWN = 0x80000006,
+    EVENT_TICK = 0x80000007,
+    EVENT_BAR_STATE_UPDATE = 0x80000014,
+    EVENT_INPUT = 0x80000015,
+}
+
+public enum NodeType {
+    ROOT,
+    WORKSPACE,
+    CONTAINER,
+    WINDOW,
+    OUTPUT,
+    SCRATCHPAD
+}
+
+public struct Rectangle {
+    internal static Rectangle from_json(Json.Object obj) {
+        return Rectangle() {
+            x = (int)obj.get_int_member("x"),
+            y = (int)obj.get_int_member("y"),
+            width = (int)obj.get_int_member("width"),
+            height = (int)obj.get_int_member("height"),
+        };
+
+    }
+
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+}
+
+}
diff --git a/lib/sway/sway.vala b/lib/sway/sway.vala
index f3d7f13..8f7e6ba 100644
--- a/lib/sway/sway.vala
+++ b/lib/sway/sway.vala
@@ -3,7 +3,6 @@ public Sway get_default() {
     return Sway.get_default();
 }
 
-
 public class Sway : Object {
     private static Sway _instance;
     private Ipc ipc;