From c0248d9e77af29bb8f2a6d00c7e1551302d363d0 Mon Sep 17 00:00:00 2001
From: Junkyeong Kim <jk0430.kim@samsung.com>
Date: Mon, 12 Dec 2016 18:50:05 +0900
Subject: [PATCH 01/16] tizen-extension: add auto rotation set request for
 screenshooter

Change-Id: Ic136018cb3a2f7c336bb747b1fcaae4892b66ed3
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>
---
 protocol/tizen-extension.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/protocol/tizen-extension.xml b/protocol/tizen-extension.xml
index d7c9520..9105cd6 100644
--- a/protocol/tizen-extension.xml
+++ b/protocol/tizen-extension.xml
@@ -522,6 +522,13 @@
       <arg name="output" type="object" interface="wl_output" summary="output object for screenmirror"/>
     </request>
 
+    <request name="set_oneshot_auto_rotation">
+      <description summary="set screen shot auto rotation value">
+        Client can set auto rotation value for one shot.
+      </description>
+      <arg name="set" type="uint"/>
+    </request>
+
     <event name="format">
       <description summary="supported format for screenshooter">
         The tbm format codes match the #defines in tbm_surface.h. The formats actually
-- 
2.7.4


From 4feda8be8e7fbf18f0c91596d9fde2d1c31f4df7 Mon Sep 17 00:00:00 2001
From: Gwanglim Lee <gl77.lee@samsung.com>
Date: Thu, 5 Jan 2017 16:16:45 +0900
Subject: [PATCH 02/16] Packaging: update version to 1.1.2

Change-Id: I3b51890cd5c2cab0587237d3db4dfe5c2ac98000
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index 0848346..a6fbea9 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.1
+Version:	1.1.2
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4


From 5593f8a2da709b77372fec448a12b3653f26db02 Mon Sep 17 00:00:00 2001
From: MinJeong Kim <minjjj.kim@samsung.com>
Date: Mon, 9 Jan 2017 18:48:33 +0900
Subject: [PATCH 03/16] tizen-remote-surface: v4 - input_event_filter

Added belows
(R) tizen_remote_surface_provider@set_input_event_filter
(E) tizen_remote_surface@input_event_filter
(enum) tizen_remote_surface_input_event_filter

Change-Id: I7d8e3ca8f159c7af18cc9e12a035806eb6e34571
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>
---
 protocol/tizen-remote-surface.xml | 63 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/protocol/tizen-remote-surface.xml b/protocol/tizen-remote-surface.xml
index 041c9c4..fdbe724 100644
--- a/protocol/tizen-remote-surface.xml
+++ b/protocol/tizen-remote-surface.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <protocol name="tizen_remote_surface">
-  <interface name="tizen_remote_surface_manager" version="3">
+  <interface name="tizen_remote_surface_manager" version="4">
      <description summary="manager of tizen_remote_surface">
         A manager of tizen_remote_surface. This object is in charge of
         creating tizen_remote_surface_provider and tizen_remote_surface and
@@ -38,7 +38,7 @@
      </request>
   </interface>
 
-  <interface name="tizen_remote_surface_provider" version="1">
+  <interface name="tizen_remote_surface_provider" version="4">
      <description summary="a provider of remote buffer source">
         A provider client. Surfaces of providers are offscreen.
         An attached buffer of the provider is used for creating remote buffer
@@ -75,9 +75,20 @@
         <entry name="visible" value="0" />
         <entry name="invisible" value="1" />
      </enum>
+
+     <!-- version 4 additions -->
+
+     <request name="set_input_event_filter" since="4">
+        <description summary="set event filter to be allowed">
+           Some providers can accept restricted events only. To notify of what
+           event is allowed or not, provider can set event filter using this
+           request.
+        </description>
+        <arg name="event_filter" type="uint" summary="event filter value. To calculate your event filter value, refer enum input_event_filter of tizen_remote_surface interface"/>
+     </request>>
   </interface>
 
