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

input: Merge wl_seat into weston_seat

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-05-06 23:19:49 -04:00
parent 4912454ba4
commit e314875d00
23 changed files with 266 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/weston-test.c
+3 -3
View File
@@ -68,7 +68,7 @@ static void
notify_pointer_position(struct weston_test *test, struct wl_resource *resource)
{
struct weston_seat *seat = get_seat(test);
struct weston_pointer *pointer = seat->seat.pointer;
struct weston_pointer *pointer = seat->pointer;
wl_test_send_pointer_position(resource, pointer->x, pointer->y);
}
@@ -119,7 +119,7 @@ move_pointer(struct wl_client *client, struct wl_resource *resource,
{
struct weston_test *test = resource->data;
struct weston_seat *seat = get_seat(test);
struct weston_pointer *pointer = seat->seat.pointer;
struct weston_pointer *pointer = seat->pointer;
test->compositor->focus = 1;
@@ -155,7 +155,7 @@ activate_surface(struct wl_client *client, struct wl_resource *resource,
if (surface) {
weston_surface_activate(surface, seat);
notify_keyboard_focus_in(seat, &seat->keyboard.keys,
notify_keyboard_focus_in(seat, &seat->keyboard->keys,
STATE_UPDATE_AUTOMATIC);
}
else {