diff options
Diffstat (limited to 'tests/x11')
| -rw-r--r-- | tests/x11/test_input.c | 8 | ||||
| -rw-r--r-- | tests/x11/test_tablet_native.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/x11/test_input.c b/tests/x11/test_input.c index aa534ca..b2b79d7 100644 --- a/tests/x11/test_input.c +++ b/tests/x11/test_input.c @@ -62,7 +62,7 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface * 0, 0, 1, 1, 0, 0, 0); pending->target = s; pending->id = (uint64_t)i + 1; - pending->timeout = yasl_private_loop_add_timer(d->loop, PASTE_TIMEOUT_NS, + pending->timeout = yasl_loop_add_timer(d->loop, PASTE_TIMEOUT_NS, paste_timeout, pending); assert(pending->timeout); pending->next = d->pastes; @@ -89,7 +89,7 @@ static void check_selection_encoding(struct x11_display *d, struct x11_surface * incr->window = XCreateSimpleWindow(d->native, DefaultRootWindow(d->native), 0, 0, 1, 1, 0, 0, 0); incr->target = s; incr->id = 9; - incr->timeout = yasl_private_loop_add_timer(d->loop, PASTE_TIMEOUT_NS, paste_timeout, incr); + incr->timeout = yasl_loop_add_timer(d->loop, PASTE_TIMEOUT_NS, paste_timeout, incr); assert(incr->timeout); incr->next = d->pastes; d->pastes = incr; @@ -193,7 +193,7 @@ static void check_request_completion(struct x11_display *d, struct x11_surface * assert(request_paste(&d->base, YASL_PRIVATE_CLIPBOARD, &s->base, 103)); struct paste_request *timed = d->pastes; assert(timed && timed->id == 103 && timed->timeout); - assert(yasl_private_loop_del_timer(d->loop, timed->timeout)); + assert(yasl_loop_del_timer(d->loop, timed->timeout)); timed->timeout = 0; paste_timeout(timed, 0, PASTE_TIMEOUT_NS); event = wait_paste(&d->base, 103); @@ -207,7 +207,7 @@ static void check_request_completion(struct x11_display *d, struct x11_surface * yasl_private_timer_id timeout = d->pastes->timeout; yasl_private_surface_destroy(cancel_target); assert(d->pastes && !d->pastes->target && d->pastes->id == 0); - assert(yasl_private_loop_del_timer(d->loop, timeout)); + assert(yasl_loop_del_timer(d->loop, timeout)); d->pastes->timeout = 0; XSelectionEvent late_reply = { .requestor = d->pastes->window, diff --git a/tests/x11/test_tablet_native.c b/tests/x11/test_tablet_native.c index bbe39f2..8d44232 100644 --- a/tests/x11/test_tablet_native.c +++ b/tests/x11/test_tablet_native.c @@ -140,7 +140,7 @@ int main(int argc, char **argv) { assert(argc == 3); /* pen socket, eraser socket */ struct canvas_state app = {0}; - assert(yasl_init(YASL_BACKEND_X11, NULL) == 0); + assert(yasl_init(&(struct yasl_options){.backend = YASL_BACKEND_X11}) == 0); yasl_surface *surface = yasl_surface_create(&(struct yasl_surface_options){.title="YASL native pressure test", .width=500, .height=400}); assert(surface && (yasl_get_features() & YASL_FEATURE_TABLET)); struct yasl_native native; |