-  <interface name="tizen_remote_surface" version="3">
+  <interface name="tizen_remote_surface" version="4">
      <description summary="a consumer of buffers from a provider">
         A consumer client of provider client's buffer.
         The consumer can receive notice of buffer updating of
@@ -222,7 +233,7 @@
         <arg name="buffer" type="object" interface="wl_buffer" summary="wayland buffer to be released"/>
      </request>
 
-     <!-- Version 3 addtions -->
+     <!-- Version 3 additions -->
 
      <enum name="buffer_type" since="3">
         <description summary="type of remote surface buffer" />
@@ -246,6 +257,50 @@
         <arg name="options" type="array" allow-null="true" summary="array of options"/>
      </event>
 
+     <!-- Version 4 additions -->
+
+     <event name="input_event_filter" since="4">
+        <description summary="delivered a changed event filter of provider client">
+           When a provider client of this remote surface sent
+           remote_surface_provider@set_input_event_filter, a compositor delivers
+           the event filter values to this remote surface client.
+        </description>
+        <arg name="event_filter" type="uint" summary="event filter value"/>
+     </event>
+
+     <enum name="input_event_filter">
+        <description summary="vaules for event filter."/>
+        <entry name="mouse_none" value="0x00000001"/>
+        <entry name="mouse_up_down" value="0x00000002"/>
+        <entry name="mouse_move_x" value="0x00000003"/>
+        <entry name="mouse_move_y" value="0x00000004"/>
+        <entry name="mouse_move_x_y" value="0x00000005"/>
+        <entry name="mouse_up_down_move_x" value="0x00000006"/>
+        <entry name="mouse_up_down_move_y" value="0x00000007"/>
+        <entry name="mouse_up_down_move_x_y" value="0x00000008"/>
+        <entry name="mouse_all" value="0x0000000e" />
+        <entry name="mouse_flag" value="0x0000000f"/>
+        <entry name="mouse_wheel_none" value="0x00000010"/>
+        <entry name="mouse_wheel_all" value="0x000000e0"/>
+        <entry name="mouse_wheel_flag" value="0x000000f0"/>
+        <entry name="touch_none" value="0x00000100"/>
+        <entry name="touch_up_down" value="0x00000200"/>
+        <entry name="touch_move_x" value="0x00000300"/>
+        <entry name="touch_move_y" value="0x00000400"/>
+        <entry name="touch_move_x_y" value="0x00000500"/>
+        <entry name="touch_up_down_move_x" value="0x00000600"/>
+        <entry name="touch_up_down_move_y" value="0x00000700"/>
+        <entry name="touch_up_down_move_x_y" value="0x00000800"/>
+        <entry name="touch_all" value="0x00000e00"/>
+        <entry name="touch_flag" value="0x00000f00"/>
+        <entry name="touch_cancel_none" value="0x00001000"/>
+        <entry name="touch_cancel_all" value="0x0000e000"/>
+        <entry name="touch_cancel_flag" value="0x0000f000"/>
+        <entry name="key_none" value="0x00010000"/>
+        <entry name="key_all" value="0x000e0000"/>
+        <entry name="key_flag" value="0x000f0000"/>
+     </enum>
+
   </interface>
 
   <interface name="tizen_remote_surface_region" version="1">
-- 
2.7.4


From fb8b68f45f446824a2e779e626f082664ea7ade1 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Tue, 17 Jan 2017 09:54:42 +0900
Subject: [PATCH 04/16] input-method: Add focus event parameter in the
 activate/deactivate event

Change-Id: Ic8d10c47d2399ef8410f07bbb115d817c79a817a
---
 protocol/input-method.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/protocol/input-method.xml b/protocol/input-method.xml
index 7bb9f9f..43abe7b 100644
--- a/protocol/input-method.xml
+++ b/protocol/input-method.xml
@@ -283,6 +283,7 @@
       </description>
       <arg name="id" type="new_id" interface="wl_input_method_context"/>
       <arg name="text_input_id" type="uint"/>
