Merge pull request #302 from zjeffer/fix/zjeffer/monitor-id-option

Fix null monitors causing panics

src/data/regular.rs

@@ -165,9 +165,9 @@ pub struct Workspace {
     pub name: String,
     /// The monitor the workspace is on
     pub monitor: String,
-    /// The monitor id the workspace is on
+    /// The monitor id the workspace is on, can be None in some cases
     #[serde(rename = "monitorID")]
-    pub monitor_id: MonitorId,
+    pub monitor_id: Option<MonitorId>,
     /// The amount of windows in the workspace
     pub windows: u16,
     /// A bool that shows if there is a fullscreen window in the workspace
@@ -234,8 +234,8 @@ pub struct Client {
     /// The client fullscreen mode
     #[serde(rename = "fullscreenClient")]
     pub fullscreen_client: FullscreenMode,
-    /// The monitor id the window is on
-    pub monitor: MonitorId,
+    /// The monitor id the window is on, can be None in some cases
+    pub monitor: Option<MonitorId>,
     /// The initial window class
     #[serde(rename = "initialClass")]
     pub initial_class: String,

src/event_listener/shared.rs

@@ -418,7 +418,7 @@ pub struct ChangedSpecialEventData {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct MonitorAddedEventData {
     /// The monitor's id
-    pub id: u8,
+    pub id: MonitorId,
     /// The monitor's name
     pub name: String,
     /// the monitor's description
@@ -805,7 +805,7 @@ pub(crate) fn event_parser(event: String) -> crate::Result<Vec<Event>> {
             }
             ParsedEventType::MonitorRemoved => Ok(Event::MonitorRemoved(get![args;0])),
             ParsedEventType::MonitorAddedV2 => Ok(Event::MonitorAdded(MonitorAddedEventData {
-                id: parse_int!(get![ref args;0], event: "MonitorAddedV2" => u8),
+                id: parse_int!(get![ref args;0], event: "MonitorAddedV2" => MonitorId),
                 name: get![args;1],
                 description: get![args;2],
             })),