diff --git a/jay-config/src/_private.rs b/jay-config/src/_private.rs index 099d09d3..afac9f96 100644 --- a/jay-config/src/_private.rs +++ b/jay-config/src/_private.rs @@ -1,5 +1,5 @@ pub mod client; -pub mod ipc; +pub mod messages; mod logging; use { @@ -16,8 +16,8 @@ use { pub const VERSION: u32 = 1; -pub type ServerHandler = unsafe fn(data: *const u8, msg: &ipc::ClientMessage<'_>); -pub type ConfigHandler = unsafe fn(data: *const u8, msg: &ipc::ServerMessage); +pub type ServerHandler = unsafe fn(data: *const u8, msg: &messages::ClientMessage<'_>); +pub type ConfigHandler = unsafe fn(data: *const u8, msg: &messages::ServerMessage); pub type Unref = unsafe fn(data: *const u8); pub struct ConfigEntry { @@ -26,7 +26,7 @@ pub struct ConfigEntry { srv_data: *const u8, srv_unref: Unref, srv_handler: ServerHandler, - msg: ipc::InitMessage, + msg: messages::InitMessage, ) -> *const u8, pub unref: Unref, pub handle_msg: ConfigHandler, diff --git a/jay-config/src/_private/client.rs b/jay-config/src/_private/client.rs index 82d19d8c..9cd4e557 100644 --- a/jay-config/src/_private/client.rs +++ b/jay-config/src/_private/client.rs @@ -5,7 +5,7 @@ use { _private::{ ClientCriterionIpc, ClientCriterionStringField, GenericCriterionIpc, PollableId, ServerHandler, Unref, WindowCriterionIpc, WindowCriterionStringField, WireMode, - ipc::{ + messages::{ ClientMessage, InitMessage, Response, ServerFeature, ServerMessage, WorkspaceSource, }, }, diff --git a/jay-config/src/_private/ipc.rs b/jay-config/src/_private/messages.rs similarity index 100% rename from jay-config/src/_private/ipc.rs rename to jay-config/src/_private/messages.rs diff --git a/jay-config/src/input.rs b/jay-config/src/input.rs index a3229654..384b769d 100644 --- a/jay-config/src/input.rs +++ b/jay-config/src/input.rs @@ -6,7 +6,7 @@ pub mod clickmethod; use { crate::{ - _private::{DEFAULT_SEAT_NAME, ipc::WorkspaceSource}, + _private::{DEFAULT_SEAT_NAME, messages::WorkspaceSource}, Axis, Direction, ModifiedKeySym, Workspace, input::{acceleration::AccelProfile, capability::Capability, clickmethod::ClickMethod}, keyboard::{Keymap, mods::Modifiers, syms::KeySym}, diff --git a/jay-config/src/lib.rs b/jay-config/src/lib.rs index 039b4479..608f128d 100644 --- a/jay-config/src/lib.rs +++ b/jay-config/src/lib.rs @@ -17,7 +17,7 @@ use crate::input::Seat; use { crate::{ - _private::ipc::WorkspaceSource, keyboard::ModifiedKeySym, video::Connector, window::Window, + _private::messages::WorkspaceSource, keyboard::ModifiedKeySym, video::Connector, window::Window, }, serde::{Deserialize, Serialize}, std::{ diff --git a/src/config.rs b/src/config.rs index 3c7c830f..0c20aa36 100644 --- a/src/config.rs +++ b/src/config.rs @@ -18,7 +18,7 @@ use { jay_config::{ _private::{ ConfigEntry, VERSION, - ipc::{InitMessage, ServerFeature, ServerMessage, V1InitMessage}, + messages::{InitMessage, ServerFeature, ServerMessage, V1InitMessage}, }, input::{InputDevice, Seat, SwitchEvent}, keyboard::{mods::Modifiers, syms::KeySym}, @@ -260,7 +260,7 @@ unsafe fn unref(data: *const u8) { } } -unsafe fn handle_msg(data: *const u8, msg: &jay_config::_private::ipc::ClientMessage<'_>) { +unsafe fn handle_msg(data: *const u8, msg: &jay_config::_private::messages::ClientMessage<'_>) { unsafe { let server = (data as *const ConfigProxyHandler).deref(); if server.dropped.get() { diff --git a/src/config/handler.rs b/src/config/handler.rs index 412dca6e..07bfebb6 100644 --- a/src/config/handler.rs +++ b/src/config/handler.rs @@ -44,7 +44,7 @@ use { _private::{ ClientCriterionIpc, ClientCriterionStringField, GenericCriterionIpc, PollableId, ConfigHandler, Unref, WindowCriterionIpc, WindowCriterionStringField, WireMode, - ipc::{ClientMessage, Response, ServerMessage, WorkspaceSource}, + messages::{ClientMessage, Response, ServerMessage, WorkspaceSource}, }, Axis, Direction, Workspace, client::{Client as ConfigClient, ClientMatcher}, diff --git a/src/it/test_config.rs b/src/it/test_config.rs index 2706ae58..1d7daf1d 100644 --- a/src/it/test_config.rs +++ b/src/it/test_config.rs @@ -10,7 +10,7 @@ use { jay_config::{ _private::{ ConfigEntry, VERSION, - ipc::{ClientMessage, Response, ServerMessage}, + messages::{ClientMessage, Response, ServerMessage}, }, Axis, Direction, input::{InputDevice, Seat}, @@ -56,7 +56,7 @@ unsafe fn init( srv_data: *const u8, srv_unref: jay_config::_private::Unref, srv_handler: jay_config::_private::ServerHandler, - _msg: jay_config::_private::ipc::InitMessage, + _msg: jay_config::_private::messages::InitMessage, ) -> *const u8 { let tc = CONFIG.get(); assert!(tc.is_not_null());