+      <arg name="focus_in_event" type="uint"/>
     </event>
     <event name="deactivate">
       <description summary="deactivate event">
@@ -291,6 +292,7 @@
         handled.
       </description>
       <arg name="context" type="object" interface="wl_input_method_context"/>
+      <arg name="focus_out_event" type="uint"/>
     </event>
     <event name="show_input_panel">
       <description summary="show input panel event">
-- 
2.7.4


From 55568e1fcfb42b58b3bd18736955d89968c0f4f9 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Tue, 17 Jan 2017 16:15:40 +0900
Subject: [PATCH 05/16] Packaging: update version to 1.1.3

Change-Id: I7572148d01796d7292eed394b4c7950828fbfbf3
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index a6fbea9..c14da00 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.2
+Version:	1.1.3
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4


From d7b07d175ebaa553c3b8e471934990e9b2e99c61 Mon Sep 17 00:00:00 2001
From: Duna Oh <duna.oh@samsung.com>
Date: Mon, 23 Jan 2017 20:33:20 +0900
Subject: [PATCH 06/16] tizen_policy: add set_parent request since version 3

Signed-off-by: Duna Oh <duna.oh@samsung.com>

Change-Id: I8d560730c8f5f05a8928c2c3215bdcbcb2f00430
---
 protocol/tizen-extension.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/protocol/tizen-extension.xml b/protocol/tizen-extension.xml
index 9105cd6..5e5a821 100644
--- a/protocol/tizen-extension.xml
+++ b/protocol/tizen-extension.xml
@@ -14,7 +14,7 @@
     </event>
   </interface>
 
-  <interface name="tizen_policy" version="2">
+  <interface name="tizen_policy" version="3">
     <request name="get_visibility">
       <arg name="id" type="new_id" interface="tizen_visibility" summary="new visibility object"/>
       <arg name="surface" type="object" interface="wl_surface" summary="surface object"/>
@@ -290,6 +290,10 @@
       <arg name="id" type="new_id" interface="tizen_subsurface_watcher" />
       <arg name="surface" type="object" interface="wl_surface" />
     </request>
+    <request name="set_parent" since="3">
+      <arg name="child" type="object" interface="wl_surface" />
+      <arg name="parent" type="object" interface="wl_surface" />
+    </request>
   </interface>
 
   <interface name="tizen_visibility" version="1">
-- 
2.7.4


From abf0cb7e13c988c897bf3aea27f05cc8cbde1d3d Mon Sep 17 00:00:00 2001
From: Juyeon Lee <juyeonne.lee@samsung.com>
Date: Tue, 24 Jan 2017 19:52:45 +0900
Subject: [PATCH 07/16] Packaging: update version to 1.1.4

Change-Id: If136ea96d06d06826eb58b33d07036995d0ff141
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index c14da00..522098b 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.3
+Version:	1.1.4
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4


From 0ead247e55aa5c32eee90fb3ba43716347129f10 Mon Sep 17 00:00:00 2001
From: MinJeong Kim <minjjj.kim@samsung.com>
Date: Tue, 24 Jan 2017 19:15:22 +0900
Subject: [PATCH 08/16] tizen_policy: version up to 4 - new conformant messages

Change-Id: If075d4252cb6603945bd66b6ae92072cf3a10f9d
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>
---
 protocol/tizen-extension.xml | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/protocol/tizen-extension.xml b/protocol/tizen-extension.xml
index 5e5a821..15c5484 100644
--- a/protocol/tizen-extension.xml
+++ b/protocol/tizen-extension.xml
@@ -14,7 +14,7 @@
     </event>
   </interface>
 
-  <interface name="tizen_policy" version="3">
+  <interface name="tizen_policy" version="4">
     <request name="get_visibility">
       <arg name="id" type="new_id" interface="tizen_visibility" summary="new visibility object"/>
       <arg name="surface" type="object" interface="wl_surface" summary="surface object"/>
