rename and simplification

3 files changed, 7 insertions, 7 deletions

diff --git a/tests/x11/test_input.c b/tests/x11/test_input.c
index af45e76..80a6451 100644
--- a/tests/x11/test_input.c
+++ b/tests/x11/test_input.c
@@ -1,6 +1,6 @@
 /* An isolated real X server supplies the keymap; disabling this surface's XIC
  * deliberately exercises text insertion when no input method is available. */
-#include "../../src/x11/window.c"
+#include "../../src/platform/x11/window.c"
 
 static void check_selection_encoding(struct x11_display *d, struct x11_surface *s)
 {
@@ -71,7 +71,7 @@ int main(void)
     struct yasl_display *base = yasl_display_open(NULL, &ds);
     assert(base);
     struct x11_display *d = (struct x11_display *)base;
-    struct yasl_surface_spec spec = {.title = "Keyboard fallback", .size = {100, 100}};
+    struct yasl_window_spec spec = {.title = "Keyboard fallback", .size = {100, 100}};
     struct yasl_surface *surface = yasl_surface_create_toplevel(base, &spec);
     assert(surface);
     struct x11_surface *s = (struct x11_surface *)surface;
diff --git a/tests/x11/test_tablet.c b/tests/x11/test_tablet.c
index ba815cb..12c183e 100644
--- a/tests/x11/test_tablet.c
+++ b/tests/x11/test_tablet.c
@@ -1,5 +1,5 @@
 /* Exercise native XI2 samples through the backend and public input queue. */
-#include "../../src/x11/window.c"
+#include "../../src/platform/x11/window.c"
 
 static struct yasl_mouse_event next(struct x11_surface *surface)
 {
@@ -113,8 +113,8 @@ static void test_x11_gaps(struct x11_display *d, struct x11_surface *s)
 
     struct drag_test_recorder rec1 = {0};
     struct drag_test_recorder rec2 = {0};
-    struct yasl_surface_cbs cbs1 = {.drag = on_test_drag};
-    struct yasl_surface_cbs cbs2 = {.drag = on_test_drag};
+    struct yasl_window_cbs cbs1 = {.drag = on_test_drag};
+    struct yasl_window_cbs cbs2 = {.drag = on_test_drag};
     set_callbacks(&s->base, &cbs1, &rec1);
     set_callbacks(&s2.base, &cbs2, &rec2);
 
diff --git a/tests/x11/test_tablet_native.c b/tests/x11/test_tablet_native.c
index 0ddb6d8..6e7eeb4 100644
--- a/tests/x11/test_tablet_native.c
+++ b/tests/x11/test_tablet_native.c
@@ -108,10 +108,10 @@ int main(int argc, char **argv)
     struct yasl_display_spec ds = {.backend = YASL_BACKEND_X11};
     struct yasl_display *display = yasl_display_open(NULL, &ds);
     assert(display && (yasl_display_caps(display) & YASL_CAP_TABLET));
-    struct yasl_surface_spec ss = {.title = "YASL native pressure test", .size = {500, 400}};
+    struct yasl_window_spec ss = {.title = "YASL native pressure test", .size = {500, 400}};
     struct yasl_surface *surface = yasl_surface_create_toplevel(display, &ss);
     assert(surface);
-    struct yasl_surface_cbs cbs = {.draw = draw, .configure = configure};
+    struct yasl_window_cbs cbs = {.draw = draw, .configure = configure};
     yasl_surface_set_callbacks(surface, &cbs, &app);
     yasl_surface_schedule_redraw(surface);
     Display *x = yasl_display_get_native_handle(display);