summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2015-07-15 13:00:36 -0500
committerBryce Harrington <bryce@osg.samsung.com>2015-07-16 19:03:43 -0700
commit8ae2db5b0cc5673e442938aa176cb44ada3e20ca (patch)
tree3cd6d82774f2774bdc1fb10c77360f903bad223f /tests
parent0720ea36c8ee7e957d292a9ca41f35b403f39062 (diff)
input: Pass the appropriate pointer type to bindings instead of a seat
Normally we need to check if a seat's [device_type]_count is > 0 before we can use the associated pointer. However, in a binding you're guaranteed that the seat has a device of that type. If we pass in that type instead of the seat, it's obvious we don't have to test it. The bindings can still get the seat pointer via whatever->seat if they need it. This is preparation for a follow up patch that prevents direct access to seat->device_type pointers, and this will save us a few tests at that point. Reviewed-by: Jonas Ã…dahl <jadahl@gmail.com> Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/surface-screenshot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/surface-screenshot.c b/tests/surface-screenshot.c
index 06ef8d1d..a54ae22e 100644
--- a/tests/surface-screenshot.c
+++ b/tests/surface-screenshot.c
@@ -131,13 +131,14 @@ unpremultiply_and_swap_a8b8g8r8_to_PAMrgba(void *pixels, size_t size)
}
static void
-trigger_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
+trigger_binding(struct weston_keyboard *keyboard, uint32_t time, uint32_t key,
void *data)
{
const char *prefix = "surfaceshot-";
const char *suffix = ".pam";
char fname[1024];
struct weston_surface *surface;
+ struct weston_seat *seat = keyboard->seat;
int width, height;
char desc[512];
void *pixels;