@@ -105,6 +105,11 @@
     </enum>
 
     <event name="conformant_area">
+       <description summary="Notify of conformant area">
+          Notify of conformant area to client. Sending this event does NOT guarantee
+          perfect compositing of conformant owner client surface and
+          conformant part client surface.
+      </description>
       <arg name="surface" type="object" interface="wl_surface" summary="surface object"/>
       <arg name="conformant_part" type="uint"/>
       <arg name="state" type="uint"/>
@@ -285,15 +290,47 @@
       <arg name="above_res_id" type="uint" />
     </request>
 
+    <!-- version 2 additions -->
     <!-- for subsurface watcher -->
     <request name="get_subsurface_watcher" since="2">
       <arg name="id" type="new_id" interface="tizen_subsurface_watcher" />
       <arg name="surface" type="object" interface="wl_surface" />
     </request>
+
+    <!-- version 3 additions -->
     <request name="set_parent" since="3">
       <arg name="child" type="object" interface="wl_surface" />
       <arg name="parent" type="object" interface="wl_surface" />
     </request>
+
+    <!-- version 4 additions -->
+    <!-- for conformant -->
+    <event name="conformant_region" since="4">
+      <description summary="notify of geometry values of conformant region(area)">
+         The server can notify of conformant region(area) using this event.
+         If client is received this event, client should ack for it using
+         tizen_policy@ack_conformant_region request.
+      </description>
+      <arg name="surface" type="object" interface="wl_surface" summary="surface object"/>
+      <arg name="conformant_part" type="uint"/>
+      <arg name="state" type="uint"/>
+      <arg name="x" type="int"/>
+      <arg name="y" type="int"/>
+      <arg name="w" type="int"/>
+      <arg name="h" type="int"/>
+      <arg name="serial" type="uint"/>
+    </event>
+
+    <request name="ack_conformant_region" since="4">
+      <description summary="ack for tizen_policy@conformant_region">
+         A client can refresh its surface for applying new conformant region which
+         is from tizen_policy@conformant_region event. The client has to ack
+         after complete of its updates by this request.
+      </description>
+      <arg name="surface" type="object" interface="wl_surface" summary="surface object"/>
+      <arg name="serial" type="uint"/>
+    </request>
+
   </interface>
 
   <interface name="tizen_visibility" version="1">
-- 
2.7.4


From daa383670c9d039937f57929c640b3a81b6d4542 Mon Sep 17 00:00:00 2001
From: MinJeong Kim <minjjj.kim@samsung.com>
Date: Tue, 31 Jan 2017 16:59:38 +0900
Subject: [PATCH 09/16] Packaging: update version to 1.1.5

Change-Id: I7a28f0fd44e65084ac530fc41fdb57422a6a3072
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index 522098b..a8aeaa4 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.4
+Version:	1.1.5
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4


From 10aa6afd0cb93d745296a8ea16969b3cd623e87d Mon Sep 17 00:00:00 2001
From: JengHyun Kang <jhyuni.kang@samsung.com>
Date: Thu, 2 Feb 2017 12:19:46 +0900
Subject: [PATCH 10/16] tizen_input_device_manager: Add a class value to
 initialize input generator

Change-Id: Ie0e3298a149e362097ddd5d791e22345ad5979a2
---
 protocol/tizen-extension.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/protocol/tizen-extension.xml b/protocol/tizen-extension.xml
index 15c5484..0008a8a 100644
--- a/protocol/tizen-extension.xml
+++ b/protocol/tizen-extension.xml
@@ -1057,11 +1057,13 @@
     <request name="init_generator">
       <description summary="initialize input generator system">
       </description>
+      <arg name="clas" type="uint" enum="clas"/>
     </request>
 
     <request name="deinit_generator">
       <description summary="deinitialize input generator system">
       </description>
+      <arg name="clas" type="uint" enum="clas"/>
     </request>
 
     <request name="generate_key">
