diff options
Diffstat (limited to 'tests/wayland/test_clipboard.c')
| -rw-r--r-- | tests/wayland/test_clipboard.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/wayland/test_clipboard.c b/tests/wayland/test_clipboard.c index 1778ad2..0ee74b6 100644 --- a/tests/wayland/test_clipboard.c +++ b/tests/wayland/test_clipboard.c @@ -6,7 +6,7 @@ struct received { int count; size_t len; uint64_t request_id; - enum yasl_transfer_status status; + enum yasl_private_transfer_status status; struct clipboard *clipboard; bool forget_on_receive; char text[32]; @@ -14,12 +14,12 @@ struct received { static void receive(const char *text, size_t len, bool uri_list, struct wl_surface *surface, uint64_t request_id, - enum yasl_transfer_status status, void *ud) + enum yasl_private_transfer_status status, void *ud) { (void)surface; struct received *r = ud; assert(!uri_list && len < sizeof(r->text)); - if (status == YASL_TRANSFER_OK) { + if (status == YASL_PRIVATE_TRANSFER_OK) { assert(text); memcpy(r->text, text, len); r->text[len] = '\0'; @@ -39,7 +39,7 @@ static void receive(const char *text, size_t len, bool uri_list, int main(void) { struct received received = {0}; - struct clipboard c = {.loop = yasl_loop_create(), .receive = receive, .ud = &received}; + struct clipboard c = {.loop = yasl_private_loop_create(), .receive = receive, .ud = &received}; received.clipboard = &c; assert(c.loop); const struct { const char *bytes; size_t len; bool valid; } cases[] = { @@ -55,19 +55,19 @@ int main(void) assert(pipe(fds) == 0); struct transfer *transfer = start_transfer_text(&c, fds[0], false, false, c.text); assert(transfer); - yasl_timer_id timeout_id = transfer->timeout; - assert(timeout_id && yasl_loop_timer_armed(c.loop, timeout_id)); + yasl_private_timer_id timeout_id = transfer->timeout; + assert(timeout_id && yasl_private_loop_timer_armed(c.loop, timeout_id)); transfer->paste = true; transfer->request_id = 42; assert(write(fds[1], cases[i].bytes, cases[i].len) == (ssize_t)cases[i].len); close(fds[1]); for (int steps = 0; c.transfers && steps < 10; steps++) - assert(yasl_loop_step(c.loop, 0) >= 0); + assert(yasl_private_loop_step(c.loop, 0) >= 0); assert(!c.transfers); - assert(!yasl_loop_timer_armed(c.loop, timeout_id)); + assert(!yasl_private_loop_timer_armed(c.loop, timeout_id)); assert(received.count == 1); assert(received.request_id == 42); - assert(received.status == (cases[i].valid ? YASL_TRANSFER_OK : YASL_TRANSFER_FAILED)); + assert(received.status == (cases[i].valid ? YASL_PRIVATE_TRANSFER_OK : YASL_PRIVATE_TRANSFER_FAILED)); if (cases[i].valid) { assert(received.len == cases[i].len); assert(memcmp(received.text, cases[i].bytes, received.len) == 0); @@ -79,8 +79,8 @@ int main(void) assert(pipe(cancel_fds) == 0); struct transfer *pending = start_transfer_text(&c, cancel_fds[0], false, false, NULL); assert(pending); - yasl_timer_id cancel_timeout_id = pending->timeout; - assert(cancel_timeout_id && yasl_loop_timer_armed(c.loop, cancel_timeout_id)); + yasl_private_timer_id cancel_timeout_id = pending->timeout; + assert(cancel_timeout_id && yasl_private_loop_timer_armed(c.loop, cancel_timeout_id)); pending->paste = true; pending->request_id = 99; struct wl_surface *target = (struct wl_surface *)(uintptr_t)1; @@ -88,7 +88,7 @@ int main(void) clipboard_forget_surface(&c, target); close(cancel_fds[1]); assert(!c.transfers && received.count == 0); - assert(!yasl_loop_timer_armed(c.loop, cancel_timeout_id)); + assert(!yasl_private_loop_timer_armed(c.loop, cancel_timeout_id)); received.forget_on_receive = true; int timeout_fds[2]; @@ -99,12 +99,12 @@ int main(void) timed->request_id = 100; struct wl_surface *timeout_target = (struct wl_surface *)(uintptr_t)2; timed->drop_surface = timeout_target; - yasl_timer_id timeout_id = timed->timeout; - assert(yasl_loop_del_timer(c.loop, timeout_id)); + yasl_private_timer_id timeout_id = timed->timeout; + assert(yasl_private_loop_del_timer(c.loop, timeout_id)); (void)transfer_timeout(timed, timeout_id, CLIPBOARD_TRANSFER_TIMEOUT_NS); close(timeout_fds[1]); assert(!c.transfers && received.count == 1); - assert(received.request_id == 100 && received.status == YASL_TRANSFER_FAILED); - yasl_loop_destroy(c.loop); + assert(received.request_id == 100 && received.status == YASL_PRIVATE_TRANSFER_FAILED); + yasl_private_loop_destroy(c.loop); return 0; } |