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

fix(backend): 修复缺少 colormap 导致的创建 bar 窗口失败

Browse Source
This commit is contained in:
Zedhugh Chen
2026-06-06 08:56:09 +08:00
parent adf839bf21
commit c30c7d0698
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,8 +648,7 @@ backend_scan_result_t *backend_scan_windows(backend_t *backend) {
backend_scan_result_t *result = p_new(backend_scan_result_t, 1); backend_scan_result_t *result = p_new(backend_scan_result_t, 1);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
auto slot = (window_map_request_event_t *) auto slot = array_push(result->windows, result->count, result->capacity);
array_push(result->windows, result->count, result->capacity);
if (!populate_window_event(backend, list[i], slot)) { if (!populate_window_event(backend, list[i], slot)) {
window_layer_props_cleanup(&slot->props); window_layer_props_cleanup(&slot->props);
window_metadata_cleanup(&slot->metadata); window_metadata_cleanup(&slot->metadata);
@@ -690,19 +689,28 @@ backend_bar_window_t backend_create_bar_window(
auto root = backend->screen->root; auto root = backend->screen->root;
auto visual = window_get_visual(backend, true); auto visual = window_get_visual(backend, true);
xcb_grab_server(conn); static xcb_colormap_t colormap = XCB_NONE;
if (colormap == XCB_NONE) {
colormap = xcb_generate_id(conn);
uint8_t alloc = XCB_COLORMAP_ALLOC_NONE;
xcb_create_colormap(conn, alloc, colormap, root, visual->visual->visual_id);
}
window_clean_event_mask(conn, root); window_clean_event_mask(conn, root);
xcb_grab_server(conn);
auto window_id = xcb_generate_id(conn); auto window_id = xcb_generate_id(conn);
uint16_t _class = XCB_WINDOW_CLASS_INPUT_OUTPUT; uint16_t _class = XCB_WINDOW_CLASS_INPUT_OUTPUT;
uint32_t event_mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_BACK_PIXEL | uint32_t value_mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_BACK_PIXEL |
XCB_CW_BORDER_PIXEL | XCB_CW_EVENT_MASK; XCB_CW_BORDER_PIXEL | XCB_CW_EVENT_MASK |
XCB_CW_COLORMAP;
const xcb_create_window_value_list_t value_list = { const xcb_create_window_value_list_t value_list = {
.override_redirect = true, .override_redirect = true,
.background_pixel = bg_pixel, .background_pixel = bg_pixel,
.border_pixel = 0, .border_pixel = 0,
.event_mask = XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_EXPOSURE, .event_mask = XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_EXPOSURE,
.colormap = colormap,
}; };
auto cookie = xcb_create_window_aux_checked( auto cookie = xcb_create_window_aux_checked(
conn, conn,
@@ -716,7 +724,7 @@ backend_bar_window_t backend_create_bar_window(
0, 0,
_class, _class,
visual->visual->visual_id, visual->visual->visual_id,
event_mask, value_mask,
&value_list &value_list
); );
if (xcb_request_check(conn, cookie)) fatal("cannot create bar window"); if (xcb_request_check(conn, cookie)) fatal("cannot create bar window");
@@ -727,8 +735,8 @@ backend_bar_window_t backend_create_bar_window(
window_set_class_instance(conn, window_id); window_set_class_instance(conn, window_id);
window_set_name_static(conn, window_id, APP_NAME "_bar"); window_set_name_static(conn, window_id, APP_NAME "_bar");
root_set_event_mask(backend);
xcb_ungrab_server(conn); xcb_ungrab_server(conn);
root_set_event_mask(backend);
xcb_aux_sync(conn); xcb_aux_sync(conn);
auto width = geometry.width; auto width = geometry.width;