-- 
2.7.4


From 4c293d48adb7f495b51704ed62f3b5abd1e58908 Mon Sep 17 00:00:00 2001
From: JengHyun Kang <jhyuni.kang@samsung.com>
Date: Thu, 2 Feb 2017 20:50:27 +0900
Subject: [PATCH 11/16] Packaging : update version to 1.1.6

Change-Id: I4e105e40052a4a9b67577ffe2dc0319924530790
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index a8aeaa4..9a61fe9 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.5
+Version:	1.1.6
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4


From 2bd25f9255424cc11dabe309fc43e3dac297573d Mon Sep 17 00:00:00 2001
From: kyoungsik park <kstyle.park@samsung.com>
Date: Fri, 3 Feb 2017 11:03:20 +0900
Subject: [PATCH 12/16] tizen_video_object: add request
 follow_topmost_visibility

Change-Id: I3833e770453248844255bac82fb8021dd5cc750d
Signed-off-by: kyoungsik park <kstyle.park@samsung.com>
---
 protocol/tizen-extension.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 mode change 100644 => 100755 protocol/tizen-extension.xml

diff --git a/protocol/tizen-extension.xml b/protocol/tizen-extension.xml
old mode 100644
new mode 100755
index 0008a8a..303d3b1
--- a/protocol/tizen-extension.xml
+++ b/protocol/tizen-extension.xml
@@ -700,6 +700,20 @@
       <arg name="value" type="int"/>
     </request>
 
+    <request name="follow_topmost_visibility">
+      <description summary="follow mute control change of a topmost surface">
+        If tizen_video_object.follow_topmost_visibility is applied to a video_object,
+        It will be video mute control based on topmost visibility.
+      </description>
+    </request>
+
+    <request name="unfollow_topmost_visibility">
+      <description summary="unfollow mute control change of a topmost surface">
+        If tizen_video_object.unfollow_topmost_visibility is applied to a video_object,
+        It will not be video mute control based on topmost visibility.
+      </description>
+    </request>
+
   </interface>
 
   <interface name="tizen_subsurface_watcher" version="1">
-- 
2.7.4


From 4e07527c18a33178498f437821d6b807a7f9f0a6 Mon Sep 17 00:00:00 2001
From: SooChan Lim <sc1.lim@samsung.com>
Date: Fri, 3 Feb 2017 14:30:47 +0900
Subject: [PATCH 13/16] Packaging : update version to 1.1.7

Change-Id: Idce3f4097391d0043fd4ccdeaf55a73b588e850c
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index 9a61fe9..d3816de 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.6
+Version:	1.1.7
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4


From 171f28e9dea640ae3b25e3f01e3864a01dccbff4 Mon Sep 17 00:00:00 2001
From: Wonkeun Oh <wonkeun.oh@samsung.com>
Date: Tue, 7 Feb 2017 17:31:14 +0900
Subject: [PATCH 14/16] input-method: Added update_ise_geometry protocol

Change-Id: I518c64ed492ef0b094ebcb0a35d1b86b60d56242
---
 protocol/input-method.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/protocol/input-method.xml b/protocol/input-method.xml
index 43abe7b..d143229 100644
--- a/protocol/input-method.xml
+++ b/protocol/input-method.xml
@@ -211,6 +211,13 @@
       <arg name="serial" type="uint"/>
       <arg name="state" type="uint"/>
     </request>
+    <request name="update_ise_geometry">
+      <arg name="serial" type="uint"/>
+      <arg name="x" type="uint"/>
+      <arg name="y" type="uint"/>
+      <arg name="width" type="uint"/>
+      <arg name="height" type="uint"/>
+    </request>
     <event name="reset">
     </event>
     <event name="content_type">
-- 
2.7.4


From c91d45564533bf675ed4ede73f4f2347f91305e2 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Wed, 8 Feb 2017 19:01:59 +0900
Subject: [PATCH 15/16] text/inputmethod: fix typos

