From f540c07aad849afda5fcb60b4b00725aeec2bc38 Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Fri, 5 Jun 2026 18:59:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=20APP=5FNAME=20=E5=AE=8F?= =?UTF-8?q?=E4=BB=8E=20CMake=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=94=B9=E4=B8=BA=E9=9D=99=E6=80=81=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 ------ src/app.h.in | 5 ----- src/backend/x11/backend.c | 10 +++++----- src/backend/x11/window.h | 3 ++- src/base/app.h | 3 +++ src/base/log.c | 2 +- 6 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 src/app.h.in create mode 100644 src/base/app.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 32325bb..e8bbfed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,9 +91,3 @@ target_link_libraries(${APP_NAME} PRIVATE m PRIVATE ${deps_LIBRARIES} ) - -configure_file("${SOURCE_DIR}/app.h.in" - "${BUILD_DIR}/app.h" - ESCAPE_QUOTES - @ONLY -) diff --git a/src/app.h.in b/src/app.h.in deleted file mode 100644 index 58537fe..0000000 --- a/src/app.h.in +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define APP_NAME "@APP_NAME@" - -#cmakedefine HAS_EXECINFO diff --git a/src/backend/x11/backend.c b/src/backend/x11/backend.c index efc3226..fbf44ba 100644 --- a/src/backend/x11/backend.c +++ b/src/backend/x11/backend.c @@ -17,6 +17,7 @@ #include "backend/output_utils.h" #include "backend/x11/window.h" +#include "base/app.h" #include "base/array.h" #include "base/log.h" #include "base/macros.h" @@ -72,13 +73,12 @@ static void create_wm_check_window(backend_t *backend) { xcb_create_window(conn, depth, win, root, -1, -1, 1, 1, 0, _c, v, m, p); window_set_class_instance(conn, win); -#define NAME "zdwm" - window_set_name_static(conn, win, NAME); + window_set_name_static(conn, win, APP_NAME); uint8_t mode = XCB_PROP_MODE_REPLACE; xcb_atom_t prop = backend->atoms._NET_WM_NAME; xcb_atom_t type = backend->atoms.UTF8_STRING; - xcb_change_property(conn, mode, win, prop, type, 8, sizeof(NAME) - 1, NAME); -#undef NAME + auto data_len = sizeof(APP_NAME) - 1; + xcb_change_property(conn, mode, win, prop, type, 8, data_len, APP_NAME); prop = backend->atoms._NET_SUPPORTING_WM_CHECK; type = XCB_ATOM_WINDOW; @@ -109,7 +109,7 @@ static void create_no_focus_window(backend_t *backend) { }; xcb_create_window_aux(conn, d, win, root, -1, -1, 1, 1, 0, _c, v, m, &p); window_set_class_instance(conn, win); - window_set_name_static(conn, win, "zdwm no input window"); + window_set_name_static(conn, win, APP_NAME " no input window"); xcb_map_window(conn, win); backend->window_no_focus = win; diff --git a/src/backend/x11/window.h b/src/backend/x11/window.h index d2d3054..1227f88 100644 --- a/src/backend/x11/window.h +++ b/src/backend/x11/window.h @@ -7,6 +7,7 @@ #include #include +#include "base/app.h" #include "core/backend.h" #include "internal.h" @@ -73,7 +74,7 @@ window_state_t atom_to_window_state(const atoms_t *atoms, xcb_atom_t atom); xcb_icccm_set_wm_name(conn, win, XCB_ATOM_STRING, 8, sizeof(name) - 1, name) #define window_set_class_instance(conn, win) \ - window_set_class_instance_static(conn, win, "zdwm", "zdwm") + window_set_class_instance_static(conn, win, APP_NAME, APP_NAME) #define window_set_class_instance_static(conn, win, instance, class) \ _window_set_class_instance_static(conn, win, instance "\0" class) #define _window_set_class_instance_static(conn, win, instance_class) \ diff --git a/src/base/app.h b/src/base/app.h new file mode 100644 index 0000000..ddb3b8d --- /dev/null +++ b/src/base/app.h @@ -0,0 +1,3 @@ +#pragma once + +#define APP_NAME "zdwm" diff --git a/src/base/log.c b/src/base/log.c index bc5a667..155328f 100644 --- a/src/base/log.c +++ b/src/base/log.c @@ -5,7 +5,7 @@ #include #include -#include "app.h" +#include "base/app.h" const char *current_time_str(void) { static char buffer[25];