From 85ecaa5d75d3a47b43470376ee3421a7ec801533 Mon Sep 17 00:00:00 2001
From: Jan Arne Petersen <jpetersen@openismus.com>
Date: Thu, 18 Apr 2013 16:47:25 +0200
Subject: [PATCH] text: Add "none" preedit-style

Use "default" preedit style as default. "None" is used when the
composing text should look like non-composing text.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
---
 clients/keyboard.c | 2 +-
 protocol/text.xml  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/clients/keyboard.c b/clients/keyboard.c
index b2f66f02..2f28a8f1 100644
--- a/clients/keyboard.c
+++ b/clients/keyboard.c
@@ -233,8 +233,8 @@ static const struct layout arabic_layout = {
 };
 
 static const char *style_labels[] = {
-	"none",
 	"default",
+	"none",
 	"active",
 	"inactive",
 	"highlight",
diff --git a/protocol/text.xml b/protocol/text.xml
index 85d67ff7..02c50410 100644
--- a/protocol/text.xml
+++ b/protocol/text.xml
@@ -209,7 +209,8 @@
       <arg name="commit" type="string"/>
     </event>
     <enum name="preedit_style">
-      <entry name="default" value="1"/>
+      <entry name="default" value="0" summary="default style for composing text"/>
+      <entry name="none" value="1" summary="style should be the same as in non-composing text"/>
       <entry name="active" value="2"/>
       <entry name="inactive" value="3"/>
       <entry name="highlight" value="4"/>