Change-Id: I816406cdafb87be692f07f700c42c5c0822c35a3
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---
 protocol/input-method.xml | 26 +++++++++++++-------------
 protocol/text.xml         | 25 +++++++++++++------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/protocol/input-method.xml b/protocol/input-method.xml
index d143229..0821a07 100644
--- a/protocol/input-method.xml
+++ b/protocol/input-method.xml
@@ -27,9 +27,9 @@
 
   <interface name="wl_input_method_context" version="1">
     <description summary="input method context">
-      Corresponds to a text model on input method side. An input method context
-      is created on text model activation on the input method side. It allows to
-      receive information about the text model from the application via events.
+      Corresponds to a text input on input method side. An input method context
+      is created on text input activation on the input method side. It allows to
+      receive information about the text input from the application via events.
       Input method contexts do not keep state after deactivation and should be
       destroyed after deactivation is handled.
 
@@ -126,8 +126,8 @@
       <description summary="keysym">
         Notify when a key event was sent. Key events should not be used for
         normal text input operations, which should be done with commit_string,
-        delete_surrounfing_text, etc. The key event follows the wl_keyboard key
-        event convention. Sym is a XKB keysym, state a wl_keyboard key_state.
+        delete_surrounding_text, etc. The key event follows the wl_keyboard key
+        event convention. Sym is an XKB keysym, state is a wl_keyboard key_state.
       </description>
       <arg name="serial" type="uint" summary="serial of the latest known text input state"/>
       <arg name="time" type="uint"/>
@@ -137,7 +137,7 @@
     </request>
     <request name="grab_keyboard">
       <description summary="grab hardware keyboard">
-        Allows an input method to receive hardware keyboard input and process
+        Allow an input method to receive hardware keyboard input and process
         key events to generate text events (with pre-edit) over the wire. This
         allows input methods which compose multiple key events for inputting
         text like it is done for CJK languages.
@@ -278,15 +278,15 @@
 
   <interface name="wl_input_method" version="1">
     <description summary="input method">
-      An input method object is responsible to compose text in response to
+      An input method object is responsible for composing text in response to
       input from hardware or virtual keyboards. There is one input method
       object per seat. On activate there is a new input method context object
-      created which allows the input method to communicate with the text model.
+      created which allows the input method to communicate with the text input.
     </description>
     <event name="activate">
       <description summary="activate event">
-        A text model was activated. Creates an input method context object
-        which allows communication with the text model.
+        A text input was activated. Creates an input method context object
+        which allows communication with the text input.
       </description>
       <arg name="id" type="new_id" interface="wl_input_method_context"/>
       <arg name="text_input_id" type="uint"/>
@@ -294,7 +294,7 @@
     </event>
     <event name="deactivate">
       <description summary="deactivate event">
-        The text model corresponding to the context argument was deactivated.
+        The text input corresponding to the context argument was deactivated.
         The input method context should be destroyed after deactivation is
         handled.
       </description>
@@ -333,7 +333,7 @@
 
     <request name="set_toplevel">
       <description summary="set the surface type as a keyboard">
-        A keyboard surface is only shown, when a text model is active.
+        A keyboard surface is only shown, when a text input is active.
       </description>
       <arg name="output" type="object" interface="wl_output"/>
       <arg name="position" type="uint"/>
@@ -342,7 +342,7 @@
     <request name="set_overlay_panel">
       <description summary="set the surface type as an overlay panel">
         An overlay panel is shown near the input cursor above the application
-        window when a text model is active.
+        window when a text input is active.
       </description>
     </request>
 
diff --git a/protocol/text.xml b/protocol/text.xml
index b35c36f..07451e2 100644
--- a/protocol/text.xml
+++ b/protocol/text.xml
@@ -29,12 +29,13 @@
   <interface name="wl_text_input" version="1">
     <description summary="text input">
       An object used for text input. Adds support for text input and input
