text-input: Replace model with input
commit 78d00e45cc renamed text_model to text_input
This cleans up remaining uses of the word "model"
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
diff --git a/src/text-backend.c b/src/text-backend.c
index 65b4e5e..daae03c 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -69,7 +69,7 @@
struct wl_listener destroy_listener;
struct weston_seat *seat;
- struct text_input *model;
+ struct text_input *input;
struct wl_list link;
@@ -85,7 +85,7 @@
struct input_method_context {
struct wl_resource *resource;
- struct text_input *model;
+ struct text_input *input;
struct input_method *input_method;
struct wl_resource *keyboard;
@@ -109,7 +109,7 @@
};
static void
-input_method_context_create(struct text_input *model,
+input_method_context_create(struct text_input *input,
struct input_method *input_method);
static void
input_method_context_end_keyboard_grab(struct input_method_context *context);
@@ -120,7 +120,7 @@
static void
deactivate_input_method(struct input_method *input_method)
{
- struct text_input *text_input = input_method->model;
+ struct text_input *text_input = input_method->input;
struct weston_compositor *ec = text_input->ec;
if (input_method->context && input_method->input_method_binding) {
@@ -130,7 +130,7 @@
}
wl_list_remove(&input_method->link);
- input_method->model = NULL;
+ input_method->input = NULL;
input_method->context = NULL;
if (wl_list_empty(&text_input->input_methods) &&
@@ -186,13 +186,13 @@
struct weston_compositor *ec = text_input->ec;
struct text_input *current;
- if (input_method->model == text_input)
+ if (input_method->input == text_input)
return;
- if (input_method->model)
+ if (input_method->input)
deactivate_input_method(input_method);
- input_method->model = text_input;
+ input_method->input = text_input;
wl_list_insert(&text_input->input_methods, &input_method->link);
input_method_init_seat(weston_seat);
@@ -224,7 +224,7 @@
{
struct weston_seat *weston_seat = wl_resource_get_user_data(seat);
- if (weston_seat->input_method->model)
+ if (weston_seat->input_method->input)
deactivate_input_method(weston_seat->input_method);
}
@@ -462,8 +462,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_commit_string(context->model->resource,
+ if (context->input)
+ wl_text_input_send_commit_string(context->input->resource,
serial, text);
}
@@ -477,8 +477,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_preedit_string(context->model->resource,
+ if (context->input)
+ wl_text_input_send_preedit_string(context->input->resource,
serial, text, commit);
}
@@ -492,8 +492,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_preedit_styling(context->model->resource,
+ if (context->input)
+ wl_text_input_send_preedit_styling(context->input->resource,
index, length, style);
}
@@ -505,8 +505,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_preedit_cursor(context->model->resource,
+ if (context->input)
+ wl_text_input_send_preedit_cursor(context->input->resource,
cursor);
}
@@ -519,8 +519,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_delete_surrounding_text(context->model->resource,
+ if (context->input)
+ wl_text_input_send_delete_surrounding_text(context->input->resource,
index, length);
}
@@ -533,8 +533,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_cursor_position(context->model->resource,
+ if (context->input)
+ wl_text_input_send_cursor_position(context->input->resource,
index, anchor);
}
@@ -546,8 +546,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_modifiers_map(context->model->resource, map);
+ if (context->input)
+ wl_text_input_send_modifiers_map(context->input->resource, map);
}
static void
@@ -562,8 +562,8 @@
struct input_method_context *context =
wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_keysym(context->model->resource,
+ if (context->input)
+ wl_text_input_send_keysym(context->input->resource,
serial, time, sym, state, modifiers);
}
@@ -692,8 +692,8 @@
{
struct input_method_context *context = wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_language(context->model->resource,
+ if (context->input)
+ wl_text_input_send_language(context->input->resource,
serial, language);
}
@@ -705,8 +705,8 @@
{
struct input_method_context *context = wl_resource_get_user_data(resource);
- if (context->model)
- wl_text_input_send_text_direction(context->model->resource,
+ if (context->input)
+ wl_text_input_send_text_direction(context->input->resource,
serial, direction);
}
@@ -744,7 +744,7 @@
}
static void
-input_method_context_create(struct text_input *model,
+input_method_context_create(struct text_input *input,
struct input_method *input_method)
{
struct input_method_context *context;
@@ -765,7 +765,7 @@
&input_method_context_implementation,
context, destroy_input_method_context);
- context->model = model;
+ context->input = input;
context->input_method = input_method;
input_method->context = context;
@@ -843,7 +843,7 @@
struct input_method *input_method =
container_of(listener, struct input_method, destroy_listener);
- if (input_method->model)
+ if (input_method->input)
deactivate_input_method(input_method);
wl_global_destroy(input_method->input_method_global);
@@ -860,10 +860,10 @@
container_of(listener, struct input_method, keyboard_focus_listener);
struct weston_surface *surface = keyboard->focus;
- if (!input_method->model)
+ if (!input_method->input)
return;
- if (!surface || input_method->model->surface != surface)
+ if (!surface || input_method->input->surface != surface)
deactivate_input_method(input_method);
}
@@ -948,7 +948,7 @@
return;
input_method->seat = seat;
- input_method->model = NULL;
+ input_method->input = NULL;
input_method->focus_listener_initialized = 0;
input_method->context = NULL;
input_method->text_backend = text_backend;