From 894b235e04ca9be70d730d961e84a7f735a27c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=A4nel?= Date: Sun, 22 Jan 2017 20:42:14 +0100 Subject: [PATCH 1/2] Added support for undocumented WorkspaceEventTypes "reload", "restore" and "reload" are possible types of the workspace event. They weren't documented (I will contact the responsible person). I'm not sure if the "reload" signal can be received, but better be safe than sorry. --- include/i3ipc++/ipc.hpp | 3 +++ src/ipc.cpp | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/i3ipc++/ipc.hpp b/include/i3ipc++/ipc.hpp index 917f244..e1e6b1e 100644 --- a/include/i3ipc++/ipc.hpp +++ b/include/i3ipc++/ipc.hpp @@ -89,6 +89,9 @@ enum class WorkspaceEventType : char { INIT = 'i', ///< Initialized EMPTY = 'e', ///< Became empty URGENT = 'u', ///< Became urgent + RENAME = 'r', ///< Renamed + RELOAD = 'l', ///< Reloaded + RESTORED = 's', ///< Restored }; /** diff --git a/src/ipc.cpp b/src/ipc.cpp index 35a610f..45a2a52 100644 --- a/src/ipc.cpp +++ b/src/ipc.cpp @@ -287,7 +287,13 @@ connection::connection(const std::string& socket_path) : m_main_socket(i3_conne ev.type = WorkspaceEventType::EMPTY; } else if (change == "urgent") { ev.type = WorkspaceEventType::URGENT; - } else { + } else if (change == "rename") { + ev.type = WorkspaceEventType::RENAME; + } else if (change == "reload") { + ev.type = WorkspaceEventType::RELOAD; + } else if (change == "restored") { + ev.type = WorkspaceEventType::RESTORED; + } else { I3IPC_WARN("Unknown workspace event type " << change) break; } From 31ef0375da4c4d5c7c80693e6bc44a302bec91ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=A4nel?= Date: Mon, 23 Jan 2017 22:36:53 +0100 Subject: [PATCH 2/2] Fixed identation --- include/i3ipc++/ipc.hpp | 6 +++--- src/ipc.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/i3ipc++/ipc.hpp b/include/i3ipc++/ipc.hpp index e1e6b1e..daa84bb 100644 --- a/include/i3ipc++/ipc.hpp +++ b/include/i3ipc++/ipc.hpp @@ -89,9 +89,9 @@ enum class WorkspaceEventType : char { INIT = 'i', ///< Initialized EMPTY = 'e', ///< Became empty URGENT = 'u', ///< Became urgent - RENAME = 'r', ///< Renamed - RELOAD = 'l', ///< Reloaded - RESTORED = 's', ///< Restored + RENAME = 'r', ///< Renamed + RELOAD = 'l', ///< Reloaded + RESTORED = 's', ///< Restored }; /** diff --git a/src/ipc.cpp b/src/ipc.cpp index 45a2a52..ecd823a 100644 --- a/src/ipc.cpp +++ b/src/ipc.cpp @@ -287,13 +287,13 @@ connection::connection(const std::string& socket_path) : m_main_socket(i3_conne ev.type = WorkspaceEventType::EMPTY; } else if (change == "urgent") { ev.type = WorkspaceEventType::URGENT; - } else if (change == "rename") { - ev.type = WorkspaceEventType::RENAME; - } else if (change == "reload") { - ev.type = WorkspaceEventType::RELOAD; - } else if (change == "restored") { - ev.type = WorkspaceEventType::RESTORED; - } else { + } else if (change == "rename") { + ev.type = WorkspaceEventType::RENAME; + } else if (change == "reload") { + ev.type = WorkspaceEventType::RELOAD; + } else if (change == "restored") { + ev.type = WorkspaceEventType::RESTORED; + } else { I3IPC_WARN("Unknown workspace event type " << change) break; }