aboutsummaryrefslogtreecommitdiff
path: root/nexgb/xcmisc
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2013-08-11 20:43:26 -0400
committerPřemysl Janouch <p@janouch.name>2018-09-08 16:49:17 +0200
commit0685fb57e14104ee4ad9f70ec94f787a9a22c028 (patch)
treec52429c82379c154c95dbfafcfc52460ec9168c0 /nexgb/xcmisc
parent4b20ffaf4f4cc756832a6d064d5dfe182f16b0e9 (diff)
downloadhaven-0685fb57e14104ee4ad9f70ec94f787a9a22c028.tar.gz
haven-0685fb57e14104ee4ad9f70ec94f787a9a22c028.tar.xz
haven-0685fb57e14104ee4ad9f70ec94f787a9a22c028.zip
Update to latest xproto XML.
Diffstat (limited to 'nexgb/xcmisc')
-rw-r--r--nexgb/xcmisc/xcmisc.go164
1 files changed, 82 insertions, 82 deletions
diff --git a/nexgb/xcmisc/xcmisc.go b/nexgb/xcmisc/xcmisc.go
index dce0e9d..e32ae42 100644
--- a/nexgb/xcmisc/xcmisc.go
+++ b/nexgb/xcmisc/xcmisc.go
@@ -2,7 +2,7 @@
package xcmisc
/*
- This file was generated by xc_misc.xml on Jun 5 2012 12:11:59am EDT.
+ This file was generated by xc_misc.xml on Aug 11 2013 8:39:43pm EDT.
This file is automatically generated. Edit at your peril!
*/
@@ -40,29 +40,29 @@ func init() {
xgb.NewExtErrorFuncs["XC-MISC"] = make(map[int]xgb.NewErrorFun)
}
-// Skipping definition for base type 'Int8'
+// Skipping definition for base type 'Bool'
-// Skipping definition for base type 'Card16'
+// Skipping definition for base type 'Byte'
+
+// 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'
-// Skipping definition for base type 'Void'
+// Skipping definition for base type 'Int8'
-// Skipping definition for base type 'Byte'
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Card32'
// GetVersionCookie is a cookie used only for GetVersion requests.
type GetVersionCookie struct {
@@ -159,44 +159,45 @@ func getVersionRequest(c *xgb.Conn, ClientMajorVersion uint16, ClientMinorVersio
return buf
}
-// GetXIDRangeCookie is a cookie used only for GetXIDRange requests.
-type GetXIDRangeCookie struct {
+// GetXIDListCookie is a cookie used only for GetXIDList requests.
+type GetXIDListCookie struct {
*xgb.Cookie
}
-// GetXIDRange sends a checked request.
-// If an error occurs, it will be returned with the reply by calling GetXIDRangeCookie.Reply()
-func GetXIDRange(c *xgb.Conn) GetXIDRangeCookie {
+// GetXIDList sends a checked request.
+// If an error occurs, it will be returned with the reply by calling GetXIDListCookie.Reply()
+func GetXIDList(c *xgb.Conn, Count uint32) GetXIDListCookie {
if _, ok := c.Extensions["XC-MISC"]; !ok {
- panic("Cannot issue request 'GetXIDRange' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
+ panic("Cannot issue request 'GetXIDList' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, true)
- c.NewRequest(getXIDRangeRequest(c), cookie)
- return GetXIDRangeCookie{cookie}
+ c.NewRequest(getXIDListRequest(c, Count), cookie)
+ return GetXIDListCookie{cookie}
}
-// GetXIDRangeUnchecked sends an unchecked request.
+// GetXIDListUnchecked sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func GetXIDRangeUnchecked(c *xgb.Conn) GetXIDRangeCookie {
+func GetXIDListUnchecked(c *xgb.Conn, Count uint32) GetXIDListCookie {
if _, ok := c.Extensions["XC-MISC"]; !ok {
- panic("Cannot issue request 'GetXIDRange' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
+ panic("Cannot issue request 'GetXIDList' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, true)
- c.NewRequest(getXIDRangeRequest(c), cookie)
- return GetXIDRangeCookie{cookie}
+ c.NewRequest(getXIDListRequest(c, Count), cookie)
+ return GetXIDListCookie{cookie}
}
-// GetXIDRangeReply represents the data returned from a GetXIDRange request.
-type GetXIDRangeReply struct {
+// GetXIDListReply represents the data returned from a GetXIDList request.
+type GetXIDListReply struct {
Sequence uint16 // sequence number of the request for this reply
Length uint32 // number of bytes in this reply
// padding: 1 bytes
- StartId uint32
- Count uint32
+ IdsLen uint32
+ // padding: 20 bytes
+ Ids []uint32 // size: xgb.Pad((int(IdsLen) * 4))
}
-// Reply blocks and returns the reply data for a GetXIDRange request.
-func (cook GetXIDRangeCookie) Reply() (*GetXIDRangeReply, error) {
+// Reply blocks and returns the reply data for a GetXIDList request.
+func (cook GetXIDListCookie) Reply() (*GetXIDListReply, error) {
buf, err := cook.Cookie.Reply()
if err != nil {
return nil, err
@@ -204,12 +205,12 @@ func (cook GetXIDRangeCookie) Reply() (*GetXIDRangeReply, error) {
if buf == nil {
return nil, nil
}
- return getXIDRangeReply(buf), nil
+ return getXIDListReply(buf), nil
}
-// getXIDRangeReply reads a byte slice into a GetXIDRangeReply value.
-func getXIDRangeReply(buf []byte) *GetXIDRangeReply {
- v := new(GetXIDRangeReply)
+// getXIDListReply reads a byte slice into a GetXIDListReply value.
+func getXIDListReply(buf []byte) *GetXIDListReply {
+ v := new(GetXIDListReply)
b := 1 // skip reply determinant
b += 1 // padding
@@ -220,73 +221,81 @@ func getXIDRangeReply(buf []byte) *GetXIDRangeReply {
v.Length = xgb.Get32(buf[b:]) // 4-byte units
b += 4
- v.StartId = xgb.Get32(buf[b:])
+ v.IdsLen = xgb.Get32(buf[b:])
b += 4
- v.Count = xgb.Get32(buf[b:])
- b += 4
+ b += 20 // padding
+
+ v.Ids = make([]uint32, v.IdsLen)
+ for i := 0; i < int(v.IdsLen); i++ {
+ v.Ids[i] = xgb.Get32(buf[b:])
+ b += 4
+ }
+ b = xgb.Pad(b)
return v
}
-// Write request to wire for GetXIDRange
-// getXIDRangeRequest writes a GetXIDRange request to a byte slice.
-func getXIDRangeRequest(c *xgb.Conn) []byte {
- size := 4
+// Write request to wire for GetXIDList
+// getXIDListRequest writes a GetXIDList request to a byte slice.
+func getXIDListRequest(c *xgb.Conn, Count uint32) []byte {
+ size := 8
b := 0
buf := make([]byte, size)
buf[b] = c.Extensions["XC-MISC"]
b += 1
- buf[b] = 1 // request opcode
+ buf[b] = 2 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
b += 2
+ xgb.Put32(buf[b:], Count)
+ b += 4
+
return buf
}
-// GetXIDListCookie is a cookie used only for GetXIDList requests.
-type GetXIDListCookie struct {
+// GetXIDRangeCookie is a cookie used only for GetXIDRange requests.
+type GetXIDRangeCookie struct {
*xgb.Cookie
}
-// GetXIDList sends a checked request.
-// If an error occurs, it will be returned with the reply by calling GetXIDListCookie.Reply()
-func GetXIDList(c *xgb.Conn, Count uint32) GetXIDListCookie {
+// GetXIDRange sends a checked request.
+// If an error occurs, it will be returned with the reply by calling GetXIDRangeCookie.Reply()
+func GetXIDRange(c *xgb.Conn) GetXIDRangeCookie {
if _, ok := c.Extensions["XC-MISC"]; !ok {
- panic("Cannot issue request 'GetXIDList' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
+ panic("Cannot issue request 'GetXIDRange' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, true)
- c.NewRequest(getXIDListRequest(c, Count), cookie)
- return GetXIDListCookie{cookie}
+ c.NewRequest(getXIDRangeRequest(c), cookie)
+ return GetXIDRangeCookie{cookie}
}
-// GetXIDListUnchecked sends an unchecked request.
+// GetXIDRangeUnchecked sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func GetXIDListUnchecked(c *xgb.Conn, Count uint32) GetXIDListCookie {
+func GetXIDRangeUnchecked(c *xgb.Conn) GetXIDRangeCookie {
if _, ok := c.Extensions["XC-MISC"]; !ok {
- panic("Cannot issue request 'GetXIDList' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
+ panic("Cannot issue request 'GetXIDRange' using the uninitialized extension 'XC-MISC'. xcmisc.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, true)
- c.NewRequest(getXIDListRequest(c, Count), cookie)
- return GetXIDListCookie{cookie}
+ c.NewRequest(getXIDRangeRequest(c), cookie)
+ return GetXIDRangeCookie{cookie}
}
-// GetXIDListReply represents the data returned from a GetXIDList request.
-type GetXIDListReply struct {
+// GetXIDRangeReply represents the data returned from a GetXIDRange request.
+type GetXIDRangeReply struct {
Sequence uint16 // sequence number of the request for this reply
Length uint32 // number of bytes in this reply
// padding: 1 bytes
- IdsLen uint32
- // padding: 20 bytes
- Ids []uint32 // size: xgb.Pad((int(IdsLen) * 4))
+ StartId uint32
+ Count uint32
}
-// Reply blocks and returns the reply data for a GetXIDList request.
-func (cook GetXIDListCookie) Reply() (*GetXIDListReply, error) {
+// Reply blocks and returns the reply data for a GetXIDRange request.
+func (cook GetXIDRangeCookie) Reply() (*GetXIDRangeReply, error) {
buf, err := cook.Cookie.Reply()
if err != nil {
return nil, err
@@ -294,12 +303,12 @@ func (cook GetXIDListCookie) Reply() (*GetXIDListReply, error) {
if buf == nil {
return nil, nil
}
- return getXIDListReply(buf), nil
+ return getXIDRangeReply(buf), nil
}
-// getXIDListReply reads a byte slice into a GetXIDListReply value.
-func getXIDListReply(buf []byte) *GetXIDListReply {
- v := new(GetXIDListReply)
+// getXIDRangeReply reads a byte slice into a GetXIDRangeReply value.
+func getXIDRangeReply(buf []byte) *GetXIDRangeReply {
+ v := new(GetXIDRangeReply)
b := 1 // skip reply determinant
b += 1 // padding
@@ -310,39 +319,30 @@ func getXIDListReply(buf []byte) *GetXIDListReply {
v.Length = xgb.Get32(buf[b:]) // 4-byte units
b += 4
- v.IdsLen = xgb.Get32(buf[b:])
+ v.StartId = xgb.Get32(buf[b:])
b += 4
- b += 20 // padding
-
- v.Ids = make([]uint32, v.IdsLen)
- for i := 0; i < int(v.IdsLen); i++ {
- v.Ids[i] = xgb.Get32(buf[b:])
- b += 4
- }
- b = xgb.Pad(b)
+ v.Count = xgb.Get32(buf[b:])
+ b += 4
return v
}
-// Write request to wire for GetXIDList
-// getXIDListRequest writes a GetXIDList request to a byte slice.
-func getXIDListRequest(c *xgb.Conn, Count uint32) []byte {
- size := 8
+// Write request to wire for GetXIDRange
+// getXIDRangeRequest writes a GetXIDRange request to a byte slice.
+func getXIDRangeRequest(c *xgb.Conn) []byte {
+ size := 4
b := 0
buf := make([]byte, size)
buf[b] = c.Extensions["XC-MISC"]
b += 1
- buf[b] = 2 // request opcode
+ buf[b] = 1 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
b += 2
- xgb.Put32(buf[b:], Count)
- b += 4
-
return buf
}