zedhugh/zdwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码 APP_NAME 无关化

Browse Source
This commit is contained in:
Zedhugh Chen
2025-10-16 18:15:58 +08:00
parent c575092c00
commit 0ed798c113
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ set(APP_NAME "zdwm")
set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(BUILD_DIR "${CMAKE_CURRENT_BINARY_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 # generate compile_commands.json for clangd
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

20
src/main.c
View File

@@ -11,24 +11,24 @@
#include "types.h" #include "types.h"
#include "utils.h" #include "utils.h"
zdwm_t global_state; global_state_t global_state;
/** argv used to run zdwm */ /** argv used to run wm */
static char **zdwm_argv; static char **cmd_argv;
/** A pipe that is used to asynchronously handle SIGCHLD */ /** A pipe that is used to asynchronously handle SIGCHLD */
static int sigchld_pipe[2]; 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) { static void wm_restart(void) {
zdwm_atexit(true); wm_atexit(true);
execvp(zdwm_argv[0], zdwm_argv); execvp(cmd_argv[0], cmd_argv);
fatal("execv() failed: %s", strerror(errno)); fatal("execv() failed: %s", strerror(errno));
} }
static gboolean restart_on_signal(gpointer data) { static gboolean restart_on_signal(gpointer data) {
zdwm_restart(); wm_restart();
return TRUE; return TRUE;
} }
@@ -54,7 +54,7 @@ static void signal_child(int signum) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
p_clear(&global_state, 1); p_clear(&global_state, 1);
zdwm_argv = argv; cmd_argv = argv;
g_unix_signal_add(SIGINT, exit_on_signal, NULL); g_unix_signal_add(SIGINT, exit_on_signal, NULL);
g_unix_signal_add(SIGTERM, 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); g_main_loop_unref(global_state.loop);
global_state.loop = NULL; global_state.loop = NULL;
zdwm_atexit(false); wm_atexit(false);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

4
src/types.h
View File

@@ -2,7 +2,7 @@
#include <glib.h> #include <glib.h>
typedef struct zdwm_t { typedef struct global_state_t {
bool need_restart; bool need_restart;
GMainLoop *loop; GMainLoop *loop;
} zdwm_t; } global_state_t;