diff options
| author | Emre Ucan <eucan@de.adit-jv.com> | 2018-10-19 10:20:29 +0200 |
|---|---|---|
| committer | Emre Ucan <eucan@de.adit-jv.com> | 2018-10-19 10:20:29 +0200 |
| commit | 9acdaa1a9c79558691b1513cc4917f2ced91af8a (patch) | |
| tree | f8dc51fe0e13012f6cf1d5062433f9eca1631585 | |
| parent | 0ad170874109c967173662d73283c8cfc3caadba (diff) | |
| parent | 62c758693b8980c56f161a26fc465df9da78d08a (diff) | |
| download | wayland-ivi-extension-9acdaa1a9c79558691b1513cc4917f2ced91af8a.tar.gz | |
Merge remote-tracking branch 'upstream/pull/100'
* upstream/pull/100
weston: bump required weston version to 5.0
ivi-input: use core API to send keymaps
Due to clone mode infrastructure added by Pekka Paalanen weston_output is actually a entry to weston_head.
Acked-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
| -rw-r--r-- | ivi-input-modules/ivi-input-controller/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c | 5 | ||||
| -rw-r--r-- | weston-ivi-shell/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | weston-ivi-shell/src/ivi-controller.c | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/ivi-input-modules/ivi-input-controller/CMakeLists.txt b/ivi-input-modules/ivi-input-controller/CMakeLists.txt index a1f2c9f..abaf599 100644 --- a/ivi-input-modules/ivi-input-controller/CMakeLists.txt +++ b/ivi-input-modules/ivi-input-controller/CMakeLists.txt @@ -23,7 +23,7 @@ project(ivi-input-controller) find_package(PkgConfig REQUIRED) pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) -pkg_check_modules(WESTON weston REQUIRED) +pkg_check_modules(WESTON weston>=5.0.0 REQUIRED) pkg_check_modules(PIXMAN pixman-1 REQUIRED) GET_TARGET_PROPERTY(ILM_COMMON_INCLUDE_DIRS ilmCommon INCLUDE_DIRECTORIES) diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c index 908b73b..a0bfc48 100644 --- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c @@ -253,10 +253,7 @@ input_ctrl_kbd_snd_event_resource(struct seat_ctx *ctx_seat, seat->compositor->kb_repeat_delay); } - wl_keyboard_send_keymap(resource, - WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, - keyboard->xkb_info->keymap_fd, - keyboard->xkb_info->keymap_size); + weston_keyboard_send_keymap(keyboard, resource); wl_keyboard_send_modifiers(resource, kbd_data->serial, diff --git a/weston-ivi-shell/CMakeLists.txt b/weston-ivi-shell/CMakeLists.txt index 48fbedb..2eeba66 100644 --- a/weston-ivi-shell/CMakeLists.txt +++ b/weston-ivi-shell/CMakeLists.txt @@ -24,7 +24,7 @@ project(ivi-controller) find_package(PkgConfig REQUIRED) pkg_check_modules(WAYLAND_SERVER wayland-server>=1.13.0 REQUIRED) -pkg_check_modules(WESTON weston>=4.0.0 REQUIRED) +pkg_check_modules(WESTON weston>=5.0.0 REQUIRED) pkg_check_modules(PIXMAN pixman-1 REQUIRED) find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c index 9220455..8faec2a 100644 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c @@ -1402,7 +1402,7 @@ controller_create_screen(struct wl_client *client, struct wl_resource *output_resource, uint32_t id) { - struct weston_output *weston_output = + struct weston_head *weston_head = wl_resource_get_user_data(output_resource); struct wl_resource *screen_resource; struct ivicontroller *ctrl = wl_resource_get_user_data(resource); @@ -1410,7 +1410,7 @@ controller_create_screen(struct wl_client *client, wl_list_for_each(iviscrn, &ctrl->shell->list_screen, link) { - if (weston_output != iviscrn->output) { + if (weston_head->output != iviscrn->output) { continue; } |