backend: X11 后端 window 信息查询接口使用原始封装代替语义化封装

- 拆分 window_get_skip_taskbar / window_get_urgency /
  window_get_states / window_get_geometry_mode 为更底层的
  window_get_atom_array / window_get_wm_hints / atom_to_window_state
- window_get_fixed_size 改为输出参数风格
- 扁平化 window_map_request_event_t，内联原 window_props_t 和
  window_geometry_t 的字段
- window_props_t → window_layer_props_t，仅保留 layer 分类所需的
  types/states

src/backend/x11/event.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
+#include <xcb/xcb_icccm.h>
 #include <xcb/xproto.h>
 
 #include "backend/x11/window.h"
@@ -12,55 +13,113 @@
 #include "core/window.h"
 #include "internal.h" /* IWYU pragma: keep */
 
-static void map_request_cleanup(event_t *event) {
-  window_metadata_t *metadata = &event->data.window_map_request.metadata;
-  window_props_t *props = &event->data.window_map_request.props;
-  p_delete(&metadata->role);
-  p_delete(&metadata->title);
-  p_delete(&metadata->class_name);
-  p_delete(&metadata->instance_name);
-  p_delete(&props->types);
-  p_delete(&props->states);
+static window_state_t *derive_window_states(const atoms_t *atoms,
+                                            const xcb_atom_t *raw,
+                                            uint32_t count, size_t *out_count) {
+  if (!raw || count == 0) {
+    *out_count = 0;
+    return nullptr;
+  }
+  window_state_t *buf = p_new(window_state_t, count);
+  size_t valid = 0;
+  for (uint32_t i = 0; i < count; i++) {
+    window_state_t s = atom_to_window_state(atoms, raw[i]);
+    if (s != (window_state_t)-1) buf[valid++] = s;
+  }
+  if (valid == 0) {
+    p_delete(&buf);
+    *out_count = 0;
+    return nullptr;
+  }
+  *out_count = valid;
+  return buf;
+}
+
+static bool derive_skip_taskbar(const atoms_t *atoms, const xcb_atom_t *raw,
+                                uint32_t count) {
+  for (uint32_t i = 0; i < count; i++)
+    if (raw[i] == atoms->_NET_WM_STATE_SKIP_TASKBAR) return true;
+  return false;
+}
+
+static window_geometry_mode_t geometry_mode_from_hints(
+  const xcb_icccm_wm_hints_t *hints) {
+  if (hints->initial_state == XCB_ICCCM_WM_STATE_ICONIC)
+    return ZDWM_GEOMETRY_MINIMIZED;
+  return ZDWM_GEOMETRY_NORMAL;
+}
+
+static window_geometry_mode_t geometry_mode_from_states(
+  const atoms_t *atoms, const xcb_atom_t *state_atoms, uint32_t state_count) {
+  for (uint32_t i = 0; i < state_count; i++) {
+    if (state_atoms[i] == atoms->_NET_WM_STATE_FULLSCREEN)
+      return ZDWM_GEOMETRY_FULLSCREEN;
+    if (state_atoms[i] == atoms->_NET_WM_STATE_MAXIMIZED_VERT ||
+        state_atoms[i] == atoms->_NET_WM_STATE_MAXIMIZED_HORZ)
+      return ZDWM_GEOMETRY_MAXIMIZED;
+  }
+  return ZDWM_GEOMETRY_NORMAL;
 }
 
 static bool handle_map_request(backend_t *backend, event_t *event,
                                const xcb_map_request_event_t *xcb_event) {
-  p_clear(event, 1);
   xcb_window_t window = xcb_event->window;
+
+  p_clear(event, 1);
   event->type = ZDWM_EVENT_WINDOW_MAP_REQUEST;
-  event->data.window_map_request.window = (window_id_t)window;
 
-  window_metadata_t *metadata = &event->data.window_map_request.metadata;
-  window_props_t *props = &event->data.window_map_request.props;
-  window_geometry_t *geometry = &event->data.window_map_request.geometry;
+  window_map_request_event_t *ev = &event->data.window_map_request;
+  ev->window = (window_id_t)window;
+  ev->transient_for = window_get_transient_for(backend, window);
+  ev->geometry_mode = ZDWM_GEOMETRY_NORMAL;
 
-  {
-    xcb_get_window_attributes_reply_t *wa_reply =
-      window_get_attributes(backend, window);
-    if (!wa_reply) return false;
-    props->override_redirect = (bool)wa_reply->override_redirect;
-    p_delete(&wa_reply);
+  xcb_get_window_attributes_reply_t *wa =
+    window_get_attributes(backend, window);
+  if (!wa) return false;
+  ev->override_redirect = (bool)wa->override_redirect;
+  p_delete(&wa);
+
+  xcb_icccm_wm_hints_t wm_hints = {0};
+  if (window_get_wm_hints(backend, window, &wm_hints)) {
+    ev->urgent = (bool)xcb_icccm_wm_hints_get_urgency(&wm_hints);
+    ev->geometry_mode = geometry_mode_from_hints(&wm_hints);
   }
 
-  if (!window_get_geometry(backend, window, &geometry->rect)) return false;
+  if (!window_get_fixed_size(backend, window, &ev->fixed_size)) return false;
+  if (!window_get_geometry(backend, window, &ev->rect)) return false;
 
-  props->transient_for = window_get_transient_for(backend, window);
-  props->skip_taskbar = window_get_skip_taskbar(backend, window);
-  props->urgent = window_get_urgency(backend, window);
-  geometry->mode = window_get_geometry_mode(backend, window);
-  geometry->fixed_size = window_get_fixed_size(backend, window);
-
-  metadata->role = window_get_role(backend, window);
-  metadata->title = window_get_title(backend, window);
-  window_get_class(backend, window, &metadata->class_name,
-                   &metadata->instance_name);
-
-  if (!window_get_types(backend, window, &props->types, &props->type_count) ||
-      !window_get_states(backend, window, &props->states, &props->state_count)) {
-    map_request_cleanup(event);
+  const atoms_t *atoms = &backend->atoms;
+  xcb_atom_t *state_atoms = nullptr;
+  uint32_t state_count = 0;
+  if (!window_get_atom_array(backend, window, atoms->_NET_WM_STATE,
+                             &state_atoms, &state_count)) {
     return false;
   }
 
+  if (ev->geometry_mode == ZDWM_GEOMETRY_NORMAL && state_atoms) {
+    ev->geometry_mode =
+      geometry_mode_from_states(atoms, state_atoms, state_count);
+  }
+
+  if (state_atoms) {
+    ev->skip_taskbar = derive_skip_taskbar(atoms, state_atoms, state_count);
+    ev->props.states = derive_window_states(atoms, state_atoms, state_count,
+                                            &ev->props.state_count);
+  }
+
+  p_delete(&state_atoms);
+
+  window_layer_props_t *props = &ev->props;
+  if (!window_get_types(backend, window, &props->types, &props->type_count)) {
+    p_delete(&props->states);
+    return false;
+  }
+
+  ev->metadata.role = window_get_role(backend, window);
+  ev->metadata.title = window_get_title(backend, window);
+  window_get_class(backend, window, &ev->metadata.class_name,
+                   &ev->metadata.instance_name);
+
   return true;
 }