text: Add activate/deactivate events

Let the client know when a text model gets activated or deactiavted.
2012-08-10 16:47:21 +02:00
parent 5196374218
commit de3b6a15c0
3 changed files with 42 additions and 17 deletions
@@ -54,6 +54,7 @@ deactivate_text_model(struct text_model *text_model)
 	if (text_model->input_method->active_model == text_model) {
 		text_model->input_method->active_model = NULL;
 		wl_signal_emit(&ec->hide_input_panel_signal, ec);
+		text_model_send_deactivated(&text_model->resource);
 	}
 }

@@ -90,9 +91,18 @@ text_model_activate(struct wl_client *client,
 	struct text_model *text_model = resource->data;
 	struct weston_compositor *ec = text_model->input_method->ec;

+	if (text_model->input_method->active_model) {
+		if (text_model->input_method->active_model == text_model)
+			return;
+
+		deactivate_text_model(text_model->input_method->active_model);
+	}
+
 	text_model->input_method->active_model = text_model;

 	wl_signal_emit(&ec->show_input_panel_signal, ec);
+
+	text_model_send_activated(&text_model->resource);
 }

 static void