refactor(runtime): 将 runtime 模块从 core 目录迁移至独立的 runtime 目录并封装内部细节

CMakeLists.txt

@@ -50,7 +50,6 @@ add_executable(${APP_NAME}
     ${SOURCE_DIR}/core/plan.c
     ${SOURCE_DIR}/core/policy.c
     ${SOURCE_DIR}/core/rules.c
-    ${SOURCE_DIR}/core/runtime.c
     ${SOURCE_DIR}/core/state.c
     ${SOURCE_DIR}/core/window.c
 
@@ -58,6 +57,8 @@ add_executable(${APP_NAME}
     ${SOURCE_DIR}/layouts/fullscreen.c
     ${SOURCE_DIR}/layouts/maximize.c
 
+    ${SOURCE_DIR}/runtime/runtime.c
+
     ${SOURCE_DIR}/main.c
 )
 

src/config/runtime_config.c

@@ -13,7 +13,6 @@
 #include "core/layout.h"
 #include "core/listeners.h"
 #include "core/rules.h"
-#include "core/runtime.h"
 #include "core/types.h"
 #include "core/wm_desc.h"
 #include "layouts/fair.h"

src/config/runtime_config.h

@@ -1,6 +1,30 @@
 #pragma once
 
-typedef struct runtime_init_desc_t runtime_init_desc_t;
+#include <stddef.h>
+#include <zdwm/types.h>
+
+#include "core/backend.h"
+#include "core/binding.h"
+#include "core/layout.h"
+#include "core/listeners.h"
+#include "core/rules.h"
+#include "core/types.h"
+#include "core/wm_desc.h"
+
+typedef struct runtime_init_desc_t {
+  backend_t *backend;
+  zdwm_output_info_t *outputs;
+  size_t output_count;
+
+  layout_registry_t layouts;
+  rules_t rules;
+  border_config_t border;
+  workspace_desc_t *workspaces;
+  size_t workspace_count;
+  void *config_module_handle;
+  binding_table_t *binding_table;
+  listeners_t listeners;
+} runtime_init_desc_t;
 
 bool runtime_config_load(const char *override_path, runtime_init_desc_t *out);
 void runtime_config_cleanup(runtime_init_desc_t *desc);

src/core/runtime.h

@@ -1,53 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "core/backend.h"
-#include "core/binding.h"
-#include "core/command_buffer.h"
-#include "core/layout.h"
-#include "core/listeners.h"
-#include "core/plan.h"
-#include "core/rules.h"
-#include "core/state.h"
-#include "core/types.h"
-
-typedef struct runtime_init_desc_t {
-  backend_t *backend;
-  output_info_t *outputs;
-  size_t output_count;
-
-  layout_registry_t layouts;
-  rules_t rules;
-  border_config_t border;
-  workspace_desc_t *workspaces;
-  size_t workspace_count;
-  void *config_module_handle;
-  binding_table_t *binding_table;
-  listeners_t listeners;
-} runtime_init_desc_t;
-
-typedef struct runtime_t {
-  bool running;
-  bool will_restart;
-
-  plan_t plan;
-  command_buffer_t command_buffer;
-  state_t state;
-  layout_result_t layout_result;
-  layout_registry_t layouts;
-  rules_t rules;
-  border_config_t border;
-  backend_t *backend;
-  void *config_module_handle;
-  binding_table_t *binding_table;
-  listeners_t listeners;
-} runtime_t;
-
-bool runtime_init(runtime_t *runtime, runtime_init_desc_t *desc);
-void runtime_init_desc_cleanup(runtime_init_desc_t *desc);
-void runtime_shutdown(runtime_t *runtime);
-void runtime_setup(runtime_t *runtime);
-void runtime_scan(runtime_t *runtime);
-void runtime_run(runtime_t *runtime);

src/main.c

@@ -3,52 +3,16 @@
 #include <unistd.h>
 
 #include "base/log.h"
-#include "config/runtime_config.h"
+#include "runtime/runtime.h"
-#include "core/backend.h"
-#include "core/runtime.h"
-
-static void bootstrap(runtime_t *runtime) {
-  auto backend = backend_create(nullptr);
-  auto detect = backend_detect(backend);
-  if (!backend || !detect || detect->output_count == 0) {
-    fatal("backend detect failed");
-  }
-
-  runtime_init_desc_t desc = {
-    .backend = backend,
-    .outputs = detect->outputs,
-    .output_count = detect->output_count,
-  };
-  if (!runtime_config_load(nullptr, &desc)) {
-    fatal("failed to build runtime inputs");
-  }
-
-  backend = nullptr;
-
-  bool inited = runtime_init(runtime, &desc);
-
-  runtime_init_desc_cleanup(&desc);
-  backend_detect_destroy(detect);
-
-  if (!inited) {
-    fatal("runtime init failed");
-  }
-}
 
 char **cmd_argv = nullptr;
 
 int main(int argc, char *argv[]) {
   cmd_argv = argv;
 
-  runtime_t runtime = {0};
+  auto restart = runtime_run(nullptr, nullptr);
 
-  bootstrap(&runtime);
+  if (restart) {
-  runtime_setup(&runtime);
-  runtime_scan(&runtime);
-  runtime_run(&runtime);
-  runtime_shutdown(&runtime);
-
-  if (runtime.will_restart) {
     execvp(cmd_argv[0], cmd_argv);
     fatal("execvp() failed: %s", strerror(errno));
   }

src/runtime/runtime.c

@@ -1,4 +1,4 @@
-#include "core/runtime.h"
+#include "runtime/runtime.h"
 
 #include <dlfcn.h>
 #include <stddef.h>
@@ -6,7 +6,9 @@
 #include <zdwm/layout.h>
 
 #include "base/array.h"
+#include "base/log.h"
 #include "base/memory.h"
+#include "config/runtime_config.h"
 #include "core/backend.h"
 #include "core/binding.h"
 #include "core/command_buffer.h"
@@ -21,6 +23,23 @@
 #include "core/window.h"
 #include "core/wm_desc.h"
 
+typedef struct runtime_t {
+  bool running;
+  bool will_restart;
+
+  plan_t plan;
+  command_buffer_t command_buffer;
+  state_t state;
+  layout_result_t layout_result;
+  layout_registry_t layouts;
+  rules_t rules;
+  border_config_t border;
+  backend_t *backend;
+  void *config_module_handle;
+  binding_table_t *binding_table;
+  listeners_t listeners;
+} runtime_t;
+
 static bool runtime_workspace_desc_has_valid_layouts(
   const layout_registry_t *layouts,
   const workspace_desc_t *workspace
@@ -52,7 +71,7 @@ static bool runtime_init_desc_valid(const runtime_init_desc_t *desc) {
   return true;
 }
 
-bool runtime_init(runtime_t *runtime, runtime_init_desc_t *desc) {
+static bool runtime_init(runtime_t *runtime, runtime_init_desc_t *desc) {
   if (!runtime || !runtime_init_desc_valid(desc)) return false;
 
   p_clear(runtime, 1);
@@ -83,7 +102,7 @@ bool runtime_init(runtime_t *runtime, runtime_init_desc_t *desc) {
   return true;
 }
 
-void runtime_init_desc_cleanup(runtime_init_desc_t *desc) {
+static void runtime_init_desc_cleanup(runtime_init_desc_t *desc) {
   if (!desc) return;
 
   binding_table_destroy(desc->binding_table);
@@ -107,7 +126,7 @@ void runtime_init_desc_cleanup(runtime_init_desc_t *desc) {
   desc->config_module_handle = nullptr;
 }
 
-void runtime_shutdown(runtime_t *runtime) {
+static void runtime_shutdown(runtime_t *runtime) {
   runtime->running = false;
   plan_cleanup(&runtime->plan);
   command_buffer_cleanup(&runtime->command_buffer);
@@ -159,7 +178,7 @@ static void runtime_notify_initial_state(runtime_t *runtime) {
   listeners_notify_binding_mode(listeners, runtime->binding_table);
 }
 
-void runtime_setup(runtime_t *runtime) {
+static void runtime_setup(runtime_t *runtime) {
   size_t bind_count = 0;
   auto bindings =
     binding_table_get_current_bindings(runtime->binding_table, &bind_count);
@@ -309,7 +328,7 @@ static policy_context_t policy_context_init(runtime_t *runtime) {
   return ctx;
 }
 
-void runtime_scan(runtime_t *runtime) {
+static void runtime_scan(runtime_t *runtime) {
   auto result = backend_scan_windows(runtime->backend);
   if (!result) return;
 
@@ -341,7 +360,7 @@ void runtime_scan(runtime_t *runtime) {
   listeners_notify_initial_windows(&runtime->listeners, &runtime->state);
 }
 
-void runtime_run(runtime_t *runtime) {
+static void runtime_run_event_loop(runtime_t *runtime) {
   runtime->running = true;
 
   backend_t *backend               = runtime->backend;
@@ -370,3 +389,42 @@ void runtime_run(runtime_t *runtime) {
     event_cleanup(&event);
   }
 }
+
+bool runtime_run(const char *config_so_path, const char *display_name) {
+  auto backend = backend_create(nullptr);
+  auto detect  = backend_detect(backend);
+  if (!backend || !detect || detect->output_count == 0) {
+    fatal("backend detect failed");
+  }
+
+  runtime_init_desc_t desc = {
+    .backend      = backend,
+    .outputs      = detect->outputs,
+    .output_count = detect->output_count,
+  };
+  if (!runtime_config_load(nullptr, &desc)) {
+    fatal("failed to build runtime inputs");
+  }
+
+  backend = nullptr;
+
+  auto runtime = p_new(runtime_t, 1);
+  bool inited  = runtime_init(runtime, &desc);
+
+  runtime_init_desc_cleanup(&desc);
+  backend_detect_destroy(detect);
+
+  if (!inited) {
+    fatal("runtime init failed");
+  }
+
+  runtime_setup(runtime);
+  runtime_scan(runtime);
+  runtime_run_event_loop(runtime);
+
+  auto restart = runtime->will_restart;
+  runtime_shutdown(runtime);
+  p_delete(&runtime);
+
+  return restart;
+}

src/runtime/runtime.h

@@ -0,0 +1,3 @@
+#pragma once
+
+bool runtime_run(const char *config_so_path, const char *display_name);