Fix build issues

- `std::copy_n` requires to #include <algorithm>
- `std::optional` requires C++17 or newer

CMakeLists.txt

@@ -57,7 +57,7 @@ target_link_libraries(i3ipc++
 )
 
 target_compile_options(i3ipc++
-	PRIVATE -std=c++11 -Wall -Wextra -Wno-unused-parameter
+	PRIVATE -std=c++17 -Wall -Wextra -Wno-unused-parameter
 )
 
 target_compile_definitions(i3ipc++

include/i3ipc++/ipc.hpp

@@ -30,8 +30,8 @@ std::string  get_socketpath();
  * Primitive of rectangle
  */
 struct rect_t {
-	uint32_t  x; ///< Position on X axis
+	int32_t  x; ///< Position on X axis
-	uint32_t  y; ///< Position on Y axis
+	int32_t  y; ///< Position on Y axis
 	uint32_t  width; ///< Width of rectangle
 	uint32_t  height; ///< Height of rectangle
 };
@@ -95,6 +95,7 @@ enum class WorkspaceEventType : char {
 	RENAME = 'r', ///< Renamed
 	RELOAD = 'l', ///< Reloaded
 	RESTORED = 's', ///< Restored
+	MOVE = 'm', ///< Moved (to output)
 };
 
 /**

src/ipc-util.cpp

@@ -8,6 +8,7 @@ extern "C" {
 #include <errno.h>
 }
 
+#include <algorithm>
 #include <cstring>
 #include <ios>
 
@@ -30,7 +31,7 @@ errno_error::errno_error(const std::string&  msg) : ipc_error(format_errno(msg))
 
 static const std::string  g_i3_ipc_magic = "i3-ipc";
 
-buf_t::buf_t(uint32_t  payload_size) : 
+buf_t::buf_t(uint32_t  payload_size) :
 	data(sizeof(header_t) + payload_size, 0),
 	header(reinterpret_cast<header_t*>(data.data())),
 	payload(reinterpret_cast<char*>(data.data() + sizeof(header_t)))
@@ -54,7 +55,7 @@ int32_t  i3_connect(const std::string&  socket_path) {
 	}
 
 	(void)fcntl(sockfd, F_SETFD, FD_CLOEXEC); // What for?
-	
+
 	struct sockaddr_un addr;
 	memset(&addr, 0, sizeof(struct sockaddr_un));
 	addr.sun_family = AF_LOCAL;

src/ipc.cpp

@@ -45,8 +45,8 @@ std::vector<std::ostream*>  g_logging_err_outs = {
 
 inline rect_t  parse_rect_from_json(const Json::Value&  value) {
 	return {
-		.x = value["x"].asUInt(),
+		.x = value["x"].asInt(),
-		.y = value["y"].asUInt(),
+		.y = value["y"].asInt(),
 		.width = value["width"].asUInt(),
 		.height = value["height"].asUInt(),
 	};
@@ -355,6 +355,8 @@ connection::connection(const std::string&  socket_path) : m_main_socket(i3_conne
 				ev.type = WorkspaceEventType::RELOAD;
 			} else if (change == "restored") {
 				ev.type = WorkspaceEventType::RESTORED;
+			} else if(change == "move") {
+				ev.type = WorkspaceEventType::MOVE;
 			} else {
 				I3IPC_WARN("Unknown workspace event type " << change)
 				break;