[PATCH 1/5] text: Remove unused requests/events

Jan Arne Petersen jpetersen at openismus.com
Thu Jan 31 06:52:19 PST 2013


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

Put them back in, when we know what arguments they will have.

Signed-off-by: Jan Arne Petersen <jpetersen at openismus.com>
---
 clients/editor.c   | 21 ---------------------
 protocol/text.xml  |  4 ----
 src/text-backend.c |  7 -------
 3 files changed, 32 deletions(-)

diff --git a/clients/editor.c b/clients/editor.c
index 2909109..1eb8f11 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -336,24 +336,6 @@ text_model_keysym(void *data,
 }
 
 static void
-text_model_selection_replacement(void *data,
-				 struct text_model *text_model)
-{
-}
-
-static void
-text_model_direction(void *data,
-		     struct text_model *text_model)
-{
-}
-
-static void
-text_model_locale(void *data,
-		  struct text_model *text_model)
-{
-}
-
-static void
 text_model_enter(void *data,
 		 struct text_model *text_model,
 		 struct wl_surface *surface)
@@ -389,9 +371,6 @@ static const struct text_model_listener text_model_listener = {
 	text_model_preedit_cursor,
 	text_model_modifiers_map,
 	text_model_keysym,
-	text_model_selection_replacement,
-	text_model_direction,
-	text_model_locale,
 	text_model_enter,
 	text_model_leave
 };
diff --git a/protocol/text.xml b/protocol/text.xml
index 1871619..8004f91 100644
--- a/protocol/text.xml
+++ b/protocol/text.xml
@@ -82,7 +82,6 @@
       <arg name="width" type="int"/>
       <arg name="height" type="int"/>
     </request>
-    <request name="set_preedit"/>
     <enum name="content_hint">
       <description summary="content hint">
         Content hint is a bitmask to allow to modify the behavior of the text input
@@ -233,9 +232,6 @@
       <arg name="state" type="uint"/>
       <arg name="modifiers" type="uint"/>
     </event>
-    <event name="selection_replacement"/>
-    <event name="direction"/>
-    <event name="locale"/>
     <event name="enter">
       <description summary="enter event">
         Notify the model when it is activated. Typically in response to an
diff --git a/src/text-backend.c b/src/text-backend.c
index c0cddfe..c7761a9 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -226,12 +226,6 @@ text_model_set_micro_focus(struct wl_client *client,
 }
 
 static void
-text_model_set_preedit(struct wl_client *client,
-		       struct wl_resource *resource)
-{
-}
-
-static void
 text_model_set_content_type(struct wl_client *client,
 			    struct wl_resource *resource,
 			    uint32_t hint,
@@ -269,7 +263,6 @@ static const struct text_model_interface text_model_implementation = {
 	text_model_deactivate,
 	text_model_reset,
 	text_model_set_micro_focus,
-	text_model_set_preedit,
 	text_model_set_content_type,
 	text_model_invoke_action
 };
-- 
1.8.1



More information about the wayland-devel mailing list