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

Use input method protocol from wayland-protocols

Browse Source 
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>
This commit is contained in:
Jonas Ådahl
2015-11-17 16:00:30 +08:00
committed by Pekka Paalanen
parent 3bcba347a2
commit b57f472c84
7 changed files with 199 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/input-panel.c
+8 -6
View File
@@ -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;