Merge branch 'devel/upgrade' into tizensubmit/tizen/20140417.073530accepted/tizen/mobile/20140519.082429

Change-Id: I6cbfae8f651ede15c0567c28f5d76cc212f26428
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

1 files changed, 92 insertions, 78 deletions

diff --git a/src/xproto.xml b/src/xproto.xml
index bf4dcbf..0779568 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -889,74 +889,74 @@ A timestamp of the server time when the property was changed.
   <enum name="Atom">
     <item name="None"> <value>0</value></item>
     <item name="Any">  <value>0</value></item>
-    <item name="PRIMARY" />
-    <item name="SECONDARY" />
-    <item name="ARC" />
-    <item name="ATOM" />
-    <item name="BITMAP" />
-    <item name="CARDINAL" />
-    <item name="COLORMAP" />
-    <item name="CURSOR" />
-    <item name="CUT_BUFFER0" />
-    <item name="CUT_BUFFER1" />
-    <item name="CUT_BUFFER2" />
-    <item name="CUT_BUFFER3" />
-    <item name="CUT_BUFFER4" />
-    <item name="CUT_BUFFER5" />
-    <item name="CUT_BUFFER6" />
-    <item name="CUT_BUFFER7" />
-    <item name="DRAWABLE" />
-    <item name="FONT" />
-    <item name="INTEGER" />
-    <item name="PIXMAP" />
-    <item name="POINT" />
-    <item name="RECTANGLE" />
-    <item name="RESOURCE_MANAGER" />
-    <item name="RGB_COLOR_MAP" />
-    <item name="RGB_BEST_MAP" />
-    <item name="RGB_BLUE_MAP" />
-    <item name="RGB_DEFAULT_MAP" />
-    <item name="RGB_GRAY_MAP" />
-    <item name="RGB_GREEN_MAP" />
-    <item name="RGB_RED_MAP" />
-    <item name="STRING" />
-    <item name="VISUALID" />
-    <item name="WINDOW" />
-    <item name="WM_COMMAND" />
-    <item name="WM_HINTS" />
-    <item name="WM_CLIENT_MACHINE" />
-    <item name="WM_ICON_NAME" />
-    <item name="WM_ICON_SIZE" />
-    <item name="WM_NAME" />
-    <item name="WM_NORMAL_HINTS" />
-    <item name="WM_SIZE_HINTS" />
-    <item name="WM_ZOOM_HINTS" />
-    <item name="MIN_SPACE" />
-    <item name="NORM_SPACE" />
-    <item name="MAX_SPACE" />
-    <item name="END_SPACE" />
-    <item name="SUPERSCRIPT_X" />
-    <item name="SUPERSCRIPT_Y" />
-    <item name="SUBSCRIPT_X" />
-    <item name="SUBSCRIPT_Y" />
-    <item name="UNDERLINE_POSITION" />
-    <item name="UNDERLINE_THICKNESS" />
-    <item name="STRIKEOUT_ASCENT" />
-    <item name="STRIKEOUT_DESCENT" />
-    <item name="ITALIC_ANGLE" />
-    <item name="X_HEIGHT" />
-    <item name="QUAD_WIDTH" />
-    <item name="WEIGHT" />
-    <item name="POINT_SIZE" />
-    <item name="RESOLUTION" />
-    <item name="COPYRIGHT" />
-    <item name="NOTICE" />
-    <item name="FONT_NAME" />
-    <item name="FAMILY_NAME" />
-    <item name="FULL_NAME" />
-    <item name="CAP_HEIGHT" />
-    <item name="WM_CLASS" />
-    <item name="WM_TRANSIENT_FOR" />
+    <item name="PRIMARY">              <value>1</value> </item>
+    <item name="SECONDARY">            <value>2</value> </item>
+    <item name="ARC">                  <value>3</value> </item>
+    <item name="ATOM">                 <value>4</value> </item>
+    <item name="BITMAP">               <value>5</value> </item>
+    <item name="CARDINAL">             <value>6</value> </item>
+    <item name="COLORMAP">             <value>7</value> </item>
+    <item name="CURSOR">               <value>8</value> </item>
+    <item name="CUT_BUFFER0">          <value>9</value> </item>
+    <item name="CUT_BUFFER1">          <value>10</value> </item>
+    <item name="CUT_BUFFER2">          <value>11</value> </item>
+    <item name="CUT_BUFFER3">          <value>12</value> </item>
+    <item name="CUT_BUFFER4">          <value>13</value> </item>
+    <item name="CUT_BUFFER5">          <value>14</value> </item>
+    <item name="CUT_BUFFER6">          <value>15</value> </item>
+    <item name="CUT_BUFFER7">          <value>16</value> </item>
+    <item name="DRAWABLE">             <value>17</value> </item>
+    <item name="FONT">                 <value>18</value> </item>
+    <item name="INTEGER">              <value>19</value> </item>
+    <item name="PIXMAP">               <value>20</value> </item>
+    <item name="POINT">                <value>21</value> </item>
+    <item name="RECTANGLE">            <value>22</value> </item>
+    <item name="RESOURCE_MANAGER">     <value>23</value> </item>
+    <item name="RGB_COLOR_MAP">        <value>24</value> </item>
+    <item name="RGB_BEST_MAP">         <value>25</value> </item>
+    <item name="RGB_BLUE_MAP">         <value>26</value> </item>
+    <item name="RGB_DEFAULT_MAP">      <value>27</value> </item>
+    <item name="RGB_GRAY_MAP">         <value>28</value> </item>
+    <item name="RGB_GREEN_MAP">        <value>29</value> </item>
+    <item name="RGB_RED_MAP">          <value>30</value> </item>
+    <item name="STRING">               <value>31</value> </item>
+    <item name="VISUALID">             <value>32</value> </item>
+    <item name="WINDOW">               <value>33</value> </item>
+    <item name="WM_COMMAND">           <value>34</value> </item>
+    <item name="WM_HINTS">             <value>35</value> </item>
+    <item name="WM_CLIENT_MACHINE">    <value>36</value> </item>
+    <item name="WM_ICON_NAME">         <value>37</value> </item>
+    <item name="WM_ICON_SIZE">         <value>38</value> </item>
+    <item name="WM_NAME">              <value>39</value> </item>
+    <item name="WM_NORMAL_HINTS">      <value>40</value> </item>
+    <item name="WM_SIZE_HINTS">        <value>41</value> </item>
+    <item name="WM_ZOOM_HINTS">        <value>42</value> </item>
+    <item name="MIN_SPACE">            <value>43</value> </item>
+    <item name="NORM_SPACE">           <value>44</value> </item>
+    <item name="MAX_SPACE">            <value>45</value> </item>
+    <item name="END_SPACE">            <value>46</value> </item>
+    <item name="SUPERSCRIPT_X">        <value>47</value> </item>
+    <item name="SUPERSCRIPT_Y">        <value>48</value> </item>
+    <item name="SUBSCRIPT_X">          <value>49</value> </item>
+    <item name="SUBSCRIPT_Y">          <value>50</value> </item>
+    <item name="UNDERLINE_POSITION">   <value>51</value> </item>
+    <item name="UNDERLINE_THICKNESS">  <value>52</value> </item>
+    <item name="STRIKEOUT_ASCENT">     <value>53</value> </item>
+    <item name="STRIKEOUT_DESCENT">    <value>54</value> </item>
+    <item name="ITALIC_ANGLE">         <value>55</value> </item>
+    <item name="X_HEIGHT">             <value>56</value> </item>
+    <item name="QUAD_WIDTH">           <value>57</value> </item>
+    <item name="WEIGHT">               <value>58</value> </item>
+    <item name="POINT_SIZE">           <value>59</value> </item>
+    <item name="RESOLUTION">           <value>60</value> </item>
+    <item name="COPYRIGHT">            <value>61</value> </item>
+    <item name="NOTICE">               <value>62</value> </item>
+    <item name="FONT_NAME">            <value>63</value> </item>
+    <item name="FAMILY_NAME">          <value>64</value> </item>
+    <item name="FULL_NAME">            <value>65</value> </item>
+    <item name="CAP_HEIGHT">           <value>66</value> </item>
+    <item name="WM_CLASS">             <value>67</value> </item>
+    <item name="WM_TRANSIENT_FOR">     <value>68</value> </item>
   </enum>
 
   <event name="SelectionRequest" number="30">
