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

text: add serial argument to text protocol

Browse Source 
The serial argument will allow to ignore outdated events from before a
reset request.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
dev
Jan Arne Petersen 12 years ago committed by Kristian Høgsberg
parent 4653531e7a
commit c7d2a9839b
6 changed files with 83 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      clients/editor.c
  2. 20
      clients/keyboard.c
  3. 21
      clients/weston-simple-im.c
  4. 7
      protocol/input-method.xml
  5. 7
      protocol/text.xml
  6. 31
      src/text-backend.c

13
clients/editor.c
Unescape View File

@ -64,6 +64,7 @@ struct text_entry {
struct { struct {
xkb_mod_mask_t shift_mask; xkb_mod_mask_t shift_mask;
} keysym; } keysym;
uint32_t serial;
}; };
struct editor { struct editor {
@ -300,6 +301,7 @@ static void text_entry_delete_selected_text(struct text_entry *entry);
static void static void
text_model_commit_string(void *data, text_model_commit_string(void *data,
struct text_model *text_model, struct text_model *text_model,
uint32_t serial,
const char *text, const char *text,
uint32_t index) uint32_t index)
{ {
@ -317,6 +319,7 @@ text_model_commit_string(void *data,
static void static void
text_model_preedit_string(void *data, text_model_preedit_string(void *data,
struct text_model *text_model, struct text_model *text_model,
uint32_t serial,
const char *text, const char *text,
const char *commit) const char *commit)
{ {
@ -331,6 +334,7 @@ text_model_preedit_string(void *data,
static void static void
text_model_delete_surrounding_text(void *data, text_model_delete_surrounding_text(void *data,
struct text_model *text_model, struct text_model *text_model,
uint32_t serial,
int32_t index, int32_t index,
uint32_t length) uint32_t length)
{ {
@ -362,6 +366,7 @@ text_model_delete_surrounding_text(void *data,
static void static void
text_model_preedit_styling(void *data, text_model_preedit_styling(void *data,
struct text_model *text_model, struct text_model *text_model,
uint32_t serial,
uint32_t index, uint32_t index,
uint32_t length, uint32_t length,
uint32_t style) uint32_t style)
@ -371,6 +376,7 @@ text_model_preedit_styling(void *data,
static void static void
text_model_preedit_cursor(void *data, text_model_preedit_cursor(void *data,
struct text_model *text_model, struct text_model *text_model,
uint32_t serial,
int32_t index) int32_t index)
{ {
struct text_entry *entry = data; struct text_entry *entry = data;
@ -594,7 +600,10 @@ text_entry_activate(struct text_entry *entry,
{ {
struct wl_surface *surface = window_get_wl_surface(entry->window); struct wl_surface *surface = window_get_wl_surface(entry->window);
entry->serial++;
text_model_activate(entry->model, text_model_activate(entry->model,
entry->serial,
seat, seat,
surface); surface);
} }
@ -681,7 +690,9 @@ text_entry_set_cursor_position(struct text_entry *entry,
{ {
entry->cursor = text_layout_xy_to_index(entry->layout, x, y); entry->cursor = text_layout_xy_to_index(entry->layout, x, y);
text_model_reset(entry->model); entry->serial++;
text_model_reset(entry->model, entry->serial);
if (entry->preedit.cursor > 0 && if (entry->preedit.cursor > 0 &&
entry->cursor >= (uint32_t)entry->preedit.cursor) { entry->cursor >= (uint32_t)entry->preedit.cursor) {

20
clients/keyboard.c
Unescape View File

@ -41,6 +41,7 @@ struct virtual_keyboard {
struct { struct {
xkb_mod_mask_t shift_mask; xkb_mod_mask_t shift_mask;
} keysym; } keysym;
uint32_t serial;
}; };
enum key_type { enum key_type {
@ -227,11 +228,14 @@ virtual_keyboard_commit_preedit(struct virtual_keyboard *keyboard)
return; return;
input_method_context_preedit_cursor(keyboard->context, input_method_context_preedit_cursor(keyboard->context,
keyboard->serial,
0); 0);
input_method_context_preedit_string(keyboard->context, input_method_context_preedit_string(keyboard->context,
keyboard->serial,
"", "",
""); "");
input_method_context_commit_string(keyboard->context, input_method_context_commit_string(keyboard->context,
keyboard->serial,
keyboard->preedit_string, keyboard->preedit_string,
strlen(keyboard->preedit_string)); strlen(keyboard->preedit_string));
free(keyboard->preedit_string); free(keyboard->preedit_string);
@ -253,8 +257,10 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key *
keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string, keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string,
label); label);
input_method_context_preedit_cursor(keyboard->keyboard->context, input_method_context_preedit_cursor(keyboard->keyboard->context,
keyboard->keyboard->serial,
strlen(keyboard->keyboard->preedit_string)); strlen(keyboard->keyboard->preedit_string));
input_method_context_preedit_string(keyboard->keyboard->context, input_method_context_preedit_string(keyboard->keyboard->context,
keyboard->keyboard->serial,
keyboard->keyboard->preedit_string, keyboard->keyboard->preedit_string,
keyboard->keyboard->preedit_string); keyboard->keyboard->preedit_string);
break; break;
@ -264,12 +270,15 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key *
if (strlen(keyboard->keyboard->preedit_string) == 0) { if (strlen(keyboard->keyboard->preedit_string) == 0) {
input_method_context_delete_surrounding_text(keyboard->keyboard->context, input_method_context_delete_surrounding_text(keyboard->keyboard->context,
keyboard->keyboard->serial,
-1, 1); -1, 1);
} else { } else {
keyboard->keyboard->preedit_string[strlen(keyboard->keyboard->preedit_string) - 1] = '\0'; keyboard->keyboard->preedit_string[strlen(keyboard->keyboard->preedit_string) - 1] = '\0';
input_method_context_preedit_cursor(keyboard->keyboard->context, input_method_context_preedit_cursor(keyboard->keyboard->context,
keyboard->keyboard->serial,
strlen(keyboard->keyboard->preedit_string)); strlen(keyboard->keyboard->preedit_string));
input_method_context_preedit_string(keyboard->keyboard->context, input_method_context_preedit_string(keyboard->keyboard->context,
keyboard->keyboard->serial,
keyboard->keyboard->preedit_string, keyboard->keyboard->preedit_string,
keyboard->keyboard->preedit_string); keyboard->keyboard->preedit_string);
} }
@ -385,7 +394,8 @@ input_method_context_surrounding_text(void *data,
static void static void
input_method_context_reset(void *data, input_method_context_reset(void *data,
struct input_method_context *context) struct input_method_context *context,
uint32_t serial)
{ {
struct virtual_keyboard *keyboard = data; struct virtual_keyboard *keyboard = data;
@ -393,13 +403,17 @@ input_method_context_reset(void *data,
if (strlen(keyboard->preedit_string)) { if (strlen(keyboard->preedit_string)) {
input_method_context_preedit_cursor(context, input_method_context_preedit_cursor(context,
serial,
0); 0);
input_method_context_preedit_string(context, input_method_context_preedit_string(context,
serial,
"", "",
""); "");
free(keyboard->preedit_string); free(keyboard->preedit_string);
keyboard->preedit_string = strdup(""); keyboard->preedit_string = strdup("");
} }
keyboard->serial = serial;
} }
static const struct input_method_context_listener input_method_context_listener = { static const struct input_method_context_listener input_method_context_listener = {
@ -410,7 +424,8 @@ static const struct input_method_context_listener input_method_context_listener
static void static void
input_method_activate(void *data, input_method_activate(void *data,
struct input_method *input_method, struct input_method *input_method,
struct input_method_context *context) struct input_method_context *context,
uint32_t serial)
{ {
struct virtual_keyboard *keyboard = data; struct virtual_keyboard *keyboard = data;
struct wl_array modifiers_map; struct wl_array modifiers_map;
@ -422,6 +437,7 @@ input_method_activate(void *data,
free(keyboard->preedit_string); free(keyboard->preedit_string);
keyboard->preedit_string = strdup(""); keyboard->preedit_string = strdup("");
keyboard->serial = serial;
keyboard->context = context; keyboard->context = context;
input_method_context_add_listener(context, input_method_context_add_listener(context,

21
clients/weston-simple-im.c
Unescape View File

@ -70,6 +70,8 @@ struct simple_im {
xkb_mod_mask_t shift_mask; xkb_mod_mask_t shift_mask;
keyboard_input_key_handler_t key_handler; keyboard_input_key_handler_t key_handler;
uint32_t serial;
}; };
static const struct compose_seq compose_seqs[] = { static const struct compose_seq compose_seqs[] = {
@ -110,13 +112,16 @@ input_method_context_surrounding_text(void *data,
static void static void
input_method_context_reset(void *data, input_method_context_reset(void *data,
struct input_method_context *context) struct input_method_context *context,
uint32_t serial)
{ {
struct simple_im *keyboard = data; struct simple_im *keyboard = data;
fprintf(stderr, "Reset pre-edit buffer\n"); fprintf(stderr, "Reset pre-edit buffer\n");
keyboard->compose_state = state_normal; keyboard->compose_state = state_normal;
keyboard->serial = serial;
} }
static const struct input_method_context_listener input_method_context_listener = { static const struct input_method_context_listener input_method_context_listener = {
@ -247,7 +252,8 @@ static const struct wl_keyboard_listener input_method_keyboard_listener = {
static void static void
input_method_activate(void *data, input_method_activate(void *data,
struct input_method *input_method, struct input_method *input_method,
struct input_method_context *context) struct input_method_context *context,
uint32_t serial)
{ {
struct simple_im *keyboard = data; struct simple_im *keyboard = data;
@ -256,6 +262,8 @@ input_method_activate(void *data,
keyboard->compose_state = state_normal; keyboard->compose_state = state_normal;
keyboard->serial = serial;
keyboard->context = context; keyboard->context = context;
input_method_context_add_listener(context, input_method_context_add_listener(context,
&input_method_context_listener, &input_method_context_listener,
@ -371,10 +379,13 @@ simple_im_key_handler(struct simple_im *keyboard,
if (cs) { if (cs) {
if (cs->keys[i + 1] == 0) { if (cs->keys[i + 1] == 0) {
input_method_context_preedit_cursor(keyboard->context, input_method_context_preedit_cursor(keyboard->context,
keyboard->serial,
0); 0);
input_method_context_preedit_string(keyboard->context, input_method_context_preedit_string(keyboard->context,
keyboard->serial,
"", ""); "", "");
input_method_context_commit_string(keyboard->context, input_method_context_commit_string(keyboard->context,
keyboard->serial,
cs->text, cs->text,
strlen(cs->text)); strlen(cs->text));
keyboard->compose_state = state_normal; keyboard->compose_state = state_normal;
@ -386,8 +397,10 @@ simple_im_key_handler(struct simple_im *keyboard,
} }
input_method_context_preedit_cursor(keyboard->context, input_method_context_preedit_cursor(keyboard->context,
keyboard->serial,
strlen(text)); strlen(text));
input_method_context_preedit_string(keyboard->context, input_method_context_preedit_string(keyboard->context,
keyboard->serial,
text, text,
text); text);
} }
@ -398,10 +411,13 @@ simple_im_key_handler(struct simple_im *keyboard,
idx += xkb_keysym_to_utf8(keyboard->compose_seq.keys[j], text + idx, sizeof(text) - idx); idx += xkb_keysym_to_utf8(keyboard->compose_seq.keys[j], text + idx, sizeof(text) - idx);
} }
input_method_context_preedit_cursor(keyboard->context, input_method_context_preedit_cursor(keyboard->context,
keyboard->serial,
0); 0);
input_method_context_preedit_string(keyboard->context, input_method_context_preedit_string(keyboard->context,
keyboard->serial,
"", ""); "", "");
input_method_context_commit_string(keyboard->context, input_method_context_commit_string(keyboard->context,
keyboard->serial,
text, text,
strlen(text)); strlen(text));
keyboard->compose_state = state_normal; keyboard->compose_state = state_normal;
@ -418,6 +434,7 @@ simple_im_key_handler(struct simple_im *keyboard,
return; return;
input_method_context_commit_string(keyboard->context, input_method_context_commit_string(keyboard->context,
keyboard->serial,
text, text,
strlen(text)); strlen(text));
} }

7
protocol/input-method.xml
Unescape View File

@ -39,6 +39,7 @@
<description summary="commit string"> <description summary="commit string">
Send the commit string text to the applications text model. Send the commit string text to the applications text model.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="text" type="string"/> <arg name="text" type="string"/>
<arg name="index" type="uint"/> <arg name="index" type="uint"/>
</request> </request>
@ -46,10 +47,12 @@
<description summary="pre-edit string"> <description summary="pre-edit string">
Send the pre-edit string text to the applications text model. Send the pre-edit string text to the applications text model.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="text" type="string"/> <arg name="text" type="string"/>
<arg name="commit" type="string"/> <arg name="commit" type="string"/>
</request> </request>
<request name="preedit_styling"> <request name="preedit_styling">
<arg name="serial" type="uint"/>
<arg name="index" type="uint"/> <arg name="index" type="uint"/>
<arg name="length" type="uint"/> <arg name="length" type="uint"/>
<arg name="style" type="uint"/> <arg name="style" type="uint"/>
@ -59,9 +62,11 @@
Sets the cursor position inside the composing text (as byte index) Sets the cursor position inside the composing text (as byte index)
relative to the start of the composing text. relative to the start of the composing text.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="index" type="int"/> <arg name="index" type="int"/>
</request> </request>
<request name="delete_surrounding_text"> <request name="delete_surrounding_text">
<arg name="serial" type="uint"/>
<arg name="index" type="int"/> <arg name="index" type="int"/>
<arg name="length" type="uint"/> <arg name="length" type="uint"/>
</request> </request>
@ -116,6 +121,7 @@
<arg name="anchor" type="uint"/> <arg name="anchor" type="uint"/>
</event> </event>
<event name="reset"> <event name="reset">
<arg name="serial" type="uint"/>
</event> </event>
</interface> </interface>
@ -132,6 +138,7 @@
which allows communication with the text model. which allows communication with the text model.
</description> </description>
<arg name="id" type="new_id" interface="input_method_context"/> <arg name="id" type="new_id" interface="input_method_context"/>
<arg name="serial" type="uint"/>
</event> </event>
<event name="deactivate"> <event name="deactivate">
<description summary="activate event"> <description summary="activate event">

7
protocol/text.xml
Unescape View File

@ -56,6 +56,7 @@
model and tracked for focus lost. The activated event is emitted on model and tracked for focus lost. The activated event is emitted on
successful activation. successful activation.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="seat" type="object" interface="wl_seat"/> <arg name="seat" type="object" interface="wl_seat"/>
<arg name="surface" type="object" interface="wl_surface"/> <arg name="surface" type="object" interface="wl_surface"/>
</request> </request>
@ -73,6 +74,7 @@
be reseted, for example after the text was changed outside of the be reseted, for example after the text was changed outside of the
normal input method flow. normal input method flow.
</description> </description>
<arg name="serial" type="uint"/>
</request> </request>
<request name="set_micro_focus"> <request name="set_micro_focus">
<arg name="x" type="int"/> <arg name="x" type="int"/>
@ -90,6 +92,7 @@
or the result of some composing (pre-edit). It also sets the new or the result of some composing (pre-edit). It also sets the new
cursor position (as byte index) relative to the inserted text. cursor position (as byte index) relative to the inserted text.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="text" type="string"/> <arg name="text" type="string"/>
<arg name="index" type="uint"/> <arg name="index" type="uint"/>
</event> </event>
@ -100,6 +103,7 @@
be removed. It also sets the cursor position (as byte index) relative be removed. It also sets the cursor position (as byte index) relative
to the start of the composing text. to the start of the composing text.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="text" type="string"/> <arg name="text" type="string"/>
<arg name="commit" type="string"/> <arg name="commit" type="string"/>
</event> </event>
@ -109,6 +113,7 @@
deleted. Index is relative to the current cursor (as byte index). deleted. Index is relative to the current cursor (as byte index).
Length is the length of deleted text (as bytes). Length is the length of deleted text (as bytes).
</description> </description>
<arg name="serial" type="uint"/>
<arg name="index" type="int"/> <arg name="index" type="int"/>
<arg name="length" type="uint"/> <arg name="length" type="uint"/>
</event> </event>
@ -122,6 +127,7 @@
<entry name="incorrect" value="7"/> <entry name="incorrect" value="7"/>
</enum> </enum>
<event name="preedit_styling"> <event name="preedit_styling">
<arg name="serial" type="uint"/>
<arg name="index" type="uint"/> <arg name="index" type="uint"/>
<arg name="length" type="uint"/> <arg name="length" type="uint"/>
<arg name="style" type="uint"/> <arg name="style" type="uint"/>
@ -131,6 +137,7 @@
Sets the cursor position inside the composing text (as byte index) Sets the cursor position inside the composing text (as byte index)
relative to the start of the composing text. relative to the start of the composing text.
</description> </description>
<arg name="serial" type="uint"/>
<arg name="index" type="int"/> <arg name="index" type="int"/>
</event> </event>
<event name="modifiers_map"> <event name="modifiers_map">

31
src/text-backend.c
Unescape View File

@ -95,7 +95,8 @@ struct text_backend {
}; };
static void input_method_context_create(struct text_model *model, static void input_method_context_create(struct text_model *model,
struct input_method *input_method); struct input_method *input_method,
uint32_t serial);
static void input_method_context_end_keyboard_grab(struct input_method_context *context); static void input_method_context_end_keyboard_grab(struct input_method_context *context);
static void input_method_init_seat(struct weston_seat *seat); static void input_method_init_seat(struct weston_seat *seat);
@ -157,6 +158,7 @@ text_model_set_surrounding_text(struct wl_client *client,
static void static void
text_model_activate(struct wl_client *client, text_model_activate(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial,
struct wl_resource *seat, struct wl_resource *seat,
struct wl_resource *surface) struct wl_resource *surface)
{ {
@ -180,7 +182,7 @@ text_model_activate(struct wl_client *client,
text_model->surface = surface->data; text_model->surface = surface->data;
input_method_context_create(text_model, input_method); input_method_context_create(text_model, input_method, serial);
wl_signal_emit(&ec->show_input_panel_signal, ec); wl_signal_emit(&ec->show_input_panel_signal, ec);
@ -201,7 +203,8 @@ text_model_deactivate(struct wl_client *client,
static void static void
text_model_reset(struct wl_client *client, text_model_reset(struct wl_client *client,
struct wl_resource *resource) struct wl_resource *resource,
uint32_t serial)
{ {
struct text_model *text_model = resource->data; struct text_model *text_model = resource->data;
struct input_method *input_method, *next; struct input_method *input_method, *next;
@ -209,7 +212,7 @@ text_model_reset(struct wl_client *client,
wl_list_for_each_safe(input_method, next, &text_model->input_methods, link) { wl_list_for_each_safe(input_method, next, &text_model->input_methods, link) {
if (!input_method->context) if (!input_method->context)
continue; continue;
input_method_context_send_reset(&input_method->context->resource); input_method_context_send_reset(&input_method->context->resource, serial);
} }
} }
@ -328,56 +331,61 @@ input_method_context_destroy(struct wl_client *client,
static void static void
input_method_context_commit_string(struct wl_client *client, input_method_context_commit_string(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial,
const char *text, const char *text,
uint32_t index) uint32_t index)
{ {
struct input_method_context *context = resource->data; struct input_method_context *context = resource->data;
text_model_send_commit_string(&context->model->resource, text, index); text_model_send_commit_string(&context->model->resource, serial, text, index);
} }
static void static void
input_method_context_preedit_string(struct wl_client *client, input_method_context_preedit_string(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial,
const char *text, const char *text,
const char *commit) const char *commit)
{ {
struct input_method_context *context = resource->data; struct input_method_context *context = resource->data;
text_model_send_preedit_string(&context->model->resource, text, commit); text_model_send_preedit_string(&context->model->resource, serial, text, commit);
} }
static void static void
input_method_context_preedit_styling(struct wl_client *client, input_method_context_preedit_styling(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial,
uint32_t index, uint32_t index,
uint32_t length, uint32_t length,
uint32_t style) uint32_t style)
{ {
struct input_method_context *context = resource->data; struct input_method_context *context = resource->data;
text_model_send_preedit_styling(&context->model->resource, index, length, style); text_model_send_preedit_styling(&context->model->resource, serial, index, length, style);
} }
static void static void
input_method_context_preedit_cursor(struct wl_client *client, input_method_context_preedit_cursor(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial,
int32_t cursor) int32_t cursor)
{ {
struct input_method_context *context = resource->data; struct input_method_context *context = resource->data;
text_model_send_preedit_cursor(&context->model->resource, cursor); text_model_send_preedit_cursor(&context->model->resource, serial, cursor);
} }
static void static void
input_method_context_delete_surrounding_text(struct wl_client *client, input_method_context_delete_surrounding_text(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial,
int32_t index, int32_t index,
uint32_t length) uint32_t length)
{ {
struct input_method_context *context = resource->data; struct input_method_context *context = resource->data;
text_model_send_delete_surrounding_text(&context->model->resource, index, length); text_model_send_delete_surrounding_text(&context->model->resource, serial, index, length);
} }
static void static void
@ -541,7 +549,8 @@ destroy_input_method_context(struct wl_resource *resource)
static void static void
input_method_context_create(struct text_model *model, input_method_context_create(struct text_model *model,
struct input_method *input_method) struct input_method *input_method,
uint32_t serial)
{ {
struct input_method_context *context; struct input_method_context *context;
@ -568,7 +577,7 @@ input_method_context_create(struct text_model *model,
wl_client_add_resource(input_method->input_method_binding->client, &context->resource); wl_client_add_resource(input_method->input_method_binding->client, &context->resource);
input_method_send_activate(input_method->input_method_binding, &context->resource); input_method_send_activate(input_method->input_method_binding, &context->resource, serial);
} }
static void static void

Write Preview
Loading…
Cancel
Save