feat(infra): auto-commit con 11 cambios

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-10 13:30:27 +02:00
parent b8dd7ea018
commit 401d8523b4
10 changed files with 496 additions and 12 deletions
+40 -2
View File
@@ -165,6 +165,37 @@ Beneficios:
- Reset trivial (basta borrar `local_files/`).
- Separacion clara para backup/sync (solo `local_files/` es propio del PC).
### 7.1 Anti-jitter automatico (AltSnap, tiling WMs)
`fn::run_app` aplica tres capas de proteccion contra jitter al mover la
ventana con herramientas externas (AltSnap en Windows, snap-assist, tiling
WMs). Activado por defecto, sin opt-in:
1. **GLFW pos/size callbacks**`vp->Pos/Size` se sincronizan al instante
con `glfwSetWindowPos/Size` (no espera al siguiente NewFrame).
2. **Per-frame viewport sync** al inicio del main loop — cubre viewports
secundarios (paneles drag-out) que la backend crea dinamicamente.
3. **Win32 WndProc subclass** (`#ifdef _WIN32`) — observa `WM_ENTERSIZEMOVE`
/ `WM_EXITSIZEMOVE` que AltSnap fakea alrededor de cada drag. Mientras
el bracket esta abierto el main loop SKIPEA `render_fn` + `glfwSwapBuffers`,
replicando el contrato del title-bar drag native (DefWindowProc bloquea
el hilo, DWM compositor mueve el framebuffer existente).
Tests: `cpp/apps/altsnap_jitter_test/` corre dos fases:
- `p1.sync` (cross-platform): drives `glfwSetWindowPos` cada frame, asserta
`vp->Pos` sigue OS dentro de 1px.
- `p2.altsnap` (Windows): worker thread fakea `WM_ENTERSIZEMOVE` +
burst de `SetWindowPos(SWP_ASYNCWINDOWPOS)` + `WM_EXITSIZEMOVE`, asserta
que `render()` no se llama durante el bracket.
Lanzar con `e2e_run_cpp_windows altsnap_jitter_test`.
NO hace falta nada en cada app — toda `fn::run_app` lo hereda. Si una app
necesita renderizar incluso durante external move (caso raro: telemetria
en vivo, video stream), tendria que evitar el bypass — actualmente no hay
flag para desactivarlo (anadir `cfg.pause_on_external_sizemove = true` por
default si surge necesidad).
### 8. Convenciones de runtime
Cumplir el checklist completo de `cpp/PATTERNS.md`. Resumen de lo que NUNCA debe aparecer en una app:
@@ -196,8 +227,15 @@ Si la app tiene componentes que se quieren proteger contra regresiones visuales,
### 10. Layouts persistentes (default)
`fn::run_app` provee menu Layouts (Save current as.../Apply/Delete/Reset) sin
codigo. Crea `<exe_dir>/local_files/layouts.db` (tabla `imgui_layouts`) y
persiste el `imgui.ini` serializado por nombre.
codigo. Crea `<exe_dir>/local_files/layouts.db` (tabla `imgui_layouts` +
`layout_meta`) y persiste el `imgui.ini` serializado por nombre.
**Restore-on-open / save-on-close (1.1.0+):** al cerrar la app, el slot del
layout activo se reescribe con el `imgui.ini` actual (los retoques de
docking sobreviven). Al abrir, si habia un layout activo persistido en
`layout_meta.last_active`, se carga en el primer frame. Si la app no usa
named layouts (nunca clico Save/Apply), el comportamiento sigue siendo el
de antes: `imgui.ini` es la unica fuente.
- App nueva: nada que tocar — Layouts viene activo.
- App quiere personalizar `on_reset` (ej. re-mostrar paneles especificos como
+15 -2
View File
@@ -15,7 +15,20 @@ set -euo pipefail
build_cpp_windows() {
local target="${1:-}"
local registry_root="${FN_REGISTRY_ROOT:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)}"
local registry_root="${FN_REGISTRY_ROOT:-}"
if [ -z "$registry_root" ]; then
local d="$PWD"
while [ "$d" != "/" ]; do
if [ -f "$d/registry.db" ] && [ -d "$d/cpp" ]; then
registry_root="$d"; break
fi
d="$(dirname "$d")"
done
fi
if [ -z "$registry_root" ]; then
echo "[build_cpp_windows] No se localiza la raiz del registry. Exporta FN_REGISTRY_ROOT." >&2
return 2
fi
local cpp_root="$registry_root/cpp"
local build_dir="${BUILD_WIN:-$cpp_root/build/windows}"
local toolchain="$cpp_root/toolchains/mingw-w64.cmake"
@@ -46,6 +59,6 @@ build_cpp_windows() {
}
# Invocacion directa como script (compatibilidad).
if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
if [ "${BASH_SOURCE[0]:-}" = "${0:-}" ] && [ -n "${BASH_SOURCE[0]:-}" ]; then
build_cpp_windows "$@"
fi
@@ -54,6 +54,14 @@ deploy_cpp_exe_to_windows() {
"$app_dir/enrichers/" "$assets/enrichers/"
fi
# --- 7b. collectors/ del app_dir -> assets/collectors/ (odr_console) ---
if [ -d "$app_dir/collectors" ]; then
rsync -a --delete \
--exclude '__pycache__' \
--exclude '*.pyc' \
"$app_dir/collectors/" "$assets/collectors/"
fi
# --- 8. runtime/ Python embebido -> assets/runtime/ ---
if grep -q '^python_runtime:[[:space:]]*true' "$app_dir/app.md" 2>/dev/null; then
if [ ! -d "$app_dir/runtime/python" ] || \
+103
View File
@@ -17,6 +17,7 @@
#include "gfx/gl_loader.h"
#include <GLFW/glfw3.h>
#include <atomic>
#include <cstdio>
#include <cstring>
#include <filesystem>
@@ -28,6 +29,8 @@
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#define GLFW_EXPOSE_NATIVE_WIN32
#include <GLFW/glfw3native.h>
#else
#include <unistd.h>
#endif
@@ -40,6 +43,60 @@ static void glfw_error_callback(int error, const char* description) {
fprintf(stderr, "GLFW Error %d: %s\n", error, description);
}
#ifdef _WIN32
// AltSnap (and other external window movers — tiling WMs, snap-assist) bracket
// their drag with WM_ENTERSIZEMOVE / WM_EXITSIZEMOVE messages but, unlike the
// native title-bar drag, do NOT block the application thread inside the
// modal DefWindowProc move loop. Result: the app keeps rendering and swapping
// buffers while the OS posts SetWindowPos(SWP_ASYNCWINDOWPOS) calls, racing
// the framebuffer presentation against the live window position and producing
// the visible jitter / "grab and release" flicker the user reports.
//
// Native title-bar drag has no jitter precisely because Windows enters the
// modal sizemove loop and the app stops drawing — the DWM compositor moves
// the existing buffer pixels. We replicate that contract: while sizemove is
// active, skip render + glfwSwapBuffers, only pump the message queue. As soon
// as WM_EXITSIZEMOVE arrives, normal rendering resumes.
static std::atomic<bool> g_in_sizemove{false};
static WNDPROC g_orig_wndproc = nullptr;
static HWND g_subclassed_hwnd = nullptr;
static LRESULT CALLBACK fn_subclass_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
switch (msg) {
case WM_ENTERSIZEMOVE:
g_in_sizemove.store(true, std::memory_order_release);
break;
case WM_EXITSIZEMOVE:
g_in_sizemove.store(false, std::memory_order_release);
break;
default: break;
}
return CallWindowProcW(g_orig_wndproc, hwnd, msg, wp, lp);
}
static void install_sizemove_subclass(GLFWwindow* w) {
HWND hwnd = glfwGetWin32Window(w);
if (!hwnd) return;
g_subclassed_hwnd = hwnd;
g_orig_wndproc = (WNDPROC)SetWindowLongPtrW(
hwnd, GWLP_WNDPROC, (LONG_PTR)fn_subclass_wndproc);
}
static void uninstall_sizemove_subclass() {
if (g_subclassed_hwnd && g_orig_wndproc) {
SetWindowLongPtrW(g_subclassed_hwnd, GWLP_WNDPROC, (LONG_PTR)g_orig_wndproc);
}
g_subclassed_hwnd = nullptr;
g_orig_wndproc = nullptr;
}
static inline bool external_sizemove_active() {
return g_in_sizemove.load(std::memory_order_acquire);
}
#else
static inline bool external_sizemove_active() { return false; }
#endif
namespace fn {
// ============================================================================
@@ -225,6 +282,14 @@ int run_app(AppConfig config, std::function<void()> render_fn) {
}
});
#ifdef _WIN32
// Install Win32 WndProc subclass to detect WM_ENTERSIZEMOVE / WM_EXITSIZEMOVE.
// External movers (AltSnap) fake these brackets without blocking the app
// thread; we observe them and skip render+swap so the compositor moves
// the existing buffer (same contract as native title-bar drag).
install_sizemove_subclass(window);
#endif
// Carga punteros a funciones GL >= 2.0 si la app lo pide. En Linux es
// no-op; en Windows usa wglGetProcAddress (requiere ctx GL activo).
if (config.init_gl_loader) {
@@ -277,6 +342,17 @@ int run_app(AppConfig config, std::function<void()> render_fn) {
if (auto_layouts_storage) {
fn_ui::layout_storage_make_callbacks(auto_layouts_storage, auto_layouts_cb);
config.layouts_cb = &auto_layouts_cb;
// Restore-on-open: si hay un layout activo persistido, lo dejamos
// pendiente para que el primer frame del main loop lo aplique via
// layout_storage_apply_pending. Asi la app abre con el ultimo
// layout que el usuario tenia activo. active_name se setea ya
// optimista para reflejarlo en el menu desde el primer frame.
std::string last = fn_ui::layout_storage_get_last_active(auto_layouts_storage);
if (!last.empty() && fn_ui::layout_storage_apply(auto_layouts_storage, last)) {
auto_layouts_cb.active_name = last;
fn_log::log_info("auto_layouts: restaurado layout '%s'", last.c_str());
}
} else {
fn_log::log_warn("auto_layouts: layout_storage_open fallo (%s)", db_name);
}
@@ -335,6 +411,19 @@ int run_app(AppConfig config, std::function<void()> render_fn) {
continue;
}
// While an external mover (AltSnap on Win32, tiling WMs) is dragging
// the window we mirror the native title-bar contract: do not render,
// do not swap, just pump events. The DWM compositor scrolls the last
// presented framebuffer with the window — no race between SetWindowPos
// (async) and glfwSwapBuffers, so no jitter. WM_EXITSIZEMOVE clears
// the flag and the main loop resumes normal rendering.
if (external_sizemove_active()) {
// Bound the busy loop so the message queue gets drained but we
// don't burn CPU when AltSnap pauses between mouse moves.
glfwWaitEventsTimeout(0.016);
continue;
}
// Anti-jitter pass 2: covers secondary viewport windows that the
// backend creates dynamically (panels dragged outside the main).
// Sync each viewport's Pos/Size to the OS-reported state BEFORE
@@ -449,6 +538,17 @@ int run_app(AppConfig config, std::function<void()> render_fn) {
fn_log::logger_close();
}
// Save-on-close: si hay un layout activo, persiste el INI actual en su
// slot para que la proxima apertura cargue exactamente el mismo estado
// (incluye los retoques de docking/posiciones que el usuario hizo
// durante la sesion). Tambien reescribe last_active por si el callback
// se salto. Hecho ANTES de cerrar el storage. Necesita ImGui context
// vivo (SaveIniSettingsToMemory), por eso va antes de DestroyContext.
if (auto_layouts_storage && !auto_layouts_cb.active_name.empty()) {
fn_ui::layout_storage_save(auto_layouts_storage, auto_layouts_cb.active_name);
fn_ui::layout_storage_set_last_active(auto_layouts_storage, auto_layouts_cb.active_name);
}
// Cierra el storage de layouts auto-creado, si lo hay.
if (auto_layouts_storage) {
fn_ui::layout_storage_close(auto_layouts_storage);
@@ -461,6 +561,9 @@ int run_app(AppConfig config, std::function<void()> render_fn) {
ImPlot3D::DestroyContext();
ImPlot::DestroyContext();
ImGui::DestroyContext();
#ifdef _WIN32
uninstall_sizemove_subclass();
#endif
glfwDestroyWindow(window);
glfwTerminate();
+59 -2
View File
@@ -35,6 +35,10 @@ bool ensure_schema(sqlite3* db) {
" name TEXT PRIMARY KEY,"
" ini TEXT NOT NULL,"
" updated_at INTEGER NOT NULL"
");"
"CREATE TABLE IF NOT EXISTS layout_meta ("
" key TEXT PRIMARY KEY,"
" value TEXT NOT NULL"
");";
char* errmsg = nullptr;
int rc = sqlite3_exec(db, sql, nullptr, nullptr, &errmsg);
@@ -42,6 +46,17 @@ bool ensure_schema(sqlite3* db) {
return rc == SQLITE_OK;
}
bool layout_exists(sqlite3* db, const std::string& name) {
sqlite3_stmt* stmt = nullptr;
if (sqlite3_prepare_v2(db,
"SELECT 1 FROM imgui_layouts WHERE name = ? LIMIT 1;",
-1, &stmt, nullptr) != SQLITE_OK) return false;
sqlite3_bind_text(stmt, 1, name.c_str(), -1, SQLITE_TRANSIENT);
bool found = (sqlite3_step(stmt) == SQLITE_ROW);
sqlite3_finalize(stmt);
return found;
}
} // namespace
// ── API ───────────────────────────────────────────────────────────────────
@@ -154,6 +169,42 @@ bool layout_storage_delete(LayoutStorage* s, const std::string& name) {
return rc == SQLITE_DONE && changes > 0;
}
bool layout_storage_set_last_active(LayoutStorage* s, const std::string& name) {
if (!s || !s->db) return false;
sqlite3_stmt* stmt = nullptr;
if (name.empty()) {
if (sqlite3_prepare_v2(s->db,
"DELETE FROM layout_meta WHERE key = 'last_active';",
-1, &stmt, nullptr) != SQLITE_OK) return false;
} else {
if (sqlite3_prepare_v2(s->db,
"INSERT INTO layout_meta (key, value) VALUES ('last_active', ?) "
"ON CONFLICT(key) DO UPDATE SET value = excluded.value;",
-1, &stmt, nullptr) != SQLITE_OK) return false;
sqlite3_bind_text(stmt, 1, name.c_str(), -1, SQLITE_TRANSIENT);
}
int rc = sqlite3_step(stmt);
sqlite3_finalize(stmt);
return rc == SQLITE_DONE;
}
std::string layout_storage_get_last_active(LayoutStorage* s) {
if (!s || !s->db) return "";
sqlite3_stmt* stmt = nullptr;
if (sqlite3_prepare_v2(s->db,
"SELECT value FROM layout_meta WHERE key = 'last_active';",
-1, &stmt, nullptr) != SQLITE_OK) return "";
std::string name;
if (sqlite3_step(stmt) == SQLITE_ROW) {
const unsigned char* t = sqlite3_column_text(stmt, 0);
if (t) name.assign(reinterpret_cast<const char*>(t));
}
sqlite3_finalize(stmt);
if (name.empty()) return "";
if (!layout_exists(s->db, name)) return ""; // referencia colgante: ignorar
return name;
}
void layout_storage_make_callbacks(LayoutStorage* s, LayoutCallbacks& out) {
out.list = [s]() {
return layout_storage_list(s);
@@ -164,23 +215,29 @@ void layout_storage_make_callbacks(LayoutStorage* s, LayoutCallbacks& out) {
// confirme que se aplico (la app debe tomar el valor de retorno
// y propagarlo). Aqui ya lo dejamos optimistamente.
out.active_name = name;
layout_storage_set_last_active(s, name);
}
};
out.on_save = [s, &out](const std::string& name) {
if (layout_storage_save(s, name)) {
out.active_name = name;
layout_storage_set_last_active(s, name);
}
};
out.on_delete = [s, &out](const std::string& name) {
layout_storage_delete(s, name);
if (out.active_name == name) out.active_name.clear();
if (out.active_name == name) {
out.active_name.clear();
layout_storage_set_last_active(s, "");
}
};
out.on_reset = [&out]() {
out.on_reset = [s, &out]() {
// Limpia el INI en memoria. La app puede ademas re-mostrar paneles.
ImGui::LoadIniSettingsFromMemory("", 0);
ImGuiIO& io = ImGui::GetIO();
io.WantSaveIniSettings = true;
out.active_name.clear();
layout_storage_set_last_active(s, "");
};
}
+9
View File
@@ -67,6 +67,15 @@ std::string layout_storage_apply_pending(LayoutStorage* s);
// Borra un layout por nombre. Retorna true si se borro al menos una fila.
bool layout_storage_delete(LayoutStorage* s, const std::string& name);
// Persiste el nombre del ultimo layout activo en la BD (tabla layout_meta,
// key='last_active'). Pasar string vacio limpia la entrada. Retorna true si
// la operacion completo. Idempotente.
bool layout_storage_set_last_active(LayoutStorage* s, const std::string& name);
// Lee el nombre del ultimo layout activo (o "" si no hay). Si el nombre
// almacenado ya no existe en imgui_layouts (porque se borro), retorna "".
std::string layout_storage_get_last_active(LayoutStorage* s);
// Rellena `out` con callbacks que envuelven este storage. Patron de uso:
//
// auto* st = fn_ui::layout_storage_open("app.db");
+19 -6
View File
@@ -3,10 +3,10 @@ name: layout_storage
kind: function
lang: cpp
domain: core
version: "1.0.0"
version: "1.1.0"
purity: impure
signature: "fn_ui::LayoutStorage* layout_storage_open(const char*); void layout_storage_close(LayoutStorage*); std::vector<std::string> layout_storage_list(LayoutStorage*); bool layout_storage_save(LayoutStorage*, const std::string&); bool layout_storage_apply(LayoutStorage*, const std::string&); std::string layout_storage_apply_pending(LayoutStorage*); bool layout_storage_delete(LayoutStorage*, const std::string&); void layout_storage_make_callbacks(LayoutStorage*, LayoutCallbacks&)"
description: "Persistencia de layouts ImGui en SQLite con handle opaco. Una app abre el storage con un path, obtiene un LayoutCallbacks listo para pasar al menu de layouts (app_menubar/layouts_menu_items) y solo necesita llamar a layout_storage_apply_pending() al inicio de cada frame para activar layouts cargados."
signature: "fn_ui::LayoutStorage* layout_storage_open(const char*); void layout_storage_close(LayoutStorage*); std::vector<std::string> layout_storage_list(LayoutStorage*); bool layout_storage_save(LayoutStorage*, const std::string&); bool layout_storage_apply(LayoutStorage*, const std::string&); std::string layout_storage_apply_pending(LayoutStorage*); bool layout_storage_delete(LayoutStorage*, const std::string&); bool layout_storage_set_last_active(LayoutStorage*, const std::string&); std::string layout_storage_get_last_active(LayoutStorage*); void layout_storage_make_callbacks(LayoutStorage*, LayoutCallbacks&)"
description: "Persistencia de layouts ImGui en SQLite con handle opaco. Una app abre el storage con un path, obtiene un LayoutCallbacks listo para pasar al menu de layouts (app_menubar/layouts_menu_items) y solo necesita llamar a layout_storage_apply_pending() al inicio de cada frame para activar layouts cargados. Persiste tambien el ultimo layout activo (tabla layout_meta) para restore-on-open."
tags: [imgui, sqlite, layouts, persistence, dockspace, public-api]
uses_functions: []
uses_types: []
@@ -14,9 +14,9 @@ returns: []
returns_optional: false
error_type: "error_go_core"
imports: [sqlite3, imgui]
tested: false
tests: []
test_file_path: ""
tested: true
tests: ["layout_storage: last_active survives reopen", "layout_storage: get_last_active ignora referencia colgante", "layout_storage: callbacks on_apply persiste last_active", "layout_storage: callbacks on_delete del activo limpia last_active", "layout_storage: callbacks on_reset limpia last_active", "layout_storage: open con BD legacy (sin layout_meta) no rompe"]
test_file_path: "cpp/tests/test_layout_storage.cpp"
file_path: "cpp/functions/core/layout_storage.cpp"
params:
- name: db_path
@@ -42,10 +42,23 @@ CREATE TABLE IF NOT EXISTS imgui_layouts (
ini TEXT NOT NULL,
updated_at INTEGER NOT NULL -- unix epoch en segundos
);
-- Meta key/value para "last_active" (1.1.0+). Aditiva: BBDD viejas se
-- migran al primer open() sin romper datos existentes.
CREATE TABLE IF NOT EXISTS layout_meta (
key TEXT PRIMARY KEY,
value TEXT NOT NULL
);
```
`CREATE TABLE IF NOT EXISTS` significa que la nueva API convive con tablas pre-existentes en la misma BD (por ejemplo `ui_layouts` heredada o cualquier otra).
## Restore-on-open / save-on-close
`fn::run_app` (cuando `auto_layouts = true`) lee `layout_meta.last_active` justo despues de abrir el storage y, si apunta a un layout existente, lo deja pendiente con `layout_storage_apply` para que el primer frame lo cargue. Al salir, antes de cerrar el storage, reescribe el slot activo con `layout_storage_save(active_name)` para que los retoques de docking que el usuario hizo durante la sesion sobrevivan al cierre.
`make_callbacks` mantiene `layout_meta` sincronizado: `on_apply`/`on_save` apuntan al nuevo nombre, `on_delete` del layout activo y `on_reset` limpian la entrada. Si el `last_active` apunta a un layout que ya no existe (referencia colgante), `get_last_active` retorna `""`.
## Patron de uso (recomendado)
```cpp
+9
View File
@@ -136,6 +136,15 @@ else()
target_link_libraries(test_graph_icons PRIVATE OpenGL::GL)
endif()
# --- layout_storage: persistencia de last_active (restore-on-open) ---------
# layout_storage.cpp incluye <imgui.h> y referencia ImGui::Save/LoadIniSettings*,
# por eso necesitamos linkar contra imgui (compilado en el target del root
# CMakeLists). El test no abre ventanas ni inicializa GL — solo ejercita el
# meta-table y los callbacks que NO requieren un ImGui context vivo.
add_fn_test(test_layout_storage test_layout_storage.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../functions/core/layout_storage.cpp)
target_link_libraries(test_layout_storage PRIVATE SQLite::SQLite3 imgui)
# --- Visual golden-image diff (issue 0048) ---------------------------------
# El binario primitives_gallery se compila con --capture; el test compara los
# PNGs generados con los goldens en cpp/tests/golden/. Si no hay goldens o el
+232
View File
@@ -0,0 +1,232 @@
// E2E tests for layout_storage last_active persistence.
//
// Cubre:
// - set/get last_active sobreviven al cierre y reapertura del handle.
// - get_last_active retorna "" si la fila apunta a un layout que ya no existe
// (referencia colgante).
// - on_apply / on_delete (en make_callbacks) actualizan el meta correctamente.
// - on_reset borra el last_active.
// - apply_pending no rompe el flujo cuando solo hay set/get sin ImGui.
//
// Importante: NO se prueba on_save ni layout_storage_save aqui — requieren un
// ImGui context vivo (SaveIniSettingsToMemory). Esa parte queda cubierta
// indirectamente cuando una app real arranca con run_app. En este test,
// "creamos" layouts insertando directamente en imgui_layouts via SQLite.
#define CATCH_CONFIG_MAIN
#include "catch_amalgamated.hpp"
#include "core/layout_storage.h"
#include <sqlite3.h>
#include <cstdio>
#include <filesystem>
#include <string>
namespace {
std::string tmp_db_path(const char* tag) {
auto dir = std::filesystem::temp_directory_path() /
(std::string("fn_layout_storage_") + tag);
std::error_code ec;
std::filesystem::create_directories(dir, ec);
return (dir / "layouts.db").string();
}
// Inserta un layout "vacio" directamente para no depender de ImGui.
bool seed_layout(const std::string& db_path, const char* name) {
sqlite3* db = nullptr;
if (sqlite3_open(db_path.c_str(), &db) != SQLITE_OK) return false;
sqlite3_exec(db,
"CREATE TABLE IF NOT EXISTS imgui_layouts ("
" name TEXT PRIMARY KEY, ini TEXT NOT NULL, updated_at INTEGER NOT NULL"
");",
nullptr, nullptr, nullptr);
sqlite3_stmt* stmt = nullptr;
int rc = sqlite3_prepare_v2(db,
"INSERT INTO imgui_layouts (name, ini, updated_at) "
"VALUES (?, '[Window][Debug]\n', strftime('%s','now')) "
"ON CONFLICT(name) DO NOTHING;",
-1, &stmt, nullptr);
if (rc != SQLITE_OK) { sqlite3_close(db); return false; }
sqlite3_bind_text(stmt, 1, name, -1, SQLITE_TRANSIENT);
rc = sqlite3_step(stmt);
sqlite3_finalize(stmt);
sqlite3_close(db);
return rc == SQLITE_DONE;
}
bool delete_row(const std::string& db_path, const char* name) {
sqlite3* db = nullptr;
if (sqlite3_open(db_path.c_str(), &db) != SQLITE_OK) return false;
sqlite3_stmt* stmt = nullptr;
int rc = sqlite3_prepare_v2(db,
"DELETE FROM imgui_layouts WHERE name = ?;", -1, &stmt, nullptr);
if (rc != SQLITE_OK) { sqlite3_close(db); return false; }
sqlite3_bind_text(stmt, 1, name, -1, SQLITE_TRANSIENT);
rc = sqlite3_step(stmt);
sqlite3_finalize(stmt);
sqlite3_close(db);
return rc == SQLITE_DONE;
}
} // namespace
TEST_CASE("layout_storage: last_active survives reopen", "[layout_storage]") {
auto path = tmp_db_path("survives_reopen");
std::filesystem::remove(path);
REQUIRE(seed_layout(path, "Coding"));
REQUIRE(seed_layout(path, "Debug"));
// sesion 1: marca last_active
{
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
REQUIRE(fn_ui::layout_storage_set_last_active(s, "Coding"));
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "Coding");
fn_ui::layout_storage_close(s);
}
// sesion 2: el meta sobrevive
{
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "Coding");
// sobreescribir
REQUIRE(fn_ui::layout_storage_set_last_active(s, "Debug"));
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "Debug");
// limpiar
REQUIRE(fn_ui::layout_storage_set_last_active(s, ""));
REQUIRE(fn_ui::layout_storage_get_last_active(s).empty());
fn_ui::layout_storage_close(s);
}
}
TEST_CASE("layout_storage: get_last_active ignora referencia colgante",
"[layout_storage]") {
auto path = tmp_db_path("dangling");
std::filesystem::remove(path);
REQUIRE(seed_layout(path, "Coding"));
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
REQUIRE(fn_ui::layout_storage_set_last_active(s, "Coding"));
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "Coding");
// Borrar el layout sin pasar por la API (simula DB editada externamente).
fn_ui::layout_storage_close(s);
REQUIRE(delete_row(path, "Coding"));
auto* s2 = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s2 != nullptr);
// Sobrevive el meta pero apunta a un layout inexistente → "".
REQUIRE(fn_ui::layout_storage_get_last_active(s2).empty());
fn_ui::layout_storage_close(s2);
}
TEST_CASE("layout_storage: callbacks on_apply persiste last_active",
"[layout_storage]") {
auto path = tmp_db_path("cb_apply");
std::filesystem::remove(path);
REQUIRE(seed_layout(path, "Default"));
REQUIRE(seed_layout(path, "Wide"));
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
fn_ui::LayoutCallbacks cb;
fn_ui::layout_storage_make_callbacks(s, cb);
// on_apply NO requiere ImGui (solo deja blob pendiente + set meta).
cb.on_apply("Wide");
REQUIRE(cb.active_name == "Wide");
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "Wide");
fn_ui::layout_storage_close(s);
// Reopen — last_active persiste.
auto* s2 = fn_ui::layout_storage_open(path.c_str());
REQUIRE(fn_ui::layout_storage_get_last_active(s2) == "Wide");
fn_ui::layout_storage_close(s2);
}
TEST_CASE("layout_storage: callbacks on_delete del activo limpia last_active",
"[layout_storage]") {
auto path = tmp_db_path("cb_delete");
std::filesystem::remove(path);
REQUIRE(seed_layout(path, "A"));
REQUIRE(seed_layout(path, "B"));
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
fn_ui::LayoutCallbacks cb;
fn_ui::layout_storage_make_callbacks(s, cb);
cb.on_apply("A");
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "A");
// Borrar otro: no toca last_active.
cb.on_delete("B");
REQUIRE(cb.active_name == "A");
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "A");
// Borrar el activo: limpia.
cb.on_delete("A");
REQUIRE(cb.active_name.empty());
REQUIRE(fn_ui::layout_storage_get_last_active(s).empty());
fn_ui::layout_storage_close(s);
}
TEST_CASE("layout_storage: callbacks on_reset limpia last_active",
"[layout_storage]") {
auto path = tmp_db_path("cb_reset");
std::filesystem::remove(path);
REQUIRE(seed_layout(path, "X"));
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
fn_ui::LayoutCallbacks cb;
fn_ui::layout_storage_make_callbacks(s, cb);
cb.on_apply("X");
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "X");
// on_reset toca ImGui::LoadIniSettingsFromMemory — sin context cascaria.
// Para este test verificamos solo el side-effect en BD pasando por el
// mismo path: set_last_active("") es lo que el reset hace.
REQUIRE(fn_ui::layout_storage_set_last_active(s, ""));
REQUIRE(fn_ui::layout_storage_get_last_active(s).empty());
fn_ui::layout_storage_close(s);
}
TEST_CASE("layout_storage: open con BD legacy (sin layout_meta) no rompe",
"[layout_storage]") {
auto path = tmp_db_path("legacy");
std::filesystem::remove(path);
// Crear BD con SOLO la tabla vieja imgui_layouts (sin layout_meta).
{
sqlite3* db = nullptr;
REQUIRE(sqlite3_open(path.c_str(), &db) == SQLITE_OK);
REQUIRE(sqlite3_exec(db,
"CREATE TABLE imgui_layouts ("
" name TEXT PRIMARY KEY, ini TEXT NOT NULL, updated_at INTEGER NOT NULL"
");"
"INSERT INTO imgui_layouts VALUES ('Old', '[X]', 1);",
nullptr, nullptr, nullptr) == SQLITE_OK);
sqlite3_close(db);
}
// Open debe crear layout_meta on-the-fly via CREATE TABLE IF NOT EXISTS.
auto* s = fn_ui::layout_storage_open(path.c_str());
REQUIRE(s != nullptr);
REQUIRE(fn_ui::layout_storage_get_last_active(s).empty());
REQUIRE(fn_ui::layout_storage_set_last_active(s, "Old"));
REQUIRE(fn_ui::layout_storage_get_last_active(s) == "Old");
fn_ui::layout_storage_close(s);
}
+2
View File
@@ -0,0 +1,2 @@
[2026-05-10 01:14:44.360] [INFO] app start: odr_console — online data recopilation
[2026-05-10 01:14:45.365] [ERROR] GLFW createWindow failed (1400x900)