Did the merge work?

Author: mox-mox

CHANGELOG

@@ -0,0 +1,14 @@
+0.2.1
+	+ Added example of event handling
+	* Fixed SIGSEGV in parse_*_from_json functions
+
+0.2.0
+	+ Implemented GET_TREE (i3ipc::connection::get_tree())
+
+	~ Shipping all available payload with workspace and window events (issue #2)
+	~ i3ipc::I3Connection renamed to i3ipc::connection
+
+	~ Internal refreactoring
+
+	* Fixing failed build: Parts of a struct were initialised in wrong order, C99-style designated initialisers did not prevent this from causing an error [mox]
+	* Minor documentation and code fixies

CMakeLists.txt

@@ -29,7 +29,7 @@ include_directories(
 )
 
 link_directories(
-	${SIBCPP_LIBRARY_DIRS}
+	${SIGCPP_LIBRARY_DIRS}
 	3rd/jsoncpp/src/lib_json/
 )
 
@@ -42,6 +42,7 @@ add_library(i3ipc++_static STATIC ${SRC})
 
 set(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 set(I3IPCpp_INCLUDE_DIRS
+	${SIGCPP_INCLUDE_DIRS}
 	3rd/auss/include
 	${CMAKE_CURRENT_SOURCE_DIR}/include/
 )

examples/CMakeLists.txt

@@ -15,3 +15,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
 
 add_executable(workspaces workspaces.cpp)
 target_link_libraries(workspaces ${I3IPCpp_LIBRARIES})
+
+add_executable(events events.cpp)
+target_link_libraries(events ${I3IPCpp_LIBRARIES})

examples/events.cpp

@@ -0,0 +1,25 @@
+#include <iostream>
+
+#include <i3ipc++/ipc.hpp>
+
+
+int  main() {
+	i3ipc::connection  conn;
+	conn.subscribe(i3ipc::ET_WORKSPACE | i3ipc::ET_WINDOW);
+
+	conn.signal_workspace_event.connect([](const i3ipc::workspace_event_t&  ev) {
+		std::cout << "workspace_event: " << (char)ev.type << std::endl;
+	});
+	conn.signal_window_event.connect([](const i3ipc::window_event_t&  ev) {
+		std::cout << "window_event: " << (char)ev.type << std::endl;
+	});
+
+	// Don't forget this:
+	conn.prepare_to_event_handling();
+
+	while (true) {
+		conn.handle_event();
+	}
+
+	return 0;
+}

examples/workspaces.cpp

@@ -2,21 +2,49 @@
 
 #include <i3ipc++/ipc.hpp>
 
+
+void  dump_tree_container(const i3ipc::container_t&  c, std::string&  prefix) {
+	std::cout << prefix << "ID: " << c.id << " (i3's; X11's - " << c.xwindow_id << ")" << std::endl;
+	prefix.push_back('\t');
+	std::cout << prefix << "name = \"" << c.name << "\"" << std::endl;
+	std::cout << prefix << "type = \"" << c.type << "\"" << std::endl;
+	std::cout << prefix << "border = \"" << c.border_raw << "\"" << std::endl;
+	std::cout << prefix << "current_border_width = " << c.current_border_width << std::endl;
+	std::cout << prefix << "layout = \"" << c.layout_raw << "\"" << std::endl;
+	std::cout << prefix << "percent = " << c.percent << std::endl;
+	if (c.urgent) {
+		std::cout << prefix << "urgent" << std::endl;
+	}
+	if (c.focused) {
+		std::cout << prefix << "focused" << std::endl;
+	}
+	prefix.push_back('\t');
+	for (auto&  n : c.nodes) {
+		dump_tree_container(*n, prefix);
+	}
+	prefix.pop_back();
+	prefix.pop_back();
+}
+
+
 int  main() {
-	i3ipc::I3Connection  conn;
+	i3ipc::connection  conn;
 	for (auto&  w : conn.get_workspaces()) {
-		std::cout << '#' << std::hex << w.num << std::dec
-			<< "\n\tName: " << w.name
-			<< "\n\tVisible: " << w.visible
-			<< "\n\tFocused: " << w.focused
-			<< "\n\tUrgent: " << w.urgent
+		std::cout << '#' << std::hex << w->num << std::dec
+			<< "\n\tName: " << w->name
+			<< "\n\tVisible: " << w->visible
+			<< "\n\tFocused: " << w->focused
+			<< "\n\tUrgent: " << w->urgent
 			<< "\n\tRect: "
-			<< "\n\t\tX: " << w.rect.x
-			<< "\n\t\tY: " << w.rect.y
-			<< "\n\t\tWidth: " << w.rect.width
-			<< "\n\t\tHeight: " << w.rect.height
-			<< "\n\tOutput: " << w.output
+			<< "\n\t\tX: " << w->rect.x
+			<< "\n\t\tY: " << w->rect.y
+			<< "\n\t\tWidth: " << w->rect.width
+			<< "\n\t\tHeight: " << w->rect.height
+			<< "\n\tOutput: " << w->output
 			<< std::endl;
 	}
+	std::string  prefix_buf;
+	dump_tree_container(*conn.get_tree(), prefix_buf);
+
 	return 0;
 }

include/i3ipc++/ipc-util.hpp

@@ -23,9 +23,9 @@ namespace i3ipc {
  */
 struct header_t {
 	/* 6 = strlen(I3_IPC_MAGIC) */
-	char magic[6]; /**< Magic string @see I3_IPC_MAGIC */
-	uint32_t size; /**< Size of payload */
-	uint32_t type; /**< Message type */
+	char magic[6]; ///< Magic string @see I3_IPC_MAGIC
+	uint32_t size; ///< Size of payload
+	uint32_t type; ///< Message type
 }  __attribute__ ((packed));
 
 
@@ -84,8 +84,8 @@ enum class ReplyType : uint32_t {
  * @brief i3 IPC message buffer
  */
 struct buf_t {
-	uint32_t  size; /**< @brief Size of whole buffer */
-	uint8_t*  data; /**< @brief Pointer to the message */
+	uint32_t  size; ///< @brief Size of whole buffer
+	uint8_t*  data; ///< @brief Pointer to the message
 
 	/**
 	 * @brief i3 IPC message header