-      methods to applications. A text-input object is created from a
+      methods to applications. A text_input object is created from a
       wl_text_input_manager and corresponds typically to a text entry in an
       application.
-      Requests are used to activate/deactivate the text-input object and set
+
+      Requests are used to activate/deactivate the text_input object and set
       state information like surrounding and selected text or the content type.
-      The information about entered text is sent to the text-input object via
+      The information about entered text is sent to the text_input object via
       the pre-edit and commit events. Using this interface removes the need
       for applications to directly process hardware key events and compose text
       out of them.
@@ -51,11 +52,11 @@
     <request name="destroy" type="destructor"/>
     <request name="activate">
       <description summary="request activation">
-        Requests the text-input object to be activated (typically when the
+        Requests the text_input object to be activated (typically when the
         text entry gets focus).
         The seat argument is a wl_seat which maintains the focus for this
         activation. The surface argument is a wl_surface assigned to the
-        text-input object and tracked for focus lost. The enter event
+        text_input object and tracked for focus lost. The enter event
         is emitted on successful activation.
       </description>
       <arg name="seat" type="object" interface="wl_seat"/>
@@ -63,7 +64,7 @@
     </request>
     <request name="deactivate">
       <description summary="request deactivation">
-        Requests the text-input object to be deactivated (typically when the
+        Requests the text_input object to be deactivated (typically when the
         text entry lost focus). The seat argument is a wl_seat which was used
         for activation.
       </description>
@@ -159,7 +160,7 @@
     <request name="set_preferred_language">
       <description summary="set preferred language">
         Set a specific language. This allows for example a virtual keyboard to
-        show a language specific layout. The "language" argument is a RFC-3066
+        show a language specific layout. The "language" argument is an RFC-3066
         format language tag.
 
         It could be used for example in a word processor to indicate language of
@@ -254,14 +255,14 @@
     </request>
     <event name="enter">
       <description summary="enter event">
-        Notify the text-input object when it received focus. Typically in
+        Notify the text_input object when it received focus. Typically in
         response to an activate request.
       </description>
       <arg name="surface" type="object" interface="wl_surface"/>
     </event>
     <event name="leave">
       <description summary="leave event">
-        Notify the text-input object when it lost focus. Either in response
+        Notify the text_input object when it lost focus. Either in response
         to a deactivate request or when the assigned surface lost focus or was
         destroyed.
       </description>
@@ -387,7 +388,7 @@
     </event>
     <event name="language">
       <description summary="language">
-        Set the language of the input text. The "language" argument is a RFC-3066
+        Set the language of the input text. The "language" argument is an RFC-3066
         format language tag.
       </description>
       <arg name="serial" type="uint" summary="serial of the latest known text input state"/>
@@ -464,11 +465,11 @@
 
   <interface name="wl_text_input_manager" version="1">
     <description summary="text input manager">
-      A factory for text-input objects. This object is a global singleton.
+      A factory for text_input objects. This object is a global singleton.
     </description>
     <request name="create_text_input">
       <description summary="create text input">
-        Creates a new text-input object.
+        Creates a new text_input object.
       </description>
       <arg name="id" type="new_id" interface="wl_text_input"/>
     </request>
-- 
2.7.4


From bccdd8f439053cc7f8ccb266297badcc1ccb3c75 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Wed, 8 Feb 2017 19:04:29 +0900
Subject: [PATCH 16/16] Packaging : update version to 1.1.8

Change-Id: I57169b9430f3c337010666915cf274e4327cf35f
---
 packaging/wayland-extension.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wayland-extension.spec b/packaging/wayland-extension.spec
index d3816de..4dd9e38 100644
--- a/packaging/wayland-extension.spec
+++ b/packaging/wayland-extension.spec
@@ -1,5 +1,5 @@
 Name:		wayland-extension
-Version:	1.1.7
+Version:	1.1.8
 Release:	0
 Summary:	Wayland Extension Protocol
 License:	MIT
-- 
2.7.4