aboutsummaryrefslogtreecommitdiff
path: root/nexgb/composite
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/composite
parent4b20ffaf4f4cc756832a6d064d5dfe182f16b0e9 (diff)
downloadhaven-0685fb57e14104ee4ad9f70ec94f787a9a22c028.tar.gz
haven-0685fb57e14104ee4ad9f70ec94f787a9a22c028.tar.xz
haven-0685fb57e14104ee4ad9f70ec94f787a9a22c028.zip
Update to latest xproto XML.
Diffstat (limited to 'nexgb/composite')
-rw-r--r--nexgb/composite/composite.go578
1 files changed, 289 insertions, 289 deletions
diff --git a/nexgb/composite/composite.go b/nexgb/composite/composite.go
index d1f19b9..de1b773 100644
--- a/nexgb/composite/composite.go
+++ b/nexgb/composite/composite.go
@@ -2,7 +2,7 @@
package composite
/*
- This file was generated by composite.xml on Jun 5 2012 12:11:58am EDT.
+ This file was generated by composite.xml on Aug 11 2013 8:39:43pm EDT.
This file is automatically generated. Edit at your peril!
*/
@@ -41,74 +41,131 @@ func init() {
xgb.NewExtErrorFuncs["Composite"] = make(map[int]xgb.NewErrorFun)
}
-// Skipping definition for base type 'Int32'
+const (
+ RedirectAutomatic = 0
+ RedirectManual = 1
+)
-// Skipping definition for base type 'Void'
+// Skipping definition for base type 'Bool'
// Skipping definition for base type 'Byte'
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
// Skipping definition for base type 'Int8'
// Skipping definition for base type 'Card16'
-// Skipping definition for base type 'Char'
-
// Skipping definition for base type 'Card32'
-// Skipping definition for base type 'Double'
+// CreateRegionFromBorderClipCookie is a cookie used only for CreateRegionFromBorderClip requests.
+type CreateRegionFromBorderClipCookie struct {
+ *xgb.Cookie
+}
-// Skipping definition for base type 'Bool'
+// CreateRegionFromBorderClip sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func CreateRegionFromBorderClip(c *xgb.Conn, Region xfixes.Region, Window xproto.Window) CreateRegionFromBorderClipCookie {
+ if _, ok := c.Extensions["COMPOSITE"]; !ok {
+ panic("Cannot issue request 'CreateRegionFromBorderClip' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ }
+ cookie := c.NewCookie(false, false)
+ c.NewRequest(createRegionFromBorderClipRequest(c, Region, Window), cookie)
+ return CreateRegionFromBorderClipCookie{cookie}
+}
-// Skipping definition for base type 'Float'
+// CreateRegionFromBorderClipChecked sends a checked request.
+// If an error occurs, it can be retrieved using CreateRegionFromBorderClipCookie.Check()
+func CreateRegionFromBorderClipChecked(c *xgb.Conn, Region xfixes.Region, Window xproto.Window) CreateRegionFromBorderClipCookie {
+ if _, ok := c.Extensions["COMPOSITE"]; !ok {
+ panic("Cannot issue request 'CreateRegionFromBorderClip' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ }
+ cookie := c.NewCookie(true, false)
+ c.NewRequest(createRegionFromBorderClipRequest(c, Region, Window), cookie)
+ return CreateRegionFromBorderClipCookie{cookie}
+}
-// Skipping definition for base type 'Card8'
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
+func (cook CreateRegionFromBorderClipCookie) Check() error {
+ return cook.Cookie.Check()
+}
-// Skipping definition for base type 'Int16'
+// Write request to wire for CreateRegionFromBorderClip
+// createRegionFromBorderClipRequest writes a CreateRegionFromBorderClip request to a byte slice.
+func createRegionFromBorderClipRequest(c *xgb.Conn, Region xfixes.Region, Window xproto.Window) []byte {
+ size := 12
+ b := 0
+ buf := make([]byte, size)
-const (
- RedirectAutomatic = 0
- RedirectManual = 1
-)
+ buf[b] = c.Extensions["COMPOSITE"]
+ b += 1
-// QueryVersionCookie is a cookie used only for QueryVersion requests.
-type QueryVersionCookie struct {
+ buf[b] = 5 // request opcode
+ b += 1
+
+ xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+ b += 2
+
+ xgb.Put32(buf[b:], uint32(Region))
+ b += 4
+
+ xgb.Put32(buf[b:], uint32(Window))
+ b += 4
+
+ return buf
+}
+
+// GetOverlayWindowCookie is a cookie used only for GetOverlayWindow requests.
+type GetOverlayWindowCookie struct {
*xgb.Cookie
}
-// QueryVersion sends a checked request.
-// If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
-func QueryVersion(c *xgb.Conn, ClientMajorVersion uint32, ClientMinorVersion uint32) QueryVersionCookie {
+// GetOverlayWindow sends a checked request.
+// If an error occurs, it will be returned with the reply by calling GetOverlayWindowCookie.Reply()
+func GetOverlayWindow(c *xgb.Conn, Window xproto.Window) GetOverlayWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'GetOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, true)
- c.NewRequest(queryVersionRequest(c, ClientMajorVersion, ClientMinorVersion), cookie)
- return QueryVersionCookie{cookie}
+ c.NewRequest(getOverlayWindowRequest(c, Window), cookie)
+ return GetOverlayWindowCookie{cookie}
}
-// QueryVersionUnchecked sends an unchecked request.
+// GetOverlayWindowUnchecked sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func QueryVersionUnchecked(c *xgb.Conn, ClientMajorVersion uint32, ClientMinorVersion uint32) QueryVersionCookie {
+func GetOverlayWindowUnchecked(c *xgb.Conn, Window xproto.Window) GetOverlayWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'GetOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, true)
- c.NewRequest(queryVersionRequest(c, ClientMajorVersion, ClientMinorVersion), cookie)
- return QueryVersionCookie{cookie}
+ c.NewRequest(getOverlayWindowRequest(c, Window), cookie)
+ return GetOverlayWindowCookie{cookie}
}
-// QueryVersionReply represents the data returned from a QueryVersion request.
-type QueryVersionReply struct {
+// GetOverlayWindowReply represents the data returned from a GetOverlayWindow request.
+type GetOverlayWindowReply struct {
Sequence uint16 // sequence number of the request for this reply
Length uint32 // number of bytes in this reply
// padding: 1 bytes
- MajorVersion uint32
- MinorVersion uint32
- // padding: 16 bytes
+ OverlayWin xproto.Window
+ // padding: 20 bytes
}
-// Reply blocks and returns the reply data for a QueryVersion request.
-func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
+// Reply blocks and returns the reply data for a GetOverlayWindow request.
+func (cook GetOverlayWindowCookie) Reply() (*GetOverlayWindowReply, error) {
buf, err := cook.Cookie.Reply()
if err != nil {
return nil, err
@@ -116,12 +173,12 @@ func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
if buf == nil {
return nil, nil
}
- return queryVersionReply(buf), nil
+ return getOverlayWindowReply(buf), nil
}
-// queryVersionReply reads a byte slice into a QueryVersionReply value.
-func queryVersionReply(buf []byte) *QueryVersionReply {
- v := new(QueryVersionReply)
+// getOverlayWindowReply reads a byte slice into a GetOverlayWindowReply value.
+func getOverlayWindowReply(buf []byte) *GetOverlayWindowReply {
+ v := new(GetOverlayWindowReply)
b := 1 // skip reply determinant
b += 1 // padding
@@ -132,78 +189,72 @@ func queryVersionReply(buf []byte) *QueryVersionReply {
v.Length = xgb.Get32(buf[b:]) // 4-byte units
b += 4
- v.MajorVersion = xgb.Get32(buf[b:])
- b += 4
-
- v.MinorVersion = xgb.Get32(buf[b:])
+ v.OverlayWin = xproto.Window(xgb.Get32(buf[b:]))
b += 4
- b += 16 // padding
+ b += 20 // padding
return v
}
-// Write request to wire for QueryVersion
-// queryVersionRequest writes a QueryVersion request to a byte slice.
-func queryVersionRequest(c *xgb.Conn, ClientMajorVersion uint32, ClientMinorVersion uint32) []byte {
- size := 12
+// Write request to wire for GetOverlayWindow
+// getOverlayWindowRequest writes a GetOverlayWindow request to a byte slice.
+func getOverlayWindowRequest(c *xgb.Conn, Window xproto.Window) []byte {
+ size := 8
b := 0
buf := make([]byte, size)
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 0 // request opcode
+ buf[b] = 7 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
b += 2
- xgb.Put32(buf[b:], ClientMajorVersion)
- b += 4
-
- xgb.Put32(buf[b:], ClientMinorVersion)
+ xgb.Put32(buf[b:], uint32(Window))
b += 4
return buf
}
-// RedirectWindowCookie is a cookie used only for RedirectWindow requests.
-type RedirectWindowCookie struct {
+// NameWindowPixmapCookie is a cookie used only for NameWindowPixmap requests.
+type NameWindowPixmapCookie struct {
*xgb.Cookie
}
-// RedirectWindow sends an unchecked request.
+// NameWindowPixmap sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func RedirectWindow(c *xgb.Conn, Window xproto.Window, Update byte) RedirectWindowCookie {
+func NameWindowPixmap(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pixmap) NameWindowPixmapCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'RedirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'NameWindowPixmap' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, false)
- c.NewRequest(redirectWindowRequest(c, Window, Update), cookie)
- return RedirectWindowCookie{cookie}
+ c.NewRequest(nameWindowPixmapRequest(c, Window, Pixmap), cookie)
+ return NameWindowPixmapCookie{cookie}
}
-// RedirectWindowChecked sends a checked request.
-// If an error occurs, it can be retrieved using RedirectWindowCookie.Check()
-func RedirectWindowChecked(c *xgb.Conn, Window xproto.Window, Update byte) RedirectWindowCookie {
+// NameWindowPixmapChecked sends a checked request.
+// If an error occurs, it can be retrieved using NameWindowPixmapCookie.Check()
+func NameWindowPixmapChecked(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pixmap) NameWindowPixmapCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'RedirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'NameWindowPixmap' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, false)
- c.NewRequest(redirectWindowRequest(c, Window, Update), cookie)
- return RedirectWindowCookie{cookie}
+ c.NewRequest(nameWindowPixmapRequest(c, Window, Pixmap), cookie)
+ return NameWindowPixmapCookie{cookie}
}
// Check returns an error if one occurred for checked requests that are not expecting a reply.
// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook RedirectWindowCookie) Check() error {
+func (cook NameWindowPixmapCookie) Check() error {
return cook.Cookie.Check()
}
-// Write request to wire for RedirectWindow
-// redirectWindowRequest writes a RedirectWindow request to a byte slice.
-func redirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
+// Write request to wire for NameWindowPixmap
+// nameWindowPixmapRequest writes a NameWindowPixmap request to a byte slice.
+func nameWindowPixmapRequest(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pixmap) []byte {
size := 12
b := 0
buf := make([]byte, size)
@@ -211,7 +262,7 @@ func redirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byt
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 1 // request opcode
+ buf[b] = 6 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -220,50 +271,88 @@ func redirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byt
xgb.Put32(buf[b:], uint32(Window))
b += 4
- buf[b] = Update
- b += 1
-
- b += 3 // padding
+ xgb.Put32(buf[b:], uint32(Pixmap))
+ b += 4
return buf
}
-// RedirectSubwindowsCookie is a cookie used only for RedirectSubwindows requests.
-type RedirectSubwindowsCookie struct {
+// QueryVersionCookie is a cookie used only for QueryVersion requests.
+type QueryVersionCookie struct {
*xgb.Cookie
}
-// RedirectSubwindows sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func RedirectSubwindows(c *xgb.Conn, Window xproto.Window, Update byte) RedirectSubwindowsCookie {
+// QueryVersion sends a checked request.
+// If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
+func QueryVersion(c *xgb.Conn, ClientMajorVersion uint32, ClientMinorVersion uint32) QueryVersionCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'RedirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
- cookie := c.NewCookie(false, false)
- c.NewRequest(redirectSubwindowsRequest(c, Window, Update), cookie)
- return RedirectSubwindowsCookie{cookie}
+ cookie := c.NewCookie(true, true)
+ c.NewRequest(queryVersionRequest(c, ClientMajorVersion, ClientMinorVersion), cookie)
+ return QueryVersionCookie{cookie}
}
-// RedirectSubwindowsChecked sends a checked request.
-// If an error occurs, it can be retrieved using RedirectSubwindowsCookie.Check()
-func RedirectSubwindowsChecked(c *xgb.Conn, Window xproto.Window, Update byte) RedirectSubwindowsCookie {
+// QueryVersionUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func QueryVersionUnchecked(c *xgb.Conn, ClientMajorVersion uint32, ClientMinorVersion uint32) QueryVersionCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'RedirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
- cookie := c.NewCookie(true, false)
- c.NewRequest(redirectSubwindowsRequest(c, Window, Update), cookie)
- return RedirectSubwindowsCookie{cookie}
+ cookie := c.NewCookie(false, true)
+ c.NewRequest(queryVersionRequest(c, ClientMajorVersion, ClientMinorVersion), cookie)
+ return QueryVersionCookie{cookie}
}
-// Check returns an error if one occurred for checked requests that are not expecting a reply.
-// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook RedirectSubwindowsCookie) Check() error {
- return cook.Cookie.Check()
+// QueryVersionReply represents the data returned from a QueryVersion request.
+type QueryVersionReply struct {
+ Sequence uint16 // sequence number of the request for this reply
+ Length uint32 // number of bytes in this reply
+ // padding: 1 bytes
+ MajorVersion uint32
+ MinorVersion uint32
+ // padding: 16 bytes
}
-// Write request to wire for RedirectSubwindows
-// redirectSubwindowsRequest writes a RedirectSubwindows request to a byte slice.
-func redirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
+// Reply blocks and returns the reply data for a QueryVersion request.
+func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
+ buf, err := cook.Cookie.Reply()
+ if err != nil {
+ return nil, err
+ }
+ if buf == nil {
+ return nil, nil
+ }
+ return queryVersionReply(buf), nil
+}
+
+// queryVersionReply reads a byte slice into a QueryVersionReply value.
+func queryVersionReply(buf []byte) *QueryVersionReply {
+ v := new(QueryVersionReply)
+ b := 1 // skip reply determinant
+
+ b += 1 // padding
+
+ v.Sequence = xgb.Get16(buf[b:])
+ b += 2
+
+ v.Length = xgb.Get32(buf[b:]) // 4-byte units
+ b += 4
+
+ v.MajorVersion = xgb.Get32(buf[b:])
+ b += 4
+
+ v.MinorVersion = xgb.Get32(buf[b:])
+ b += 4
+
+ b += 16 // padding
+
+ return v
+}
+
+// Write request to wire for QueryVersion
+// queryVersionRequest writes a QueryVersion request to a byte slice.
+func queryVersionRequest(c *xgb.Conn, ClientMajorVersion uint32, ClientMinorVersion uint32) []byte {
size := 12
b := 0
buf := make([]byte, size)
@@ -271,59 +360,57 @@ func redirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte) [
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 2 // request opcode
+ buf[b] = 0 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
b += 2
- xgb.Put32(buf[b:], uint32(Window))
+ xgb.Put32(buf[b:], ClientMajorVersion)
b += 4
- buf[b] = Update
- b += 1
-
- b += 3 // padding
+ xgb.Put32(buf[b:], ClientMinorVersion)
+ b += 4
return buf
}
-// UnredirectWindowCookie is a cookie used only for UnredirectWindow requests.
-type UnredirectWindowCookie struct {
+// RedirectSubwindowsCookie is a cookie used only for RedirectSubwindows requests.
+type RedirectSubwindowsCookie struct {
*xgb.Cookie
}
-// UnredirectWindow sends an unchecked request.
+// RedirectSubwindows sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func UnredirectWindow(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectWindowCookie {
+func RedirectSubwindows(c *xgb.Conn, Window xproto.Window, Update byte) RedirectSubwindowsCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'UnredirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'RedirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, false)
- c.NewRequest(unredirectWindowRequest(c, Window, Update), cookie)
- return UnredirectWindowCookie{cookie}
+ c.NewRequest(redirectSubwindowsRequest(c, Window, Update), cookie)
+ return RedirectSubwindowsCookie{cookie}
}
-// UnredirectWindowChecked sends a checked request.
-// If an error occurs, it can be retrieved using UnredirectWindowCookie.Check()
-func UnredirectWindowChecked(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectWindowCookie {
+// RedirectSubwindowsChecked sends a checked request.
+// If an error occurs, it can be retrieved using RedirectSubwindowsCookie.Check()
+func RedirectSubwindowsChecked(c *xgb.Conn, Window xproto.Window, Update byte) RedirectSubwindowsCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'UnredirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'RedirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, false)
- c.NewRequest(unredirectWindowRequest(c, Window, Update), cookie)
- return UnredirectWindowCookie{cookie}
+ c.NewRequest(redirectSubwindowsRequest(c, Window, Update), cookie)
+ return RedirectSubwindowsCookie{cookie}
}
// Check returns an error if one occurred for checked requests that are not expecting a reply.
// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook UnredirectWindowCookie) Check() error {
+func (cook RedirectSubwindowsCookie) Check() error {
return cook.Cookie.Check()
}
-// Write request to wire for UnredirectWindow
-// unredirectWindowRequest writes a UnredirectWindow request to a byte slice.
-func unredirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
+// Write request to wire for RedirectSubwindows
+// redirectSubwindowsRequest writes a RedirectSubwindows request to a byte slice.
+func redirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
size := 12
b := 0
buf := make([]byte, size)
@@ -331,7 +418,7 @@ func unredirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []b
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 3 // request opcode
+ buf[b] = 2 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -348,42 +435,42 @@ func unredirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []b
return buf
}
-// UnredirectSubwindowsCookie is a cookie used only for UnredirectSubwindows requests.
-type UnredirectSubwindowsCookie struct {
+// RedirectWindowCookie is a cookie used only for RedirectWindow requests.
+type RedirectWindowCookie struct {
*xgb.Cookie
}
-// UnredirectSubwindows sends an unchecked request.
+// RedirectWindow sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func UnredirectSubwindows(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectSubwindowsCookie {
+func RedirectWindow(c *xgb.Conn, Window xproto.Window, Update byte) RedirectWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'UnredirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'RedirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, false)
- c.NewRequest(unredirectSubwindowsRequest(c, Window, Update), cookie)
- return UnredirectSubwindowsCookie{cookie}
+ c.NewRequest(redirectWindowRequest(c, Window, Update), cookie)
+ return RedirectWindowCookie{cookie}
}
-// UnredirectSubwindowsChecked sends a checked request.
-// If an error occurs, it can be retrieved using UnredirectSubwindowsCookie.Check()
-func UnredirectSubwindowsChecked(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectSubwindowsCookie {
+// RedirectWindowChecked sends a checked request.
+// If an error occurs, it can be retrieved using RedirectWindowCookie.Check()
+func RedirectWindowChecked(c *xgb.Conn, Window xproto.Window, Update byte) RedirectWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'UnredirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'RedirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, false)
- c.NewRequest(unredirectSubwindowsRequest(c, Window, Update), cookie)
- return UnredirectSubwindowsCookie{cookie}
+ c.NewRequest(redirectWindowRequest(c, Window, Update), cookie)
+ return RedirectWindowCookie{cookie}
}
// Check returns an error if one occurred for checked requests that are not expecting a reply.
// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook UnredirectSubwindowsCookie) Check() error {
+func (cook RedirectWindowCookie) Check() error {
return cook.Cookie.Check()
}
-// Write request to wire for UnredirectSubwindows
-// unredirectSubwindowsRequest writes a UnredirectSubwindows request to a byte slice.
-func unredirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
+// Write request to wire for RedirectWindow
+// redirectWindowRequest writes a RedirectWindow request to a byte slice.
+func redirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
size := 12
b := 0
buf := make([]byte, size)
@@ -391,7 +478,7 @@ func unredirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte)
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 4 // request opcode
+ buf[b] = 1 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -408,100 +495,97 @@ func unredirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte)
return buf
}
-// CreateRegionFromBorderClipCookie is a cookie used only for CreateRegionFromBorderClip requests.
-type CreateRegionFromBorderClipCookie struct {
+// ReleaseOverlayWindowCookie is a cookie used only for ReleaseOverlayWindow requests.
+type ReleaseOverlayWindowCookie struct {
*xgb.Cookie
}
-// CreateRegionFromBorderClip sends an unchecked request.
+// ReleaseOverlayWindow sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func CreateRegionFromBorderClip(c *xgb.Conn, Region xfixes.Region, Window xproto.Window) CreateRegionFromBorderClipCookie {
+func ReleaseOverlayWindow(c *xgb.Conn, Window xproto.Window) ReleaseOverlayWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'CreateRegionFromBorderClip' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'ReleaseOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, false)
- c.NewRequest(createRegionFromBorderClipRequest(c, Region, Window), cookie)
- return CreateRegionFromBorderClipCookie{cookie}
+ c.NewRequest(releaseOverlayWindowRequest(c, Window), cookie)
+ return ReleaseOverlayWindowCookie{cookie}
}
-// CreateRegionFromBorderClipChecked sends a checked request.
-// If an error occurs, it can be retrieved using CreateRegionFromBorderClipCookie.Check()
-func CreateRegionFromBorderClipChecked(c *xgb.Conn, Region xfixes.Region, Window xproto.Window) CreateRegionFromBorderClipCookie {
+// ReleaseOverlayWindowChecked sends a checked request.
+// If an error occurs, it can be retrieved using ReleaseOverlayWindowCookie.Check()
+func ReleaseOverlayWindowChecked(c *xgb.Conn, Window xproto.Window) ReleaseOverlayWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'CreateRegionFromBorderClip' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'ReleaseOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, false)
- c.NewRequest(createRegionFromBorderClipRequest(c, Region, Window), cookie)
- return CreateRegionFromBorderClipCookie{cookie}
+ c.NewRequest(releaseOverlayWindowRequest(c, Window), cookie)
+ return ReleaseOverlayWindowCookie{cookie}
}
// Check returns an error if one occurred for checked requests that are not expecting a reply.
// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook CreateRegionFromBorderClipCookie) Check() error {
+func (cook ReleaseOverlayWindowCookie) Check() error {
return cook.Cookie.Check()
}
-// Write request to wire for CreateRegionFromBorderClip
-// createRegionFromBorderClipRequest writes a CreateRegionFromBorderClip request to a byte slice.
-func createRegionFromBorderClipRequest(c *xgb.Conn, Region xfixes.Region, Window xproto.Window) []byte {
- size := 12
+// Write request to wire for ReleaseOverlayWindow
+// releaseOverlayWindowRequest writes a ReleaseOverlayWindow request to a byte slice.
+func releaseOverlayWindowRequest(c *xgb.Conn, Window xproto.Window) []byte {
+ size := 8
b := 0
buf := make([]byte, size)
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 5 // request opcode
+ buf[b] = 8 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
b += 2
- xgb.Put32(buf[b:], uint32(Region))
- b += 4
-
xgb.Put32(buf[b:], uint32(Window))
b += 4
return buf
}
-// NameWindowPixmapCookie is a cookie used only for NameWindowPixmap requests.
-type NameWindowPixmapCookie struct {
+// UnredirectSubwindowsCookie is a cookie used only for UnredirectSubwindows requests.
+type UnredirectSubwindowsCookie struct {
*xgb.Cookie
}
-// NameWindowPixmap sends an unchecked request.
+// UnredirectSubwindows sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func NameWindowPixmap(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pixmap) NameWindowPixmapCookie {
+func UnredirectSubwindows(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectSubwindowsCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'NameWindowPixmap' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'UnredirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, false)
- c.NewRequest(nameWindowPixmapRequest(c, Window, Pixmap), cookie)
- return NameWindowPixmapCookie{cookie}
+ c.NewRequest(unredirectSubwindowsRequest(c, Window, Update), cookie)
+ return UnredirectSubwindowsCookie{cookie}
}
-// NameWindowPixmapChecked sends a checked request.
-// If an error occurs, it can be retrieved using NameWindowPixmapCookie.Check()
-func NameWindowPixmapChecked(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pixmap) NameWindowPixmapCookie {
+// UnredirectSubwindowsChecked sends a checked request.
+// If an error occurs, it can be retrieved using UnredirectSubwindowsCookie.Check()
+func UnredirectSubwindowsChecked(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectSubwindowsCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'NameWindowPixmap' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'UnredirectSubwindows' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, false)
- c.NewRequest(nameWindowPixmapRequest(c, Window, Pixmap), cookie)
- return NameWindowPixmapCookie{cookie}
+ c.NewRequest(unredirectSubwindowsRequest(c, Window, Update), cookie)
+ return UnredirectSubwindowsCookie{cookie}
}
// Check returns an error if one occurred for checked requests that are not expecting a reply.
// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook NameWindowPixmapCookie) Check() error {
+func (cook UnredirectSubwindowsCookie) Check() error {
return cook.Cookie.Check()
}
-// Write request to wire for NameWindowPixmap
-// nameWindowPixmapRequest writes a NameWindowPixmap request to a byte slice.
-func nameWindowPixmapRequest(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pixmap) []byte {
+// Write request to wire for UnredirectSubwindows
+// unredirectSubwindowsRequest writes a UnredirectSubwindows request to a byte slice.
+func unredirectSubwindowsRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
size := 12
b := 0
buf := make([]byte, size)
@@ -509,7 +593,7 @@ func nameWindowPixmapRequest(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pi
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 6 // request opcode
+ buf[b] = 4 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -518,147 +602,58 @@ func nameWindowPixmapRequest(c *xgb.Conn, Window xproto.Window, Pixmap xproto.Pi
xgb.Put32(buf[b:], uint32(Window))
b += 4
- xgb.Put32(buf[b:], uint32(Pixmap))
- b += 4
-
- return buf
-}
-
-// GetOverlayWindowCookie is a cookie used only for GetOverlayWindow requests.
-type GetOverlayWindowCookie struct {
- *xgb.Cookie
-}
-
-// GetOverlayWindow sends a checked request.
-// If an error occurs, it will be returned with the reply by calling GetOverlayWindowCookie.Reply()
-func GetOverlayWindow(c *xgb.Conn, Window xproto.Window) GetOverlayWindowCookie {
- if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'GetOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
- }
- cookie := c.NewCookie(true, true)
- c.NewRequest(getOverlayWindowRequest(c, Window), cookie)
- return GetOverlayWindowCookie{cookie}
-}
-
-// GetOverlayWindowUnchecked sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func GetOverlayWindowUnchecked(c *xgb.Conn, Window xproto.Window) GetOverlayWindowCookie {
- if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'GetOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
- }
- cookie := c.NewCookie(false, true)
- c.NewRequest(getOverlayWindowRequest(c, Window), cookie)
- return GetOverlayWindowCookie{cookie}
-}
-
-// GetOverlayWindowReply represents the data returned from a GetOverlayWindow request.
-type GetOverlayWindowReply struct {
- Sequence uint16 // sequence number of the request for this reply
- Length uint32 // number of bytes in this reply
- // padding: 1 bytes
- OverlayWin xproto.Window
- // padding: 20 bytes
-}
-
-// Reply blocks and returns the reply data for a GetOverlayWindow request.
-func (cook GetOverlayWindowCookie) Reply() (*GetOverlayWindowReply, error) {
- buf, err := cook.Cookie.Reply()
- if err != nil {
- return nil, err
- }
- if buf == nil {
- return nil, nil
- }
- return getOverlayWindowReply(buf), nil
-}
-
-// getOverlayWindowReply reads a byte slice into a GetOverlayWindowReply value.
-func getOverlayWindowReply(buf []byte) *GetOverlayWindowReply {
- v := new(GetOverlayWindowReply)
- b := 1 // skip reply determinant
-
- b += 1 // padding
-
- v.Sequence = xgb.Get16(buf[b:])
- b += 2
-
- v.Length = xgb.Get32(buf[b:]) // 4-byte units
- b += 4
-
- v.OverlayWin = xproto.Window(xgb.Get32(buf[b:]))
- b += 4
-
- b += 20 // padding
-
- return v
-}
-
-// Write request to wire for GetOverlayWindow
-// getOverlayWindowRequest writes a GetOverlayWindow request to a byte slice.
-func getOverlayWindowRequest(c *xgb.Conn, Window xproto.Window) []byte {
- size := 8
- b := 0
- buf := make([]byte, size)
-
- buf[b] = c.Extensions["COMPOSITE"]
- b += 1
-
- buf[b] = 7 // request opcode
+ buf[b] = Update
b += 1
- xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
- b += 2
-
- xgb.Put32(buf[b:], uint32(Window))
- b += 4
+ b += 3 // padding
return buf
}
-// ReleaseOverlayWindowCookie is a cookie used only for ReleaseOverlayWindow requests.
-type ReleaseOverlayWindowCookie struct {
+// UnredirectWindowCookie is a cookie used only for UnredirectWindow requests.
+type UnredirectWindowCookie struct {
*xgb.Cookie
}
-// ReleaseOverlayWindow sends an unchecked request.
+// UnredirectWindow sends an unchecked request.
// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func ReleaseOverlayWindow(c *xgb.Conn, Window xproto.Window) ReleaseOverlayWindowCookie {
+func UnredirectWindow(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'ReleaseOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'UnredirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(false, false)
- c.NewRequest(releaseOverlayWindowRequest(c, Window), cookie)
- return ReleaseOverlayWindowCookie{cookie}
+ c.NewRequest(unredirectWindowRequest(c, Window, Update), cookie)
+ return UnredirectWindowCookie{cookie}
}
-// ReleaseOverlayWindowChecked sends a checked request.
-// If an error occurs, it can be retrieved using ReleaseOverlayWindowCookie.Check()
-func ReleaseOverlayWindowChecked(c *xgb.Conn, Window xproto.Window) ReleaseOverlayWindowCookie {
+// UnredirectWindowChecked sends a checked request.
+// If an error occurs, it can be retrieved using UnredirectWindowCookie.Check()
+func UnredirectWindowChecked(c *xgb.Conn, Window xproto.Window, Update byte) UnredirectWindowCookie {
if _, ok := c.Extensions["COMPOSITE"]; !ok {
- panic("Cannot issue request 'ReleaseOverlayWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
+ panic("Cannot issue request 'UnredirectWindow' using the uninitialized extension 'Composite'. composite.Init(connObj) must be called first.")
}
cookie := c.NewCookie(true, false)
- c.NewRequest(releaseOverlayWindowRequest(c, Window), cookie)
- return ReleaseOverlayWindowCookie{cookie}
+ c.NewRequest(unredirectWindowRequest(c, Window, Update), cookie)
+ return UnredirectWindowCookie{cookie}
}
// Check returns an error if one occurred for checked requests that are not expecting a reply.
// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook ReleaseOverlayWindowCookie) Check() error {
+func (cook UnredirectWindowCookie) Check() error {
return cook.Cookie.Check()
}
-// Write request to wire for ReleaseOverlayWindow
-// releaseOverlayWindowRequest writes a ReleaseOverlayWindow request to a byte slice.
-func releaseOverlayWindowRequest(c *xgb.Conn, Window xproto.Window) []byte {
- size := 8
+// Write request to wire for UnredirectWindow
+// unredirectWindowRequest writes a UnredirectWindow request to a byte slice.
+func unredirectWindowRequest(c *xgb.Conn, Window xproto.Window, Update byte) []byte {
+ size := 12
b := 0
buf := make([]byte, size)
buf[b] = c.Extensions["COMPOSITE"]
b += 1
- buf[b] = 8 // request opcode
+ buf[b] = 3 // request opcode
b += 1
xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -667,5 +662,10 @@ func releaseOverlayWindowRequest(c *xgb.Conn, Window xproto.Window) []byte {
xgb.Put32(buf[b:], uint32(Window))
b += 4
+ buf[b] = Update
+ b += 1
+
+ b += 3 // padding
+
return buf
}