1 files changed, 13 insertions, 11 deletions

diff --git a/tests/x11/test_input.c b/tests/x11/test_input.c
index ccad859..a89812b 100644
--- a/tests/x11/test_input.c
+++ b/tests/x11/test_input.c
@@ -6,12 +6,14 @@
 
 static void check_selection_encoding(struct x11_display *d, struct x11_surface *s)
 {
+    struct yasl_private_event queued;
+    while (yasl_private_display_poll_event(&d->base, &queued)) {}
     Window requestor = XCreateSimpleWindow(d->native, DefaultRootWindow(d->native),
         0, 0, 1, 1, 0, 0, 0);
     Atom property = XInternAtom(d->native, "YASL_PRIVATE_TEST_STRING", False);
     XSelectionRequestEvent request = {.display = d->native, .requestor = requestor,
         .selection = d->clipboard, .target = XA_STRING, .property = property};
-    yasl_private_display_copy(&d->base, YASL_PRIVATE_CLIPBOARD, "café £");
+    yasl_private_clipboard_set(&d->base, YASL_PRIVATE_CLIPBOARD, "café £");
     selection_request(d, &request);
     Atom actual;
     int format;
@@ -22,7 +24,7 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface *
     assert(actual == XA_STRING && format == 8 && count == 6);
     assert(memcmp(data, "caf\xe9 \xa3", count) == 0);
     XFree(data);
-    yasl_private_display_copy(&d->base, YASL_PRIVATE_CLIPBOARD, "字");
+    yasl_private_clipboard_set(&d->base, YASL_PRIVATE_CLIPBOARD, "字");
     selection_request(d, &request);
     assert(XGetWindowProperty(d->native, requestor, property, 0, 100, True,
         AnyPropertyType, &actual, &format, &count, &left, &data) == Success);
@@ -72,7 +74,7 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface *
         XSelectionEvent reply = {.requestor = pending->window, .property = property};
         selection_notify(d, &reply);
         struct yasl_private_event event;
-        assert(yasl_private_surface_poll_event(&s->base, &event));
+        assert(yasl_private_display_poll_event(&d->base, &event));
         assert(event.type == YASL_PRIVATE_EVENT_PASTE && event.paste.request_id == i + 1);
         assert(event.paste.status == cases[i].status);
         if (cases[i].status == YASL_PRIVATE_TRANSFER_OK) {
@@ -85,7 +87,7 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface *
             pending->timeout = 0;
             paste_timeout(pending, 0, PASTE_TIMEOUT_NS);
         }
-        assert(!yasl_private_surface_poll_event(&s->base, &event));
+        assert(!yasl_private_display_poll_event(&d->base, &event));
     }
 
     struct paste_request *rejected = calloc(1, sizeof(*rejected));
@@ -100,7 +102,7 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface *
     XSelectionEvent no_property = {.requestor = rejected->window, .property = None};
     selection_notify(d, &no_property);
     struct yasl_private_event event;
-    assert(yasl_private_surface_poll_event(&s->base, &event));
+    assert(yasl_private_display_poll_event(&d->base, &event));
     assert(event.type == YASL_PRIVATE_EVENT_PASTE && event.paste.request_id == 99);
     assert(event.paste.status == YASL_PRIVATE_TRANSFER_FAILED);
 }
@@ -336,21 +338,21 @@ int main(void)
         /* Native creation and keymap updates may already have queued focus or
          * reset input on the shared display stream. Isolate this synthetic key. */
         struct yasl_private_event event;
-        while (yasl_private_surface_poll_event(surface, &event)) {}
+        while (yasl_private_display_poll_event(base, &event)) {}
         XKeyEvent native = {.type = KeyPress, .display = d->native,
             .window = s->window, .keycode = code};
         key_event(s, &native, false);
-        assert(yasl_private_surface_poll_event(surface, &event));
+        assert(yasl_private_display_poll_event(base, &event));
         assert(event.type == YASL_PRIVATE_EVENT_KEY && event.key.key == YASL_KEY_A);
         assert(event.key.codepoint == cases[i].label);
-        assert(yasl_private_surface_poll_event(surface, &event));
+        assert(yasl_private_display_poll_event(base, &event));
         assert(event.type == YASL_PRIVATE_EVENT_TEXT && event.text.len == strlen(cases[i].text));
         assert(strcmp(event.text.data, cases[i].text) == 0);
-        assert(!yasl_private_surface_poll_event(surface, &event));
+        assert(!yasl_private_display_poll_event(base, &event));
         native.type = KeyRelease;
         key_event(s, &native, false);
-        assert(yasl_private_surface_poll_event(surface, &event) && event.type == YASL_PRIVATE_EVENT_KEY);
-        assert(!yasl_private_surface_poll_event(surface, &event));
+        assert(yasl_private_display_poll_event(base, &event) && event.type == YASL_PRIVATE_EVENT_KEY);
+        assert(!yasl_private_display_poll_event(base, &event));
     }
     XChangeKeyboardMapping(d->native, code, width, saved, 1);
     XSync(d->native, False);