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

text: Add language and text-direction to protocol

Browse Source 
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2013-04-18 16:47:15 +02:00
committed by Kristian Høgsberg
parent f91871980e
commit ece6b5af51
7 changed files with 191 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+19 -1
View File
@@ -391,6 +391,22 @@ text_model_input_panel_state(void *data,
{
}
static void
text_model_language(void *data,
struct text_model *text_model,
uint32_t serial,
const char *language)
{
}
static void
text_model_text_direction(void *data,
struct text_model *text_model,
uint32_t serial,
uint32_t direction)
{
}
static const struct text_model_listener text_model_listener = {
text_model_commit_string,
text_model_preedit_string,
@@ -402,7 +418,9 @@ static const struct text_model_listener text_model_listener = {
text_model_keysym,
text_model_enter,
text_model_leave,
text_model_input_panel_state
text_model_input_panel_state,
text_model_language,
text_model_text_direction
};
static struct text_entry*
clients/keyboard.c
+31 -23
View File
@@ -492,11 +492,11 @@ button_handler(struct widget *widget,
}
static void
input_method_context_surrounding_text(void *data,
struct input_method_context *context,
const char *text,
uint32_t cursor,
uint32_t anchor)
handle_surrounding_text(void *data,
struct input_method_context *context,
const char *text,
uint32_t cursor,
uint32_t anchor)
{
struct virtual_keyboard *keyboard = data;
@@ -505,9 +505,9 @@ input_method_context_surrounding_text(void *data,
}
static void
input_method_context_reset(void *data,
struct input_method_context *context,
uint32_t serial)
handle_reset(void *data,
struct input_method_context *context,
uint32_t serial)
{
struct virtual_keyboard *keyboard = data;
@@ -529,10 +529,10 @@ input_method_context_reset(void *data,
}
static void
input_method_context_content_type(void *data,
struct input_method_context *context,
uint32_t hint,
uint32_t purpose)
handle_content_type(void *data,
struct input_method_context *context,
uint32_t hint,
uint32_t purpose)
{
struct virtual_keyboard *keyboard = data;
@@ -541,10 +541,10 @@ input_method_context_content_type(void *data,
}
static void
input_method_context_invoke_action(void *data,
struct input_method_context *context,
uint32_t button,
uint32_t index)
handle_invoke_action(void *data,
struct input_method_context *context,
uint32_t button,
uint32_t index)
{
struct virtual_keyboard *keyboard = data;
@@ -555,8 +555,8 @@ input_method_context_invoke_action(void *data,
}
static void
input_method_context_commit(void *data,
struct input_method_context *context)
handle_commit(void *data,
struct input_method_context *context)
{
struct virtual_keyboard *keyboard = data;
const struct layout *layout;
@@ -573,12 +573,20 @@ input_method_context_commit(void *data,
widget_schedule_redraw(keyboard->widget);
}
static void
handle_preferred_language(void *data,
struct input_method_context *context,
const char *language)
{
}
static const struct input_method_context_listener input_method_context_listener = {
input_method_context_surrounding_text,
input_method_context_reset,
input_method_context_content_type,
input_method_context_invoke_action,
input_method_context_commit
handle_surrounding_text,
handle_reset,
handle_content_type,
handle_invoke_action,
handle_commit,
handle_preferred_language
};
static void
clients/weston-simple-im.c
+31 -23
View File
@@ -101,19 +101,19 @@ static const uint32_t ignore_keys_on_compose[] = {
};
static void
input_method_context_surrounding_text(void *data,
struct input_method_context *context,
const char *text,
uint32_t cursor,
uint32_t anchor)
handle_surrounding_text(void *data,
struct input_method_context *context,
const char *text,
uint32_t cursor,
uint32_t anchor)
{
fprintf(stderr, "Surrounding text updated: %s\n", text);
}
static void
input_method_context_reset(void *data,
struct input_method_context *context,
uint32_t serial)
handle_reset(void *data,
struct input_method_context *context,
uint32_t serial)
{
struct simple_im *keyboard = data;
@@ -125,33 +125,41 @@ input_method_context_reset(void *data,
}
static void
input_method_context_content_type(void *data,
struct input_method_context *context,
uint32_t hint,
uint32_t purpose)
handle_content_type(void *data,
struct input_method_context *context,
uint32_t hint,
uint32_t purpose)
{
}
static void
input_method_context_invoke_action(void *data,
struct input_method_context *context,
uint32_t button,
uint32_t index)
handle_invoke_action(void *data,
struct input_method_context *context,
uint32_t button,
uint32_t index)
{
}
static void
input_method_context_commit(void *data,
struct input_method_context *context)
handle_commit(void *data,
struct input_method_context *context)
{
}
static void
handle_preferred_language(void *data,
struct input_method_context *context,
const char *language)
{
}
static const struct input_method_context_listener input_method_context_listener = {
input_method_context_surrounding_text,
input_method_context_reset,
input_method_context_content_type,
input_method_context_invoke_action,
input_method_context_commit
handle_surrounding_text,
handle_reset,
handle_content_type,
handle_invoke_action,
handle_commit,
handle_preferred_language
};
static void