fabs/i3ipcpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #42 from Thaodan/support_sigc++3

Browse Source 
Optionally support sig-c++-3.0
This commit is contained in:
Sergey Naumov
2023-11-20 12:48:04 +06:00
committed by GitHub
parent 1bf594d1f2 50ae7287c2
commit f8d5903f42
6 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -1,4 +1,8 @@
build
doc
build/
doc/
*.sublime-workspace
*.log
.ccls*
*.o
compile_commands.*

24
CMakeLists.txt
View File

@@ -1,15 +1,23 @@
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
project(i3ipc++)
string(TIMESTAMP I3IPCppBUILD_DATETIME "%Y-%m-%d %H:%M:%S")
option(I3IPCpp_WITH_TESTS "Build unit tests executables" OFF)
option(I3IPCpp_BUILD_EXAMPLES "Build example executables" OFF)
find_package(PkgConfig)
pkg_check_modules(SIGCPP REQUIRED sigc++-2.0)
pkg_check_modules(JSONCPP REQUIRED jsoncpp)
file(GLOB_RECURSE SRC src/*.cpp)
add_library(i3ipc++ ${SRC})
find_package(PkgConfig)
pkg_check_modules(JSONCPP REQUIRED jsoncpp)
pkg_check_modules(SIGCPP sigc++-3.0)
if(SIGCPP_FOUND)
target_compile_definitions(i3ipc++
PUBLIC I3CPP_IPC_SIGCPP3=${SIGCPP_FOUND}
)
else()
pkg_check_modules(SIGCPP REQUIRED sigc++-2.0)
endif()
set(I3IPCpp_INCLUDE_DIRS
${SIGCPP_INCLUDE_DIRS}
@@ -33,8 +41,6 @@ set(I3IPCpp_LIBRARIES
# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3 -DDEBUG")
# set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
file(GLOB_RECURSE SRC src/*.cpp)
add_library(i3ipc++ ${SRC})
target_include_directories(i3ipc++
PUBLIC
@@ -60,10 +66,6 @@ target_compile_options(i3ipc++
PRIVATE -std=c++17 -Wall -Wextra -Wno-unused-parameter
)
target_compile_definitions(i3ipc++
PRIVATE I3IPC_BUILD_DATETIME="${I3IPCppBUILD_DATETIME}"
)
if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
target_compile_options(i3ipc++
PUBLIC -g3

1
README.md
View File

@@ -10,6 +10,7 @@ An implementation of i3 IPC in C++11.
* C++11 compiler
* sigc++ 2.0
* jsoncpp
* i3 (for i3/ipc.h)
## Using
Yet the only way of using is to add this repo as a submodule

15
include/i3ipc++/ipc.hpp
View File

@@ -369,14 +369,21 @@ public:
* Disconnect the event socket
*/
void disconnect_event_socket();
sigc::signal<void, const workspace_event_t&> signal_workspace_event; ///< Workspace event signal
#ifdef I3CPP_IPC_SIGCPP3
sigc::signal<void(const workspace_event_t&)> signal_workspace_event; ///< Workspace event signal
sigc::signal<void()> signal_output_event; ///< Output event signal
sigc::signal<void(const mode_t&)> signal_mode_event; ///< Output mode event signal
sigc::signal<void(const window_event_t&)> signal_window_event; ///< Window event signal
sigc::signal<void(const bar_config_t&)> signal_barconfig_update_event; ///< Barconfig update event signal
sigc::signal<void(const binding_t&)> signal_binding_event; ///< Binding event signal
sigc::signal<void(EventType, const std::shared_ptr<const buf_t>&)> signal_event; ///< i3 event signal @note Default handler routes event to signal according to type
#else
sigc::signal<void, const workspace_event_t&> signal_workspace_event; ///< Workspace event signal
sigc::signal<void> signal_output_event; ///< Output event signal
sigc::signal<void, const mode_t&> signal_mode_event; ///< Output mode event signal
sigc::signal<void, const window_event_t&> signal_window_event; ///< Window event signal
sigc::signal<void, const bar_config_t&> signal_barconfig_update_event; ///< Barconfig update event signal
sigc::signal<void, const binding_t&> signal_binding_event; ///< Binding event signal
sigc::signal<void, EventType, const std::shared_ptr<const buf_t>&> signal_event; ///< i3 event signal @note Default handler routes event to signal according to type
#endif
private:
const int32_t m_main_socket;
int32_t m_event_socket;

2
src/ipc.cpp
View File

@@ -661,7 +661,7 @@ const version_t& get_version() {
#define I3IPC_VERSION_MINOR 5
#define I3IPC_VERSION_PATCH 0
static version_t version = {
.human_readable = auss_t() << I3IPC_VERSION_MAJOR << '.' << I3IPC_VERSION_MINOR << '.' << I3IPC_VERSION_PATCH << " (built on " << I3IPC_BUILD_DATETIME << ")",
.human_readable = auss_t() << I3IPC_VERSION_MAJOR << '.' << I3IPC_VERSION_MINOR << '.' << I3IPC_VERSION_PATCH,
.loaded_config_file_name = std::string(),
.major = I3IPC_VERSION_MAJOR,
.minor = I3IPC_VERSION_MINOR,

2
test/test_ipc.hpp
View File

@@ -14,7 +14,7 @@ public:
auto buff = i3_pack(ClientMessageType::COMMAND, "exit");
auss_t auss;
auss << std::hex;
for (uint32_t i = 0; i < buff->size; i++) {
for (uint32_t i = 0; i < buff->data.size(); i++) {
if (buff->data[i] < 0x10) {
auss << '0';
}