Remove deprecated Cocoa OpenGL and private compatibility APIs

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/cocoa/test_keyboard.m b/tests/cocoa/test_keyboard.m
index a41011c..a457a74 100644
--- a/tests/cocoa/test_keyboard.m
+++ b/tests/cocoa/test_keyboard.m
@@ -35,7 +35,7 @@
 static struct yasl_private_event next(struct yasl_surface *surface, enum yasl_private_event_type type)
 {
     struct yasl_private_event event;
-    assert(yasl_private_surface_poll_event(surface, &event));
+    assert(yasl_private_display_poll_event(yasl_private_surface_display(surface), &event));
     assert(event.type == type && event.surface == surface);
     return event;
 }
@@ -43,7 +43,7 @@ static struct yasl_private_event next(struct yasl_surface *surface, enum yasl_pr
 static void empty(struct yasl_surface *surface)
 {
     struct yasl_private_event event;
-    assert(!yasl_private_surface_poll_event(surface, &event));
+    assert(!yasl_private_display_poll_event(yasl_private_surface_display(surface), &event));
 }
 
 int main(void)
@@ -65,7 +65,7 @@ int main(void)
         NSWindow *window = (NSWindow *)yasl_private_surface_get_native_handle(surface);
         NSView<NSTextInputClient> *view = (id)window.contentView;
         struct yasl_private_event event;
-        while (yasl_private_surface_poll_event(surface, &event)) {}
+        while (yasl_private_display_poll_event(yasl_private_surface_display(surface), &event)) {}
 
         InputSample *sample = [InputSample new];
         NSEvent *native = (NSEvent *)sample;
@@ -100,6 +100,8 @@ int main(void)
         [view setMarkedText:@"é" selectedRange:NSMakeRange(1, 0)
             replacementRange:NSMakeRange(1, 2)];
         assert(strcmp(yasl_private_surface_ime_preedit(surface), "é") == 0);
+        event = next(surface, YASL_PRIVATE_EVENT_COMPOSITION);
+        assert(event.composition.active && !strcmp(event.composition.data, "é"));
         empty(surface);
         [view insertText:@"😀é" replacementRange:NSMakeRange(NSNotFound, 0)];
         event = next(surface, YASL_PRIVATE_EVENT_TEXT_EDIT);
@@ -107,6 +109,7 @@ int main(void)
         assert(event.text_edit.begin == 1 && event.text_edit.end == 5);
         assert(event.text_edit.revision == 7 && event.text_edit.generation == 3);
         assert(!yasl_private_surface_ime_preedit(surface));
+        assert(!next(surface, YASL_PRIVATE_EVENT_COMPOSITION).composition.active);
         empty(surface);
 
         /* Exercise the keyDown -> interpretKeyEvents -> insertText route with