diff options
| author | Jan Arne Petersen <jpetersen@openismus.com> | 2013-04-18 16:47:37 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-02 17:12:02 -0400 |
| commit | 70d942b4d74fe5025f5190afe05fc1798a1094c9 (patch) | |
| tree | 7bb6a70a299076485a56cd4cc43bdf60585a328f | |
| parent | 62ece76b1e519b5356dfb6eaba260872a3c96bdf (diff) | |
| download | weston-70d942b4d74fe5025f5190afe05fc1798a1094c9.tar.gz weston-70d942b4d74fe5025f5190afe05fc1798a1094c9.tar.bz2 weston-70d942b4d74fe5025f5190afe05fc1798a1094c9.zip | |
text: Rename ::set_panel to ::set_overlay_panel
Also add documentation to input_panel_surface::set_overlay_panel.
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
| -rw-r--r-- | protocol/input-method.xml | 8 | ||||
| -rw-r--r-- | src/shell.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/protocol/input-method.xml b/protocol/input-method.xml index dd905c2d..4ccb08e1 100644 --- a/protocol/input-method.xml +++ b/protocol/input-method.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <protocol name="input_method"> <copyright> - Copyright © 2012 Intel Corporation + Copyright © 2012, 2013 Intel Corporation Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -215,7 +215,11 @@ <arg name="position" type="uint"/> </request> - <request name="set_panel"> + <request name="set_overlay_panel"> + <description summary="set the surface type as an overlay panel"> + An overlay panel is shown near the input cursor above the application + window when a text model is active. + </description> </request> </interface> </protocol> diff --git a/src/shell.c b/src/shell.c index fd9e9a82..dff41eb1 100644 --- a/src/shell.c +++ b/src/shell.c @@ -3638,8 +3638,8 @@ input_panel_surface_set_toplevel(struct wl_client *client, } static void -input_panel_surface_set_panel(struct wl_client *client, - struct wl_resource *resource) +input_panel_surface_set_overlay_panel(struct wl_client *client, + struct wl_resource *resource) { struct input_panel_surface *input_panel_surface = resource->data; struct desktop_shell *shell = input_panel_surface->shell; @@ -3652,7 +3652,7 @@ input_panel_surface_set_panel(struct wl_client *client, static const struct input_panel_surface_interface input_panel_surface_implementation = { input_panel_surface_set_toplevel, - input_panel_surface_set_panel + input_panel_surface_set_overlay_panel }; static void |