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

feat(core+backend/X11): 区分窗口销毁和撤销

Browse Source
This commit is contained in:
Zedhugh Chen
2026-04-27 22:28:43 +08:00
parent 8d838135d6
commit 722d3946c6
7 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/x11/backend.c
View File

@@ -9,6 +9,7 @@
#include <xcb/randr.h>
#include <xcb/xcb.h>
#include <xcb/xcb_aux.h>
#include <xcb/xcb_icccm.h>
#include <xcb/xcb_keysyms.h>
#include <xcb/xfixes.h>
#include <xcb/xinerama.h>
@@ -494,6 +495,13 @@ static void backend_merge_effects(
case ZDWM_EFFECT_KILL_WINDOW:
window_list_push(&backend->kill, e->as.kill.window);
break;
case ZDWM_EFFECT_WITHDRAW_WINDOW:
window_set_icccm_wm_state(
backend->conn,
e->as.withdraw.window,
XCB_ICCCM_WM_STATE_WITHDRAWN
);
break;
case ZDWM_EFFECT_MOVE_WINDOW: {
window_configure_t *cfg =
find_or_push_configure(configs, e->as.move.window);

9
src/backend/x11/event.c
View File

@@ -173,7 +173,11 @@ static bool handle_unmap_notify(
) {
event->type = ZDWM_EVENT_WINDOW_REMOVE;
event->as.window_remove.window = xcb_event->window;
event->as.window_remove.reason = ZDWM_WINDOW_REMOVE_WITHDRAWN;
if (XCB_EVENT_SENT(xcb_event)) {
event->as.window_remove.reason = ZDWM_WINDOW_REMOVE_WITHDRAWN;
} else {
event->as.window_remove.reason = ZDWM_WINDOW_REMOVE_DESTROY;
}
return true;
}
@@ -251,7 +255,8 @@ bool backend_next_event(backend_t *backend, event_t *event) {
uint8_t response_type = XCB_EVENT_RESPONSE_TYPE(raw_event);
bool handled = false;
printf("xcb event type: %u\n", response_type);
auto label = xcb_event_get_label(response_type);
printf("xcb event type: %s[%u]\n", label, response_type);
switch (response_type) {
#define EVENT(type, handler) \

21
src/backend/x11/window.c
View File

@@ -319,6 +319,27 @@ void window_clean_event_mask(xcb_connection_t *conn, xcb_window_t window) {
xcb_change_window_attributes_aux(conn, window, change_mask, &value_list);
}
void window_set_icccm_wm_state(
xcb_connection_t *conn,
xcb_window_t window,
xcb_icccm_wm_state_t state
) {
xcb_icccm_wm_hints_t hints;
xcb_icccm_wm_hints_set_none(&hints);
switch (state) {
case XCB_ICCCM_WM_STATE_WITHDRAWN:
xcb_icccm_wm_hints_set_withdrawn(&hints);
break;
case XCB_ICCCM_WM_STATE_NORMAL:
xcb_icccm_wm_hints_set_normal(&hints);
break;
case XCB_ICCCM_WM_STATE_ICONIC:
xcb_icccm_wm_hints_set_iconic(&hints);
break;
}
xcb_icccm_set_wm_hints(conn, window, &hints);
}
void window_list_push(window_list_t *window_list, xcb_window_t window) {
xcb_window_t *win =
array_push(window_list->windows, window_list->count, window_list->capacity);

5
src/backend/x11/window.h
View File

@@ -84,6 +84,11 @@ void window_kill(backend_t *backend, xcb_window_t window);
void root_set_event_mask(backend_t *backend);
void window_set_event_mask(xcb_connection_t *conn, xcb_window_t window);
void window_clean_event_mask(xcb_connection_t *conn, xcb_window_t window);
void window_set_icccm_wm_state(
xcb_connection_t *conn,
xcb_window_t window,
xcb_icccm_wm_state_t state
);
void window_list_push(window_list_t *window_list, xcb_window_t window);
void window_list_reset(window_list_t *window_list);