system settings
git clone https://git.lucas.co/cce-system-interface.git
refactor: rename socket files and update logging paths to remove 'client' and 'clear-'
src/main.rs | 12 ++++++------
src/pages/input.rs | 4 ++--
src/pages/interface.rs | 4 ++--
src/pages/layout.rs | 20 ++++++++++----------
src/pages/services.rs | 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index b41c5ab..e77d5ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -253,9 +253,9 @@ impl cce_ui::engine::Application for SystemInterface {
let current_page_shared = current_page_shared.clone();
tokio::spawn(async move {
let display = std::env::var("WAYLAND_DISPLAY").unwrap_or_else(|_| "wayland-0".to_string());
- let windows_path = format!("/tmp/cce-client-windows-{}", display);
- let tags_path = format!("/tmp/cce-client-tags-{}", display);
- let title_path = format!("/tmp/cce-client-title-{}", display);
+ let windows_path = format!("/tmp/cce-windows-{}", display);
+ let tags_path = format!("/tmp/cce-tags-{}", display);
+ let title_path = format!("/tmp/cce-title-{}", display);
let mut last_mod = std::time::SystemTime::UNIX_EPOCH;
@@ -314,8 +314,8 @@ impl cce_ui::engine::Application for SystemInterface {
let current_page_shared = current_page_shared.clone();
tokio::spawn(async move {
let socket_path = match std::env::var("WAYLAND_DISPLAY") {
- Ok(display) => format!("/tmp/clear-input-coords-{}.sock", display),
- Err(_) => "/tmp/clear-input-coords.sock".to_string(),
+ Ok(display) => format!("/tmp/cce-input-coords-{}.sock", display),
+ Err(_) => "/tmp/cce-input-coords.sock".to_string(),
};
loop {
let current_page = current_page_shared.load(std::sync::atomic::Ordering::SeqCst);
@@ -3933,7 +3933,7 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
}
fn handle_mouse_wheel_internal(&mut self, delta: &cce_ui::widget::MouseScrollDelta, px: f32, py: f32) -> bool {
- if let Ok(mut file) = std::fs::OpenOptions::new().create(true).append(true).open("/tmp/clear-scroll-debug.txt") {
+ if let Ok(mut file) = std::fs::OpenOptions::new().create(true).append(true).open("/tmp/cce-scroll-debug.log") {
use std::io::Write;
let _ = writeln!(file, "handle_mouse_wheel_internal: px={}, py={}, delta={:?}, sidebar_w={}", px, py, delta, self.sidebar_width);
}
diff --git a/src/pages/input.rs b/src/pages/input.rs
index abf41b5..e5a202a 100644
--- a/src/pages/input.rs
+++ b/src/pages/input.rs
@@ -9,8 +9,8 @@ const CONFIG_PATH: &str = "/home/lsgalante/.config/cce/config.toml";
fn get_socket_path() -> String {
match std::env::var("WAYLAND_DISPLAY") {
- Ok(display) => format!("/tmp/cce-client-{}.sock", display),
- Err(_) => "/tmp/cce-client.sock".to_string(),
+ Ok(display) => format!("/tmp/cce-{}.sock", display),
+ Err(_) => "/tmp/cce.sock".to_string(),
}
}
diff --git a/src/pages/interface.rs b/src/pages/interface.rs
index ab9b0fe..6888e2c 100644
--- a/src/pages/interface.rs
+++ b/src/pages/interface.rs
@@ -11,8 +11,8 @@ const LINKS_PATH: &str = "/home/lsgalante/.config/cce/cce-system-interface/links
fn get_socket_path() -> String {
match std::env::var("WAYLAND_DISPLAY") {
- Ok(display) => format!("/tmp/cce-client-{}.sock", display),
- Err(_) => "/tmp/cce-client.sock".to_string(),
+ Ok(display) => format!("/tmp/cce-{}.sock", display),
+ Err(_) => "/tmp/cce.sock".to_string(),
}
}
diff --git a/src/pages/layout.rs b/src/pages/layout.rs
index aa19f6d..a741b9b 100644
--- a/src/pages/layout.rs
+++ b/src/pages/layout.rs
@@ -11,8 +11,8 @@ const CONFIG_PATH: &str = "/home/lsgalante/.config/cce/config.toml";
fn get_socket_path() -> String {
match std::env::var("WAYLAND_DISPLAY") {
- Ok(display) => format!("/tmp/cce-client-{}.sock", display),
- Err(_) => "/tmp/cce-client.sock".to_string(),
+ Ok(display) => format!("/tmp/cce-{}.sock", display),
+ Err(_) => "/tmp/cce.sock".to_string(),
}
}
@@ -433,8 +433,8 @@ fn read_current_layout_status() -> LayoutStatusInfo {
let display = std::env::var("WAYLAND_DISPLAY").unwrap_or_else(|_| "wayland-0".to_string());
- let tags_path = format!("/tmp/cce-client-tags-{}", display);
- let tags_fallback = "/tmp/cce-client-tags".to_string();
+ let tags_path = format!("/tmp/cce-tags-{}", display);
+ let tags_fallback = "/tmp/cce-tags".to_string();
let tags_content = fs::read_to_string(&tags_path)
.or_else(|_| fs::read_to_string(&tags_fallback))
.unwrap_or_default();
@@ -448,24 +448,24 @@ fn read_current_layout_status() -> LayoutStatusInfo {
}
}
- let title_path = format!("/tmp/cce-client-title-{}", display);
- let title_fallback = "/tmp/cce-client-title".to_string();
+ let title_path = format!("/tmp/cce-title-{}", display);
+ let title_fallback = "/tmp/cce-title".to_string();
let focused_title = fs::read_to_string(&title_path)
.or_else(|_| fs::read_to_string(&title_fallback))
.unwrap_or_default()
.trim()
.to_string();
- let layout_path = format!("/tmp/cce-client-layout-{}", display);
- let layout_fallback = "/tmp/cce-client-layout".to_string();
+ let layout_path = format!("/tmp/cce-layout-{}", display);
+ let layout_fallback = "/tmp/cce-layout".to_string();
let focused_layout_mode = fs::read_to_string(&layout_path)
.or_else(|_| fs::read_to_string(&layout_fallback))
.unwrap_or_else(|_| "Cascade".to_string())
.trim()
.to_string();
- let windows_path = format!("/tmp/cce-client-windows-{}", display);
- let windows_fallback = "/tmp/cce-client-windows".to_string();
+ let windows_path = format!("/tmp/cce-windows-{}", display);
+ let windows_fallback = "/tmp/cce-windows".to_string();
let windows_content = fs::read_to_string(&windows_path)
.or_else(|_| fs::read_to_string(&windows_fallback))
.unwrap_or_default();
diff --git a/src/pages/services.rs b/src/pages/services.rs
index 3192cdb..a154df7 100644
--- a/src/pages/services.rs
+++ b/src/pages/services.rs
@@ -602,8 +602,8 @@ const CONFIG_PATH: &str = "/home/lsgalante/.config/cce/config.toml";
fn get_socket_path() -> String {
match std::env::var("WAYLAND_DISPLAY") {
- Ok(display) => format!("/tmp/cce-client-{}.sock", display),
- Err(_) => "/tmp/cce-client.sock".to_string(),
+ Ok(display) => format!("/tmp/cce-{}.sock", display),
+ Err(_) => "/tmp/cce.sock".to_string(),
}
}