@@ -1080,7 +1080,21 @@ The number of keycodes altered.
     </doc>
   </event>
 
-
+  <event name="GeGeneric" number="35" xge="true">
+    <pad bytes="22" />
+    <doc>
+      <brief>generic event (with length)</brief>
+      <field name="extension"><![CDATA[
+The major opcode of the extension creating this event
+      ]]></field>
+      <field name="length"><![CDATA[
+The amount (in 4-byte units) of data beyond 32 bytes
+      ]]></field>
+      <field name="evtype"><![CDATA[
+The extension-specific event type
+      ]]></field>
+    </doc>
+  </event>
 
   <!-- Core error types -->
 
@@ -3404,7 +3418,7 @@ The number of characters in `string`.
       <field name="string"><![CDATA[
 The text to get text extents for.
       ]]></field>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified graphics context does not exist.
       ]]></error>
       <error type="Font"><![CDATA[
@@ -3953,7 +3967,7 @@ example.
       <error type="Font"><![CDATA[
 TODO: reasons?
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 TODO: reasons?
       ]]></error>
       <error type="Match"><![CDATA[
@@ -4012,7 +4026,7 @@ The X server could not allocate the requested resources (no memory?).
 Destroys the specified `gc` and all associated storage.
       ]]></description>
       <field name="gc"><![CDATA[The graphics context to destroy.]]></field>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified graphics context does not exist.
       ]]></error>
     </doc>
@@ -4073,7 +4087,7 @@ The height of the area to copy (in pixels).
       <error type="Drawable"><![CDATA[
 The specified `drawable` (Window or Pixmap) does not exist.
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified graphics context does not exist.
       ]]></error>
       <error type="Match"><![CDATA[
@@ -4162,7 +4176,7 @@ An array of points.
       <error type="Drawable"><![CDATA[
 TODO: reasons?
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 TODO: reasons?
       ]]></error>
       <error type="Match"><![CDATA[
@@ -4216,7 +4230,7 @@ An array of `xcb_segment_t` structures.
       <error type="Drawable"><![CDATA[
 The specified `drawable` does not exist.
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified `gc` does not exist.
       ]]></error>
       <error type="Match"><![CDATA[
@@ -4294,7 +4308,7 @@ The rectangles to fill.
       <error type="Drawable"><![CDATA[
 The specified `drawable` (Window or Pixmap) does not exist.
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified graphics context does not exist.
       ]]></error>
       <error type="Match"><![CDATA[
@@ -4417,7 +4431,7 @@ background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
       <error type="Drawable"><![CDATA[
 The specified `drawable` (Window or Pixmap) does not exist.
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified graphics context does not exist.
       ]]></error>
       <error type="Match"><![CDATA[
@@ -4475,7 +4489,7 @@ background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
       <error type="Drawable"><![CDATA[
 The specified `drawable` (Window or Pixmap) does not exist.
       ]]></error>
-      <error type="GC"><![CDATA[
+      <error type="GContext"><![CDATA[
 The specified graphics context does not exist.
       ]]></error>
       <error type="Match"><![CDATA[