commit 620cd62cbded7ec8d1c3d91775d177c27d4f8af2
author Jan Arne Petersen <jpetersen@openismus.com> Sun Sep 09 23:08:32 2012 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Wed Sep 12 16:34:59 2012 -0400
tree 6bf0939ce8827b8a75f92d5a51f16145012240f0
parent b13b9ff90a630384b1efde22a679ac9f6fbd4a09

text: Introduce input_method_context interface

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>

clients/keyboard.c

diff --git a/clients/keyboard.c b/clients/keyboard.c
index 9fdd8cc..50ede54 100644
--- a/clients/keyboard.c
+++ b/clients/keyboard.c
@@ -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,12 +131,44 @@
 
 	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 @@
 		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 @@
 		return -1;
 	}
 
+	virtual_keyboard.context = NULL;
+
 	wl_display_add_global_listener(display_get_display(virtual_keyboard.display),
 				       global_handler, &virtual_keyboard);