From 391bb0ea2fe6c852f10a77c1c5037042adc4fb2a Mon Sep 17 00:00:00 2001
From: Michael <michael.lindman@gmail.com>
Date: Mon, 13 Feb 2023 01:37:28 +0000
Subject: [PATCH] fixed types for tree

---
 src/types.rs | 45 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index da51a11..6b86a07 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -23,7 +23,6 @@ pub struct Workspace {
     pub window_rect: Rect,
     pub geometry: Rect,
     pub name: String,
-    //pub nodes: Box<Vec<Workspace>>,
     pub floating_nodes: Vec<FloatingNodes>,
     pub focus: Vec<i32>,
     pub fullscreen_mode: i32,
@@ -203,14 +202,52 @@ pub struct Tree {
     pub window_rect: Rect,
     pub geometry: Rect,
     pub name: String,
-    //window: 
-    pub nodes: Vec<Output>,
-    pub floating: Vec<FloatingNodes>,
+    pub nodes: Vec<Nodes>,
+    pub floating: Option<Vec<FloatingNodes>>,
     pub focus: Vec<i32>,
     pub fullscreen_mode: i32,
     pub sticky: bool
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct Nodes {
+    pub id: i32,
+    #[serde(rename = "type")]
+    pub _type: String,
+    pub orientation: String,
+    pub percent: Option<f32>,
+    pub urgent: bool,
+    pub layout: String,
+    pub border: String,
+    pub current_border_width: i32,
+    pub rect: Rect,
+    pub deco_rect: Rect,
+    pub window_rect: Rect,
+    pub geometry: Rect,
+    pub name: String,
+    pub nodes: Option<Vec<Workspace>>,
+    pub floating_nodes: Vec<FloatingNodes>,
+    pub focus: Vec<i32>,
+    pub fullscreen_mode: i32,
+    pub sticky: bool,
+    pub active: Option<bool>,
+    pub dpms: Option<bool>,
+    pub primary: Option<bool>,
+    pub make: Option<String>,
+    pub model: Option<String>,
+    pub serial: Option<String>,
+    pub scale: Option<f32>,
+    pub scale_filter: Option<String>,
+    pub transform: Option<String>,
+    pub adaptive_sync_status: Option<String>,
+    pub current_workspace: Option<String>,
+    pub modes: Option<Vec<Mode>>,
+    pub current_mode: Option<Mode>,
+    pub max_render_time: Option<i32>,
+    pub focused: Option<bool>,
+    pub subpixel_hinting: Option<String>
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct Seat {
     pub name: String,