1 files changed, 21 insertions, 22 deletions

diff --git a/tests/cocoa/test_keyboard.m b/tests/cocoa/test_keyboard.m
index d6a1336..f93a745 100644
--- a/tests/cocoa/test_keyboard.m
+++ b/tests/cocoa/test_keyboard.m
@@ -31,18 +31,18 @@
 }
 @end
 
-static struct yasl_input_event next(struct yasl_surface *surface, enum yasl_input_kind kind)
+static struct yasl_event next(struct yasl_surface *surface, enum yasl_event_type type)
 {
-    struct yasl_input_event event;
-    assert(yasl_surface_input_poll(surface, &event));
-    assert(event.kind == kind && event.surface == surface);
+    struct yasl_event event;
+    assert(yasl_surface_poll_event(surface, &event));
+    assert(event.type == type && event.surface == surface);
     return event;
 }
 
 static void empty(struct yasl_surface *surface)
 {
-    struct yasl_input_event event;
-    assert(!yasl_surface_input_poll(surface, &event));
+    struct yasl_event event;
+    assert(!yasl_surface_poll_event(surface, &event));
 }
 
 int main(void)
@@ -55,8 +55,8 @@ int main(void)
         assert(surface);
         NSWindow *window = (NSWindow *)yasl_surface_get_native_handle(surface);
         NSView<NSTextInputClient> *view = (id)window.contentView;
-        struct yasl_input_event event;
-        while (yasl_surface_input_poll(surface, &event)) {}
+        struct yasl_event event;
+        while (yasl_surface_poll_event(surface, &event)) {}
 
         InputSample *sample = [InputSample new];
         NSEvent *native = (NSEvent *)sample;
@@ -65,7 +65,7 @@ int main(void)
         sample.label = @"q";
         sample.shiftedLabel = @"Q";
         [view keyUp:native];
-        event = next(surface, YASL_INPUT_KEY);
+        event = next(surface, YASL_EVENT_KEY);
         assert(event.key.key == YASL_KEY_A && event.key.native_code == 0);
         assert(event.key.action == YASL_KEY_RELEASE);
         assert(event.key.codepoint == 'q' && event.key.shifted == 'Q');
@@ -73,18 +73,18 @@ int main(void)
         sample.label = @"😀"; /* One scalar, two UTF-16 units. */
         sample.shiftedLabel = @"ab";
         [view keyUp:native];
-        event = next(surface, YASL_INPUT_KEY);
+        event = next(surface, YASL_EVENT_KEY);
         assert(event.key.codepoint == 0x1f600 && event.key.shifted == 0);
         sample.type = NSEventTypeFlagsChanged;
         sample.keyCode = 56; /* Left Shift. */
         sample.modifierFlags = NSEventModifierFlagShift | 0x0002;
         [view flagsChanged:native];
-        event = next(surface, YASL_INPUT_KEY);
+        event = next(surface, YASL_EVENT_KEY);
         assert(event.key.key == YASL_KEY_LEFT_SHIFT && event.key.action == YASL_KEY_PRESS);
         assert(event.key.mods == YASL_MOD_SHIFT && !event.key.codepoint && !event.key.shifted);
         sample.modifierFlags = 0;
         [view flagsChanged:native];
-        assert(next(surface, YASL_INPUT_KEY).key.action == YASL_KEY_RELEASE);
+        assert(next(surface, YASL_EVENT_KEY).key.action == YASL_KEY_RELEASE);
 
         /* Native text services own preedit and commits. Marked text is not an
          * insertion, and commits retain all UTF-8 bytes, including non-BMP. */
@@ -93,8 +93,8 @@ int main(void)
         assert(strcmp(yasl_surface_ime_preedit(surface), "é") == 0);
         empty(surface);
         [view insertText:@"😀é" replacementRange:NSMakeRange(NSNotFound, 0)];
-        event = next(surface, YASL_INPUT_TEXT);
-        assert(event.text.len == strlen("😀é") && strcmp(event.text.text, "😀é") == 0);
+        event = next(surface, YASL_EVENT_TEXT);
+        assert(event.text.len == strlen("😀é") && strcmp(event.text.data, "😀é") == 0);
         assert(!yasl_surface_ime_preedit(surface));
         empty(surface);
 
@@ -104,9 +104,9 @@ int main(void)
             modifierFlags:0 timestamp:0 windowNumber:window.windowNumber context:nil
             characters:@"a" charactersIgnoringModifiers:@"a" isARepeat:NO keyCode:0];
         [view keyDown:press];
-        assert(next(surface, YASL_INPUT_KEY).key.key == YASL_KEY_A);
-        event = next(surface, YASL_INPUT_TEXT);
-        assert(event.text.len == 1 && event.text.text[0] == 'a');
+        assert(next(surface, YASL_EVENT_KEY).key.key == YASL_KEY_A);
+        event = next(surface, YASL_EVENT_TEXT);
+        assert(event.text.len == 1 && event.text.data[0] == 'a');
         empty(surface);
 
         sample.type = NSEventTypeScrollWheel;
@@ -114,15 +114,14 @@ int main(void)
         sample.scrollingDeltaX = -2.5;
         sample.scrollingDeltaY = 1.25;
         [view scrollWheel:native];
-        event = next(surface, YASL_INPUT_MOUSE);
-        assert(event.mouse.kind == YASL_PTR_SCROLL);
-        assert(event.mouse.scroll.x == 0.25 && event.mouse.scroll.y == -0.125);
+        event = next(surface, YASL_EVENT_POINTER_SCROLL);
+        assert(event.pointer.scroll.x == 0.25 && event.pointer.scroll.y == -0.125);
         sample.hasPreciseScrollingDeltas = NO;
         sample.scrollingDeltaX = 1;
         sample.scrollingDeltaY = -1;
         [view scrollWheel:native];
-        event = next(surface, YASL_INPUT_MOUSE);
-        assert(event.mouse.scroll.x == -1 && event.mouse.scroll.y == 1);
+        event = next(surface, YASL_EVENT_POINTER_SCROLL);
+        assert(event.pointer.scroll.x == -1 && event.pointer.scroll.y == 1);
         sample.scrollingDeltaX = NAN;
         [view scrollWheel:native];
         empty(surface);