Update to latest xproto XML.

1 files changed, 106 insertions, 106 deletions

diff --git a/nexgb/xtest/xtest.go b/nexgb/xtest/xtest.go
index 30d96ec..505622a 100644
--- a/nexgb/xtest/xtest.go
+++ b/nexgb/xtest/xtest.go
@@ -2,7 +2,7 @@
 package xtest
 
 /*
-	This file was generated by xtest.xml on Jun 5 2012 12:12:00am EDT.
+	This file was generated by xtest.xml on Aug 11 2013 8:39:44pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,128 +40,34 @@ func init() {
 	xgb.NewExtErrorFuncs["XTEST"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Void'
+const (
+	CursorNone    = 0
+	CursorCurrent = 1
+)
 
-// Skipping definition for base type 'Byte'
+// Skipping definition for base type 'Bool'
 
-// Skipping definition for base type 'Int8'
+// Skipping definition for base type 'Byte'
 
-// Skipping definition for base type 'Card16'
+// Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Char'
 
-// Skipping definition for base type 'Card32'
+// Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Double'
 
-// Skipping definition for base type 'Bool'
-
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
 // Skipping definition for base type 'Int16'
 
 // Skipping definition for base type 'Int32'
 
-const (
-	CursorNone    = 0
-	CursorCurrent = 1
-)
-
-// GetVersionCookie is a cookie used only for GetVersion requests.
-type GetVersionCookie struct {
-	*xgb.Cookie
-}
-
-// GetVersion sends a checked request.
-// If an error occurs, it will be returned with the reply by calling GetVersionCookie.Reply()
-func GetVersion(c *xgb.Conn, MajorVersion byte, MinorVersion uint16) GetVersionCookie {
-	if _, ok := c.Extensions["XTEST"]; !ok {
-		panic("Cannot issue request 'GetVersion' using the uninitialized extension 'XTEST'. xtest.Init(connObj) must be called first.")
-	}
-	cookie := c.NewCookie(true, true)
-	c.NewRequest(getVersionRequest(c, MajorVersion, MinorVersion), cookie)
-	return GetVersionCookie{cookie}
-}
-
-// GetVersionUnchecked sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func GetVersionUnchecked(c *xgb.Conn, MajorVersion byte, MinorVersion uint16) GetVersionCookie {
-	if _, ok := c.Extensions["XTEST"]; !ok {
-		panic("Cannot issue request 'GetVersion' using the uninitialized extension 'XTEST'. xtest.Init(connObj) must be called first.")
-	}
-	cookie := c.NewCookie(false, true)
-	c.NewRequest(getVersionRequest(c, MajorVersion, MinorVersion), cookie)
-	return GetVersionCookie{cookie}
-}
-
-// GetVersionReply represents the data returned from a GetVersion request.
-type GetVersionReply struct {
-	Sequence     uint16 // sequence number of the request for this reply
-	Length       uint32 // number of bytes in this reply
-	MajorVersion byte
-	MinorVersion uint16
-}
-
-// Reply blocks and returns the reply data for a GetVersion request.
-func (cook GetVersionCookie) Reply() (*GetVersionReply, error) {
-	buf, err := cook.Cookie.Reply()
-	if err != nil {
-		return nil, err
-	}
-	if buf == nil {
-		return nil, nil
-	}
-	return getVersionReply(buf), nil
-}
-
-// getVersionReply reads a byte slice into a GetVersionReply value.
-func getVersionReply(buf []byte) *GetVersionReply {
-	v := new(GetVersionReply)
-	b := 1 // skip reply determinant
-
-	v.MajorVersion = buf[b]
-	b += 1
-
-	v.Sequence = xgb.Get16(buf[b:])
-	b += 2
-
-	v.Length = xgb.Get32(buf[b:]) // 4-byte units
-	b += 4
-
-	v.MinorVersion = xgb.Get16(buf[b:])
-	b += 2
-
-	return v
-}
-
-// Write request to wire for GetVersion
-// getVersionRequest writes a GetVersion request to a byte slice.
-func getVersionRequest(c *xgb.Conn, MajorVersion byte, MinorVersion uint16) []byte {
-	size := 8
-	b := 0
-	buf := make([]byte, size)
-
-	buf[b] = c.Extensions["XTEST"]
-	b += 1
-
-	buf[b] = 0 // request opcode
-	b += 1
-
-	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
-	b += 2
-
-	buf[b] = MajorVersion
-	b += 1
-
-	b += 1 // padding
+// Skipping definition for base type 'Int8'
 
-	xgb.Put16(buf[b:], MinorVersion)
-	b += 2
+// Skipping definition for base type 'Card16'
 
-	return buf
-}
+// Skipping definition for base type 'Card32'
 
 // CompareCursorCookie is a cookie used only for CompareCursor requests.
 type CompareCursorCookie struct {
@@ -334,6 +240,100 @@ func fakeInputRequest(c *xgb.Conn, Type byte, Detail byte, Time uint32, Root xpr
 	return buf
 }
 
+// GetVersionCookie is a cookie used only for GetVersion requests.
+type GetVersionCookie struct {
+	*xgb.Cookie
+}
+
+// GetVersion sends a checked request.
+// If an error occurs, it will be returned with the reply by calling GetVersionCookie.Reply()
+func GetVersion(c *xgb.Conn, MajorVersion byte, MinorVersion uint16) GetVersionCookie {
+	if _, ok := c.Extensions["XTEST"]; !ok {
+		panic("Cannot issue request 'GetVersion' using the uninitialized extension 'XTEST'. xtest.Init(connObj) must be called first.")
+	}
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(getVersionRequest(c, MajorVersion, MinorVersion), cookie)
+	return GetVersionCookie{cookie}
+}
+
+// GetVersionUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func GetVersionUnchecked(c *xgb.Conn, MajorVersion byte, MinorVersion uint16) GetVersionCookie {
+	if _, ok := c.Extensions["XTEST"]; !ok {
+		panic("Cannot issue request 'GetVersion' using the uninitialized extension 'XTEST'. xtest.Init(connObj) must be called first.")
+	}
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(getVersionRequest(c, MajorVersion, MinorVersion), cookie)
+	return GetVersionCookie{cookie}
+}
+
+// GetVersionReply represents the data returned from a GetVersion request.
+type GetVersionReply struct {
+	Sequence     uint16 // sequence number of the request for this reply
+	Length       uint32 // number of bytes in this reply
+	MajorVersion byte
+	MinorVersion uint16
+}
+
+// Reply blocks and returns the reply data for a GetVersion request.
+func (cook GetVersionCookie) Reply() (*GetVersionReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return getVersionReply(buf), nil
+}
+
+// getVersionReply reads a byte slice into a GetVersionReply value.
+func getVersionReply(buf []byte) *GetVersionReply {
+	v := new(GetVersionReply)
+	b := 1 // skip reply determinant
+
+	v.MajorVersion = buf[b]
+	b += 1
+
+	v.Sequence = xgb.Get16(buf[b:])
+	b += 2
+
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	v.MinorVersion = xgb.Get16(buf[b:])
+	b += 2
+
+	return v
+}
+
+// Write request to wire for GetVersion
+// getVersionRequest writes a GetVersion request to a byte slice.
+func getVersionRequest(c *xgb.Conn, MajorVersion byte, MinorVersion uint16) []byte {
+	size := 8
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["XTEST"]
+	b += 1
+
+	buf[b] = 0 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	buf[b] = MajorVersion
+	b += 1
+
+	b += 1 // padding
+
+	xgb.Put16(buf[b:], MinorVersion)
+	b += 2
+
+	return buf
+}
+
 // GrabControlCookie is a cookie used only for GrabControl requests.
 type GrabControlCookie struct {
 	*xgb.Cookie