Update for i3 4.14

Add Event::ShutdownEvent from i3/i3@04dcf42

Author: tmerr

Cargo.toml

@@ -15,3 +15,4 @@ serde_json = "0.6.0"
 [features]
 i3-4-12 = []
 i3-4-13 = ["i3-4-12"]
+i3-4-14 = ["i3-4-13"]

src/event.rs

@@ -16,6 +16,9 @@ pub enum Event {
     WindowEvent(WindowEventInfo),
     BarConfigEvent(BarConfigEventInfo),
     BindingEvent(BindingEventInfo),
+
+    #[cfg(feature = "i3-4-14")]
+    ShutdownEvent(ShutdownEventInfo),
 }
 
 /// Data for `WorkspaceEvent`.
@@ -211,6 +214,30 @@ impl FromStr for BindingEventInfo {
     }
 }
 
+/// Data for `ShutdownEvent`.
+#[derive(Debug)]
+#[cfg(feature = "i3-4-14")]
+pub struct ShutdownEventInfo {
+    pub change: ShutdownChange,
+}
+
+#[cfg(feature = "i3-4-14")]
+impl FromStr for ShutdownEventInfo {
+    type Err = json::error::Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let val: json::Value = try!(json::from_str(s));
+        let change = match val.find("change").unwrap().as_string().unwrap() {
+            "restart" => ShutdownChange::Restart,
+            "exit" => ShutdownChange::Exit,
+            other => {
+                warn!(target: "i3ipc", "Unknown ShutdownChange {}", other);
+                ShutdownChange::Unknown
+            },
+        };
+        Ok(ShutdownEventInfo { change: change })
+    }
+}
+
 /// Less important types
 pub mod inner {
     /// The kind of workspace change.
@@ -302,4 +329,14 @@ pub mod inner {
         /// A BindingChange we don't support yet.
         Unknown,
     }
+
+    /// The kind of shutdown change.
+    #[derive(Debug)]
+    #[cfg(feature = "i3-4-14")]
+    pub enum ShutdownChange {
+        Restart,
+        Exit,
+        /// A ShutdownChange we don't support yet.
+        Unknown,
+    }
 }

src/lib.rs

@@ -178,7 +178,11 @@ impl<'a> Iterator for EventIterator<'a> {
                 3 => event::Event::WindowEvent(try!(event::WindowEventInfo::from_str(payload))),
                 4 => event::Event::BarConfigEvent(try!(event::BarConfigEventInfo::from_str(payload))),
                 5 => event::Event::BindingEvent(try!(event::BindingEventInfo::from_str(payload))),
-                _ => unreachable!()
+
+                #[cfg(feature = "i3-4-14")]
+                6 => event::Event::ShutdownEvent(try!(event::ShutdownEventInfo::from_str(payload))),
+
+                _ => unreachable!("received an event we aren't subscribed to!")
             })
         }
 
@@ -205,7 +209,9 @@ pub enum Subscription {
     Mode,
     Window,
     BarConfig,
-    Binding
+    Binding,
+    #[cfg(feature = "i3-4-14")]
+    Shutdown,
 }
 
 /// Abstraction over an ipc socket to i3. Handles events.
@@ -239,7 +245,9 @@ impl I3EventListener {
                         Subscription::Mode => "\"mode\"",
                         Subscription::Window => "\"window\"",
                         Subscription::BarConfig => "\"barconfig_update\"",
-                        Subscription::Binding => "\"binding\""})
+                        Subscription::Binding => "\"binding\"",
+                        #[cfg(feature = "i3-4-14")]
+                        Subscription::Shutdown => "\"shutdown\""})
                     .collect::<Vec<_>>()
                     .join(", ")[..]
             + " ]";