summaryrefslogtreecommitdiff
path: root/tests/common
diff options
context:
space:
mode:
Diffstat (limited to 'tests/common')
-rw-r--r--tests/common/test_backends.c20
-rw-r--r--tests/common/test_contracts.c78
-rw-r--r--tests/common/test_timers.c29
3 files changed, 101 insertions, 26 deletions
diff --git a/tests/common/test_backends.c b/tests/common/test_backends.c
index 3372290..4f49765 100644
--- a/tests/common/test_backends.c
+++ b/tests/common/test_backends.c
@@ -1,4 +1,6 @@
#define _POSIX_C_SOURCE 200809L
+#include "yasl/native.h"
+#include "yasl/loop.h"
#include "yasl/yasl.h"
#include <X11/Xatom.h>
@@ -35,7 +37,7 @@ static int tick(int fd, short events, void *ud)
struct pump *p = ud;
for (int i = 0; i < 2; i++) {
if (p->displays[i]) {
- yasl_display_dispatch(p->displays[i]);
+ yasl_display_dispatch(p->displays[i], 0);
yasl_display_flush(p->displays[i]);
}
}
@@ -63,9 +65,11 @@ static void draw(struct yasl_surface *s, struct yasl_frame *frame, void *ud)
assert(s == w->surface);
assert(frame->surface == s);
assert(yasl_surface_display(s) == w->display);
- struct yasl_vector2i size = yasl_surface_size(s);
+ struct yasl_vector2i size = yasl_surface_geometry(s).size;
assert(size.x == frame->target.size.x && size.y == frame->target.size.y);
assert(frame->target.pixels);
+ struct yasl_native_frame native = {0};
+ assert(!yasl_surface_get_native_frame(s, &frame->target, &native));
for (int i = 0; i < size.x * size.y; i++) frame->target.pixels[i] = 0xff4080c0;
struct yasl_damage_list damage = {.n = YASL_DAMAGE_MAX + 1};
assert(!yasl_surface_present(s, &frame->target, &damage));
@@ -76,13 +80,13 @@ static void draw(struct yasl_surface *s, struct yasl_frame *frame, void *ud)
assert(!yasl_surface_present(s, &frame->target, &damage));
damage.n = -1;
struct yasl_framebuffer invalid = frame->target;
- invalid.buffer++;
+ invalid.size.x++;
assert(!yasl_surface_present(s, &invalid, &damage));
invalid = frame->target;
invalid.generation--;
assert(!yasl_surface_present(s, &invalid, &damage));
invalid = frame->target;
- invalid.native_drawable = (void *)(uintptr_t)1;
+ invalid.pixels = (uint32_t *)(uintptr_t)1;
assert(!yasl_surface_present(s, &invalid, &damage));
assert(!yasl_surface_present(s, &frame->target, NULL));
assert(yasl_surface_present(s, &frame->target, &damage));
@@ -95,9 +99,9 @@ static void configure(struct yasl_surface *s, struct yasl_geometry geometry, voi
{
struct window *w = ud;
assert(w->surface == s);
- struct yasl_vector2i size = yasl_surface_size(s);
+ struct yasl_vector2i size = yasl_surface_geometry(s).size;
assert(geometry.size.x == size.x && geometry.size.y == size.y);
- assert(geometry.scale_120 == yasl_surface_scale_120(s));
+ assert(geometry.scale_120 == yasl_surface_geometry(s).scale_120);
w->configures++;
if (w->destroy_on_configure) { yasl_surface_destroy(s); w->surface = NULL; }
}
@@ -129,6 +133,8 @@ static struct window create(struct yasl_display *d)
struct yasl_surface_spec spec = {.title = "Backend test", .size = {160, 100}};
struct yasl_surface *s = yasl_surface_create_toplevel(d, &spec);
assert(s);
+ assert(yasl_display_get_native_handle(d));
+ assert(yasl_surface_get_native_handle(s));
assert(yasl_surface_display(s) == d);
assert(yasl_surface_timing(s).source == YASL_TIMING_UNKNOWN);
return (struct window){.surface = s, .display = d};
@@ -152,7 +158,7 @@ static void x11_behavior(struct yasl_loop *loop, struct yasl_display *d, struct
XFlush(native);
pump(loop, d, NULL);
assert(w->configures > 0);
- struct yasl_vector2i size = yasl_surface_size(w->surface);
+ struct yasl_vector2i size = yasl_surface_geometry(w->surface).size;
assert(size.x == 200 && size.y == 120);
XEvent key = {0};
key.xkey = (XKeyEvent){.type = KeyPress, .display = native, .window = window,
diff --git a/tests/common/test_contracts.c b/tests/common/test_contracts.c
index 65eebcd..4e22de1 100644
--- a/tests/common/test_contracts.c
+++ b/tests/common/test_contracts.c
@@ -1,5 +1,6 @@
#include "common/backend.h"
#include "common/input.h"
+#include "common/timing.h"
#include <assert.h>
#include <errno.h>
@@ -7,6 +8,23 @@
#include <stdlib.h>
#include <string.h>
+static void test_timing_clock(void)
+{
+ struct yasl_frame_clock clock = {.refresh_ns = YASL_REFRESH_DEFAULT_NS};
+ yasl_clock_presented(&clock, 1000000000, true);
+ assert(clock.last_present_ns == 1000000000);
+ uint64_t next = yasl_clock_next_present_ns(&clock);
+ assert(next > 1000000000);
+ assert(yasl_clock_extend_ms(1000, 1000000000) == 1000000000);
+ assert(yasl_clock_frame_timestamp_ns(&clock, next) == next);
+
+ yasl_clock_note_resize(&clock, 500000);
+ struct yasl_resize_stats stats;
+ yasl_clock_resize_stats(&clock, &stats);
+ assert(stats.count == 1);
+ assert(stats.max_us == 500.0);
+}
+
static void test_queue(void)
{
struct input_queue q = {0};
@@ -96,8 +114,56 @@ static void copy(struct yasl_display *d, enum yasl_selection sel, const char *te
{ (void)d; (void)sel; (void)text; copies++; }
static void paste(struct yasl_display *d, enum yasl_selection sel, struct yasl_surface *s)
{ (void)d; (void)sel; (void)s; pastes++; }
-static struct yasl_surface *create(struct yasl_display *d, const struct yasl_surface_spec *spec)
-{ (void)d; (void)spec; creates++; return NULL; }
+static struct yasl_surface *create(struct yasl_display *d, const struct yasl_surface_spec *spec, void *graphics_device)
+{ (void)d; (void)spec; (void)graphics_device; creates++; return NULL; }
+
+static void *native_device;
+static int native_queries;
+static struct yasl_surface native_surface;
+static uint32_t native_caps(const struct yasl_display *d)
+{ (void)d; return YASL_CAP_NATIVE_GRAPHICS; }
+static struct yasl_surface *native_create(struct yasl_display *d,
+ const struct yasl_surface_spec *spec, void *device)
+{
+ (void)spec;
+ native_device = device;
+ native_surface = (struct yasl_surface){.display = d, .frame_generation = 1};
+ return &native_surface;
+}
+static bool native_frame(struct yasl_surface *s, const struct yasl_framebuffer *fb,
+ struct yasl_native_frame *out)
+{
+ (void)s; (void)fb;
+ native_queries++;
+ *out = (struct yasl_native_frame){.drawable = native_device};
+ return true;
+}
+
+static void test_native(void)
+{
+ const struct yasl_backend_ops ops = {.display_caps = native_caps,
+ .surface_create_toplevel = native_create, .surface_get_native_frame = native_frame};
+ struct yasl_display d = {.ops = &ops};
+ struct yasl_surface_spec spec = {.size = {100, 80}};
+ assert(yasl_surface_create_toplevel(&d, &spec) == &native_surface);
+ assert(!native_device);
+ assert(yasl_surface_create_native(&d, &spec, &d) == &native_surface);
+ assert(native_device == &d);
+
+ struct yasl_framebuffer fb = {.generation = 1, .size = {100, 80}};
+ struct yasl_native_frame out = {0};
+ assert(!yasl_surface_get_native_frame(NULL, &fb, &out));
+ assert(!yasl_surface_get_native_frame(&native_surface, NULL, &out));
+ assert(!yasl_surface_get_native_frame(&native_surface, &fb, NULL));
+ fb.generation = 0;
+ assert(!yasl_surface_get_native_frame(&native_surface, &fb, &out));
+ fb.generation = 2;
+ assert(!yasl_surface_get_native_frame(&native_surface, &fb, &out));
+ assert(!native_queries && !out.drawable);
+ fb.generation = 1;
+ assert(yasl_surface_get_native_frame(&native_surface, &fb, &out));
+ assert(native_queries == 1 && out.drawable == &d);
+}
static void test_validation(void)
{
@@ -143,9 +209,9 @@ static void test_validation(void)
yasl_display_copy(&d, YASL_CLIPBOARD, "yes");
yasl_display_paste(&d, YASL_CLIPBOARD, &s);
assert(copies == 1 && pastes == 1);
- struct yasl_surface_spec spec = {.size = {100, 80}, .graphics_device = &d};
- assert(!yasl_surface_create_toplevel(&d, &spec) && errno == ENOTSUP);
- spec.graphics_device = NULL;
+ struct yasl_surface_spec spec = {.size = {100, 80}};
+ assert(!yasl_surface_create_native(&d, &spec, &d) && errno == ENOTSUP);
+ assert(!yasl_surface_create_native(&d, &spec, NULL) && errno == EINVAL);
spec.size.x = 0;
assert(!yasl_surface_create_toplevel(&d, &spec) && errno == EINVAL);
assert(!creates);
@@ -168,8 +234,10 @@ static void test_scale(void)
int main(void)
{
+ test_timing_clock();
test_queue();
test_validation();
+ test_native();
test_scale();
return 0;
}
diff --git a/tests/common/test_timers.c b/tests/common/test_timers.c
index 9b6499d..d02bfe9 100644
--- a/tests/common/test_timers.c
+++ b/tests/common/test_timers.c
@@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200809L
+#include "common/loop.h"
#include "yasl/yasl.h"
#include <assert.h>
@@ -95,18 +96,18 @@ static uint64_t killer_timer_cb(void *ud, yasl_timer_id id, uint64_t interval_ns
return 0;
}
-/* 6. Millisecond variant timer. */
-static uint32_t ms_timer_cb(void *ud, yasl_timer_id id, uint32_t interval_ms)
+/* 6. Millisecond convenience conversion uses the same timer callback. */
+static uint64_t ms_timer_cb(void *ud, yasl_timer_id id, uint64_t interval_ns)
{
struct test_ctx *ctx = ud;
assert(id == ctx->id);
- assert(interval_ms == 5);
+ assert(interval_ns == YASL_MS_TO_NS(5));
ctx->count++;
if (ctx->count >= 3) {
ctx->done = true;
return 0;
}
- return interval_ms;
+ return interval_ns;
}
static void test_loop_timers(void)
@@ -185,9 +186,9 @@ static void test_loop_timers(void)
assert(ctx6.count == 1);
yasl_loop_step(l, 20);
- /* Test 7: Millisecond API */
+ /* Test 7: Millisecond conversion */
struct test_ctx ctx7 = { .loop = l };
- ctx7.id = yasl_loop_add_timer_ms(l, 5, ms_timer_cb, &ctx7);
+ ctx7.id = yasl_loop_add_timer(l, YASL_MS_TO_NS(5), ms_timer_cb, &ctx7);
assert(ctx7.id > 0);
while (!ctx7.done) {
yasl_loop_step(l, 50);
@@ -239,14 +240,14 @@ static void test_surface_timers(void)
};
struct yasl_surface *s = yasl_surface_create_toplevel(d, &sspec);
assert(s);
- assert(yasl_surface_loop(s) == loop);
+ assert(yasl_display_loop(yasl_surface_display(s)) == loop);
- /* Display timers */
+ /* Application timers use the display's loop. */
struct test_ctx dctx = {0};
- dctx.id = yasl_display_add_timer(d, 2000000ull, oneshot_cb, &dctx);
+ dctx.id = yasl_loop_add_timer(yasl_display_loop(d), 2000000ull, oneshot_cb, &dctx);
assert(dctx.id > 0);
while (dctx.count == 0) {
- yasl_display_dispatch_timeout(d, 50);
+ yasl_display_dispatch(d, 50);
}
assert(dctx.count == 1);
@@ -255,12 +256,12 @@ static void test_surface_timers(void)
sctx.id = yasl_surface_add_timer(s, 2000000ull, surface_timer_repeat_cb, &sctx);
assert(sctx.id > 0);
while (sctx.count < 3) {
- yasl_display_dispatch_timeout(d, 50);
+ yasl_display_dispatch(d, 50);
}
assert(sctx.count >= 3);
assert(yasl_surface_del_timer(s, sctx.id));
int count_before = sctx.count;
- yasl_display_dispatch_timeout(d, 10);
+ yasl_display_dispatch(d, 10);
assert(sctx.count == count_before);
/* Surface timer auto-cleanup on surface destruction */
@@ -269,7 +270,7 @@ static void test_surface_timers(void)
assert(sctx2.id > 0);
yasl_surface_destroy(s);
/* Step display/loop; timer must not fire on dead surface */
- yasl_display_dispatch_timeout(d, 10);
+ yasl_display_dispatch(d, 10);
assert(sctx2.count == 0);
/* Surface suicide from timer callback */
@@ -279,7 +280,7 @@ static void test_surface_timers(void)
sctx3.id = yasl_surface_add_timer(s, 2000000ull, surface_suicide_cb, &sctx3);
assert(sctx3.id > 0);
while (sctx3.count == 0) {
- yasl_display_dispatch_timeout(d, 50);
+ yasl_display_dispatch(d, 50);
}
assert(sctx3.count == 1);
assert(sctx3.surface == NULL);
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-25 11:11:27 +0000