From 0ed798c1130d6fd1322e235b1420c07502af8498 Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Thu, 16 Oct 2025 18:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=20APP=5FNAME=20=E6=97=A0?= =?UTF-8?q?=E5=85=B3=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CMakeLists.txt | 2 +- src/main.c | 20 ++++++++++---------- src/types.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 46b129f..73cc204 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ set(APP_NAME "zdwm") set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}") -add_compile_definitions(LOG_FILE="$ENV{HOME}/zdwm-log.txt") +add_compile_definitions(LOG_FILE="$ENV{HOME}/${APP_NAME}-log.txt") # generate compile_commands.json for clangd set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/src/main.c b/src/main.c index d7d99b7..b48901a 100644 --- a/src/main.c +++ b/src/main.c @@ -11,24 +11,24 @@ #include "types.h" #include "utils.h" -zdwm_t global_state; +global_state_t global_state; -/** argv used to run zdwm */ -static char **zdwm_argv; +/** argv used to run wm */ +static char **cmd_argv; /** A pipe that is used to asynchronously handle SIGCHLD */ static int sigchld_pipe[2]; -static void zdwm_atexit(bool restart) { global_state.need_restart = restart; } +static void wm_atexit(bool restart) { global_state.need_restart = restart; } -static void zdwm_restart(void) { - zdwm_atexit(true); - execvp(zdwm_argv[0], zdwm_argv); +static void wm_restart(void) { + wm_atexit(true); + execvp(cmd_argv[0], cmd_argv); fatal("execv() failed: %s", strerror(errno)); } static gboolean restart_on_signal(gpointer data) { - zdwm_restart(); + wm_restart(); return TRUE; } @@ -54,7 +54,7 @@ static void signal_child(int signum) { int main(int argc, char *argv[]) { p_clear(&global_state, 1); - zdwm_argv = argv; + cmd_argv = argv; g_unix_signal_add(SIGINT, exit_on_signal, NULL); g_unix_signal_add(SIGTERM, exit_on_signal, NULL); @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) { g_main_loop_unref(global_state.loop); global_state.loop = NULL; - zdwm_atexit(false); + wm_atexit(false); return EXIT_SUCCESS; } diff --git a/src/types.h b/src/types.h index c9f2742..f0d1975 100644 --- a/src/types.h +++ b/src/types.h @@ -2,7 +2,7 @@ #include -typedef struct zdwm_t { +typedef struct global_state_t { bool need_restart; GMainLoop *loop; -} zdwm_t; +} global_state_t;