diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:30 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 13:17:59 +0200 |
| commit | b57f472c84592b0ec64c39d2e707892e58587aea (patch) | |
| tree | 2fe423cd0a945fd2c6a4174c2169747525e2d8c6 /desktop-shell | |
| parent | 3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5 (diff) | |
| download | weston-b57f472c84592b0ec64c39d2e707892e58587aea.tar.gz | |
Use input method protocol from wayland-protocols
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/input-panel.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c index 95d62873..8d315dc2 100644 --- a/desktop-shell/input-panel.c +++ b/desktop-shell/input-panel.c @@ -31,7 +31,7 @@ #include "shell.h" #include "desktop-shell-server-protocol.h" -#include "input-method-server-protocol.h" +#include "input-method-unstable-v1-server-protocol.h" #include "shared/helpers.h" struct input_panel_surface { @@ -290,7 +290,7 @@ input_panel_surface_set_overlay_panel(struct wl_client *client, input_panel_surface->panel = 1; } -static const struct wl_input_panel_surface_interface input_panel_surface_implementation = { +static const struct zwp_input_panel_surface_v1_interface input_panel_surface_implementation = { input_panel_surface_set_toplevel, input_panel_surface_set_overlay_panel }; @@ -332,14 +332,16 @@ input_panel_get_input_panel_surface(struct wl_client *client, ipsurf->resource = wl_resource_create(client, - &wl_input_panel_surface_interface, 1, id); + &zwp_input_panel_surface_v1_interface, + 1, + id); wl_resource_set_implementation(ipsurf->resource, &input_panel_surface_implementation, ipsurf, destroy_input_panel_surface_resource); } -static const struct wl_input_panel_interface input_panel_implementation = { +static const struct zwp_input_panel_v1_interface input_panel_implementation = { input_panel_get_input_panel_surface }; @@ -359,7 +361,7 @@ bind_input_panel(struct wl_client *client, struct wl_resource *resource; resource = wl_resource_create(client, - &wl_input_panel_interface, 1, id); + &zwp_input_panel_v1_interface, 1, id); if (shell->input_panel.binding == NULL) { wl_resource_set_implementation(resource, @@ -398,7 +400,7 @@ input_panel_setup(struct desktop_shell *shell) wl_list_init(&shell->input_panel.surfaces); if (wl_global_create(shell->compositor->wl_display, - &wl_input_panel_interface, 1, + &zwp_input_panel_v1_interface, 1, shell, bind_input_panel) == NULL) return -1; |