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

text: Add show/hide_input_panel requests

Browse Source 
Allows to show/hide the input panel (virtual keyboard) more independent
of focus (some applications might to require additionaly click on a
focused entry to show the input panel).

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2013-01-31 15:52:21 +01:00
committed by Kristian Høgsberg
parent 0eabcaafae
commit 6138197337
4 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+3
View File
@@ -2846,6 +2846,9 @@ hide_input_panels(struct wl_listener *listener, void *data)
hide_input_panel_listener);
struct weston_surface *surface, *next;
if (!shell->showing_input_panels)
return;
shell->showing_input_panels = false;
if (!shell->locked)
src/text-backend.c
+33 -2
View File
@@ -40,6 +40,8 @@ struct text_model {
struct wl_list input_methods;
struct wl_surface *surface;
uint32_t input_panel_visible;
};
struct text_model_factory {
@@ -183,7 +185,8 @@ text_model_activate(struct wl_client *client,
input_method_context_create(text_model, input_method, serial);
wl_signal_emit(&ec->show_input_panel_signal, ec);
if (text_model->input_panel_visible)
wl_signal_emit(&ec->show_input_panel_signal, ec);
text_model_send_enter(&text_model->resource, &text_model->surface->resource);
}
@@ -271,6 +274,32 @@ text_model_commit(struct wl_client *client,
}
}
static void
text_model_show_input_panel(struct wl_client *client,
struct wl_resource *resource)
{
struct text_model *text_model = resource->data;
struct weston_compositor *ec = text_model->ec;
text_model->input_panel_visible = 1;
if (!wl_list_empty(&text_model->input_methods))
wl_signal_emit(&ec->show_input_panel_signal, ec);
}
static void
text_model_hide_input_panel(struct wl_client *client,
struct wl_resource *resource)
{
struct text_model *text_model = resource->data;
struct weston_compositor *ec = text_model->ec;
text_model->input_panel_visible = 0;
if (!wl_list_empty(&text_model->input_methods))
wl_signal_emit(&ec->hide_input_panel_signal, ec);
}
static const struct text_model_interface text_model_implementation = {
text_model_set_surrounding_text,
text_model_activate,
@@ -279,7 +308,9 @@ static const struct text_model_interface text_model_implementation = {
text_model_set_micro_focus,
text_model_set_content_type,
text_model_invoke_action,
text_model_commit
text_model_commit,
text_model_show_input_panel,
text_model_hide_input_panel
};
static void text_model_factory_create_text_model(struct wl_client *client,