1 files changed, 15 insertions, 15 deletions

diff --git a/tests/x11/test_input.c b/tests/x11/test_input.c
index 80a6451..bbcbf45 100644
--- a/tests/x11/test_input.c
+++ b/tests/x11/test_input.c
@@ -54,14 +54,14 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface *
             PropModeReplace, (const unsigned char *)cases[i].bytes, (int)cases[i].len);
         XSelectionEvent reply = {.requestor = pending->window, .property = property};
         selection_notify(d, &reply);
-        struct yasl_input_event event;
+        struct yasl_event event;
         if (cases[i].expected) {
-            assert(yasl_surface_input_poll(&s->base, &event));
-            assert(event.kind == YASL_INPUT_PASTE);
-            assert(event.paste.len == strlen(cases[i].expected));
-            assert(strcmp(event.paste.text, cases[i].expected) == 0);
+            assert(yasl_surface_poll_event(&s->base, &event));
+            assert(event.type == YASL_EVENT_PASTE);
+            assert(event.text.len == strlen(cases[i].expected));
+            assert(strcmp(event.text.data, cases[i].expected) == 0);
         }
-        assert(!yasl_surface_input_poll(&s->base, &event));
+        assert(!yasl_surface_poll_event(&s->base, &event));
     }
 }
 
@@ -98,18 +98,18 @@ int main(void)
         XKeyEvent native = {.type = KeyPress, .display = d->native,
             .window = s->window, .keycode = code};
         key_event(s, &native, false);
-        struct yasl_input_event event;
-        assert(yasl_surface_input_poll(surface, &event));
-        assert(event.kind == YASL_INPUT_KEY && event.key.key == YASL_KEY_A);
+        struct yasl_event event;
+        assert(yasl_surface_poll_event(surface, &event));
+        assert(event.type == YASL_EVENT_KEY && event.key.key == YASL_KEY_A);
         assert(event.key.codepoint == cases[i].label);
-        assert(yasl_surface_input_poll(surface, &event));
-        assert(event.kind == YASL_INPUT_TEXT && event.text.len == strlen(cases[i].text));
-        assert(strcmp(event.text.text, cases[i].text) == 0);
-        assert(!yasl_surface_input_poll(surface, &event));
+        assert(yasl_surface_poll_event(surface, &event));
+        assert(event.type == YASL_EVENT_TEXT && event.text.len == strlen(cases[i].text));
+        assert(strcmp(event.text.data, cases[i].text) == 0);
+        assert(!yasl_surface_poll_event(surface, &event));
         native.type = KeyRelease;
         key_event(s, &native, false);
-        assert(yasl_surface_input_poll(surface, &event) && event.kind == YASL_INPUT_KEY);
-        assert(!yasl_surface_input_poll(surface, &event));
+        assert(yasl_surface_poll_event(surface, &event) && event.type == YASL_EVENT_KEY);
+        assert(!yasl_surface_poll_event(surface, &event));
     }
     XChangeKeyboardMapping(d->native, code, width, saved, 1);
     XSync(d->native, False);