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

text: Introduce input_method_context interface

Browse Source 
Add an input_method_context interface which is the representation of a
text_model on input_method side.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2012-09-09 23:08:32 +02:00
committed by Kristian Høgsberg
parent b13b9ff90a
commit 620cd62cbd
3 changed files with 140 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/keyboard.c
+38 -1
View File
@@ -1,5 +1,6 @@
/*
* Copyright © 2012 Openismus GmbH
* Copyright © 2012 Intel Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
@@ -34,6 +35,7 @@
struct virtual_keyboard {
struct input_panel *input_panel;
struct input_method *input_method;
struct input_method_context *context;
struct display *display;
};
@@ -129,11 +131,43 @@ button_handler(struct widget *widget,
text[0] = y / keyboard->cy * 10 + x / keyboard->cx + '0';
input_method_commit_string(keyboard->keyboard->input_method, text, -1);
input_method_context_commit_string(keyboard->keyboard->context, text, -1);
widget_schedule_redraw(widget);
}
static void
input_method_activate(void *data,
struct input_method *input_method,
struct input_method_context *context)
{
struct virtual_keyboard *keyboard = data;
if (keyboard->context)
input_method_context_destroy(keyboard->context);
keyboard->context = context;
}
static void
input_method_deactivate(void *data,
struct input_method *input_method,
struct input_method_context *context)
{
struct virtual_keyboard *keyboard = data;
if (!keyboard->context)
return;
input_method_context_destroy(keyboard->context);
keyboard->context = NULL;
}
static const struct input_method_listener input_method_listener = {
input_method_activate,
input_method_deactivate
};
static void
global_handler(struct wl_display *display, uint32_t id,
const char *interface, uint32_t version, void *data)
@@ -144,6 +178,7 @@ global_handler(struct wl_display *display, uint32_t id,
keyboard->input_panel = wl_display_bind(display, id, &input_panel_interface);
} else if (!strcmp(interface, "input_method")) {
keyboard->input_method = wl_display_bind(display, id, &input_method_interface);
input_method_add_listener(keyboard->input_method, &input_method_listener, keyboard);
}
}
@@ -201,6 +236,8 @@ main(int argc, char *argv[])
return -1;
}
virtual_keyboard.context = NULL;
wl_display_add_global_listener(display_get_display(virtual_keyboard.display),
global_handler, &virtual_keyboard);