Update for i3 4.13

Add I3Connection::get_binding_modes from i3/i3@b1d70f2
Add WindowChange::Mark from i3/i3@e51a89e

Author: tmerr

Cargo.toml

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

src/event.rs

@@ -131,6 +131,10 @@ impl FromStr for WindowEventInfo {
                 "move" => WindowChange::Move,
                 "floating" => WindowChange::Floating,
                 "urgent" => WindowChange::Urgent,
+
+                #[cfg(feature = "i3-4-13")]
+                "mark" => WindowChange::Mark,
+
                 other => {
                     warn!(target: "i3ipc", "Unknown WindowChange {}", other);
                     WindowChange::Unknown
@@ -251,6 +255,11 @@ pub mod inner {
         Floating,
         /// The window has become urgent or lost its urgent status.
         Urgent,
+
+        /// A mark has been added to or removed from the window.
+        #[cfg(feature = "i3-4-13")]
+        Mark,
+
         /// A WindowChange we don't support yet.
         Unknown,
     }

src/lib.rs

@@ -467,6 +467,23 @@ impl I3Connection {
                                                                       .unwrap().to_owned()
         })
     }
+
+    /// Gets the list of currently configured binding modes.
+    #[cfg(feature = "i3-4-13")]
+    pub fn get_binding_modes(&mut self) -> Result<reply::BindingModes, MessageError> {
+        if let Err(e) = self.stream.send_i3_message(8, "") {
+            return Err(MessageError::Send(e));
+        }
+        let payload = match self.stream.receive_i3_message() {
+            Ok((_, payload)) => payload,
+            Err(e) => { return Err(MessageError::Receive(e)); },
+        };
+        let modes: Vec<String> = match json::from_str(&payload) {
+            Ok(v) => v,
+            Err(e) => { return Err(MessageError::JsonCouldntParse(e)); },
+        };
+        Ok(reply::BindingModes { modes: modes })
+    }
 }
 
 
@@ -556,6 +573,12 @@ mod test {
         I3Connection::connect().unwrap().get_version().unwrap();
     }
 
+    #[cfg(feature = "i3-4-13")]
+    #[test]
+    fn get_binding_modes() {
+        I3Connection::connect().unwrap().get_binding_modes().unwrap();
+    }
+
     #[test]
     fn event_subscribe() {
         let s = I3EventListener::connect().unwrap().subscribe(&[Subscription::Workspace]).unwrap();

src/reply.rs

@@ -354,3 +354,11 @@ pub struct Version {
     /// The current config path.
     pub loaded_config_file_name: String
 }
+
+/// The reply to the `get_binding_modes` request.
+#[cfg(feature = "i3-4-13")]
+#[derive(Debug)]
+pub struct BindingModes {
+    /// A vector of all currently configured binding modes.
+    pub modes: Vec<String>,
+}