From e239bb3c68a4981a3916534203c2fbd6b96f593c Mon Sep 17 00:00:00 2001 From: "Andrew Gallant (Ocelot)" Date: Thu, 10 May 2012 12:47:19 -0400 Subject: make resource ids their own individual types. last commit before overhaul to sub-packages --- nexgb/auto_composite.go | 68 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) (limited to 'nexgb/auto_composite.go') diff --git a/nexgb/auto_composite.go b/nexgb/auto_composite.go index c6c3241..836436f 100644 --- a/nexgb/auto_composite.go +++ b/nexgb/auto_composite.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by composite.xml on May 8 2012 11:03:23pm EDT. + This file was generated by composite.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -38,6 +38,12 @@ func init() { newExtErrorFuncs["Composite"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Int32' + +// Skipping definition for base type 'Void' + +// Skipping definition for base type 'Byte' + // Skipping definition for base type 'Int8' // Skipping definition for base type 'Card16' @@ -52,18 +58,10 @@ func init() { // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // 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 'Byte' - const ( CompositeRedirectAutomatic = 0 CompositeRedirectManual = 1 @@ -169,13 +167,13 @@ type CompositeRedirectWindowCookie struct { } // Write request to wire for CompositeRedirectWindow -func (c *Conn) CompositeRedirectWindow(Window Id, Update byte) CompositeRedirectWindowCookie { +func (c *Conn) CompositeRedirectWindow(Window Window, Update byte) CompositeRedirectWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeRedirectWindowRequest(Window, Update), cookie) return CompositeRedirectWindowCookie{cookie} } -func (c *Conn) CompositeRedirectWindowChecked(Window Id, Update byte) CompositeRedirectWindowCookie { +func (c *Conn) CompositeRedirectWindowChecked(Window Window, Update byte) CompositeRedirectWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeRedirectWindowRequest(Window, Update), cookie) return CompositeRedirectWindowCookie{cookie} @@ -186,7 +184,7 @@ func (cook CompositeRedirectWindowCookie) Check() error { } // Write request to wire for CompositeRedirectWindow -func (c *Conn) compositeRedirectWindowRequest(Window Id, Update byte) []byte { +func (c *Conn) compositeRedirectWindowRequest(Window Window, Update byte) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -218,13 +216,13 @@ type CompositeRedirectSubwindowsCookie struct { } // Write request to wire for CompositeRedirectSubwindows -func (c *Conn) CompositeRedirectSubwindows(Window Id, Update byte) CompositeRedirectSubwindowsCookie { +func (c *Conn) CompositeRedirectSubwindows(Window Window, Update byte) CompositeRedirectSubwindowsCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeRedirectSubwindowsRequest(Window, Update), cookie) return CompositeRedirectSubwindowsCookie{cookie} } -func (c *Conn) CompositeRedirectSubwindowsChecked(Window Id, Update byte) CompositeRedirectSubwindowsCookie { +func (c *Conn) CompositeRedirectSubwindowsChecked(Window Window, Update byte) CompositeRedirectSubwindowsCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeRedirectSubwindowsRequest(Window, Update), cookie) return CompositeRedirectSubwindowsCookie{cookie} @@ -235,7 +233,7 @@ func (cook CompositeRedirectSubwindowsCookie) Check() error { } // Write request to wire for CompositeRedirectSubwindows -func (c *Conn) compositeRedirectSubwindowsRequest(Window Id, Update byte) []byte { +func (c *Conn) compositeRedirectSubwindowsRequest(Window Window, Update byte) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -267,13 +265,13 @@ type CompositeUnredirectWindowCookie struct { } // Write request to wire for CompositeUnredirectWindow -func (c *Conn) CompositeUnredirectWindow(Window Id, Update byte) CompositeUnredirectWindowCookie { +func (c *Conn) CompositeUnredirectWindow(Window Window, Update byte) CompositeUnredirectWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeUnredirectWindowRequest(Window, Update), cookie) return CompositeUnredirectWindowCookie{cookie} } -func (c *Conn) CompositeUnredirectWindowChecked(Window Id, Update byte) CompositeUnredirectWindowCookie { +func (c *Conn) CompositeUnredirectWindowChecked(Window Window, Update byte) CompositeUnredirectWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeUnredirectWindowRequest(Window, Update), cookie) return CompositeUnredirectWindowCookie{cookie} @@ -284,7 +282,7 @@ func (cook CompositeUnredirectWindowCookie) Check() error { } // Write request to wire for CompositeUnredirectWindow -func (c *Conn) compositeUnredirectWindowRequest(Window Id, Update byte) []byte { +func (c *Conn) compositeUnredirectWindowRequest(Window Window, Update byte) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -316,13 +314,13 @@ type CompositeUnredirectSubwindowsCookie struct { } // Write request to wire for CompositeUnredirectSubwindows -func (c *Conn) CompositeUnredirectSubwindows(Window Id, Update byte) CompositeUnredirectSubwindowsCookie { +func (c *Conn) CompositeUnredirectSubwindows(Window Window, Update byte) CompositeUnredirectSubwindowsCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeUnredirectSubwindowsRequest(Window, Update), cookie) return CompositeUnredirectSubwindowsCookie{cookie} } -func (c *Conn) CompositeUnredirectSubwindowsChecked(Window Id, Update byte) CompositeUnredirectSubwindowsCookie { +func (c *Conn) CompositeUnredirectSubwindowsChecked(Window Window, Update byte) CompositeUnredirectSubwindowsCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeUnredirectSubwindowsRequest(Window, Update), cookie) return CompositeUnredirectSubwindowsCookie{cookie} @@ -333,7 +331,7 @@ func (cook CompositeUnredirectSubwindowsCookie) Check() error { } // Write request to wire for CompositeUnredirectSubwindows -func (c *Conn) compositeUnredirectSubwindowsRequest(Window Id, Update byte) []byte { +func (c *Conn) compositeUnredirectSubwindowsRequest(Window Window, Update byte) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -365,13 +363,13 @@ type CompositeCreateRegionFromBorderClipCookie struct { } // Write request to wire for CompositeCreateRegionFromBorderClip -func (c *Conn) CompositeCreateRegionFromBorderClip(Region Id, Window Id) CompositeCreateRegionFromBorderClipCookie { +func (c *Conn) CompositeCreateRegionFromBorderClip(Region XfixesRegion, Window Window) CompositeCreateRegionFromBorderClipCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeCreateRegionFromBorderClipRequest(Region, Window), cookie) return CompositeCreateRegionFromBorderClipCookie{cookie} } -func (c *Conn) CompositeCreateRegionFromBorderClipChecked(Region Id, Window Id) CompositeCreateRegionFromBorderClipCookie { +func (c *Conn) CompositeCreateRegionFromBorderClipChecked(Region XfixesRegion, Window Window) CompositeCreateRegionFromBorderClipCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeCreateRegionFromBorderClipRequest(Region, Window), cookie) return CompositeCreateRegionFromBorderClipCookie{cookie} @@ -382,7 +380,7 @@ func (cook CompositeCreateRegionFromBorderClipCookie) Check() error { } // Write request to wire for CompositeCreateRegionFromBorderClip -func (c *Conn) compositeCreateRegionFromBorderClipRequest(Region Id, Window Id) []byte { +func (c *Conn) compositeCreateRegionFromBorderClipRequest(Region XfixesRegion, Window Window) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -412,13 +410,13 @@ type CompositeNameWindowPixmapCookie struct { } // Write request to wire for CompositeNameWindowPixmap -func (c *Conn) CompositeNameWindowPixmap(Window Id, Pixmap Id) CompositeNameWindowPixmapCookie { +func (c *Conn) CompositeNameWindowPixmap(Window Window, Pixmap Pixmap) CompositeNameWindowPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeNameWindowPixmapRequest(Window, Pixmap), cookie) return CompositeNameWindowPixmapCookie{cookie} } -func (c *Conn) CompositeNameWindowPixmapChecked(Window Id, Pixmap Id) CompositeNameWindowPixmapCookie { +func (c *Conn) CompositeNameWindowPixmapChecked(Window Window, Pixmap Pixmap) CompositeNameWindowPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeNameWindowPixmapRequest(Window, Pixmap), cookie) return CompositeNameWindowPixmapCookie{cookie} @@ -429,7 +427,7 @@ func (cook CompositeNameWindowPixmapCookie) Check() error { } // Write request to wire for CompositeNameWindowPixmap -func (c *Conn) compositeNameWindowPixmapRequest(Window Id, Pixmap Id) []byte { +func (c *Conn) compositeNameWindowPixmapRequest(Window Window, Pixmap Pixmap) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -458,13 +456,13 @@ type CompositeGetOverlayWindowCookie struct { *cookie } -func (c *Conn) CompositeGetOverlayWindow(Window Id) CompositeGetOverlayWindowCookie { +func (c *Conn) CompositeGetOverlayWindow(Window Window) CompositeGetOverlayWindowCookie { cookie := c.newCookie(true, true) c.newRequest(c.compositeGetOverlayWindowRequest(Window), cookie) return CompositeGetOverlayWindowCookie{cookie} } -func (c *Conn) CompositeGetOverlayWindowUnchecked(Window Id) CompositeGetOverlayWindowCookie { +func (c *Conn) CompositeGetOverlayWindowUnchecked(Window Window) CompositeGetOverlayWindowCookie { cookie := c.newCookie(false, true) c.newRequest(c.compositeGetOverlayWindowRequest(Window), cookie) return CompositeGetOverlayWindowCookie{cookie} @@ -476,7 +474,7 @@ type CompositeGetOverlayWindowReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - OverlayWin Id + OverlayWin Window // padding: 20 bytes } @@ -505,7 +503,7 @@ func compositeGetOverlayWindowReply(buf []byte) *CompositeGetOverlayWindowReply v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.OverlayWin = Id(Get32(buf[b:])) + v.OverlayWin = Window(Get32(buf[b:])) b += 4 b += 20 // padding @@ -518,7 +516,7 @@ func (cook CompositeGetOverlayWindowCookie) Check() error { } // Write request to wire for CompositeGetOverlayWindow -func (c *Conn) compositeGetOverlayWindowRequest(Window Id) []byte { +func (c *Conn) compositeGetOverlayWindowRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -545,13 +543,13 @@ type CompositeReleaseOverlayWindowCookie struct { } // Write request to wire for CompositeReleaseOverlayWindow -func (c *Conn) CompositeReleaseOverlayWindow(Window Id) CompositeReleaseOverlayWindowCookie { +func (c *Conn) CompositeReleaseOverlayWindow(Window Window) CompositeReleaseOverlayWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.compositeReleaseOverlayWindowRequest(Window), cookie) return CompositeReleaseOverlayWindowCookie{cookie} } -func (c *Conn) CompositeReleaseOverlayWindowChecked(Window Id) CompositeReleaseOverlayWindowCookie { +func (c *Conn) CompositeReleaseOverlayWindowChecked(Window Window) CompositeReleaseOverlayWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.compositeReleaseOverlayWindowRequest(Window), cookie) return CompositeReleaseOverlayWindowCookie{cookie} @@ -562,7 +560,7 @@ func (cook CompositeReleaseOverlayWindowCookie) Check() error { } // Write request to wire for CompositeReleaseOverlayWindow -func (c *Conn) compositeReleaseOverlayWindowRequest(Window Id) []byte { +func (c *Conn) compositeReleaseOverlayWindowRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) -- cgit v1.2.3