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

Extract the text_model_manager interface from input_method

Browse Source 
This is necessary because all clients need a way to create
text_models, but only one client at a time can be bound to
the input_method global (else we don't know to whom we are
supposed to send events).
This commit is contained in:
Philipp Brüschweiler
2012-07-11 22:25:31 +02:00
committed by Kristian Høgsberg
parent f97f379dfc
commit f25602bdc0
3 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+5 -4
View File
@@ -40,7 +40,7 @@ struct text_entry {
};
struct editor {
struct input_method *input_method;
struct text_model_manager *text_model_manager;
struct display *display;
struct window *window;
struct widget *widget;
@@ -86,7 +86,7 @@ text_entry_create(struct editor *editor, const char *text)
entry->widget = editor->widget;
entry->text = strdup(text);
entry->active = 0;
entry->model = input_method_create_text_model(editor->input_method, surface);
entry->model = text_model_manager_create_text_model(editor->text_model_manager, surface);
text_model_add_listener(entry->model, &text_model_listener, entry);
return entry;
@@ -267,8 +267,9 @@ global_handler(struct wl_display *display, uint32_t id,
{
struct editor *editor = data;
if (!strcmp(interface, "input_method")) {
editor->input_method = wl_display_bind(display, id, &input_method_interface);
if (!strcmp(interface, "text_model_manager")) {
editor->text_model_manager = wl_display_bind(display, id,
&text_model_manager_interface);
}
}