[PATCH 10/15] text: Add seat argument to text_model enter event

Jan Arne Petersen jpetersen at openismus.com
Sun Nov 4 18:26:48 PST 2012


From: Jan Arne Petersen <jpetersen at openismus.com>

Signed-off-by: Jan Arne Petersen <jpetersen at openismus.com>
---
 clients/editor.c   | 1 +
 protocol/text.xml  | 1 +
 src/text-backend.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/clients/editor.c b/clients/editor.c
index 0a52faf..dd7c29b 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -429,6 +429,7 @@ text_model_locale(void *data,
 static void
 text_model_enter(void *data,
 		 struct text_model *text_model,
+		 struct wl_seat *seat,
 		 struct wl_surface *surface)
 {
 	struct text_entry *entry = data;
diff --git a/protocol/text.xml b/protocol/text.xml
index 918b1fb..08b4dc7 100644
--- a/protocol/text.xml
+++ b/protocol/text.xml
@@ -146,6 +146,7 @@
         Notify the model when it is activated. Typically in response to an
         activate request.
       </description>
+      <arg name="seat" type="object" interface="wl_seat"/>
       <arg name="surface" type="object" interface="wl_surface"/>
     </event>
     <event name="leave">
diff --git a/src/text-backend.c b/src/text-backend.c
index 81ab417..0f9a797 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -180,7 +180,7 @@ text_model_activate(struct wl_client *client,
 
 	wl_signal_emit(&ec->show_input_panel_signal, ec);
 
-	text_model_send_enter(&text_model->resource, &text_model->surface->resource);
+	text_model_send_enter(&text_model->resource, seat, &text_model->surface->resource);
 }
 
 static void
-- 
1.7.11.7



More information about the wayland-devel mailing list