mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard-test: Use wl_display_roundtrip() instead of yield()

Browse Source 
As for button-test, a wl_display_roundtrip is sufficient here.  The
yield() between wl_test_activate_surface() and wl_test_send_key() is
also not needed, since the two requests will arrive at the server in
order, and will activate the surface first, then send a key event.
This commit is contained in:
Kristian Høgsberg 2012-12-11 22:00:50 -05:00
parent f63fab7241
commit 1f4d8e9def
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/keyboard-test.c
View File

@ -44,24 +44,22 @@ TEST(simple_keyboard_test)
expect_state = WL_KEYBOARD_KEY_STATE_RELEASED; expect_state = WL_KEYBOARD_KEY_STATE_RELEASED;
wl_test_send_key(client->test->wl_test, expect_key, wl_test_send_key(client->test->wl_test, expect_key,
expect_state); expect_state);
yield(client);
} else if (keyboard->focus) { } else if (keyboard->focus) {
expect_focus = NULL; expect_focus = NULL;
wl_test_activate_surface(client->test->wl_test, wl_test_activate_surface(client->test->wl_test,
NULL); NULL);
yield(client);
} else if (expect_key < 10) { } else if (expect_key < 10) {
expect_key++; expect_key++;
expect_focus = client->surface; expect_focus = client->surface;
expect_state = WL_KEYBOARD_KEY_STATE_PRESSED; expect_state = WL_KEYBOARD_KEY_STATE_PRESSED;
wl_test_activate_surface(client->test->wl_test, wl_test_activate_surface(client->test->wl_test,
expect_focus->wl_surface); expect_focus->wl_surface);
yield(client);
wl_test_send_key(client->test->wl_test, expect_key, wl_test_send_key(client->test->wl_test, expect_key,
expect_state); expect_state);
yield(client);
} else { } else {
break; break;
} }
wl_display_roundtrip(client->wl_display);
} }
} }