diff options
| author | Andrew Gallant (Ocelot) <Andrew.Gallant@tufts.edu> | 2012-05-10 12:47:19 -0400 |
|---|---|---|
| committer | Andrew Gallant (Ocelot) <Andrew.Gallant@tufts.edu> | 2012-05-10 12:47:19 -0400 |
| commit | e239bb3c68a4981a3916534203c2fbd6b96f593c (patch) | |
| tree | ebb9b1a4a4659d09edaf57ec39a744ff4bc15ff0 /nexgb | |
| parent | 00c6217ca905b08ce0acda9a90492b5c1dc358e8 (diff) | |
| download | haven-e239bb3c68a4981a3916534203c2fbd6b96f593c.tar.gz haven-e239bb3c68a4981a3916534203c2fbd6b96f593c.tar.xz haven-e239bb3c68a4981a3916534203c2fbd6b96f593c.zip | |
make resource ids their own individual types. last commit before overhaul to sub-packages
Diffstat (limited to 'nexgb')
35 files changed, 1906 insertions, 1685 deletions
diff --git a/nexgb/auto_bigreq.go b/nexgb/auto_bigreq.go index ad06b60..e8bbaef 100644 --- a/nexgb/auto_bigreq.go +++ b/nexgb/auto_bigreq.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by bigreq.xml on May 8 2012 11:03:23pm EDT. + This file was generated by bigreq.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -33,12 +33,18 @@ func init() { newExtErrorFuncs["BIG-REQUESTS"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Card16' + +// Skipping definition for base type 'Char' + +// Skipping definition for base type 'Card32' + +// Skipping definition for base type 'Double' + // Skipping definition for base type 'Bool' // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -51,14 +57,6 @@ func init() { // 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' - // Request BigreqEnable // size: 4 type BigreqEnableCookie struct { 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) diff --git a/nexgb/auto_damage.go b/nexgb/auto_damage.go index b3130d9..97c76b4 100644 --- a/nexgb/auto_damage.go +++ b/nexgb/auto_damage.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by damage.xml on May 8 2012 11:03:23pm EDT. + This file was generated by damage.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -38,10 +38,6 @@ func init() { newExtErrorFuncs["DAMAGE"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Id' - -// Skipping definition for base type 'Card8' - // Skipping definition for base type 'Int16' // Skipping definition for base type 'Int32' @@ -64,6 +60,8 @@ func init() { // Skipping definition for base type 'Float' +// Skipping definition for base type 'Card8' + const ( DamageReportLevelRawRectangles = 0 DamageReportLevelDeltaRectangles = 1 @@ -71,7 +69,15 @@ const ( DamageReportLevelNonEmpty = 3 ) -// Skipping resource definition of 'Damage' +type DamageDamage uint32 + +func (c *Conn) NewDamageDamageId() (DamageDamage, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return DamageDamage(id), nil +} // Event definition DamageNotify (0) // Size: 32 @@ -81,8 +87,8 @@ const DamageNotify = 0 type DamageNotifyEvent struct { Sequence uint16 Level byte - Drawable Id - Damage Id + Drawable Drawable + Damage DamageDamage Timestamp Timestamp Area Rectangle Geometry Rectangle @@ -99,10 +105,10 @@ func NewDamageNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 - v.Damage = Id(Get32(buf[b:])) + v.Damage = DamageDamage(Get32(buf[b:])) b += 4 v.Timestamp = Timestamp(Get32(buf[b:])) @@ -205,7 +211,7 @@ func (err DamageBadDamageError) SequenceId() uint16 { return err.Sequence } -func (err DamageBadDamageError) BadId() Id { +func (err DamageBadDamageError) BadId() uint32 { return 0 } @@ -320,13 +326,13 @@ type DamageCreateCookie struct { } // Write request to wire for DamageCreate -func (c *Conn) DamageCreate(Damage Id, Drawable Id, Level byte) DamageCreateCookie { +func (c *Conn) DamageCreate(Damage DamageDamage, Drawable Drawable, Level byte) DamageCreateCookie { cookie := c.newCookie(false, false) c.newRequest(c.damageCreateRequest(Damage, Drawable, Level), cookie) return DamageCreateCookie{cookie} } -func (c *Conn) DamageCreateChecked(Damage Id, Drawable Id, Level byte) DamageCreateCookie { +func (c *Conn) DamageCreateChecked(Damage DamageDamage, Drawable Drawable, Level byte) DamageCreateCookie { cookie := c.newCookie(true, false) c.newRequest(c.damageCreateRequest(Damage, Drawable, Level), cookie) return DamageCreateCookie{cookie} @@ -337,7 +343,7 @@ func (cook DamageCreateCookie) Check() error { } // Write request to wire for DamageCreate -func (c *Conn) damageCreateRequest(Damage Id, Drawable Id, Level byte) []byte { +func (c *Conn) damageCreateRequest(Damage DamageDamage, Drawable Drawable, Level byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -372,13 +378,13 @@ type DamageDestroyCookie struct { } // Write request to wire for DamageDestroy -func (c *Conn) DamageDestroy(Damage Id) DamageDestroyCookie { +func (c *Conn) DamageDestroy(Damage DamageDamage) DamageDestroyCookie { cookie := c.newCookie(false, false) c.newRequest(c.damageDestroyRequest(Damage), cookie) return DamageDestroyCookie{cookie} } -func (c *Conn) DamageDestroyChecked(Damage Id) DamageDestroyCookie { +func (c *Conn) DamageDestroyChecked(Damage DamageDamage) DamageDestroyCookie { cookie := c.newCookie(true, false) c.newRequest(c.damageDestroyRequest(Damage), cookie) return DamageDestroyCookie{cookie} @@ -389,7 +395,7 @@ func (cook DamageDestroyCookie) Check() error { } // Write request to wire for DamageDestroy -func (c *Conn) damageDestroyRequest(Damage Id) []byte { +func (c *Conn) damageDestroyRequest(Damage DamageDamage) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -416,13 +422,13 @@ type DamageSubtractCookie struct { } // Write request to wire for DamageSubtract -func (c *Conn) DamageSubtract(Damage Id, Repair Id, Parts Id) DamageSubtractCookie { +func (c *Conn) DamageSubtract(Damage DamageDamage, Repair XfixesRegion, Parts XfixesRegion) DamageSubtractCookie { cookie := c.newCookie(false, false) c.newRequest(c.damageSubtractRequest(Damage, Repair, Parts), cookie) return DamageSubtractCookie{cookie} } -func (c *Conn) DamageSubtractChecked(Damage Id, Repair Id, Parts Id) DamageSubtractCookie { +func (c *Conn) DamageSubtractChecked(Damage DamageDamage, Repair XfixesRegion, Parts XfixesRegion) DamageSubtractCookie { cookie := c.newCookie(true, false) c.newRequest(c.damageSubtractRequest(Damage, Repair, Parts), cookie) return DamageSubtractCookie{cookie} @@ -433,7 +439,7 @@ func (cook DamageSubtractCookie) Check() error { } // Write request to wire for DamageSubtract -func (c *Conn) damageSubtractRequest(Damage Id, Repair Id, Parts Id) []byte { +func (c *Conn) damageSubtractRequest(Damage DamageDamage, Repair XfixesRegion, Parts XfixesRegion) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -466,13 +472,13 @@ type DamageAddCookie struct { } // Write request to wire for DamageAdd -func (c *Conn) DamageAdd(Drawable Id, Region Id) DamageAddCookie { +func (c *Conn) DamageAdd(Drawable Drawable, Region XfixesRegion) DamageAddCookie { cookie := c.newCookie(false, false) c.newRequest(c.damageAddRequest(Drawable, Region), cookie) return DamageAddCookie{cookie} } -func (c *Conn) DamageAddChecked(Drawable Id, Region Id) DamageAddCookie { +func (c *Conn) DamageAddChecked(Drawable Drawable, Region XfixesRegion) DamageAddCookie { cookie := c.newCookie(true, false) c.newRequest(c.damageAddRequest(Drawable, Region), cookie) return DamageAddCookie{cookie} @@ -483,7 +489,7 @@ func (cook DamageAddCookie) Check() error { } // Write request to wire for DamageAdd -func (c *Conn) damageAddRequest(Drawable Id, Region Id) []byte { +func (c *Conn) damageAddRequest(Drawable Drawable, Region XfixesRegion) []byte { size := 12 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_dpms.go b/nexgb/auto_dpms.go index fb4b170..8ceab58 100644 --- a/nexgb/auto_dpms.go +++ b/nexgb/auto_dpms.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by dpms.xml on May 8 2012 11:03:23pm EDT. + This file was generated by dpms.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -33,20 +33,8 @@ func init() { newExtErrorFuncs["DPMS"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Card16' - -// Skipping definition for base type 'Char' - -// Skipping definition for base type 'Card32' - -// Skipping definition for base type 'Double' - -// Skipping definition for base type 'Bool' - // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -59,6 +47,16 @@ func init() { // 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' + +// Skipping definition for base type 'Bool' + const ( DpmsDPMSModeOn = 0 DpmsDPMSModeStandby = 1 diff --git a/nexgb/auto_dri2.go b/nexgb/auto_dri2.go index d48677b..09baef5 100644 --- a/nexgb/auto_dri2.go +++ b/nexgb/auto_dri2.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by dri2.xml on May 8 2012 11:03:23pm EDT. + This file was generated by dri2.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,10 @@ func init() { newExtErrorFuncs["DRI2"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Int8' + +// Skipping definition for base type 'Card16' + // Skipping definition for base type 'Char' // Skipping definition for base type 'Card32' @@ -47,8 +51,6 @@ 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' @@ -59,10 +61,6 @@ func init() { // Skipping definition for base type 'Byte' -// Skipping definition for base type 'Int8' - -// Skipping definition for base type 'Card16' - const ( Dri2AttachmentBufferFrontLeft = 0 Dri2AttachmentBufferBackLeft = 1 @@ -231,7 +229,7 @@ type Dri2BufferSwapCompleteEvent struct { // padding: 1 bytes EventType uint16 // padding: 2 bytes - Drawable Id + Drawable Drawable UstHi uint32 UstLo uint32 MscHi uint32 @@ -254,7 +252,7 @@ func NewDri2BufferSwapCompleteEvent(buf []byte) Event { b += 2 // padding - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 v.UstHi = Get32(buf[b:]) @@ -345,7 +343,7 @@ const Dri2InvalidateBuffers = 1 type Dri2InvalidateBuffersEvent struct { Sequence uint16 // padding: 1 bytes - Drawable Id + Drawable Drawable } // Event read Dri2InvalidateBuffers @@ -358,7 +356,7 @@ func NewDri2InvalidateBuffersEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 return v @@ -496,13 +494,13 @@ type Dri2ConnectCookie struct { *cookie } -func (c *Conn) Dri2Connect(Window Id, DriverType uint32) Dri2ConnectCookie { +func (c *Conn) Dri2Connect(Window Window, DriverType uint32) Dri2ConnectCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2ConnectRequest(Window, DriverType), cookie) return Dri2ConnectCookie{cookie} } -func (c *Conn) Dri2ConnectUnchecked(Window Id, DriverType uint32) Dri2ConnectCookie { +func (c *Conn) Dri2ConnectUnchecked(Window Window, DriverType uint32) Dri2ConnectCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2ConnectRequest(Window, DriverType), cookie) return Dri2ConnectCookie{cookie} @@ -581,7 +579,7 @@ func (cook Dri2ConnectCookie) Check() error { } // Write request to wire for Dri2Connect -func (c *Conn) dri2ConnectRequest(Window Id, DriverType uint32) []byte { +func (c *Conn) dri2ConnectRequest(Window Window, DriverType uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -610,13 +608,13 @@ type Dri2AuthenticateCookie struct { *cookie } -func (c *Conn) Dri2Authenticate(Window Id, Magic uint32) Dri2AuthenticateCookie { +func (c *Conn) Dri2Authenticate(Window Window, Magic uint32) Dri2AuthenticateCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2AuthenticateRequest(Window, Magic), cookie) return Dri2AuthenticateCookie{cookie} } -func (c *Conn) Dri2AuthenticateUnchecked(Window Id, Magic uint32) Dri2AuthenticateCookie { +func (c *Conn) Dri2AuthenticateUnchecked(Window Window, Magic uint32) Dri2AuthenticateCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2AuthenticateRequest(Window, Magic), cookie) return Dri2AuthenticateCookie{cookie} @@ -667,7 +665,7 @@ func (cook Dri2AuthenticateCookie) Check() error { } // Write request to wire for Dri2Authenticate -func (c *Conn) dri2AuthenticateRequest(Window Id, Magic uint32) []byte { +func (c *Conn) dri2AuthenticateRequest(Window Window, Magic uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -697,13 +695,13 @@ type Dri2CreateDrawableCookie struct { } // Write request to wire for Dri2CreateDrawable -func (c *Conn) Dri2CreateDrawable(Drawable Id) Dri2CreateDrawableCookie { +func (c *Conn) Dri2CreateDrawable(Drawable Drawable) Dri2CreateDrawableCookie { cookie := c.newCookie(false, false) c.newRequest(c.dri2CreateDrawableRequest(Drawable), cookie) return Dri2CreateDrawableCookie{cookie} } -func (c *Conn) Dri2CreateDrawableChecked(Drawable Id) Dri2CreateDrawableCookie { +func (c *Conn) Dri2CreateDrawableChecked(Drawable Drawable) Dri2CreateDrawableCookie { cookie := c.newCookie(true, false) c.newRequest(c.dri2CreateDrawableRequest(Drawable), cookie) return Dri2CreateDrawableCookie{cookie} @@ -714,7 +712,7 @@ func (cook Dri2CreateDrawableCookie) Check() error { } // Write request to wire for Dri2CreateDrawable -func (c *Conn) dri2CreateDrawableRequest(Drawable Id) []byte { +func (c *Conn) dri2CreateDrawableRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -741,13 +739,13 @@ type Dri2DestroyDrawableCookie struct { } // Write request to wire for Dri2DestroyDrawable -func (c *Conn) Dri2DestroyDrawable(Drawable Id) Dri2DestroyDrawableCookie { +func (c *Conn) Dri2DestroyDrawable(Drawable Drawable) Dri2DestroyDrawableCookie { cookie := c.newCookie(false, false) c.newRequest(c.dri2DestroyDrawableRequest(Drawable), cookie) return Dri2DestroyDrawableCookie{cookie} } -func (c *Conn) Dri2DestroyDrawableChecked(Drawable Id) Dri2DestroyDrawableCookie { +func (c *Conn) Dri2DestroyDrawableChecked(Drawable Drawable) Dri2DestroyDrawableCookie { cookie := c.newCookie(true, false) c.newRequest(c.dri2DestroyDrawableRequest(Drawable), cookie) return Dri2DestroyDrawableCookie{cookie} @@ -758,7 +756,7 @@ func (cook Dri2DestroyDrawableCookie) Check() error { } // Write request to wire for Dri2DestroyDrawable -func (c *Conn) dri2DestroyDrawableRequest(Drawable Id) []byte { +func (c *Conn) dri2DestroyDrawableRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -784,13 +782,13 @@ type Dri2GetBuffersCookie struct { *cookie } -func (c *Conn) Dri2GetBuffers(Drawable Id, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { +func (c *Conn) Dri2GetBuffers(Drawable Drawable, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2GetBuffersRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersCookie{cookie} } -func (c *Conn) Dri2GetBuffersUnchecked(Drawable Id, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { +func (c *Conn) Dri2GetBuffersUnchecked(Drawable Drawable, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2GetBuffersRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersCookie{cookie} @@ -856,7 +854,7 @@ func (cook Dri2GetBuffersCookie) Check() error { } // Write request to wire for Dri2GetBuffers -func (c *Conn) dri2GetBuffersRequest(Drawable Id, Count uint32, Attachments []uint32) []byte { +func (c *Conn) dri2GetBuffersRequest(Drawable Drawable, Count uint32, Attachments []uint32) []byte { size := pad((12 + pad((len(Attachments) * 4)))) b := 0 buf := make([]byte, size) @@ -891,13 +889,13 @@ type Dri2CopyRegionCookie struct { *cookie } -func (c *Conn) Dri2CopyRegion(Drawable Id, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { +func (c *Conn) Dri2CopyRegion(Drawable Drawable, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2CopyRegionRequest(Drawable, Region, Dest, Src), cookie) return Dri2CopyRegionCookie{cookie} } -func (c *Conn) Dri2CopyRegionUnchecked(Drawable Id, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { +func (c *Conn) Dri2CopyRegionUnchecked(Drawable Drawable, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2CopyRegionRequest(Drawable, Region, Dest, Src), cookie) return Dri2CopyRegionCookie{cookie} @@ -944,7 +942,7 @@ func (cook Dri2CopyRegionCookie) Check() error { } // Write request to wire for Dri2CopyRegion -func (c *Conn) dri2CopyRegionRequest(Drawable Id, Region uint32, Dest uint32, Src uint32) []byte { +func (c *Conn) dri2CopyRegionRequest(Drawable Drawable, Region uint32, Dest uint32, Src uint32) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -979,13 +977,13 @@ type Dri2GetBuffersWithFormatCookie struct { *cookie } -func (c *Conn) Dri2GetBuffersWithFormat(Drawable Id, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { +func (c *Conn) Dri2GetBuffersWithFormat(Drawable Drawable, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2GetBuffersWithFormatRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersWithFormatCookie{cookie} } -func (c *Conn) Dri2GetBuffersWithFormatUnchecked(Drawable Id, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { +func (c *Conn) Dri2GetBuffersWithFormatUnchecked(Drawable Drawable, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2GetBuffersWithFormatRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersWithFormatCookie{cookie} @@ -1051,7 +1049,7 @@ func (cook Dri2GetBuffersWithFormatCookie) Check() error { } // Write request to wire for Dri2GetBuffersWithFormat -func (c *Conn) dri2GetBuffersWithFormatRequest(Drawable Id, Count uint32, Attachments []Dri2AttachFormat) []byte { +func (c *Conn) dri2GetBuffersWithFormatRequest(Drawable Drawable, Count uint32, Attachments []Dri2AttachFormat) []byte { size := pad((12 + pad((len(Attachments) * 8)))) b := 0 buf := make([]byte, size) @@ -1082,13 +1080,13 @@ type Dri2SwapBuffersCookie struct { *cookie } -func (c *Conn) Dri2SwapBuffers(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { +func (c *Conn) Dri2SwapBuffers(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2SwapBuffersRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2SwapBuffersCookie{cookie} } -func (c *Conn) Dri2SwapBuffersUnchecked(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { +func (c *Conn) Dri2SwapBuffersUnchecked(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2SwapBuffersRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2SwapBuffersCookie{cookie} @@ -1143,7 +1141,7 @@ func (cook Dri2SwapBuffersCookie) Check() error { } // Write request to wire for Dri2SwapBuffers -func (c *Conn) dri2SwapBuffersRequest(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { +func (c *Conn) dri2SwapBuffersRequest(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1187,13 +1185,13 @@ type Dri2GetMSCCookie struct { *cookie } -func (c *Conn) Dri2GetMSC(Drawable Id) Dri2GetMSCCookie { +func (c *Conn) Dri2GetMSC(Drawable Drawable) Dri2GetMSCCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2GetMSCRequest(Drawable), cookie) return Dri2GetMSCCookie{cookie} } -func (c *Conn) Dri2GetMSCUnchecked(Drawable Id) Dri2GetMSCCookie { +func (c *Conn) Dri2GetMSCUnchecked(Drawable Drawable) Dri2GetMSCCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2GetMSCRequest(Drawable), cookie) return Dri2GetMSCCookie{cookie} @@ -1264,7 +1262,7 @@ func (cook Dri2GetMSCCookie) Check() error { } // Write request to wire for Dri2GetMSC -func (c *Conn) dri2GetMSCRequest(Drawable Id) []byte { +func (c *Conn) dri2GetMSCRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1290,13 +1288,13 @@ type Dri2WaitMSCCookie struct { *cookie } -func (c *Conn) Dri2WaitMSC(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { +func (c *Conn) Dri2WaitMSC(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2WaitMSCRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2WaitMSCCookie{cookie} } -func (c *Conn) Dri2WaitMSCUnchecked(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { +func (c *Conn) Dri2WaitMSCUnchecked(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2WaitMSCRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2WaitMSCCookie{cookie} @@ -1367,7 +1365,7 @@ func (cook Dri2WaitMSCCookie) Check() error { } // Write request to wire for Dri2WaitMSC -func (c *Conn) dri2WaitMSCRequest(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { +func (c *Conn) dri2WaitMSCRequest(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1411,13 +1409,13 @@ type Dri2WaitSBCCookie struct { *cookie } -func (c *Conn) Dri2WaitSBC(Drawable Id, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { +func (c *Conn) Dri2WaitSBC(Drawable Drawable, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2WaitSBCRequest(Drawable, TargetSbcHi, TargetSbcLo), cookie) return Dri2WaitSBCCookie{cookie} } -func (c *Conn) Dri2WaitSBCUnchecked(Drawable Id, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { +func (c *Conn) Dri2WaitSBCUnchecked(Drawable Drawable, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2WaitSBCRequest(Drawable, TargetSbcHi, TargetSbcLo), cookie) return Dri2WaitSBCCookie{cookie} @@ -1488,7 +1486,7 @@ func (cook Dri2WaitSBCCookie) Check() error { } // Write request to wire for Dri2WaitSBC -func (c *Conn) dri2WaitSBCRequest(Drawable Id, TargetSbcHi uint32, TargetSbcLo uint32) []byte { +func (c *Conn) dri2WaitSBCRequest(Drawable Drawable, TargetSbcHi uint32, TargetSbcLo uint32) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1521,13 +1519,13 @@ type Dri2SwapIntervalCookie struct { } // Write request to wire for Dri2SwapInterval -func (c *Conn) Dri2SwapInterval(Drawable Id, Interval uint32) Dri2SwapIntervalCookie { +func (c *Conn) Dri2SwapInterval(Drawable Drawable, Interval uint32) Dri2SwapIntervalCookie { cookie := c.newCookie(false, false) c.newRequest(c.dri2SwapIntervalRequest(Drawable, Interval), cookie) return Dri2SwapIntervalCookie{cookie} } -func (c *Conn) Dri2SwapIntervalChecked(Drawable Id, Interval uint32) Dri2SwapIntervalCookie { +func (c *Conn) Dri2SwapIntervalChecked(Drawable Drawable, Interval uint32) Dri2SwapIntervalCookie { cookie := c.newCookie(true, false) c.newRequest(c.dri2SwapIntervalRequest(Drawable, Interval), cookie) return Dri2SwapIntervalCookie{cookie} @@ -1538,7 +1536,7 @@ func (cook Dri2SwapIntervalCookie) Check() error { } // Write request to wire for Dri2SwapInterval -func (c *Conn) dri2SwapIntervalRequest(Drawable Id, Interval uint32) []byte { +func (c *Conn) dri2SwapIntervalRequest(Drawable Drawable, Interval uint32) []byte { size := 12 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_ge.go b/nexgb/auto_ge.go index 10b4ac0..3d1b00c 100644 --- a/nexgb/auto_ge.go +++ b/nexgb/auto_ge.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by ge.xml on May 8 2012 11:03:23pm EDT. + This file was generated by ge.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -47,8 +47,6 @@ 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' diff --git a/nexgb/auto_glx.go b/nexgb/auto_glx.go index d88b1c9..0fe0f61 100644 --- a/nexgb/auto_glx.go +++ b/nexgb/auto_glx.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by glx.xml on May 8 2012 11:03:23pm EDT. + This file was generated by glx.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -55,8 +55,6 @@ 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' @@ -103,17 +101,65 @@ const ( GlxRmGlSelect = 7170 ) -// Skipping resource definition of 'Pixmap' +type GlxPixmap uint32 + +func (c *Conn) NewGlxPixmapId() (GlxPixmap, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxPixmap(id), nil +} + +type GlxContext uint32 + +func (c *Conn) NewGlxContextId() (GlxContext, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxContext(id), nil +} + +type GlxPbuffer uint32 -// Skipping resource definition of 'Context' +func (c *Conn) NewGlxPbufferId() (GlxPbuffer, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxPbuffer(id), nil +} -// Skipping resource definition of 'Pbuffer' +type GlxWindow uint32 -// Skipping resource definition of 'Window' +func (c *Conn) NewGlxWindowId() (GlxWindow, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxWindow(id), nil +} -// Skipping resource definition of 'Fbconfig' +type GlxFbconfig uint32 -// Skipping resource definition of 'Drawable' +func (c *Conn) NewGlxFbconfigId() (GlxFbconfig, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxFbconfig(id), nil +} + +type GlxDrawable uint32 + +func (c *Conn) NewGlxDrawableId() (GlxDrawable, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxDrawable(id), nil +} type GlxFloat32 float64 @@ -133,7 +179,7 @@ type GlxPbufferClobberEvent struct { // padding: 1 bytes EventType uint16 DrawType uint16 - Drawable Id + Drawable GlxDrawable BMask uint32 AuxBuffer uint16 X uint16 @@ -160,7 +206,7 @@ func NewGlxPbufferClobberEvent(buf []byte) Event { v.DrawType = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = GlxDrawable(Get32(buf[b:])) b += 4 v.BMask = Get32(buf[b:]) @@ -308,7 +354,7 @@ func (err GlxGenericError) SequenceId() uint16 { return err.Sequence } -func (err GlxGenericError) BadId() Id { +func (err GlxGenericError) BadId() uint32 { return 0 } @@ -344,8 +390,8 @@ func (err GlxBadContextError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadContextError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadContextError) BadId() uint32 { + return 0 } func (err GlxBadContextError) Error() string { @@ -380,8 +426,8 @@ func (err GlxBadContextStateError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadContextStateError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadContextStateError) BadId() uint32 { + return 0 } func (err GlxBadContextStateError) Error() string { @@ -416,8 +462,8 @@ func (err GlxBadDrawableError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadDrawableError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadDrawableError) BadId() uint32 { + return 0 } func (err GlxBadDrawableError) Error() string { @@ -452,8 +498,8 @@ func (err GlxBadPixmapError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadPixmapError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadPixmapError) BadId() uint32 { + return 0 } func (err GlxBadPixmapError) Error() string { @@ -488,8 +534,8 @@ func (err GlxBadContextTagError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadContextTagError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadContextTagError) BadId() uint32 { + return 0 } func (err GlxBadContextTagError) Error() string { @@ -524,8 +570,8 @@ func (err GlxBadCurrentWindowError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadCurrentWindowError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadCurrentWindowError) BadId() uint32 { + return 0 } func (err GlxBadCurrentWindowError) Error() string { @@ -560,8 +606,8 @@ func (err GlxBadRenderRequestError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadRenderRequestError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadRenderRequestError) BadId() uint32 { + return 0 } func (err GlxBadRenderRequestError) Error() string { @@ -596,8 +642,8 @@ func (err GlxBadLargeRequestError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadLargeRequestError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadLargeRequestError) BadId() uint32 { + return 0 } func (err GlxBadLargeRequestError) Error() string { @@ -632,8 +678,8 @@ func (err GlxUnsupportedPrivateRequestError) SequenceId() uint16 { return err.Sequence } -func (err GlxUnsupportedPrivateRequestError) BadId() Id { - return Id(err.BadValue) +func (err GlxUnsupportedPrivateRequestError) BadId() uint32 { + return 0 } func (err GlxUnsupportedPrivateRequestError) Error() string { @@ -668,8 +714,8 @@ func (err GlxBadFBConfigError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadFBConfigError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadFBConfigError) BadId() uint32 { + return 0 } func (err GlxBadFBConfigError) Error() string { @@ -704,8 +750,8 @@ func (err GlxBadPbufferError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadPbufferError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadPbufferError) BadId() uint32 { + return 0 } func (err GlxBadPbufferError) Error() string { @@ -740,8 +786,8 @@ func (err GlxBadCurrentDrawableError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadCurrentDrawableError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadCurrentDrawableError) BadId() uint32 { + return 0 } func (err GlxBadCurrentDrawableError) Error() string { @@ -776,8 +822,8 @@ func (err GlxBadWindowError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadWindowError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadWindowError) BadId() uint32 { + return 0 } func (err GlxBadWindowError) Error() string { @@ -812,8 +858,8 @@ func (err GlxGLXBadProfileARBError) SequenceId() uint16 { return err.Sequence } -func (err GlxGLXBadProfileARBError) BadId() Id { - return Id(err.BadValue) +func (err GlxGLXBadProfileARBError) BadId() uint32 { + return 0 } func (err GlxGLXBadProfileARBError) Error() string { @@ -940,13 +986,13 @@ type GlxCreateContextCookie struct { } // Write request to wire for GlxCreateContext -func (c *Conn) GlxCreateContext(Context Id, Visual Visualid, Screen uint32, ShareList Id, IsDirect bool) GlxCreateContextCookie { +func (c *Conn) GlxCreateContext(Context GlxContext, Visual Visualid, Screen uint32, ShareList GlxContext, IsDirect bool) GlxCreateContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateContextRequest(Context, Visual, Screen, ShareList, IsDirect), cookie) return GlxCreateContextCookie{cookie} } -func (c *Conn) GlxCreateContextChecked(Context Id, Visual Visualid, Screen uint32, ShareList Id, IsDirect bool) GlxCreateContextCookie { +func (c *Conn) GlxCreateContextChecked(Context GlxContext, Visual Visualid, Screen uint32, ShareList GlxContext, IsDirect bool) GlxCreateContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateContextRequest(Context, Visual, Screen, ShareList, IsDirect), cookie) return GlxCreateContextCookie{cookie} @@ -957,7 +1003,7 @@ func (cook GlxCreateContextCookie) Check() error { } // Write request to wire for GlxCreateContext -func (c *Conn) glxCreateContextRequest(Context Id, Visual Visualid, Screen uint32, ShareList Id, IsDirect bool) []byte { +func (c *Conn) glxCreateContextRequest(Context GlxContext, Visual Visualid, Screen uint32, ShareList GlxContext, IsDirect bool) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -1002,13 +1048,13 @@ type GlxDestroyContextCookie struct { } // Write request to wire for GlxDestroyContext -func (c *Conn) GlxDestroyContext(Context Id) GlxDestroyContextCookie { +func (c *Conn) GlxDestroyContext(Context GlxContext) GlxDestroyContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyContextRequest(Context), cookie) return GlxDestroyContextCookie{cookie} } -func (c *Conn) GlxDestroyContextChecked(Context Id) GlxDestroyContextCookie { +func (c *Conn) GlxDestroyContextChecked(Context GlxContext) GlxDestroyContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyContextRequest(Context), cookie) return GlxDestroyContextCookie{cookie} @@ -1019,7 +1065,7 @@ func (cook GlxDestroyContextCookie) Check() error { } // Write request to wire for GlxDestroyContext -func (c *Conn) glxDestroyContextRequest(Context Id) []byte { +func (c *Conn) glxDestroyContextRequest(Context GlxContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1045,13 +1091,13 @@ type GlxMakeCurrentCookie struct { *cookie } -func (c *Conn) GlxMakeCurrent(Drawable Id, Context Id, OldContextTag GlxContextTag) GlxMakeCurrentCookie { +func (c *Conn) GlxMakeCurrent(Drawable GlxDrawable, Context GlxContext, OldContextTag GlxContextTag) GlxMakeCurrentCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxMakeCurrentRequest(Drawable, Context, OldContextTag), cookie) return GlxMakeCurrentCookie{cookie} } -func (c *Conn) GlxMakeCurrentUnchecked(Drawable Id, Context Id, OldContextTag GlxContextTag) GlxMakeCurrentCookie { +func (c *Conn) GlxMakeCurrentUnchecked(Drawable GlxDrawable, Context GlxContext, OldContextTag GlxContextTag) GlxMakeCurrentCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxMakeCurrentRequest(Drawable, Context, OldContextTag), cookie) return GlxMakeCurrentCookie{cookie} @@ -1105,7 +1151,7 @@ func (cook GlxMakeCurrentCookie) Check() error { } // Write request to wire for GlxMakeCurrent -func (c *Conn) glxMakeCurrentRequest(Drawable Id, Context Id, OldContextTag GlxContextTag) []byte { +func (c *Conn) glxMakeCurrentRequest(Drawable GlxDrawable, Context GlxContext, OldContextTag GlxContextTag) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1137,13 +1183,13 @@ type GlxIsDirectCookie struct { *cookie } -func (c *Conn) GlxIsDirect(Context Id) GlxIsDirectCookie { +func (c *Conn) GlxIsDirect(Context GlxContext) GlxIsDirectCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxIsDirectRequest(Context), cookie) return GlxIsDirectCookie{cookie} } -func (c *Conn) GlxIsDirectUnchecked(Context Id) GlxIsDirectCookie { +func (c *Conn) GlxIsDirectUnchecked(Context GlxContext) GlxIsDirectCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxIsDirectRequest(Context), cookie) return GlxIsDirectCookie{cookie} @@ -1201,7 +1247,7 @@ func (cook GlxIsDirectCookie) Check() error { } // Write request to wire for GlxIsDirect -func (c *Conn) glxIsDirectRequest(Context Id) []byte { +func (c *Conn) glxIsDirectRequest(Context GlxContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1409,13 +1455,13 @@ type GlxCopyContextCookie struct { } // Write request to wire for GlxCopyContext -func (c *Conn) GlxCopyContext(Src Id, Dest Id, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { +func (c *Conn) GlxCopyContext(Src GlxContext, Dest GlxContext, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCopyContextRequest(Src, Dest, Mask, SrcContextTag), cookie) return GlxCopyContextCookie{cookie} } -func (c *Conn) GlxCopyContextChecked(Src Id, Dest Id, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { +func (c *Conn) GlxCopyContextChecked(Src GlxContext, Dest GlxContext, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCopyContextRequest(Src, Dest, Mask, SrcContextTag), cookie) return GlxCopyContextCookie{cookie} @@ -1426,7 +1472,7 @@ func (cook GlxCopyContextCookie) Check() error { } // Write request to wire for GlxCopyContext -func (c *Conn) glxCopyContextRequest(Src Id, Dest Id, Mask uint32, SrcContextTag GlxContextTag) []byte { +func (c *Conn) glxCopyContextRequest(Src GlxContext, Dest GlxContext, Mask uint32, SrcContextTag GlxContextTag) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1462,13 +1508,13 @@ type GlxSwapBuffersCookie struct { } // Write request to wire for GlxSwapBuffers -func (c *Conn) GlxSwapBuffers(ContextTag GlxContextTag, Drawable Id) GlxSwapBuffersCookie { +func (c *Conn) GlxSwapBuffers(ContextTag GlxContextTag, Drawable GlxDrawable) GlxSwapBuffersCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxSwapBuffersRequest(ContextTag, Drawable), cookie) return GlxSwapBuffersCookie{cookie} } -func (c *Conn) GlxSwapBuffersChecked(ContextTag GlxContextTag, Drawable Id) GlxSwapBuffersCookie { +func (c *Conn) GlxSwapBuffersChecked(ContextTag GlxContextTag, Drawable GlxDrawable) GlxSwapBuffersCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxSwapBuffersRequest(ContextTag, Drawable), cookie) return GlxSwapBuffersCookie{cookie} @@ -1479,7 +1525,7 @@ func (cook GlxSwapBuffersCookie) Check() error { } // Write request to wire for GlxSwapBuffers -func (c *Conn) glxSwapBuffersRequest(ContextTag GlxContextTag, Drawable Id) []byte { +func (c *Conn) glxSwapBuffersRequest(ContextTag GlxContextTag, Drawable GlxDrawable) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1509,13 +1555,13 @@ type GlxUseXFontCookie struct { } // Write request to wire for GlxUseXFont -func (c *Conn) GlxUseXFont(ContextTag GlxContextTag, Font Id, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { +func (c *Conn) GlxUseXFont(ContextTag GlxContextTag, Font Font, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxUseXFontRequest(ContextTag, Font, First, Count, ListBase), cookie) return GlxUseXFontCookie{cookie} } -func (c *Conn) GlxUseXFontChecked(ContextTag GlxContextTag, Font Id, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { +func (c *Conn) GlxUseXFontChecked(ContextTag GlxContextTag, Font Font, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxUseXFontRequest(ContextTag, Font, First, Count, ListBase), cookie) return GlxUseXFontCookie{cookie} @@ -1526,7 +1572,7 @@ func (cook GlxUseXFontCookie) Check() error { } // Write request to wire for GlxUseXFont -func (c *Conn) glxUseXFontRequest(ContextTag GlxContextTag, Font Id, First uint32, Count uint32, ListBase uint32) []byte { +func (c *Conn) glxUseXFontRequest(ContextTag GlxContextTag, Font Font, First uint32, Count uint32, ListBase uint32) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -1565,13 +1611,13 @@ type GlxCreateGLXPixmapCookie struct { } // Write request to wire for GlxCreateGLXPixmap -func (c *Conn) GlxCreateGLXPixmap(Screen uint32, Visual Visualid, Pixmap Id, GlxPixmap Id) GlxCreateGLXPixmapCookie { +func (c *Conn) GlxCreateGLXPixmap(Screen uint32, Visual Visualid, Pixmap Pixmap, GlxPixmap GlxPixmap) GlxCreateGLXPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateGLXPixmapRequest(Screen, Visual, Pixmap, GlxPixmap), cookie) return GlxCreateGLXPixmapCookie{cookie} } -func (c *Conn) GlxCreateGLXPixmapChecked(Screen uint32, Visual Visualid, Pixmap Id, GlxPixmap Id) GlxCreateGLXPixmapCookie { +func (c *Conn) GlxCreateGLXPixmapChecked(Screen uint32, Visual Visualid, Pixmap Pixmap, GlxPixmap GlxPixmap) GlxCreateGLXPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateGLXPixmapRequest(Screen, Visual, Pixmap, GlxPixmap), cookie) return GlxCreateGLXPixmapCookie{cookie} @@ -1582,7 +1628,7 @@ func (cook GlxCreateGLXPixmapCookie) Check() error { } // Write request to wire for GlxCreateGLXPixmap -func (c *Conn) glxCreateGLXPixmapRequest(Screen uint32, Visual Visualid, Pixmap Id, GlxPixmap Id) []byte { +func (c *Conn) glxCreateGLXPixmapRequest(Screen uint32, Visual Visualid, Pixmap Pixmap, GlxPixmap GlxPixmap) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1716,13 +1762,13 @@ type GlxDestroyGLXPixmapCookie struct { } // Write request to wire for GlxDestroyGLXPixmap -func (c *Conn) GlxDestroyGLXPixmap(GlxPixmap Id) GlxDestroyGLXPixmapCookie { +func (c *Conn) GlxDestroyGLXPixmap(GlxPixmap GlxPixmap) GlxDestroyGLXPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyGLXPixmapRequest(GlxPixmap), cookie) return GlxDestroyGLXPixmapCookie{cookie} } -func (c *Conn) GlxDestroyGLXPixmapChecked(GlxPixmap Id) GlxDestroyGLXPixmapCookie { +func (c *Conn) GlxDestroyGLXPixmapChecked(GlxPixmap GlxPixmap) GlxDestroyGLXPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyGLXPixmapRequest(GlxPixmap), cookie) return GlxDestroyGLXPixmapCookie{cookie} @@ -1733,7 +1779,7 @@ func (cook GlxDestroyGLXPixmapCookie) Check() error { } // Write request to wire for GlxDestroyGLXPixmap -func (c *Conn) glxDestroyGLXPixmapRequest(GlxPixmap Id) []byte { +func (c *Conn) glxDestroyGLXPixmapRequest(GlxPixmap GlxPixmap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2249,13 +2295,13 @@ type GlxCreatePixmapCookie struct { } // Write request to wire for GlxCreatePixmap -func (c *Conn) GlxCreatePixmap(Screen uint32, Fbconfig Id, Pixmap Id, GlxPixmap Id, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { +func (c *Conn) GlxCreatePixmap(Screen uint32, Fbconfig GlxFbconfig, Pixmap Pixmap, GlxPixmap GlxPixmap, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreatePixmapRequest(Screen, Fbconfig, Pixmap, GlxPixmap, NumAttribs, Attribs), cookie) return GlxCreatePixmapCookie{cookie} } -func (c *Conn) GlxCreatePixmapChecked(Screen uint32, Fbconfig Id, Pixmap Id, GlxPixmap Id, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { +func (c *Conn) GlxCreatePixmapChecked(Screen uint32, Fbconfig GlxFbconfig, Pixmap Pixmap, GlxPixmap GlxPixmap, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreatePixmapRequest(Screen, Fbconfig, Pixmap, GlxPixmap, NumAttribs, Attribs), cookie) return GlxCreatePixmapCookie{cookie} @@ -2266,7 +2312,7 @@ func (cook GlxCreatePixmapCookie) Check() error { } // Write request to wire for GlxCreatePixmap -func (c *Conn) glxCreatePixmapRequest(Screen uint32, Fbconfig Id, Pixmap Id, GlxPixmap Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreatePixmapRequest(Screen uint32, Fbconfig GlxFbconfig, Pixmap Pixmap, GlxPixmap GlxPixmap, NumAttribs uint32, Attribs []uint32) []byte { size := pad((24 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2311,13 +2357,13 @@ type GlxDestroyPixmapCookie struct { } // Write request to wire for GlxDestroyPixmap -func (c *Conn) GlxDestroyPixmap(GlxPixmap Id) GlxDestroyPixmapCookie { +func (c *Conn) GlxDestroyPixmap(GlxPixmap GlxPixmap) GlxDestroyPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyPixmapRequest(GlxPixmap), cookie) return GlxDestroyPixmapCookie{cookie} } -func (c *Conn) GlxDestroyPixmapChecked(GlxPixmap Id) GlxDestroyPixmapCookie { +func (c *Conn) GlxDestroyPixmapChecked(GlxPixmap GlxPixmap) GlxDestroyPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyPixmapRequest(GlxPixmap), cookie) return GlxDestroyPixmapCookie{cookie} @@ -2328,7 +2374,7 @@ func (cook GlxDestroyPixmapCookie) Check() error { } // Write request to wire for GlxDestroyPixmap -func (c *Conn) glxDestroyPixmapRequest(GlxPixmap Id) []byte { +func (c *Conn) glxDestroyPixmapRequest(GlxPixmap GlxPixmap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2355,13 +2401,13 @@ type GlxCreateNewContextCookie struct { } // Write request to wire for GlxCreateNewContext -func (c *Conn) GlxCreateNewContext(Context Id, Fbconfig Id, Screen uint32, RenderType uint32, ShareList Id, IsDirect bool) GlxCreateNewContextCookie { +func (c *Conn) GlxCreateNewContext(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, RenderType uint32, ShareList GlxContext, IsDirect bool) GlxCreateNewContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateNewContextRequest(Context, Fbconfig, Screen, RenderType, ShareList, IsDirect), cookie) return GlxCreateNewContextCookie{cookie} } -func (c *Conn) GlxCreateNewContextChecked(Context Id, Fbconfig Id, Screen uint32, RenderType uint32, ShareList Id, IsDirect bool) GlxCreateNewContextCookie { +func (c *Conn) GlxCreateNewContextChecked(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, RenderType uint32, ShareList GlxContext, IsDirect bool) GlxCreateNewContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateNewContextRequest(Context, Fbconfig, Screen, RenderType, ShareList, IsDirect), cookie) return GlxCreateNewContextCookie{cookie} @@ -2372,7 +2418,7 @@ func (cook GlxCreateNewContextCookie) Check() error { } // Write request to wire for GlxCreateNewContext -func (c *Conn) glxCreateNewContextRequest(Context Id, Fbconfig Id, Screen uint32, RenderType uint32, ShareList Id, IsDirect bool) []byte { +func (c *Conn) glxCreateNewContextRequest(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, RenderType uint32, ShareList GlxContext, IsDirect bool) []byte { size := 28 b := 0 buf := make([]byte, size) @@ -2419,13 +2465,13 @@ type GlxQueryContextCookie struct { *cookie } -func (c *Conn) GlxQueryContext(Context Id) GlxQueryContextCookie { +func (c *Conn) GlxQueryContext(Context GlxContext) GlxQueryContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxQueryContextRequest(Context), cookie) return GlxQueryContextCookie{cookie} } -func (c *Conn) GlxQueryContextUnchecked(Context Id) GlxQueryContextCookie { +func (c *Conn) GlxQueryContextUnchecked(Context GlxContext) GlxQueryContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxQueryContextRequest(Context), cookie) return GlxQueryContextCookie{cookie} @@ -2487,7 +2533,7 @@ func (cook GlxQueryContextCookie) Check() error { } // Write request to wire for GlxQueryContext -func (c *Conn) glxQueryContextRequest(Context Id) []byte { +func (c *Conn) glxQueryContextRequest(Context GlxContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2513,13 +2559,13 @@ type GlxMakeContextCurrentCookie struct { *cookie } -func (c *Conn) GlxMakeContextCurrent(OldContextTag GlxContextTag, Drawable Id, ReadDrawable Id, Context Id) GlxMakeContextCurrentCookie { +func (c *Conn) GlxMakeContextCurrent(OldContextTag GlxContextTag, Drawable GlxDrawable, ReadDrawable GlxDrawable, Context GlxContext) GlxMakeContextCurrentCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxMakeContextCurrentRequest(OldContextTag, Drawable, ReadDrawable, Context), cookie) return GlxMakeContextCurrentCookie{cookie} } -func (c *Conn) GlxMakeContextCurrentUnchecked(OldContextTag GlxContextTag, Drawable Id, ReadDrawable Id, Context Id) GlxMakeContextCurrentCookie { +func (c *Conn) GlxMakeContextCurrentUnchecked(OldContextTag GlxContextTag, Drawable GlxDrawable, ReadDrawable GlxDrawable, Context GlxContext) GlxMakeContextCurrentCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxMakeContextCurrentRequest(OldContextTag, Drawable, ReadDrawable, Context), cookie) return GlxMakeContextCurrentCookie{cookie} @@ -2573,7 +2619,7 @@ func (cook GlxMakeContextCurrentCookie) Check() error { } // Write request to wire for GlxMakeContextCurrent -func (c *Conn) glxMakeContextCurrentRequest(OldContextTag GlxContextTag, Drawable Id, ReadDrawable Id, Context Id) []byte { +func (c *Conn) glxMakeContextCurrentRequest(OldContextTag GlxContextTag, Drawable GlxDrawable, ReadDrawable GlxDrawable, Context GlxContext) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -2609,13 +2655,13 @@ type GlxCreatePbufferCookie struct { } // Write request to wire for GlxCreatePbuffer -func (c *Conn) GlxCreatePbuffer(Screen uint32, Fbconfig Id, Pbuffer Id, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { +func (c *Conn) GlxCreatePbuffer(Screen uint32, Fbconfig GlxFbconfig, Pbuffer GlxPbuffer, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreatePbufferRequest(Screen, Fbconfig, Pbuffer, NumAttribs, Attribs), cookie) return GlxCreatePbufferCookie{cookie} } -func (c *Conn) GlxCreatePbufferChecked(Screen uint32, Fbconfig Id, Pbuffer Id, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { +func (c *Conn) GlxCreatePbufferChecked(Screen uint32, Fbconfig GlxFbconfig, Pbuffer GlxPbuffer, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreatePbufferRequest(Screen, Fbconfig, Pbuffer, NumAttribs, Attribs), cookie) return GlxCreatePbufferCookie{cookie} @@ -2626,7 +2672,7 @@ func (cook GlxCreatePbufferCookie) Check() error { } // Write request to wire for GlxCreatePbuffer -func (c *Conn) glxCreatePbufferRequest(Screen uint32, Fbconfig Id, Pbuffer Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreatePbufferRequest(Screen uint32, Fbconfig GlxFbconfig, Pbuffer GlxPbuffer, NumAttribs uint32, Attribs []uint32) []byte { size := pad((20 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2668,13 +2714,13 @@ type GlxDestroyPbufferCookie struct { } // Write request to wire for GlxDestroyPbuffer -func (c *Conn) GlxDestroyPbuffer(Pbuffer Id) GlxDestroyPbufferCookie { +func (c *Conn) GlxDestroyPbuffer(Pbuffer GlxPbuffer) GlxDestroyPbufferCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyPbufferRequest(Pbuffer), cookie) return GlxDestroyPbufferCookie{cookie} } -func (c *Conn) GlxDestroyPbufferChecked(Pbuffer Id) GlxDestroyPbufferCookie { +func (c *Conn) GlxDestroyPbufferChecked(Pbuffer GlxPbuffer) GlxDestroyPbufferCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyPbufferRequest(Pbuffer), cookie) return GlxDestroyPbufferCookie{cookie} @@ -2685,7 +2731,7 @@ func (cook GlxDestroyPbufferCookie) Check() error { } // Write request to wire for GlxDestroyPbuffer -func (c *Conn) glxDestroyPbufferRequest(Pbuffer Id) []byte { +func (c *Conn) glxDestroyPbufferRequest(Pbuffer GlxPbuffer) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2711,13 +2757,13 @@ type GlxGetDrawableAttributesCookie struct { *cookie } -func (c *Conn) GlxGetDrawableAttributes(Drawable Id) GlxGetDrawableAttributesCookie { +func (c *Conn) GlxGetDrawableAttributes(Drawable GlxDrawable) GlxGetDrawableAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxGetDrawableAttributesRequest(Drawable), cookie) return GlxGetDrawableAttributesCookie{cookie} } -func (c *Conn) GlxGetDrawableAttributesUnchecked(Drawable Id) GlxGetDrawableAttributesCookie { +func (c *Conn) GlxGetDrawableAttributesUnchecked(Drawable GlxDrawable) GlxGetDrawableAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxGetDrawableAttributesRequest(Drawable), cookie) return GlxGetDrawableAttributesCookie{cookie} @@ -2779,7 +2825,7 @@ func (cook GlxGetDrawableAttributesCookie) Check() error { } // Write request to wire for GlxGetDrawableAttributes -func (c *Conn) glxGetDrawableAttributesRequest(Drawable Id) []byte { +func (c *Conn) glxGetDrawableAttributesRequest(Drawable GlxDrawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2806,13 +2852,13 @@ type GlxChangeDrawableAttributesCookie struct { } // Write request to wire for GlxChangeDrawableAttributes -func (c *Conn) GlxChangeDrawableAttributes(Drawable Id, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { +func (c *Conn) GlxChangeDrawableAttributes(Drawable GlxDrawable, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxChangeDrawableAttributesRequest(Drawable, NumAttribs, Attribs), cookie) return GlxChangeDrawableAttributesCookie{cookie} } -func (c *Conn) GlxChangeDrawableAttributesChecked(Drawable Id, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { +func (c *Conn) GlxChangeDrawableAttributesChecked(Drawable GlxDrawable, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxChangeDrawableAttributesRequest(Drawable, NumAttribs, Attribs), cookie) return GlxChangeDrawableAttributesCookie{cookie} @@ -2823,7 +2869,7 @@ func (cook GlxChangeDrawableAttributesCookie) Check() error { } // Write request to wire for GlxChangeDrawableAttributes -func (c *Conn) glxChangeDrawableAttributesRequest(Drawable Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxChangeDrawableAttributesRequest(Drawable GlxDrawable, NumAttribs uint32, Attribs []uint32) []byte { size := pad((12 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2859,13 +2905,13 @@ type GlxCreateWindowCookie struct { } // Write request to wire for GlxCreateWindow -func (c *Conn) GlxCreateWindow(Screen uint32, Fbconfig Id, Window Id, GlxWindow Id, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { +func (c *Conn) GlxCreateWindow(Screen uint32, Fbconfig GlxFbconfig, Window Window, GlxWindow GlxWindow, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateWindowRequest(Screen, Fbconfig, Window, GlxWindow, NumAttribs, Attribs), cookie) return GlxCreateWindowCookie{cookie} } -func (c *Conn) GlxCreateWindowChecked(Screen uint32, Fbconfig Id, Window Id, GlxWindow Id, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { +func (c *Conn) GlxCreateWindowChecked(Screen uint32, Fbconfig GlxFbconfig, Window Window, GlxWindow GlxWindow, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateWindowRequest(Screen, Fbconfig, Window, GlxWindow, NumAttribs, Attribs), cookie) return GlxCreateWindowCookie{cookie} @@ -2876,7 +2922,7 @@ func (cook GlxCreateWindowCookie) Check() error { } // Write request to wire for GlxCreateWindow -func (c *Conn) glxCreateWindowRequest(Screen uint32, Fbconfig Id, Window Id, GlxWindow Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreateWindowRequest(Screen uint32, Fbconfig GlxFbconfig, Window Window, GlxWindow GlxWindow, NumAttribs uint32, Attribs []uint32) []byte { size := pad((24 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2921,13 +2967,13 @@ type GlxDeleteWindowCookie struct { } // Write request to wire for GlxDeleteWindow -func (c *Conn) GlxDeleteWindow(Glxwindow Id) GlxDeleteWindowCookie { +func (c *Conn) GlxDeleteWindow(Glxwindow GlxWindow) GlxDeleteWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDeleteWindowRequest(Glxwindow), cookie) return GlxDeleteWindowCookie{cookie} } -func (c *Conn) GlxDeleteWindowChecked(Glxwindow Id) GlxDeleteWindowCookie { +func (c *Conn) GlxDeleteWindowChecked(Glxwindow GlxWindow) GlxDeleteWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDeleteWindowRequest(Glxwindow), cookie) return GlxDeleteWindowCookie{cookie} @@ -2938,7 +2984,7 @@ func (cook GlxDeleteWindowCookie) Check() error { } // Write request to wire for GlxDeleteWindow -func (c *Conn) glxDeleteWindowRequest(Glxwindow Id) []byte { +func (c *Conn) glxDeleteWindowRequest(Glxwindow GlxWindow) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3033,13 +3079,13 @@ type GlxCreateContextAttribsARBCookie struct { } // Write request to wire for GlxCreateContextAttribsARB -func (c *Conn) GlxCreateContextAttribsARB(Context Id, Fbconfig Id, Screen uint32, ShareList Id, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { +func (c *Conn) GlxCreateContextAttribsARB(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, ShareList GlxContext, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateContextAttribsARBRequest(Context, Fbconfig, Screen, ShareList, IsDirect, NumAttribs, Attribs), cookie) return GlxCreateContextAttribsARBCookie{cookie} } -func (c *Conn) GlxCreateContextAttribsARBChecked(Context Id, Fbconfig Id, Screen uint32, ShareList Id, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { +func (c *Conn) GlxCreateContextAttribsARBChecked(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, ShareList GlxContext, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateContextAttribsARBRequest(Context, Fbconfig, Screen, ShareList, IsDirect, NumAttribs, Attribs), cookie) return GlxCreateContextAttribsARBCookie{cookie} @@ -3050,7 +3096,7 @@ func (cook GlxCreateContextAttribsARBCookie) Check() error { } // Write request to wire for GlxCreateContextAttribsARB -func (c *Conn) glxCreateContextAttribsARBRequest(Context Id, Fbconfig Id, Screen uint32, ShareList Id, IsDirect bool, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreateContextAttribsARBRequest(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, ShareList GlxContext, IsDirect bool, NumAttribs uint32, Attribs []uint32) []byte { size := pad((28 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_randr.go b/nexgb/auto_randr.go index e086abd..d7e68bd 100644 --- a/nexgb/auto_randr.go +++ b/nexgb/auto_randr.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by randr.xml on May 8 2012 11:03:24pm EDT. + This file was generated by randr.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -38,10 +38,6 @@ func init() { newExtErrorFuncs["RANDR"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Float' - -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -64,6 +60,8 @@ func init() { // Skipping definition for base type 'Bool' +// Skipping definition for base type 'Float' + const ( RandrRotationRotate0 = 1 RandrRotationRotate90 = 2 @@ -116,11 +114,35 @@ const ( RandrNotifyOutputProperty = 2 ) -// Skipping resource definition of 'Mode' +type RandrMode uint32 + +func (c *Conn) NewRandrModeId() (RandrMode, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RandrMode(id), nil +} -// Skipping resource definition of 'Crtc' +type RandrCrtc uint32 -// Skipping resource definition of 'Output' +func (c *Conn) NewRandrCrtcId() (RandrCrtc, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RandrCrtc(id), nil +} + +type RandrOutput uint32 + +func (c *Conn) NewRandrOutputId() (RandrOutput, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RandrOutput(id), nil +} // 'RandrScreenSize' struct definition // Size: 8 @@ -401,9 +423,9 @@ func RandrModeInfoListBytes(buf []byte, list []RandrModeInfo) int { // Size: 28 type RandrCrtcChange struct { Timestamp Timestamp - Window Id - Crtc Id - Mode Id + Window Window + Crtc RandrCrtc + Mode RandrMode Rotation uint16 // padding: 2 bytes X int16 @@ -419,13 +441,13 @@ func ReadRandrCrtcChange(buf []byte, v *RandrCrtcChange) int { v.Timestamp = Timestamp(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Crtc = Id(Get32(buf[b:])) + v.Crtc = RandrCrtc(Get32(buf[b:])) b += 4 - v.Mode = Id(Get32(buf[b:])) + v.Mode = RandrMode(Get32(buf[b:])) b += 4 v.Rotation = Get16(buf[b:]) @@ -512,10 +534,10 @@ func RandrCrtcChangeListBytes(buf []byte, list []RandrCrtcChange) int { type RandrOutputChange struct { Timestamp Timestamp ConfigTimestamp Timestamp - Window Id - Output Id - Crtc Id - Mode Id + Window Window + Output RandrOutput + Crtc RandrCrtc + Mode RandrMode Rotation uint16 Connection byte SubpixelOrder byte @@ -531,16 +553,16 @@ func ReadRandrOutputChange(buf []byte, v *RandrOutputChange) int { v.ConfigTimestamp = Timestamp(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Output = Id(Get32(buf[b:])) + v.Output = RandrOutput(Get32(buf[b:])) b += 4 - v.Crtc = Id(Get32(buf[b:])) + v.Crtc = RandrCrtc(Get32(buf[b:])) b += 4 - v.Mode = Id(Get32(buf[b:])) + v.Mode = RandrMode(Get32(buf[b:])) b += 4 v.Rotation = Get16(buf[b:]) @@ -615,9 +637,9 @@ func RandrOutputChangeListBytes(buf []byte, list []RandrOutputChange) int { // 'RandrOutputProperty' struct definition // Size: 28 type RandrOutputProperty struct { - Window Id - Output Id - Atom Id + Window Window + Output RandrOutput + Atom Atom Timestamp Timestamp Status byte // padding: 11 bytes @@ -627,13 +649,13 @@ type RandrOutputProperty struct { func ReadRandrOutputProperty(buf []byte, v *RandrOutputProperty) int { b := 0 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Output = Id(Get32(buf[b:])) + v.Output = RandrOutput(Get32(buf[b:])) b += 4 - v.Atom = Id(Get32(buf[b:])) + v.Atom = Atom(Get32(buf[b:])) b += 4 v.Timestamp = Timestamp(Get32(buf[b:])) @@ -866,8 +888,8 @@ type RandrScreenChangeNotifyEvent struct { Rotation byte Timestamp Timestamp ConfigTimestamp Timestamp - Root Id - RequestWindow Id + Root Window + RequestWindow Window SizeID uint16 SubpixelOrder uint16 Width uint16 @@ -893,10 +915,10 @@ func NewRandrScreenChangeNotifyEvent(buf []byte) Event { v.ConfigTimestamp = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.RequestWindow = Id(Get32(buf[b:])) + v.RequestWindow = Window(Get32(buf[b:])) b += 4 v.SizeID = Get16(buf[b:]) @@ -1092,7 +1114,7 @@ func (err RandrBadOutputError) SequenceId() uint16 { return err.Sequence } -func (err RandrBadOutputError) BadId() Id { +func (err RandrBadOutputError) BadId() uint32 { return 0 } @@ -1137,7 +1159,7 @@ func (err RandrBadCrtcError) SequenceId() uint16 { return err.Sequence } -func (err RandrBadCrtcError) BadId() Id { +func (err RandrBadCrtcError) BadId() uint32 { return 0 } @@ -1182,7 +1204,7 @@ func (err RandrBadModeError) SequenceId() uint16 { return err.Sequence } -func (err RandrBadModeError) BadId() Id { +func (err RandrBadModeError) BadId() uint32 { return 0 } @@ -1296,13 +1318,13 @@ type RandrSetScreenConfigCookie struct { *cookie } -func (c *Conn) RandrSetScreenConfig(Window Id, Timestamp Timestamp, ConfigTimestamp Timestamp, SizeID uint16, Rotation uint16, Rate uint16) RandrSetScreenConfigCookie { +func (c *Conn) RandrSetScreenConfig(Window Window, Timestamp Timestamp, ConfigTimestamp Timestamp, SizeID uint16, Rotation uint16, Rate uint16) RandrSetScreenConfigCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrSetScreenConfigRequest(Window, Timestamp, ConfigTimestamp, SizeID, Rotation, Rate), cookie) return RandrSetScreenConfigCookie{cookie} } -func (c *Conn) RandrSetScreenConfigUnchecked(Window Id, Timestamp Timestamp, ConfigTimestamp Timestamp, SizeID uint16, Rotation uint16, Rate uint16) RandrSetScreenConfigCookie { +func (c *Conn) RandrSetScreenConfigUnchecked(Window Window, Timestamp Timestamp, ConfigTimestamp Timestamp, SizeID uint16, Rotation uint16, Rate uint16) RandrSetScreenConfigCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrSetScreenConfigRequest(Window, Timestamp, ConfigTimestamp, SizeID, Rotation, Rate), cookie) return RandrSetScreenConfigCookie{cookie} @@ -1316,7 +1338,7 @@ type RandrSetScreenConfigReply struct { Status byte NewTimestamp Timestamp ConfigTimestamp Timestamp - Root Id + Root Window SubpixelOrder uint16 // padding: 10 bytes } @@ -1353,7 +1375,7 @@ func randrSetScreenConfigReply(buf []byte) *RandrSetScreenConfigReply { v.ConfigTimestamp = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 v.SubpixelOrder = Get16(buf[b:]) @@ -1369,7 +1391,7 @@ func (cook RandrSetScreenConfigCookie) Check() error { } // Write request to wire for RandrSetScreenConfig -func (c *Conn) randrSetScreenConfigRequest(Window Id, Timestamp Timestamp, ConfigTimestamp Timestamp, SizeID uint16, Rotation uint16, Rate uint16) []byte { +func (c *Conn) randrSetScreenConfigRequest(Window Window, Timestamp Timestamp, ConfigTimestamp Timestamp, SizeID uint16, Rotation uint16, Rate uint16) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -1413,13 +1435,13 @@ type RandrSelectInputCookie struct { } // Write request to wire for RandrSelectInput -func (c *Conn) RandrSelectInput(Window Id, Enable uint16) RandrSelectInputCookie { +func (c *Conn) RandrSelectInput(Window Window, Enable uint16) RandrSelectInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrSelectInputRequest(Window, Enable), cookie) return RandrSelectInputCookie{cookie} } -func (c *Conn) RandrSelectInputChecked(Window Id, Enable uint16) RandrSelectInputCookie { +func (c *Conn) RandrSelectInputChecked(Window Window, Enable uint16) RandrSelectInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrSelectInputRequest(Window, Enable), cookie) return RandrSelectInputCookie{cookie} @@ -1430,7 +1452,7 @@ func (cook RandrSelectInputCookie) Check() error { } // Write request to wire for RandrSelectInput -func (c *Conn) randrSelectInputRequest(Window Id, Enable uint16) []byte { +func (c *Conn) randrSelectInputRequest(Window Window, Enable uint16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1461,13 +1483,13 @@ type RandrGetScreenInfoCookie struct { *cookie } -func (c *Conn) RandrGetScreenInfo(Window Id) RandrGetScreenInfoCookie { +func (c *Conn) RandrGetScreenInfo(Window Window) RandrGetScreenInfoCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetScreenInfoRequest(Window), cookie) return RandrGetScreenInfoCookie{cookie} } -func (c *Conn) RandrGetScreenInfoUnchecked(Window Id) RandrGetScreenInfoCookie { +func (c *Conn) RandrGetScreenInfoUnchecked(Window Window) RandrGetScreenInfoCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetScreenInfoRequest(Window), cookie) return RandrGetScreenInfoCookie{cookie} @@ -1479,7 +1501,7 @@ type RandrGetScreenInfoReply struct { Sequence uint16 Length uint32 Rotations byte - Root Id + Root Window Timestamp Timestamp ConfigTimestamp Timestamp NSizes uint16 @@ -1518,7 +1540,7 @@ func randrGetScreenInfoReply(buf []byte) *RandrGetScreenInfoReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 v.Timestamp = Timestamp(Get32(buf[b:])) @@ -1558,7 +1580,7 @@ func (cook RandrGetScreenInfoCookie) Check() error { } // Write request to wire for RandrGetScreenInfo -func (c *Conn) randrGetScreenInfoRequest(Window Id) []byte { +func (c *Conn) randrGetScreenInfoRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1584,13 +1606,13 @@ type RandrGetScreenSizeRangeCookie struct { *cookie } -func (c *Conn) RandrGetScreenSizeRange(Window Id) RandrGetScreenSizeRangeCookie { +func (c *Conn) RandrGetScreenSizeRange(Window Window) RandrGetScreenSizeRangeCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetScreenSizeRangeRequest(Window), cookie) return RandrGetScreenSizeRangeCookie{cookie} } -func (c *Conn) RandrGetScreenSizeRangeUnchecked(Window Id) RandrGetScreenSizeRangeCookie { +func (c *Conn) RandrGetScreenSizeRangeUnchecked(Window Window) RandrGetScreenSizeRangeCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetScreenSizeRangeRequest(Window), cookie) return RandrGetScreenSizeRangeCookie{cookie} @@ -1656,7 +1678,7 @@ func (cook RandrGetScreenSizeRangeCookie) Check() error { } // Write request to wire for RandrGetScreenSizeRange -func (c *Conn) randrGetScreenSizeRangeRequest(Window Id) []byte { +func (c *Conn) randrGetScreenSizeRangeRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1683,13 +1705,13 @@ type RandrSetScreenSizeCookie struct { } // Write request to wire for RandrSetScreenSize -func (c *Conn) RandrSetScreenSize(Window Id, Width uint16, Height uint16, MmWidth uint32, MmHeight uint32) RandrSetScreenSizeCookie { +func (c *Conn) RandrSetScreenSize(Window Window, Width uint16, Height uint16, MmWidth uint32, MmHeight uint32) RandrSetScreenSizeCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrSetScreenSizeRequest(Window, Width, Height, MmWidth, MmHeight), cookie) return RandrSetScreenSizeCookie{cookie} } -func (c *Conn) RandrSetScreenSizeChecked(Window Id, Width uint16, Height uint16, MmWidth uint32, MmHeight uint32) RandrSetScreenSizeCookie { +func (c *Conn) RandrSetScreenSizeChecked(Window Window, Width uint16, Height uint16, MmWidth uint32, MmHeight uint32) RandrSetScreenSizeCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrSetScreenSizeRequest(Window, Width, Height, MmWidth, MmHeight), cookie) return RandrSetScreenSizeCookie{cookie} @@ -1700,7 +1722,7 @@ func (cook RandrSetScreenSizeCookie) Check() error { } // Write request to wire for RandrSetScreenSize -func (c *Conn) randrSetScreenSizeRequest(Window Id, Width uint16, Height uint16, MmWidth uint32, MmHeight uint32) []byte { +func (c *Conn) randrSetScreenSizeRequest(Window Window, Width uint16, Height uint16, MmWidth uint32, MmHeight uint32) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1738,13 +1760,13 @@ type RandrGetScreenResourcesCookie struct { *cookie } -func (c *Conn) RandrGetScreenResources(Window Id) RandrGetScreenResourcesCookie { +func (c *Conn) RandrGetScreenResources(Window Window) RandrGetScreenResourcesCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetScreenResourcesRequest(Window), cookie) return RandrGetScreenResourcesCookie{cookie} } -func (c *Conn) RandrGetScreenResourcesUnchecked(Window Id) RandrGetScreenResourcesCookie { +func (c *Conn) RandrGetScreenResourcesUnchecked(Window Window) RandrGetScreenResourcesCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetScreenResourcesRequest(Window), cookie) return RandrGetScreenResourcesCookie{cookie} @@ -1763,8 +1785,8 @@ type RandrGetScreenResourcesReply struct { NumModes uint16 NamesLen uint16 // padding: 8 bytes - Crtcs []Id // size: pad((int(NumCrtcs) * 4)) - Outputs []Id // size: pad((int(NumOutputs) * 4)) + Crtcs []RandrCrtc // size: pad((int(NumCrtcs) * 4)) + Outputs []RandrOutput // size: pad((int(NumOutputs) * 4)) Modes []RandrModeInfo // size: pad((int(NumModes) * 32)) Names []byte // size: pad((int(NamesLen) * 1)) } @@ -1814,16 +1836,16 @@ func randrGetScreenResourcesReply(buf []byte) *RandrGetScreenResourcesReply { b += 8 // padding - v.Crtcs = make([]Id, v.NumCrtcs) + v.Crtcs = make([]RandrCrtc, v.NumCrtcs) for i := 0; i < int(v.NumCrtcs); i++ { - v.Crtcs[i] = Id(Get32(buf[b:])) + v.Crtcs[i] = RandrCrtc(Get32(buf[b:])) b += 4 } b = pad(b) - v.Outputs = make([]Id, v.NumOutputs) + v.Outputs = make([]RandrOutput, v.NumOutputs) for i := 0; i < int(v.NumOutputs); i++ { - v.Outputs[i] = Id(Get32(buf[b:])) + v.Outputs[i] = RandrOutput(Get32(buf[b:])) b += 4 } b = pad(b) @@ -1843,7 +1865,7 @@ func (cook RandrGetScreenResourcesCookie) Check() error { } // Write request to wire for RandrGetScreenResources -func (c *Conn) randrGetScreenResourcesRequest(Window Id) []byte { +func (c *Conn) randrGetScreenResourcesRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1869,13 +1891,13 @@ type RandrGetOutputInfoCookie struct { *cookie } -func (c *Conn) RandrGetOutputInfo(Output Id, ConfigTimestamp Timestamp) RandrGetOutputInfoCookie { +func (c *Conn) RandrGetOutputInfo(Output RandrOutput, ConfigTimestamp Timestamp) RandrGetOutputInfoCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetOutputInfoRequest(Output, ConfigTimestamp), cookie) return RandrGetOutputInfoCookie{cookie} } -func (c *Conn) RandrGetOutputInfoUnchecked(Output Id, ConfigTimestamp Timestamp) RandrGetOutputInfoCookie { +func (c *Conn) RandrGetOutputInfoUnchecked(Output RandrOutput, ConfigTimestamp Timestamp) RandrGetOutputInfoCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetOutputInfoRequest(Output, ConfigTimestamp), cookie) return RandrGetOutputInfoCookie{cookie} @@ -1888,7 +1910,7 @@ type RandrGetOutputInfoReply struct { Length uint32 Status byte Timestamp Timestamp - Crtc Id + Crtc RandrCrtc MmWidth uint32 MmHeight uint32 Connection byte @@ -1898,10 +1920,10 @@ type RandrGetOutputInfoReply struct { NumPreferred uint16 NumClones uint16 NameLen uint16 - Crtcs []Id // size: pad((int(NumCrtcs) * 4)) - Modes []Id // size: pad((int(NumModes) * 4)) - Clones []Id // size: pad((int(NumClones) * 4)) - Name []byte // size: pad((int(NameLen) * 1)) + Crtcs []RandrCrtc // size: pad((int(NumCrtcs) * 4)) + Modes []RandrMode // size: pad((int(NumModes) * 4)) + Clones []RandrOutput // size: pad((int(NumClones) * 4)) + Name []byte // size: pad((int(NameLen) * 1)) } // Waits and reads reply data from request RandrGetOutputInfo @@ -1933,7 +1955,7 @@ func randrGetOutputInfoReply(buf []byte) *RandrGetOutputInfoReply { v.Timestamp = Timestamp(Get32(buf[b:])) b += 4 - v.Crtc = Id(Get32(buf[b:])) + v.Crtc = RandrCrtc(Get32(buf[b:])) b += 4 v.MmWidth = Get32(buf[b:]) @@ -1963,23 +1985,23 @@ func randrGetOutputInfoReply(buf []byte) *RandrGetOutputInfoReply { v.NameLen = Get16(buf[b:]) b += 2 - v.Crtcs = make([]Id, v.NumCrtcs) + v.Crtcs = make([]RandrCrtc, v.NumCrtcs) for i := 0; i < int(v.NumCrtcs); i++ { - v.Crtcs[i] = Id(Get32(buf[b:])) + v.Crtcs[i] = RandrCrtc(Get32(buf[b:])) b += 4 } b = pad(b) - v.Modes = make([]Id, v.NumModes) + v.Modes = make([]RandrMode, v.NumModes) for i := 0; i < int(v.NumModes); i++ { - v.Modes[i] = Id(Get32(buf[b:])) + v.Modes[i] = RandrMode(Get32(buf[b:])) b += 4 } b = pad(b) - v.Clones = make([]Id, v.NumClones) + v.Clones = make([]RandrOutput, v.NumClones) for i := 0; i < int(v.NumClones); i++ { - v.Clones[i] = Id(Get32(buf[b:])) + v.Clones[i] = RandrOutput(Get32(buf[b:])) b += 4 } b = pad(b) @@ -1996,7 +2018,7 @@ func (cook RandrGetOutputInfoCookie) Check() error { } // Write request to wire for RandrGetOutputInfo -func (c *Conn) randrGetOutputInfoRequest(Output Id, ConfigTimestamp Timestamp) []byte { +func (c *Conn) randrGetOutputInfoRequest(Output RandrOutput, ConfigTimestamp Timestamp) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2025,13 +2047,13 @@ type RandrListOutputPropertiesCookie struct { *cookie } -func (c *Conn) RandrListOutputProperties(Output Id) RandrListOutputPropertiesCookie { +func (c *Conn) RandrListOutputProperties(Output RandrOutput) RandrListOutputPropertiesCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrListOutputPropertiesRequest(Output), cookie) return RandrListOutputPropertiesCookie{cookie} } -func (c *Conn) RandrListOutputPropertiesUnchecked(Output Id) RandrListOutputPropertiesCookie { +func (c *Conn) RandrListOutputPropertiesUnchecked(Output RandrOutput) RandrListOutputPropertiesCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrListOutputPropertiesRequest(Output), cookie) return RandrListOutputPropertiesCookie{cookie} @@ -2045,7 +2067,7 @@ type RandrListOutputPropertiesReply struct { // padding: 1 bytes NumAtoms uint16 // padding: 22 bytes - Atoms []Id // size: pad((int(NumAtoms) * 4)) + Atoms []Atom // size: pad((int(NumAtoms) * 4)) } // Waits and reads reply data from request RandrListOutputProperties @@ -2078,9 +2100,9 @@ func randrListOutputPropertiesReply(buf []byte) *RandrListOutputPropertiesReply b += 22 // padding - v.Atoms = make([]Id, v.NumAtoms) + v.Atoms = make([]Atom, v.NumAtoms) for i := 0; i < int(v.NumAtoms); i++ { - v.Atoms[i] = Id(Get32(buf[b:])) + v.Atoms[i] = Atom(Get32(buf[b:])) b += 4 } b = pad(b) @@ -2093,7 +2115,7 @@ func (cook RandrListOutputPropertiesCookie) Check() error { } // Write request to wire for RandrListOutputProperties -func (c *Conn) randrListOutputPropertiesRequest(Output Id) []byte { +func (c *Conn) randrListOutputPropertiesRequest(Output RandrOutput) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2119,13 +2141,13 @@ type RandrQueryOutputPropertyCookie struct { *cookie } -func (c *Conn) RandrQueryOutputProperty(Output Id, Property Id) RandrQueryOutputPropertyCookie { +func (c *Conn) RandrQueryOutputProperty(Output RandrOutput, Property Atom) RandrQueryOutputPropertyCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrQueryOutputPropertyRequest(Output, Property), cookie) return RandrQueryOutputPropertyCookie{cookie} } -func (c *Conn) RandrQueryOutputPropertyUnchecked(Output Id, Property Id) RandrQueryOutputPropertyCookie { +func (c *Conn) RandrQueryOutputPropertyUnchecked(Output RandrOutput, Property Atom) RandrQueryOutputPropertyCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrQueryOutputPropertyRequest(Output, Property), cookie) return RandrQueryOutputPropertyCookie{cookie} @@ -2207,7 +2229,7 @@ func (cook RandrQueryOutputPropertyCookie) Check() error { } // Write request to wire for RandrQueryOutputProperty -func (c *Conn) randrQueryOutputPropertyRequest(Output Id, Property Id) []byte { +func (c *Conn) randrQueryOutputPropertyRequest(Output RandrOutput, Property Atom) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2237,13 +2259,13 @@ type RandrConfigureOutputPropertyCookie struct { } // Write request to wire for RandrConfigureOutputProperty -func (c *Conn) RandrConfigureOutputProperty(Output Id, Property Id, Pending bool, Range bool, Values []int32) RandrConfigureOutputPropertyCookie { +func (c *Conn) RandrConfigureOutputProperty(Output RandrOutput, Property Atom, Pending bool, Range bool, Values []int32) RandrConfigureOutputPropertyCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrConfigureOutputPropertyRequest(Output, Property, Pending, Range, Values), cookie) return RandrConfigureOutputPropertyCookie{cookie} } -func (c *Conn) RandrConfigureOutputPropertyChecked(Output Id, Property Id, Pending bool, Range bool, Values []int32) RandrConfigureOutputPropertyCookie { +func (c *Conn) RandrConfigureOutputPropertyChecked(Output RandrOutput, Property Atom, Pending bool, Range bool, Values []int32) RandrConfigureOutputPropertyCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrConfigureOutputPropertyRequest(Output, Property, Pending, Range, Values), cookie) return RandrConfigureOutputPropertyCookie{cookie} @@ -2254,7 +2276,7 @@ func (cook RandrConfigureOutputPropertyCookie) Check() error { } // Write request to wire for RandrConfigureOutputProperty -func (c *Conn) randrConfigureOutputPropertyRequest(Output Id, Property Id, Pending bool, Range bool, Values []int32) []byte { +func (c *Conn) randrConfigureOutputPropertyRequest(Output RandrOutput, Property Atom, Pending bool, Range bool, Values []int32) []byte { size := pad((16 + pad((len(Values) * 4)))) b := 0 buf := make([]byte, size) @@ -2306,13 +2328,13 @@ type RandrChangeOutputPropertyCookie struct { } // Write request to wire for RandrChangeOutputProperty -func (c *Conn) RandrChangeOutputProperty(Output Id, Property Id, Type Id, Format byte, Mode byte, NumUnits uint32, Data []byte) RandrChangeOutputPropertyCookie { +func (c *Conn) RandrChangeOutputProperty(Output RandrOutput, Property Atom, Type Atom, Format byte, Mode byte, NumUnits uint32, Data []byte) RandrChangeOutputPropertyCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrChangeOutputPropertyRequest(Output, Property, Type, Format, Mode, NumUnits, Data), cookie) return RandrChangeOutputPropertyCookie{cookie} } -func (c *Conn) RandrChangeOutputPropertyChecked(Output Id, Property Id, Type Id, Format byte, Mode byte, NumUnits uint32, Data []byte) RandrChangeOutputPropertyCookie { +func (c *Conn) RandrChangeOutputPropertyChecked(Output RandrOutput, Property Atom, Type Atom, Format byte, Mode byte, NumUnits uint32, Data []byte) RandrChangeOutputPropertyCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrChangeOutputPropertyRequest(Output, Property, Type, Format, Mode, NumUnits, Data), cookie) return RandrChangeOutputPropertyCookie{cookie} @@ -2323,7 +2345,7 @@ func (cook RandrChangeOutputPropertyCookie) Check() error { } // Write request to wire for RandrChangeOutputProperty -func (c *Conn) randrChangeOutputPropertyRequest(Output Id, Property Id, Type Id, Format byte, Mode byte, NumUnits uint32, Data []byte) []byte { +func (c *Conn) randrChangeOutputPropertyRequest(Output RandrOutput, Property Atom, Type Atom, Format byte, Mode byte, NumUnits uint32, Data []byte) []byte { size := pad((24 + pad((((int(NumUnits) * int(Format)) / 8) * 1)))) b := 0 buf := make([]byte, size) @@ -2370,13 +2392,13 @@ type RandrDeleteOutputPropertyCookie struct { } // Write request to wire for RandrDeleteOutputProperty -func (c *Conn) RandrDeleteOutputProperty(Output Id, Property Id) RandrDeleteOutputPropertyCookie { +func (c *Conn) RandrDeleteOutputProperty(Output RandrOutput, Property Atom) RandrDeleteOutputPropertyCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrDeleteOutputPropertyRequest(Output, Property), cookie) return RandrDeleteOutputPropertyCookie{cookie} } -func (c *Conn) RandrDeleteOutputPropertyChecked(Output Id, Property Id) RandrDeleteOutputPropertyCookie { +func (c *Conn) RandrDeleteOutputPropertyChecked(Output RandrOutput, Property Atom) RandrDeleteOutputPropertyCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrDeleteOutputPropertyRequest(Output, Property), cookie) return RandrDeleteOutputPropertyCookie{cookie} @@ -2387,7 +2409,7 @@ func (cook RandrDeleteOutputPropertyCookie) Check() error { } // Write request to wire for RandrDeleteOutputProperty -func (c *Conn) randrDeleteOutputPropertyRequest(Output Id, Property Id) []byte { +func (c *Conn) randrDeleteOutputPropertyRequest(Output RandrOutput, Property Atom) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2416,13 +2438,13 @@ type RandrGetOutputPropertyCookie struct { *cookie } -func (c *Conn) RandrGetOutputProperty(Output Id, Property Id, Type Id, LongOffset uint32, LongLength uint32, Delete bool, Pending bool) RandrGetOutputPropertyCookie { +func (c *Conn) RandrGetOutputProperty(Output RandrOutput, Property Atom, Type Atom, LongOffset uint32, LongLength uint32, Delete bool, Pending bool) RandrGetOutputPropertyCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetOutputPropertyRequest(Output, Property, Type, LongOffset, LongLength, Delete, Pending), cookie) return RandrGetOutputPropertyCookie{cookie} } -func (c *Conn) RandrGetOutputPropertyUnchecked(Output Id, Property Id, Type Id, LongOffset uint32, LongLength uint32, Delete bool, Pending bool) RandrGetOutputPropertyCookie { +func (c *Conn) RandrGetOutputPropertyUnchecked(Output RandrOutput, Property Atom, Type Atom, LongOffset uint32, LongLength uint32, Delete bool, Pending bool) RandrGetOutputPropertyCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetOutputPropertyRequest(Output, Property, Type, LongOffset, LongLength, Delete, Pending), cookie) return RandrGetOutputPropertyCookie{cookie} @@ -2434,7 +2456,7 @@ type RandrGetOutputPropertyReply struct { Sequence uint16 Length uint32 Format byte - Type Id + Type Atom BytesAfter uint32 NumItems uint32 // padding: 12 bytes @@ -2467,7 +2489,7 @@ func randrGetOutputPropertyReply(buf []byte) *RandrGetOutputPropertyReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Type = Id(Get32(buf[b:])) + v.Type = Atom(Get32(buf[b:])) b += 4 v.BytesAfter = Get32(buf[b:]) @@ -2490,7 +2512,7 @@ func (cook RandrGetOutputPropertyCookie) Check() error { } // Write request to wire for RandrGetOutputProperty -func (c *Conn) randrGetOutputPropertyRequest(Output Id, Property Id, Type Id, LongOffset uint32, LongLength uint32, Delete bool, Pending bool) []byte { +func (c *Conn) randrGetOutputPropertyRequest(Output RandrOutput, Property Atom, Type Atom, LongOffset uint32, LongLength uint32, Delete bool, Pending bool) []byte { size := 28 b := 0 buf := make([]byte, size) @@ -2544,13 +2566,13 @@ type RandrCreateModeCookie struct { *cookie } -func (c *Conn) RandrCreateMode(Window Id, ModeInfo RandrModeInfo, Name string) RandrCreateModeCookie { +func (c *Conn) RandrCreateMode(Window Window, ModeInfo RandrModeInfo, Name string) RandrCreateModeCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrCreateModeRequest(Window, ModeInfo, Name), cookie) return RandrCreateModeCookie{cookie} } -func (c *Conn) RandrCreateModeUnchecked(Window Id, ModeInfo RandrModeInfo, Name string) RandrCreateModeCookie { +func (c *Conn) RandrCreateModeUnchecked(Window Window, ModeInfo RandrModeInfo, Name string) RandrCreateModeCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrCreateModeRequest(Window, ModeInfo, Name), cookie) return RandrCreateModeCookie{cookie} @@ -2562,7 +2584,7 @@ type RandrCreateModeReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Mode Id + Mode RandrMode // padding: 20 bytes } @@ -2591,7 +2613,7 @@ func randrCreateModeReply(buf []byte) *RandrCreateModeReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Mode = Id(Get32(buf[b:])) + v.Mode = RandrMode(Get32(buf[b:])) b += 4 b += 20 // padding @@ -2604,7 +2626,7 @@ func (cook RandrCreateModeCookie) Check() error { } // Write request to wire for RandrCreateMode -func (c *Conn) randrCreateModeRequest(Window Id, ModeInfo RandrModeInfo, Name string) []byte { +func (c *Conn) randrCreateModeRequest(Window Window, ModeInfo RandrModeInfo, Name string) []byte { size := pad((40 + pad((len(Name) * 1)))) b := 0 buf := make([]byte, size) @@ -2640,13 +2662,13 @@ type RandrDestroyModeCookie struct { } // Write request to wire for RandrDestroyMode -func (c *Conn) RandrDestroyMode(Mode Id) RandrDestroyModeCookie { +func (c *Conn) RandrDestroyMode(Mode RandrMode) RandrDestroyModeCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrDestroyModeRequest(Mode), cookie) return RandrDestroyModeCookie{cookie} } -func (c *Conn) RandrDestroyModeChecked(Mode Id) RandrDestroyModeCookie { +func (c *Conn) RandrDestroyModeChecked(Mode RandrMode) RandrDestroyModeCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrDestroyModeRequest(Mode), cookie) return RandrDestroyModeCookie{cookie} @@ -2657,7 +2679,7 @@ func (cook RandrDestroyModeCookie) Check() error { } // Write request to wire for RandrDestroyMode -func (c *Conn) randrDestroyModeRequest(Mode Id) []byte { +func (c *Conn) randrDestroyModeRequest(Mode RandrMode) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2684,13 +2706,13 @@ type RandrAddOutputModeCookie struct { } // Write request to wire for RandrAddOutputMode -func (c *Conn) RandrAddOutputMode(Output Id, Mode Id) RandrAddOutputModeCookie { +func (c *Conn) RandrAddOutputMode(Output RandrOutput, Mode RandrMode) RandrAddOutputModeCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrAddOutputModeRequest(Output, Mode), cookie) return RandrAddOutputModeCookie{cookie} } -func (c *Conn) RandrAddOutputModeChecked(Output Id, Mode Id) RandrAddOutputModeCookie { +func (c *Conn) RandrAddOutputModeChecked(Output RandrOutput, Mode RandrMode) RandrAddOutputModeCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrAddOutputModeRequest(Output, Mode), cookie) return RandrAddOutputModeCookie{cookie} @@ -2701,7 +2723,7 @@ func (cook RandrAddOutputModeCookie) Check() error { } // Write request to wire for RandrAddOutputMode -func (c *Conn) randrAddOutputModeRequest(Output Id, Mode Id) []byte { +func (c *Conn) randrAddOutputModeRequest(Output RandrOutput, Mode RandrMode) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2731,13 +2753,13 @@ type RandrDeleteOutputModeCookie struct { } // Write request to wire for RandrDeleteOutputMode -func (c *Conn) RandrDeleteOutputMode(Output Id, Mode Id) RandrDeleteOutputModeCookie { +func (c *Conn) RandrDeleteOutputMode(Output RandrOutput, Mode RandrMode) RandrDeleteOutputModeCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrDeleteOutputModeRequest(Output, Mode), cookie) return RandrDeleteOutputModeCookie{cookie} } -func (c *Conn) RandrDeleteOutputModeChecked(Output Id, Mode Id) RandrDeleteOutputModeCookie { +func (c *Conn) RandrDeleteOutputModeChecked(Output RandrOutput, Mode RandrMode) RandrDeleteOutputModeCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrDeleteOutputModeRequest(Output, Mode), cookie) return RandrDeleteOutputModeCookie{cookie} @@ -2748,7 +2770,7 @@ func (cook RandrDeleteOutputModeCookie) Check() error { } // Write request to wire for RandrDeleteOutputMode -func (c *Conn) randrDeleteOutputModeRequest(Output Id, Mode Id) []byte { +func (c *Conn) randrDeleteOutputModeRequest(Output RandrOutput, Mode RandrMode) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2777,13 +2799,13 @@ type RandrGetCrtcInfoCookie struct { *cookie } -func (c *Conn) RandrGetCrtcInfo(Crtc Id, ConfigTimestamp Timestamp) RandrGetCrtcInfoCookie { +func (c *Conn) RandrGetCrtcInfo(Crtc RandrCrtc, ConfigTimestamp Timestamp) RandrGetCrtcInfoCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetCrtcInfoRequest(Crtc, ConfigTimestamp), cookie) return RandrGetCrtcInfoCookie{cookie} } -func (c *Conn) RandrGetCrtcInfoUnchecked(Crtc Id, ConfigTimestamp Timestamp) RandrGetCrtcInfoCookie { +func (c *Conn) RandrGetCrtcInfoUnchecked(Crtc RandrCrtc, ConfigTimestamp Timestamp) RandrGetCrtcInfoCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetCrtcInfoRequest(Crtc, ConfigTimestamp), cookie) return RandrGetCrtcInfoCookie{cookie} @@ -2800,13 +2822,13 @@ type RandrGetCrtcInfoReply struct { Y int16 Width uint16 Height uint16 - Mode Id + Mode RandrMode Rotation uint16 Rotations uint16 NumOutputs uint16 NumPossibleOutputs uint16 - Outputs []Id // size: pad((int(NumOutputs) * 4)) - Possible []Id // size: pad((int(NumPossibleOutputs) * 4)) + Outputs []RandrOutput // size: pad((int(NumOutputs) * 4)) + Possible []RandrOutput // size: pad((int(NumPossibleOutputs) * 4)) } // Waits and reads reply data from request RandrGetCrtcInfo @@ -2850,7 +2872,7 @@ func randrGetCrtcInfoReply(buf []byte) *RandrGetCrtcInfoReply { v.Height = Get16(buf[b:]) b += 2 - v.Mode = Id(Get32(buf[b:])) + v.Mode = RandrMode(Get32(buf[b:])) b += 4 v.Rotation = Get16(buf[b:]) @@ -2865,16 +2887,16 @@ func randrGetCrtcInfoReply(buf []byte) *RandrGetCrtcInfoReply { v.NumPossibleOutputs = Get16(buf[b:]) b += 2 - v.Outputs = make([]Id, v.NumOutputs) + v.Outputs = make([]RandrOutput, v.NumOutputs) for i := 0; i < int(v.NumOutputs); i++ { - v.Outputs[i] = Id(Get32(buf[b:])) + v.Outputs[i] = RandrOutput(Get32(buf[b:])) b += 4 } b = pad(b) - v.Possible = make([]Id, v.NumPossibleOutputs) + v.Possible = make([]RandrOutput, v.NumPossibleOutputs) for i := 0; i < int(v.NumPossibleOutputs); i++ { - v.Possible[i] = Id(Get32(buf[b:])) + v.Possible[i] = RandrOutput(Get32(buf[b:])) b += 4 } b = pad(b) @@ -2887,7 +2909,7 @@ func (cook RandrGetCrtcInfoCookie) Check() error { } // Write request to wire for RandrGetCrtcInfo -func (c *Conn) randrGetCrtcInfoRequest(Crtc Id, ConfigTimestamp Timestamp) []byte { +func (c *Conn) randrGetCrtcInfoRequest(Crtc RandrCrtc, ConfigTimestamp Timestamp) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2916,13 +2938,13 @@ type RandrSetCrtcConfigCookie struct { *cookie } -func (c *Conn) RandrSetCrtcConfig(Crtc Id, Timestamp Timestamp, ConfigTimestamp Timestamp, X int16, Y int16, Mode Id, Rotation uint16, Outputs []Id) RandrSetCrtcConfigCookie { +func (c *Conn) RandrSetCrtcConfig(Crtc RandrCrtc, Timestamp Timestamp, ConfigTimestamp Timestamp, X int16, Y int16, Mode RandrMode, Rotation uint16, Outputs []RandrOutput) RandrSetCrtcConfigCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrSetCrtcConfigRequest(Crtc, Timestamp, ConfigTimestamp, X, Y, Mode, Rotation, Outputs), cookie) return RandrSetCrtcConfigCookie{cookie} } -func (c *Conn) RandrSetCrtcConfigUnchecked(Crtc Id, Timestamp Timestamp, ConfigTimestamp Timestamp, X int16, Y int16, Mode Id, Rotation uint16, Outputs []Id) RandrSetCrtcConfigCookie { +func (c *Conn) RandrSetCrtcConfigUnchecked(Crtc RandrCrtc, Timestamp Timestamp, ConfigTimestamp Timestamp, X int16, Y int16, Mode RandrMode, Rotation uint16, Outputs []RandrOutput) RandrSetCrtcConfigCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrSetCrtcConfigRequest(Crtc, Timestamp, ConfigTimestamp, X, Y, Mode, Rotation, Outputs), cookie) return RandrSetCrtcConfigCookie{cookie} @@ -2977,7 +2999,7 @@ func (cook RandrSetCrtcConfigCookie) Check() error { } // Write request to wire for RandrSetCrtcConfig -func (c *Conn) randrSetCrtcConfigRequest(Crtc Id, Timestamp Timestamp, ConfigTimestamp Timestamp, X int16, Y int16, Mode Id, Rotation uint16, Outputs []Id) []byte { +func (c *Conn) randrSetCrtcConfigRequest(Crtc RandrCrtc, Timestamp Timestamp, ConfigTimestamp Timestamp, X int16, Y int16, Mode RandrMode, Rotation uint16, Outputs []RandrOutput) []byte { size := pad((28 + pad((len(Outputs) * 4)))) b := 0 buf := make([]byte, size) @@ -3029,13 +3051,13 @@ type RandrGetCrtcGammaSizeCookie struct { *cookie } -func (c *Conn) RandrGetCrtcGammaSize(Crtc Id) RandrGetCrtcGammaSizeCookie { +func (c *Conn) RandrGetCrtcGammaSize(Crtc RandrCrtc) RandrGetCrtcGammaSizeCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetCrtcGammaSizeRequest(Crtc), cookie) return RandrGetCrtcGammaSizeCookie{cookie} } -func (c *Conn) RandrGetCrtcGammaSizeUnchecked(Crtc Id) RandrGetCrtcGammaSizeCookie { +func (c *Conn) RandrGetCrtcGammaSizeUnchecked(Crtc RandrCrtc) RandrGetCrtcGammaSizeCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetCrtcGammaSizeRequest(Crtc), cookie) return RandrGetCrtcGammaSizeCookie{cookie} @@ -3089,7 +3111,7 @@ func (cook RandrGetCrtcGammaSizeCookie) Check() error { } // Write request to wire for RandrGetCrtcGammaSize -func (c *Conn) randrGetCrtcGammaSizeRequest(Crtc Id) []byte { +func (c *Conn) randrGetCrtcGammaSizeRequest(Crtc RandrCrtc) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3115,13 +3137,13 @@ type RandrGetCrtcGammaCookie struct { *cookie } -func (c *Conn) RandrGetCrtcGamma(Crtc Id) RandrGetCrtcGammaCookie { +func (c *Conn) RandrGetCrtcGamma(Crtc RandrCrtc) RandrGetCrtcGammaCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetCrtcGammaRequest(Crtc), cookie) return RandrGetCrtcGammaCookie{cookie} } -func (c *Conn) RandrGetCrtcGammaUnchecked(Crtc Id) RandrGetCrtcGammaCookie { +func (c *Conn) RandrGetCrtcGammaUnchecked(Crtc RandrCrtc) RandrGetCrtcGammaCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetCrtcGammaRequest(Crtc), cookie) return RandrGetCrtcGammaCookie{cookie} @@ -3199,7 +3221,7 @@ func (cook RandrGetCrtcGammaCookie) Check() error { } // Write request to wire for RandrGetCrtcGamma -func (c *Conn) randrGetCrtcGammaRequest(Crtc Id) []byte { +func (c *Conn) randrGetCrtcGammaRequest(Crtc RandrCrtc) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3226,13 +3248,13 @@ type RandrSetCrtcGammaCookie struct { } // Write request to wire for RandrSetCrtcGamma -func (c *Conn) RandrSetCrtcGamma(Crtc Id, Size uint16, Red []uint16, Green []uint16, Blue []uint16) RandrSetCrtcGammaCookie { +func (c *Conn) RandrSetCrtcGamma(Crtc RandrCrtc, Size uint16, Red []uint16, Green []uint16, Blue []uint16) RandrSetCrtcGammaCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrSetCrtcGammaRequest(Crtc, Size, Red, Green, Blue), cookie) return RandrSetCrtcGammaCookie{cookie} } -func (c *Conn) RandrSetCrtcGammaChecked(Crtc Id, Size uint16, Red []uint16, Green []uint16, Blue []uint16) RandrSetCrtcGammaCookie { +func (c *Conn) RandrSetCrtcGammaChecked(Crtc RandrCrtc, Size uint16, Red []uint16, Green []uint16, Blue []uint16) RandrSetCrtcGammaCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrSetCrtcGammaRequest(Crtc, Size, Red, Green, Blue), cookie) return RandrSetCrtcGammaCookie{cookie} @@ -3243,7 +3265,7 @@ func (cook RandrSetCrtcGammaCookie) Check() error { } // Write request to wire for RandrSetCrtcGamma -func (c *Conn) randrSetCrtcGammaRequest(Crtc Id, Size uint16, Red []uint16, Green []uint16, Blue []uint16) []byte { +func (c *Conn) randrSetCrtcGammaRequest(Crtc RandrCrtc, Size uint16, Red []uint16, Green []uint16, Blue []uint16) []byte { size := pad((((12 + pad((int(Size) * 2))) + pad((int(Size) * 2))) + pad((int(Size) * 2)))) b := 0 buf := make([]byte, size) @@ -3292,13 +3314,13 @@ type RandrGetScreenResourcesCurrentCookie struct { *cookie } -func (c *Conn) RandrGetScreenResourcesCurrent(Window Id) RandrGetScreenResourcesCurrentCookie { +func (c *Conn) RandrGetScreenResourcesCurrent(Window Window) RandrGetScreenResourcesCurrentCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetScreenResourcesCurrentRequest(Window), cookie) return RandrGetScreenResourcesCurrentCookie{cookie} } -func (c *Conn) RandrGetScreenResourcesCurrentUnchecked(Window Id) RandrGetScreenResourcesCurrentCookie { +func (c *Conn) RandrGetScreenResourcesCurrentUnchecked(Window Window) RandrGetScreenResourcesCurrentCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetScreenResourcesCurrentRequest(Window), cookie) return RandrGetScreenResourcesCurrentCookie{cookie} @@ -3317,8 +3339,8 @@ type RandrGetScreenResourcesCurrentReply struct { NumModes uint16 NamesLen uint16 // padding: 8 bytes - Crtcs []Id // size: pad((int(NumCrtcs) * 4)) - Outputs []Id // size: pad((int(NumOutputs) * 4)) + Crtcs []RandrCrtc // size: pad((int(NumCrtcs) * 4)) + Outputs []RandrOutput // size: pad((int(NumOutputs) * 4)) Modes []RandrModeInfo // size: pad((int(NumModes) * 32)) Names []byte // size: pad((int(NamesLen) * 1)) } @@ -3368,16 +3390,16 @@ func randrGetScreenResourcesCurrentReply(buf []byte) *RandrGetScreenResourcesCur b += 8 // padding - v.Crtcs = make([]Id, v.NumCrtcs) + v.Crtcs = make([]RandrCrtc, v.NumCrtcs) for i := 0; i < int(v.NumCrtcs); i++ { - v.Crtcs[i] = Id(Get32(buf[b:])) + v.Crtcs[i] = RandrCrtc(Get32(buf[b:])) b += 4 } b = pad(b) - v.Outputs = make([]Id, v.NumOutputs) + v.Outputs = make([]RandrOutput, v.NumOutputs) for i := 0; i < int(v.NumOutputs); i++ { - v.Outputs[i] = Id(Get32(buf[b:])) + v.Outputs[i] = RandrOutput(Get32(buf[b:])) b += 4 } b = pad(b) @@ -3397,7 +3419,7 @@ func (cook RandrGetScreenResourcesCurrentCookie) Check() error { } // Write request to wire for RandrGetScreenResourcesCurrent -func (c *Conn) randrGetScreenResourcesCurrentRequest(Window Id) []byte { +func (c *Conn) randrGetScreenResourcesCurrentRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3424,13 +3446,13 @@ type RandrSetCrtcTransformCookie struct { } // Write request to wire for RandrSetCrtcTransform -func (c *Conn) RandrSetCrtcTransform(Crtc Id, Transform RenderTransform, FilterLen uint16, FilterName string, FilterParams []RenderFixed) RandrSetCrtcTransformCookie { +func (c *Conn) RandrSetCrtcTransform(Crtc RandrCrtc, Transform RenderTransform, FilterLen uint16, FilterName string, FilterParams []RenderFixed) RandrSetCrtcTransformCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrSetCrtcTransformRequest(Crtc, Transform, FilterLen, FilterName, FilterParams), cookie) return RandrSetCrtcTransformCookie{cookie} } -func (c *Conn) RandrSetCrtcTransformChecked(Crtc Id, Transform RenderTransform, FilterLen uint16, FilterName string, FilterParams []RenderFixed) RandrSetCrtcTransformCookie { +func (c *Conn) RandrSetCrtcTransformChecked(Crtc RandrCrtc, Transform RenderTransform, FilterLen uint16, FilterName string, FilterParams []RenderFixed) RandrSetCrtcTransformCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrSetCrtcTransformRequest(Crtc, Transform, FilterLen, FilterName, FilterParams), cookie) return RandrSetCrtcTransformCookie{cookie} @@ -3441,7 +3463,7 @@ func (cook RandrSetCrtcTransformCookie) Check() error { } // Write request to wire for RandrSetCrtcTransform -func (c *Conn) randrSetCrtcTransformRequest(Crtc Id, Transform RenderTransform, FilterLen uint16, FilterName string, FilterParams []RenderFixed) []byte { +func (c *Conn) randrSetCrtcTransformRequest(Crtc RandrCrtc, Transform RenderTransform, FilterLen uint16, FilterName string, FilterParams []RenderFixed) []byte { size := pad(((48 + pad((int(FilterLen) * 1))) + pad((len(FilterParams) * 4)))) b := 0 buf := make([]byte, size) @@ -3487,13 +3509,13 @@ type RandrGetCrtcTransformCookie struct { *cookie } -func (c *Conn) RandrGetCrtcTransform(Crtc Id) RandrGetCrtcTransformCookie { +func (c *Conn) RandrGetCrtcTransform(Crtc RandrCrtc) RandrGetCrtcTransformCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetCrtcTransformRequest(Crtc), cookie) return RandrGetCrtcTransformCookie{cookie} } -func (c *Conn) RandrGetCrtcTransformUnchecked(Crtc Id) RandrGetCrtcTransformCookie { +func (c *Conn) RandrGetCrtcTransformUnchecked(Crtc RandrCrtc) RandrGetCrtcTransformCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetCrtcTransformRequest(Crtc), cookie) return RandrGetCrtcTransformCookie{cookie} @@ -3610,7 +3632,7 @@ func (cook RandrGetCrtcTransformCookie) Check() error { } // Write request to wire for RandrGetCrtcTransform -func (c *Conn) randrGetCrtcTransformRequest(Crtc Id) []byte { +func (c *Conn) randrGetCrtcTransformRequest(Crtc RandrCrtc) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3636,13 +3658,13 @@ type RandrGetPanningCookie struct { *cookie } -func (c *Conn) RandrGetPanning(Crtc Id) RandrGetPanningCookie { +func (c *Conn) RandrGetPanning(Crtc RandrCrtc) RandrGetPanningCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetPanningRequest(Crtc), cookie) return RandrGetPanningCookie{cookie} } -func (c *Conn) RandrGetPanningUnchecked(Crtc Id) RandrGetPanningCookie { +func (c *Conn) RandrGetPanningUnchecked(Crtc RandrCrtc) RandrGetPanningCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetPanningRequest(Crtc), cookie) return RandrGetPanningCookie{cookie} @@ -3742,7 +3764,7 @@ func (cook RandrGetPanningCookie) Check() error { } // Write request to wire for RandrGetPanning -func (c *Conn) randrGetPanningRequest(Crtc Id) []byte { +func (c *Conn) randrGetPanningRequest(Crtc RandrCrtc) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3768,13 +3790,13 @@ type RandrSetPanningCookie struct { *cookie } -func (c *Conn) RandrSetPanning(Crtc Id, Timestamp Timestamp, Left uint16, Top uint16, Width uint16, Height uint16, TrackLeft uint16, TrackTop uint16, TrackWidth uint16, TrackHeight uint16, BorderLeft int16, BorderTop int16, BorderRight int16, BorderBottom int16) RandrSetPanningCookie { +func (c *Conn) RandrSetPanning(Crtc RandrCrtc, Timestamp Timestamp, Left uint16, Top uint16, Width uint16, Height uint16, TrackLeft uint16, TrackTop uint16, TrackWidth uint16, TrackHeight uint16, BorderLeft int16, BorderTop int16, BorderRight int16, BorderBottom int16) RandrSetPanningCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrSetPanningRequest(Crtc, Timestamp, Left, Top, Width, Height, TrackLeft, TrackTop, TrackWidth, TrackHeight, BorderLeft, BorderTop, BorderRight, BorderBottom), cookie) return RandrSetPanningCookie{cookie} } -func (c *Conn) RandrSetPanningUnchecked(Crtc Id, Timestamp Timestamp, Left uint16, Top uint16, Width uint16, Height uint16, TrackLeft uint16, TrackTop uint16, TrackWidth uint16, TrackHeight uint16, BorderLeft int16, BorderTop int16, BorderRight int16, BorderBottom int16) RandrSetPanningCookie { +func (c *Conn) RandrSetPanningUnchecked(Crtc RandrCrtc, Timestamp Timestamp, Left uint16, Top uint16, Width uint16, Height uint16, TrackLeft uint16, TrackTop uint16, TrackWidth uint16, TrackHeight uint16, BorderLeft int16, BorderTop int16, BorderRight int16, BorderBottom int16) RandrSetPanningCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrSetPanningRequest(Crtc, Timestamp, Left, Top, Width, Height, TrackLeft, TrackTop, TrackWidth, TrackHeight, BorderLeft, BorderTop, BorderRight, BorderBottom), cookie) return RandrSetPanningCookie{cookie} @@ -3826,7 +3848,7 @@ func (cook RandrSetPanningCookie) Check() error { } // Write request to wire for RandrSetPanning -func (c *Conn) randrSetPanningRequest(Crtc Id, Timestamp Timestamp, Left uint16, Top uint16, Width uint16, Height uint16, TrackLeft uint16, TrackTop uint16, TrackWidth uint16, TrackHeight uint16, BorderLeft int16, BorderTop int16, BorderRight int16, BorderBottom int16) []byte { +func (c *Conn) randrSetPanningRequest(Crtc RandrCrtc, Timestamp Timestamp, Left uint16, Top uint16, Width uint16, Height uint16, TrackLeft uint16, TrackTop uint16, TrackWidth uint16, TrackHeight uint16, BorderLeft int16, BorderTop int16, BorderRight int16, BorderBottom int16) []byte { size := 36 b := 0 buf := make([]byte, size) @@ -3892,13 +3914,13 @@ type RandrSetOutputPrimaryCookie struct { } // Write request to wire for RandrSetOutputPrimary -func (c *Conn) RandrSetOutputPrimary(Window Id, Output Id) RandrSetOutputPrimaryCookie { +func (c *Conn) RandrSetOutputPrimary(Window Window, Output RandrOutput) RandrSetOutputPrimaryCookie { cookie := c.newCookie(false, false) c.newRequest(c.randrSetOutputPrimaryRequest(Window, Output), cookie) return RandrSetOutputPrimaryCookie{cookie} } -func (c *Conn) RandrSetOutputPrimaryChecked(Window Id, Output Id) RandrSetOutputPrimaryCookie { +func (c *Conn) RandrSetOutputPrimaryChecked(Window Window, Output RandrOutput) RandrSetOutputPrimaryCookie { cookie := c.newCookie(true, false) c.newRequest(c.randrSetOutputPrimaryRequest(Window, Output), cookie) return RandrSetOutputPrimaryCookie{cookie} @@ -3909,7 +3931,7 @@ func (cook RandrSetOutputPrimaryCookie) Check() error { } // Write request to wire for RandrSetOutputPrimary -func (c *Conn) randrSetOutputPrimaryRequest(Window Id, Output Id) []byte { +func (c *Conn) randrSetOutputPrimaryRequest(Window Window, Output RandrOutput) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -3938,13 +3960,13 @@ type RandrGetOutputPrimaryCookie struct { *cookie } -func (c *Conn) RandrGetOutputPrimary(Window Id) RandrGetOutputPrimaryCookie { +func (c *Conn) RandrGetOutputPrimary(Window Window) RandrGetOutputPrimaryCookie { cookie := c.newCookie(true, true) c.newRequest(c.randrGetOutputPrimaryRequest(Window), cookie) return RandrGetOutputPrimaryCookie{cookie} } -func (c *Conn) RandrGetOutputPrimaryUnchecked(Window Id) RandrGetOutputPrimaryCookie { +func (c *Conn) RandrGetOutputPrimaryUnchecked(Window Window) RandrGetOutputPrimaryCookie { cookie := c.newCookie(false, true) c.newRequest(c.randrGetOutputPrimaryRequest(Window), cookie) return RandrGetOutputPrimaryCookie{cookie} @@ -3956,7 +3978,7 @@ type RandrGetOutputPrimaryReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Output Id + Output RandrOutput } // Waits and reads reply data from request RandrGetOutputPrimary @@ -3984,7 +4006,7 @@ func randrGetOutputPrimaryReply(buf []byte) *RandrGetOutputPrimaryReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Output = Id(Get32(buf[b:])) + v.Output = RandrOutput(Get32(buf[b:])) b += 4 return v @@ -3995,7 +4017,7 @@ func (cook RandrGetOutputPrimaryCookie) Check() error { } // Write request to wire for RandrGetOutputPrimary -func (c *Conn) randrGetOutputPrimaryRequest(Window Id) []byte { +func (c *Conn) randrGetOutputPrimaryRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_record.go b/nexgb/auto_record.go index c92868f..ec936d7 100644 --- a/nexgb/auto_record.go +++ b/nexgb/auto_record.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by record.xml on May 8 2012 11:03:24pm EDT. + This file was generated by record.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -33,20 +33,6 @@ func init() { newExtErrorFuncs["RECORD"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Card16' - -// Skipping definition for base type 'Char' - -// Skipping definition for base type 'Card32' - -// Skipping definition for base type 'Double' - -// Skipping definition for base type 'Bool' - -// Skipping definition for base type 'Float' - -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -59,6 +45,18 @@ func init() { // 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' + +// Skipping definition for base type 'Bool' + +// Skipping definition for base type 'Float' + const ( RecordHTypeFromServerTime = 1 RecordHTypeFromClientTime = 2 @@ -71,7 +69,15 @@ const ( RecordCsAllClients = 3 ) -// Skipping resource definition of 'Context' +type RecordContext uint32 + +func (c *Conn) NewRecordContextId() (RecordContext, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RecordContext(id), nil +} type RecordElementHeader byte @@ -498,7 +504,7 @@ func (err RecordBadContextError) SequenceId() uint16 { return err.Sequence } -func (err RecordBadContextError) BadId() Id { +func (err RecordBadContextError) BadId() uint32 { return 0 } @@ -611,13 +617,13 @@ type RecordCreateContextCookie struct { } // Write request to wire for RecordCreateContext -func (c *Conn) RecordCreateContext(Context Id, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordCreateContextCookie { +func (c *Conn) RecordCreateContext(Context RecordContext, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordCreateContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.recordCreateContextRequest(Context, ElementHeader, NumClientSpecs, NumRanges, ClientSpecs, Ranges), cookie) return RecordCreateContextCookie{cookie} } -func (c *Conn) RecordCreateContextChecked(Context Id, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordCreateContextCookie { +func (c *Conn) RecordCreateContextChecked(Context RecordContext, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordCreateContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.recordCreateContextRequest(Context, ElementHeader, NumClientSpecs, NumRanges, ClientSpecs, Ranges), cookie) return RecordCreateContextCookie{cookie} @@ -628,7 +634,7 @@ func (cook RecordCreateContextCookie) Check() error { } // Write request to wire for RecordCreateContext -func (c *Conn) recordCreateContextRequest(Context Id, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) []byte { +func (c *Conn) recordCreateContextRequest(Context RecordContext, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) []byte { size := pad(((20 + pad((int(NumClientSpecs) * 4))) + pad((int(NumRanges) * 24)))) b := 0 buf := make([]byte, size) @@ -674,13 +680,13 @@ type RecordRegisterClientsCookie struct { } // Write request to wire for RecordRegisterClients -func (c *Conn) RecordRegisterClients(Context Id, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordRegisterClientsCookie { +func (c *Conn) RecordRegisterClients(Context RecordContext, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordRegisterClientsCookie { cookie := c.newCookie(false, false) c.newRequest(c.recordRegisterClientsRequest(Context, ElementHeader, NumClientSpecs, NumRanges, ClientSpecs, Ranges), cookie) return RecordRegisterClientsCookie{cookie} } -func (c *Conn) RecordRegisterClientsChecked(Context Id, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordRegisterClientsCookie { +func (c *Conn) RecordRegisterClientsChecked(Context RecordContext, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) RecordRegisterClientsCookie { cookie := c.newCookie(true, false) c.newRequest(c.recordRegisterClientsRequest(Context, ElementHeader, NumClientSpecs, NumRanges, ClientSpecs, Ranges), cookie) return RecordRegisterClientsCookie{cookie} @@ -691,7 +697,7 @@ func (cook RecordRegisterClientsCookie) Check() error { } // Write request to wire for RecordRegisterClients -func (c *Conn) recordRegisterClientsRequest(Context Id, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) []byte { +func (c *Conn) recordRegisterClientsRequest(Context RecordContext, ElementHeader RecordElementHeader, NumClientSpecs uint32, NumRanges uint32, ClientSpecs []RecordClientSpec, Ranges []RecordRange) []byte { size := pad(((20 + pad((int(NumClientSpecs) * 4))) + pad((int(NumRanges) * 24)))) b := 0 buf := make([]byte, size) @@ -737,13 +743,13 @@ type RecordUnregisterClientsCookie struct { } // Write request to wire for RecordUnregisterClients -func (c *Conn) RecordUnregisterClients(Context Id, NumClientSpecs uint32, ClientSpecs []RecordClientSpec) RecordUnregisterClientsCookie { +func (c *Conn) RecordUnregisterClients(Context RecordContext, NumClientSpecs uint32, ClientSpecs []RecordClientSpec) RecordUnregisterClientsCookie { cookie := c.newCookie(false, false) c.newRequest(c.recordUnregisterClientsRequest(Context, NumClientSpecs, ClientSpecs), cookie) return RecordUnregisterClientsCookie{cookie} } -func (c *Conn) RecordUnregisterClientsChecked(Context Id, NumClientSpecs uint32, ClientSpecs []RecordClientSpec) RecordUnregisterClientsCookie { +func (c *Conn) RecordUnregisterClientsChecked(Context RecordContext, NumClientSpecs uint32, ClientSpecs []RecordClientSpec) RecordUnregisterClientsCookie { cookie := c.newCookie(true, false) c.newRequest(c.recordUnregisterClientsRequest(Context, NumClientSpecs, ClientSpecs), cookie) return RecordUnregisterClientsCookie{cookie} @@ -754,7 +760,7 @@ func (cook RecordUnregisterClientsCookie) Check() error { } // Write request to wire for RecordUnregisterClients -func (c *Conn) recordUnregisterClientsRequest(Context Id, NumClientSpecs uint32, ClientSpecs []RecordClientSpec) []byte { +func (c *Conn) recordUnregisterClientsRequest(Context RecordContext, NumClientSpecs uint32, ClientSpecs []RecordClientSpec) []byte { size := pad((12 + pad((int(NumClientSpecs) * 4)))) b := 0 buf := make([]byte, size) @@ -789,13 +795,13 @@ type RecordGetContextCookie struct { *cookie } -func (c *Conn) RecordGetContext(Context Id) RecordGetContextCookie { +func (c *Conn) RecordGetContext(Context RecordContext) RecordGetContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.recordGetContextRequest(Context), cookie) return RecordGetContextCookie{cookie} } -func (c *Conn) RecordGetContextUnchecked(Context Id) RecordGetContextCookie { +func (c *Conn) RecordGetContextUnchecked(Context RecordContext) RecordGetContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.recordGetContextRequest(Context), cookie) return RecordGetContextCookie{cookie} @@ -865,7 +871,7 @@ func (cook RecordGetContextCookie) Check() error { } // Write request to wire for RecordGetContext -func (c *Conn) recordGetContextRequest(Context Id) []byte { +func (c *Conn) recordGetContextRequest(Context RecordContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -891,13 +897,13 @@ type RecordEnableContextCookie struct { *cookie } -func (c *Conn) RecordEnableContext(Context Id) RecordEnableContextCookie { +func (c *Conn) RecordEnableContext(Context RecordContext) RecordEnableContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.recordEnableContextRequest(Context), cookie) return RecordEnableContextCookie{cookie} } -func (c *Conn) RecordEnableContextUnchecked(Context Id) RecordEnableContextCookie { +func (c *Conn) RecordEnableContextUnchecked(Context RecordContext) RecordEnableContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.recordEnableContextRequest(Context), cookie) return RecordEnableContextCookie{cookie} @@ -980,7 +986,7 @@ func (cook RecordEnableContextCookie) Check() error { } // Write request to wire for RecordEnableContext -func (c *Conn) recordEnableContextRequest(Context Id) []byte { +func (c *Conn) recordEnableContextRequest(Context RecordContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1007,13 +1013,13 @@ type RecordDisableContextCookie struct { } // Write request to wire for RecordDisableContext -func (c *Conn) RecordDisableContext(Context Id) RecordDisableContextCookie { +func (c *Conn) RecordDisableContext(Context RecordContext) RecordDisableContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.recordDisableContextRequest(Context), cookie) return RecordDisableContextCookie{cookie} } -func (c *Conn) RecordDisableContextChecked(Context Id) RecordDisableContextCookie { +func (c *Conn) RecordDisableContextChecked(Context RecordContext) RecordDisableContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.recordDisableContextRequest(Context), cookie) return RecordDisableContextCookie{cookie} @@ -1024,7 +1030,7 @@ func (cook RecordDisableContextCookie) Check() error { } // Write request to wire for RecordDisableContext -func (c *Conn) recordDisableContextRequest(Context Id) []byte { +func (c *Conn) recordDisableContextRequest(Context RecordContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1051,13 +1057,13 @@ type RecordFreeContextCookie struct { } // Write request to wire for RecordFreeContext -func (c *Conn) RecordFreeContext(Context Id) RecordFreeContextCookie { +func (c *Conn) RecordFreeContext(Context RecordContext) RecordFreeContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.recordFreeContextRequest(Context), cookie) return RecordFreeContextCookie{cookie} } -func (c *Conn) RecordFreeContextChecked(Context Id) RecordFreeContextCookie { +func (c *Conn) RecordFreeContextChecked(Context RecordContext) RecordFreeContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.recordFreeContextRequest(Context), cookie) return RecordFreeContextCookie{cookie} @@ -1068,7 +1074,7 @@ func (cook RecordFreeContextCookie) Check() error { } // Write request to wire for RecordFreeContext -func (c *Conn) recordFreeContextRequest(Context Id) []byte { +func (c *Conn) recordFreeContextRequest(Context RecordContext) []byte { size := 8 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_render.go b/nexgb/auto_render.go index bea7d88..5e1ff12 100644 --- a/nexgb/auto_render.go +++ b/nexgb/auto_render.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by render.xml on May 8 2012 11:03:24pm EDT. + This file was generated by render.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,12 @@ func init() { newExtErrorFuncs["RENDER"] = make(map[int]newErrorFun) } +// 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' @@ -45,8 +51,6 @@ 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' @@ -57,12 +61,6 @@ func init() { // Skipping definition for base type 'Byte' -// Skipping definition for base type 'Int8' - -// Skipping definition for base type 'Card16' - -// Skipping definition for base type 'Char' - const ( RenderPictTypeIndexed = 0 RenderPictTypeDirect = 1 @@ -170,11 +168,35 @@ const ( RenderRepeatReflect = 3 ) -// Skipping resource definition of 'Glyphset' +type RenderGlyphset uint32 -// Skipping resource definition of 'Picture' +func (c *Conn) NewRenderGlyphsetId() (RenderGlyphset, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RenderGlyphset(id), nil +} + +type RenderPicture uint32 + +func (c *Conn) NewRenderPictureId() (RenderPicture, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RenderPicture(id), nil +} + +type RenderPictformat uint32 -// Skipping resource definition of 'Pictformat' +func (c *Conn) NewRenderPictformatId() (RenderPictformat, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return RenderPictformat(id), nil +} type RenderGlyph uint32 @@ -281,19 +303,19 @@ func RenderDirectformatListBytes(buf []byte, list []RenderDirectformat) int { // 'RenderPictforminfo' struct definition // Size: 28 type RenderPictforminfo struct { - Id Id + Id RenderPictformat Type byte Depth byte // padding: 2 bytes Direct RenderDirectformat - Colormap Id + Colormap Colormap } // Struct read RenderPictforminfo func ReadRenderPictforminfo(buf []byte, v *RenderPictforminfo) int { b := 0 - v.Id = Id(Get32(buf[b:])) + v.Id = RenderPictformat(Get32(buf[b:])) b += 4 v.Type = buf[b] @@ -307,7 +329,7 @@ func ReadRenderPictforminfo(buf []byte, v *RenderPictforminfo) int { v.Direct = RenderDirectformat{} b += ReadRenderDirectformat(buf[b:], &v.Direct) - v.Colormap = Id(Get32(buf[b:])) + v.Colormap = Colormap(Get32(buf[b:])) b += 4 return b @@ -367,7 +389,7 @@ func RenderPictforminfoListBytes(buf []byte, list []RenderPictforminfo) int { // Size: 8 type RenderPictvisual struct { Visual Visualid - Format Id + Format RenderPictformat } // Struct read RenderPictvisual @@ -377,7 +399,7 @@ func ReadRenderPictvisual(buf []byte, v *RenderPictvisual) int { v.Visual = Visualid(Get32(buf[b:])) b += 4 - v.Format = Id(Get32(buf[b:])) + v.Format = RenderPictformat(Get32(buf[b:])) b += 4 return b @@ -504,7 +526,7 @@ func RenderPictdepthListSize(list []RenderPictdepth) int { // Size: (8 + RenderPictdepthListSize(Depths)) type RenderPictscreen struct { NumDepths uint32 - Fallback Id + Fallback RenderPictformat Depths []RenderPictdepth // size: RenderPictdepthListSize(Depths) } @@ -515,7 +537,7 @@ func ReadRenderPictscreen(buf []byte, v *RenderPictscreen) int { v.NumDepths = Get32(buf[b:]) b += 4 - v.Fallback = Id(Get32(buf[b:])) + v.Fallback = RenderPictformat(Get32(buf[b:])) b += 4 v.Depths = make([]RenderPictdepth, v.NumDepths) @@ -1176,7 +1198,7 @@ func RenderTransformListBytes(buf []byte, list []RenderTransform) int { // 'RenderAnimcursorelt' struct definition // Size: 8 type RenderAnimcursorelt struct { - Cursor Id + Cursor Cursor Delay uint32 } @@ -1184,7 +1206,7 @@ type RenderAnimcursorelt struct { func ReadRenderAnimcursorelt(buf []byte, v *RenderAnimcursorelt) int { b := 0 - v.Cursor = Id(Get32(buf[b:])) + v.Cursor = Cursor(Get32(buf[b:])) b += 4 v.Delay = Get32(buf[b:]) @@ -1384,7 +1406,7 @@ func (err RenderPictFormatError) SequenceId() uint16 { return err.Sequence } -func (err RenderPictFormatError) BadId() Id { +func (err RenderPictFormatError) BadId() uint32 { return 0 } @@ -1429,7 +1451,7 @@ func (err RenderPictureError) SequenceId() uint16 { return err.Sequence } -func (err RenderPictureError) BadId() Id { +func (err RenderPictureError) BadId() uint32 { return 0 } @@ -1474,7 +1496,7 @@ func (err RenderPictOpError) SequenceId() uint16 { return err.Sequence } -func (err RenderPictOpError) BadId() Id { +func (err RenderPictOpError) BadId() uint32 { return 0 } @@ -1519,7 +1541,7 @@ func (err RenderGlyphSetError) SequenceId() uint16 { return err.Sequence } -func (err RenderGlyphSetError) BadId() Id { +func (err RenderGlyphSetError) BadId() uint32 { return 0 } @@ -1564,7 +1586,7 @@ func (err RenderGlyphError) SequenceId() uint16 { return err.Sequence } -func (err RenderGlyphError) BadId() Id { +func (err RenderGlyphError) BadId() uint32 { return 0 } @@ -1793,13 +1815,13 @@ type RenderQueryPictIndexValuesCookie struct { *cookie } -func (c *Conn) RenderQueryPictIndexValues(Format Id) RenderQueryPictIndexValuesCookie { +func (c *Conn) RenderQueryPictIndexValues(Format RenderPictformat) RenderQueryPictIndexValuesCookie { cookie := c.newCookie(true, true) c.newRequest(c.renderQueryPictIndexValuesRequest(Format), cookie) return RenderQueryPictIndexValuesCookie{cookie} } -func (c *Conn) RenderQueryPictIndexValuesUnchecked(Format Id) RenderQueryPictIndexValuesCookie { +func (c *Conn) RenderQueryPictIndexValuesUnchecked(Format RenderPictformat) RenderQueryPictIndexValuesCookie { cookie := c.newCookie(false, true) c.newRequest(c.renderQueryPictIndexValuesRequest(Format), cookie) return RenderQueryPictIndexValuesCookie{cookie} @@ -1857,7 +1879,7 @@ func (cook RenderQueryPictIndexValuesCookie) Check() error { } // Write request to wire for RenderQueryPictIndexValues -func (c *Conn) renderQueryPictIndexValuesRequest(Format Id) []byte { +func (c *Conn) renderQueryPictIndexValuesRequest(Format RenderPictformat) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1884,13 +1906,13 @@ type RenderCreatePictureCookie struct { } // Write request to wire for RenderCreatePicture -func (c *Conn) RenderCreatePicture(Pid Id, Drawable Id, Format Id, ValueMask uint32, ValueList []uint32) RenderCreatePictureCookie { +func (c *Conn) RenderCreatePicture(Pid RenderPicture, Drawable Drawable, Format RenderPictformat, ValueMask uint32, ValueList []uint32) RenderCreatePictureCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreatePictureRequest(Pid, Drawable, Format, ValueMask, ValueList), cookie) return RenderCreatePictureCookie{cookie} } -func (c *Conn) RenderCreatePictureChecked(Pid Id, Drawable Id, Format Id, ValueMask uint32, ValueList []uint32) RenderCreatePictureCookie { +func (c *Conn) RenderCreatePictureChecked(Pid RenderPicture, Drawable Drawable, Format RenderPictformat, ValueMask uint32, ValueList []uint32) RenderCreatePictureCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreatePictureRequest(Pid, Drawable, Format, ValueMask, ValueList), cookie) return RenderCreatePictureCookie{cookie} @@ -1901,7 +1923,7 @@ func (cook RenderCreatePictureCookie) Check() error { } // Write request to wire for RenderCreatePicture -func (c *Conn) renderCreatePictureRequest(Pid Id, Drawable Id, Format Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) renderCreatePictureRequest(Pid RenderPicture, Drawable Drawable, Format RenderPictformat, ValueMask uint32, ValueList []uint32) []byte { size := pad((16 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -1942,13 +1964,13 @@ type RenderChangePictureCookie struct { } // Write request to wire for RenderChangePicture -func (c *Conn) RenderChangePicture(Picture Id, ValueMask uint32, ValueList []uint32) RenderChangePictureCookie { +func (c *Conn) RenderChangePicture(Picture RenderPicture, ValueMask uint32, ValueList []uint32) RenderChangePictureCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderChangePictureRequest(Picture, ValueMask, ValueList), cookie) return RenderChangePictureCookie{cookie} } -func (c *Conn) RenderChangePictureChecked(Picture Id, ValueMask uint32, ValueList []uint32) RenderChangePictureCookie { +func (c *Conn) RenderChangePictureChecked(Picture RenderPicture, ValueMask uint32, ValueList []uint32) RenderChangePictureCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderChangePictureRequest(Picture, ValueMask, ValueList), cookie) return RenderChangePictureCookie{cookie} @@ -1959,7 +1981,7 @@ func (cook RenderChangePictureCookie) Check() error { } // Write request to wire for RenderChangePicture -func (c *Conn) renderChangePictureRequest(Picture Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) renderChangePictureRequest(Picture RenderPicture, ValueMask uint32, ValueList []uint32) []byte { size := pad((8 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -1994,13 +2016,13 @@ type RenderSetPictureClipRectanglesCookie struct { } // Write request to wire for RenderSetPictureClipRectangles -func (c *Conn) RenderSetPictureClipRectangles(Picture Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) RenderSetPictureClipRectanglesCookie { +func (c *Conn) RenderSetPictureClipRectangles(Picture RenderPicture, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) RenderSetPictureClipRectanglesCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderSetPictureClipRectanglesRequest(Picture, ClipXOrigin, ClipYOrigin, Rectangles), cookie) return RenderSetPictureClipRectanglesCookie{cookie} } -func (c *Conn) RenderSetPictureClipRectanglesChecked(Picture Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) RenderSetPictureClipRectanglesCookie { +func (c *Conn) RenderSetPictureClipRectanglesChecked(Picture RenderPicture, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) RenderSetPictureClipRectanglesCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderSetPictureClipRectanglesRequest(Picture, ClipXOrigin, ClipYOrigin, Rectangles), cookie) return RenderSetPictureClipRectanglesCookie{cookie} @@ -2011,7 +2033,7 @@ func (cook RenderSetPictureClipRectanglesCookie) Check() error { } // Write request to wire for RenderSetPictureClipRectangles -func (c *Conn) renderSetPictureClipRectanglesRequest(Picture Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) []byte { +func (c *Conn) renderSetPictureClipRectanglesRequest(Picture RenderPicture, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) []byte { size := pad((12 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -2046,13 +2068,13 @@ type RenderFreePictureCookie struct { } // Write request to wire for RenderFreePicture -func (c *Conn) RenderFreePicture(Picture Id) RenderFreePictureCookie { +func (c *Conn) RenderFreePicture(Picture RenderPicture) RenderFreePictureCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderFreePictureRequest(Picture), cookie) return RenderFreePictureCookie{cookie} } -func (c *Conn) RenderFreePictureChecked(Picture Id) RenderFreePictureCookie { +func (c *Conn) RenderFreePictureChecked(Picture RenderPicture) RenderFreePictureCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderFreePictureRequest(Picture), cookie) return RenderFreePictureCookie{cookie} @@ -2063,7 +2085,7 @@ func (cook RenderFreePictureCookie) Check() error { } // Write request to wire for RenderFreePicture -func (c *Conn) renderFreePictureRequest(Picture Id) []byte { +func (c *Conn) renderFreePictureRequest(Picture RenderPicture) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2090,13 +2112,13 @@ type RenderCompositeCookie struct { } // Write request to wire for RenderComposite -func (c *Conn) RenderComposite(Op byte, Src Id, Mask Id, Dst Id, SrcX int16, SrcY int16, MaskX int16, MaskY int16, DstX int16, DstY int16, Width uint16, Height uint16) RenderCompositeCookie { +func (c *Conn) RenderComposite(Op byte, Src RenderPicture, Mask RenderPicture, Dst RenderPicture, SrcX int16, SrcY int16, MaskX int16, MaskY int16, DstX int16, DstY int16, Width uint16, Height uint16) RenderCompositeCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCompositeRequest(Op, Src, Mask, Dst, SrcX, SrcY, MaskX, MaskY, DstX, DstY, Width, Height), cookie) return RenderCompositeCookie{cookie} } -func (c *Conn) RenderCompositeChecked(Op byte, Src Id, Mask Id, Dst Id, SrcX int16, SrcY int16, MaskX int16, MaskY int16, DstX int16, DstY int16, Width uint16, Height uint16) RenderCompositeCookie { +func (c *Conn) RenderCompositeChecked(Op byte, Src RenderPicture, Mask RenderPicture, Dst RenderPicture, SrcX int16, SrcY int16, MaskX int16, MaskY int16, DstX int16, DstY int16, Width uint16, Height uint16) RenderCompositeCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCompositeRequest(Op, Src, Mask, Dst, SrcX, SrcY, MaskX, MaskY, DstX, DstY, Width, Height), cookie) return RenderCompositeCookie{cookie} @@ -2107,7 +2129,7 @@ func (cook RenderCompositeCookie) Check() error { } // Write request to wire for RenderComposite -func (c *Conn) renderCompositeRequest(Op byte, Src Id, Mask Id, Dst Id, SrcX int16, SrcY int16, MaskX int16, MaskY int16, DstX int16, DstY int16, Width uint16, Height uint16) []byte { +func (c *Conn) renderCompositeRequest(Op byte, Src RenderPicture, Mask RenderPicture, Dst RenderPicture, SrcX int16, SrcY int16, MaskX int16, MaskY int16, DstX int16, DstY int16, Width uint16, Height uint16) []byte { size := 36 b := 0 buf := make([]byte, size) @@ -2169,13 +2191,13 @@ type RenderTrapezoidsCookie struct { } // Write request to wire for RenderTrapezoids -func (c *Conn) RenderTrapezoids(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Traps []RenderTrapezoid) RenderTrapezoidsCookie { +func (c *Conn) RenderTrapezoids(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Traps []RenderTrapezoid) RenderTrapezoidsCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderTrapezoidsRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Traps), cookie) return RenderTrapezoidsCookie{cookie} } -func (c *Conn) RenderTrapezoidsChecked(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Traps []RenderTrapezoid) RenderTrapezoidsCookie { +func (c *Conn) RenderTrapezoidsChecked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Traps []RenderTrapezoid) RenderTrapezoidsCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderTrapezoidsRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Traps), cookie) return RenderTrapezoidsCookie{cookie} @@ -2186,7 +2208,7 @@ func (cook RenderTrapezoidsCookie) Check() error { } // Write request to wire for RenderTrapezoids -func (c *Conn) renderTrapezoidsRequest(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Traps []RenderTrapezoid) []byte { +func (c *Conn) renderTrapezoidsRequest(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Traps []RenderTrapezoid) []byte { size := pad((24 + pad((len(Traps) * 40)))) b := 0 buf := make([]byte, size) @@ -2232,13 +2254,13 @@ type RenderTrianglesCookie struct { } // Write request to wire for RenderTriangles -func (c *Conn) RenderTriangles(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Triangles []RenderTriangle) RenderTrianglesCookie { +func (c *Conn) RenderTriangles(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Triangles []RenderTriangle) RenderTrianglesCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderTrianglesRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Triangles), cookie) return RenderTrianglesCookie{cookie} } -func (c *Conn) RenderTrianglesChecked(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Triangles []RenderTriangle) RenderTrianglesCookie { +func (c *Conn) RenderTrianglesChecked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Triangles []RenderTriangle) RenderTrianglesCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderTrianglesRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Triangles), cookie) return RenderTrianglesCookie{cookie} @@ -2249,7 +2271,7 @@ func (cook RenderTrianglesCookie) Check() error { } // Write request to wire for RenderTriangles -func (c *Conn) renderTrianglesRequest(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Triangles []RenderTriangle) []byte { +func (c *Conn) renderTrianglesRequest(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Triangles []RenderTriangle) []byte { size := pad((24 + pad((len(Triangles) * 24)))) b := 0 buf := make([]byte, size) @@ -2295,13 +2317,13 @@ type RenderTriStripCookie struct { } // Write request to wire for RenderTriStrip -func (c *Conn) RenderTriStrip(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriStripCookie { +func (c *Conn) RenderTriStrip(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriStripCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderTriStripRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Points), cookie) return RenderTriStripCookie{cookie} } -func (c *Conn) RenderTriStripChecked(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriStripCookie { +func (c *Conn) RenderTriStripChecked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriStripCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderTriStripRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Points), cookie) return RenderTriStripCookie{cookie} @@ -2312,7 +2334,7 @@ func (cook RenderTriStripCookie) Check() error { } // Write request to wire for RenderTriStrip -func (c *Conn) renderTriStripRequest(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Points []RenderPointfix) []byte { +func (c *Conn) renderTriStripRequest(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Points []RenderPointfix) []byte { size := pad((24 + pad((len(Points) * 8)))) b := 0 buf := make([]byte, size) @@ -2358,13 +2380,13 @@ type RenderTriFanCookie struct { } // Write request to wire for RenderTriFan -func (c *Conn) RenderTriFan(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriFanCookie { +func (c *Conn) RenderTriFan(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriFanCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderTriFanRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Points), cookie) return RenderTriFanCookie{cookie} } -func (c *Conn) RenderTriFanChecked(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriFanCookie { +func (c *Conn) RenderTriFanChecked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Points []RenderPointfix) RenderTriFanCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderTriFanRequest(Op, Src, Dst, MaskFormat, SrcX, SrcY, Points), cookie) return RenderTriFanCookie{cookie} @@ -2375,7 +2397,7 @@ func (cook RenderTriFanCookie) Check() error { } // Write request to wire for RenderTriFan -func (c *Conn) renderTriFanRequest(Op byte, Src Id, Dst Id, MaskFormat Id, SrcX int16, SrcY int16, Points []RenderPointfix) []byte { +func (c *Conn) renderTriFanRequest(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, SrcX int16, SrcY int16, Points []RenderPointfix) []byte { size := pad((24 + pad((len(Points) * 8)))) b := 0 buf := make([]byte, size) @@ -2421,13 +2443,13 @@ type RenderCreateGlyphSetCookie struct { } // Write request to wire for RenderCreateGlyphSet -func (c *Conn) RenderCreateGlyphSet(Gsid Id, Format Id) RenderCreateGlyphSetCookie { +func (c *Conn) RenderCreateGlyphSet(Gsid RenderGlyphset, Format RenderPictformat) RenderCreateGlyphSetCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateGlyphSetRequest(Gsid, Format), cookie) return RenderCreateGlyphSetCookie{cookie} } -func (c *Conn) RenderCreateGlyphSetChecked(Gsid Id, Format Id) RenderCreateGlyphSetCookie { +func (c *Conn) RenderCreateGlyphSetChecked(Gsid RenderGlyphset, Format RenderPictformat) RenderCreateGlyphSetCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateGlyphSetRequest(Gsid, Format), cookie) return RenderCreateGlyphSetCookie{cookie} @@ -2438,7 +2460,7 @@ func (cook RenderCreateGlyphSetCookie) Check() error { } // Write request to wire for RenderCreateGlyphSet -func (c *Conn) renderCreateGlyphSetRequest(Gsid Id, Format Id) []byte { +func (c *Conn) renderCreateGlyphSetRequest(Gsid RenderGlyphset, Format RenderPictformat) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2468,13 +2490,13 @@ type RenderReferenceGlyphSetCookie struct { } // Write request to wire for RenderReferenceGlyphSet -func (c *Conn) RenderReferenceGlyphSet(Gsid Id, Existing Id) RenderReferenceGlyphSetCookie { +func (c *Conn) RenderReferenceGlyphSet(Gsid RenderGlyphset, Existing RenderGlyphset) RenderReferenceGlyphSetCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderReferenceGlyphSetRequest(Gsid, Existing), cookie) return RenderReferenceGlyphSetCookie{cookie} } -func (c *Conn) RenderReferenceGlyphSetChecked(Gsid Id, Existing Id) RenderReferenceGlyphSetCookie { +func (c *Conn) RenderReferenceGlyphSetChecked(Gsid RenderGlyphset, Existing RenderGlyphset) RenderReferenceGlyphSetCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderReferenceGlyphSetRequest(Gsid, Existing), cookie) return RenderReferenceGlyphSetCookie{cookie} @@ -2485,7 +2507,7 @@ func (cook RenderReferenceGlyphSetCookie) Check() error { } // Write request to wire for RenderReferenceGlyphSet -func (c *Conn) renderReferenceGlyphSetRequest(Gsid Id, Existing Id) []byte { +func (c *Conn) renderReferenceGlyphSetRequest(Gsid RenderGlyphset, Existing RenderGlyphset) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2515,13 +2537,13 @@ type RenderFreeGlyphSetCookie struct { } // Write request to wire for RenderFreeGlyphSet -func (c *Conn) RenderFreeGlyphSet(Glyphset Id) RenderFreeGlyphSetCookie { +func (c *Conn) RenderFreeGlyphSet(Glyphset RenderGlyphset) RenderFreeGlyphSetCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderFreeGlyphSetRequest(Glyphset), cookie) return RenderFreeGlyphSetCookie{cookie} } -func (c *Conn) RenderFreeGlyphSetChecked(Glyphset Id) RenderFreeGlyphSetCookie { +func (c *Conn) RenderFreeGlyphSetChecked(Glyphset RenderGlyphset) RenderFreeGlyphSetCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderFreeGlyphSetRequest(Glyphset), cookie) return RenderFreeGlyphSetCookie{cookie} @@ -2532,7 +2554,7 @@ func (cook RenderFreeGlyphSetCookie) Check() error { } // Write request to wire for RenderFreeGlyphSet -func (c *Conn) renderFreeGlyphSetRequest(Glyphset Id) []byte { +func (c *Conn) renderFreeGlyphSetRequest(Glyphset RenderGlyphset) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2559,13 +2581,13 @@ type RenderAddGlyphsCookie struct { } // Write request to wire for RenderAddGlyphs -func (c *Conn) RenderAddGlyphs(Glyphset Id, GlyphsLen uint32, Glyphids []uint32, Glyphs []RenderGlyphinfo, Data []byte) RenderAddGlyphsCookie { +func (c *Conn) RenderAddGlyphs(Glyphset RenderGlyphset, GlyphsLen uint32, Glyphids []uint32, Glyphs []RenderGlyphinfo, Data []byte) RenderAddGlyphsCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderAddGlyphsRequest(Glyphset, GlyphsLen, Glyphids, Glyphs, Data), cookie) return RenderAddGlyphsCookie{cookie} } -func (c *Conn) RenderAddGlyphsChecked(Glyphset Id, GlyphsLen uint32, Glyphids []uint32, Glyphs []RenderGlyphinfo, Data []byte) RenderAddGlyphsCookie { +func (c *Conn) RenderAddGlyphsChecked(Glyphset RenderGlyphset, GlyphsLen uint32, Glyphids []uint32, Glyphs []RenderGlyphinfo, Data []byte) RenderAddGlyphsCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderAddGlyphsRequest(Glyphset, GlyphsLen, Glyphids, Glyphs, Data), cookie) return RenderAddGlyphsCookie{cookie} @@ -2576,7 +2598,7 @@ func (cook RenderAddGlyphsCookie) Check() error { } // Write request to wire for RenderAddGlyphs -func (c *Conn) renderAddGlyphsRequest(Glyphset Id, GlyphsLen uint32, Glyphids []uint32, Glyphs []RenderGlyphinfo, Data []byte) []byte { +func (c *Conn) renderAddGlyphsRequest(Glyphset RenderGlyphset, GlyphsLen uint32, Glyphids []uint32, Glyphs []RenderGlyphinfo, Data []byte) []byte { size := pad((((12 + pad((int(GlyphsLen) * 4))) + pad((int(GlyphsLen) * 12))) + pad((len(Data) * 1)))) b := 0 buf := make([]byte, size) @@ -2617,13 +2639,13 @@ type RenderFreeGlyphsCookie struct { } // Write request to wire for RenderFreeGlyphs -func (c *Conn) RenderFreeGlyphs(Glyphset Id, Glyphs []RenderGlyph) RenderFreeGlyphsCookie { +func (c *Conn) RenderFreeGlyphs(Glyphset RenderGlyphset, Glyphs []RenderGlyph) RenderFreeGlyphsCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderFreeGlyphsRequest(Glyphset, Glyphs), cookie) return RenderFreeGlyphsCookie{cookie} } -func (c *Conn) RenderFreeGlyphsChecked(Glyphset Id, Glyphs []RenderGlyph) RenderFreeGlyphsCookie { +func (c *Conn) RenderFreeGlyphsChecked(Glyphset RenderGlyphset, Glyphs []RenderGlyph) RenderFreeGlyphsCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderFreeGlyphsRequest(Glyphset, Glyphs), cookie) return RenderFreeGlyphsCookie{cookie} @@ -2634,7 +2656,7 @@ func (cook RenderFreeGlyphsCookie) Check() error { } // Write request to wire for RenderFreeGlyphs -func (c *Conn) renderFreeGlyphsRequest(Glyphset Id, Glyphs []RenderGlyph) []byte { +func (c *Conn) renderFreeGlyphsRequest(Glyphset RenderGlyphset, Glyphs []RenderGlyph) []byte { size := pad((8 + pad((len(Glyphs) * 4)))) b := 0 buf := make([]byte, size) @@ -2667,13 +2689,13 @@ type RenderCompositeGlyphs8Cookie struct { } // Write request to wire for RenderCompositeGlyphs8 -func (c *Conn) RenderCompositeGlyphs8(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs8Cookie { +func (c *Conn) RenderCompositeGlyphs8(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs8Cookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCompositeGlyphs8Request(Op, Src, Dst, MaskFormat, Glyphset, SrcX, SrcY, Glyphcmds), cookie) return RenderCompositeGlyphs8Cookie{cookie} } -func (c *Conn) RenderCompositeGlyphs8Checked(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs8Cookie { +func (c *Conn) RenderCompositeGlyphs8Checked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs8Cookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCompositeGlyphs8Request(Op, Src, Dst, MaskFormat, Glyphset, SrcX, SrcY, Glyphcmds), cookie) return RenderCompositeGlyphs8Cookie{cookie} @@ -2684,7 +2706,7 @@ func (cook RenderCompositeGlyphs8Cookie) Check() error { } // Write request to wire for RenderCompositeGlyphs8 -func (c *Conn) renderCompositeGlyphs8Request(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) []byte { +func (c *Conn) renderCompositeGlyphs8Request(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) []byte { size := pad((28 + pad((len(Glyphcmds) * 1)))) b := 0 buf := make([]byte, size) @@ -2734,13 +2756,13 @@ type RenderCompositeGlyphs16Cookie struct { } // Write request to wire for RenderCompositeGlyphs16 -func (c *Conn) RenderCompositeGlyphs16(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs16Cookie { +func (c *Conn) RenderCompositeGlyphs16(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs16Cookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCompositeGlyphs16Request(Op, Src, Dst, MaskFormat, Glyphset, SrcX, SrcY, Glyphcmds), cookie) return RenderCompositeGlyphs16Cookie{cookie} } -func (c *Conn) RenderCompositeGlyphs16Checked(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs16Cookie { +func (c *Conn) RenderCompositeGlyphs16Checked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs16Cookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCompositeGlyphs16Request(Op, Src, Dst, MaskFormat, Glyphset, SrcX, SrcY, Glyphcmds), cookie) return RenderCompositeGlyphs16Cookie{cookie} @@ -2751,7 +2773,7 @@ func (cook RenderCompositeGlyphs16Cookie) Check() error { } // Write request to wire for RenderCompositeGlyphs16 -func (c *Conn) renderCompositeGlyphs16Request(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) []byte { +func (c *Conn) renderCompositeGlyphs16Request(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) []byte { size := pad((28 + pad((len(Glyphcmds) * 1)))) b := 0 buf := make([]byte, size) @@ -2801,13 +2823,13 @@ type RenderCompositeGlyphs32Cookie struct { } // Write request to wire for RenderCompositeGlyphs32 -func (c *Conn) RenderCompositeGlyphs32(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs32Cookie { +func (c *Conn) RenderCompositeGlyphs32(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs32Cookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCompositeGlyphs32Request(Op, Src, Dst, MaskFormat, Glyphset, SrcX, SrcY, Glyphcmds), cookie) return RenderCompositeGlyphs32Cookie{cookie} } -func (c *Conn) RenderCompositeGlyphs32Checked(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs32Cookie { +func (c *Conn) RenderCompositeGlyphs32Checked(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) RenderCompositeGlyphs32Cookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCompositeGlyphs32Request(Op, Src, Dst, MaskFormat, Glyphset, SrcX, SrcY, Glyphcmds), cookie) return RenderCompositeGlyphs32Cookie{cookie} @@ -2818,7 +2840,7 @@ func (cook RenderCompositeGlyphs32Cookie) Check() error { } // Write request to wire for RenderCompositeGlyphs32 -func (c *Conn) renderCompositeGlyphs32Request(Op byte, Src Id, Dst Id, MaskFormat Id, Glyphset Id, SrcX int16, SrcY int16, Glyphcmds []byte) []byte { +func (c *Conn) renderCompositeGlyphs32Request(Op byte, Src RenderPicture, Dst RenderPicture, MaskFormat RenderPictformat, Glyphset RenderGlyphset, SrcX int16, SrcY int16, Glyphcmds []byte) []byte { size := pad((28 + pad((len(Glyphcmds) * 1)))) b := 0 buf := make([]byte, size) @@ -2868,13 +2890,13 @@ type RenderFillRectanglesCookie struct { } // Write request to wire for RenderFillRectangles -func (c *Conn) RenderFillRectangles(Op byte, Dst Id, Color RenderColor, Rects []Rectangle) RenderFillRectanglesCookie { +func (c *Conn) RenderFillRectangles(Op byte, Dst RenderPicture, Color RenderColor, Rects []Rectangle) RenderFillRectanglesCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderFillRectanglesRequest(Op, Dst, Color, Rects), cookie) return RenderFillRectanglesCookie{cookie} } -func (c *Conn) RenderFillRectanglesChecked(Op byte, Dst Id, Color RenderColor, Rects []Rectangle) RenderFillRectanglesCookie { +func (c *Conn) RenderFillRectanglesChecked(Op byte, Dst RenderPicture, Color RenderColor, Rects []Rectangle) RenderFillRectanglesCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderFillRectanglesRequest(Op, Dst, Color, Rects), cookie) return RenderFillRectanglesCookie{cookie} @@ -2885,7 +2907,7 @@ func (cook RenderFillRectanglesCookie) Check() error { } // Write request to wire for RenderFillRectangles -func (c *Conn) renderFillRectanglesRequest(Op byte, Dst Id, Color RenderColor, Rects []Rectangle) []byte { +func (c *Conn) renderFillRectanglesRequest(Op byte, Dst RenderPicture, Color RenderColor, Rects []Rectangle) []byte { size := pad((20 + pad((len(Rects) * 8)))) b := 0 buf := make([]byte, size) @@ -2925,13 +2947,13 @@ type RenderCreateCursorCookie struct { } // Write request to wire for RenderCreateCursor -func (c *Conn) RenderCreateCursor(Cid Id, Source Id, X uint16, Y uint16) RenderCreateCursorCookie { +func (c *Conn) RenderCreateCursor(Cid Cursor, Source RenderPicture, X uint16, Y uint16) RenderCreateCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateCursorRequest(Cid, Source, X, Y), cookie) return RenderCreateCursorCookie{cookie} } -func (c *Conn) RenderCreateCursorChecked(Cid Id, Source Id, X uint16, Y uint16) RenderCreateCursorCookie { +func (c *Conn) RenderCreateCursorChecked(Cid Cursor, Source RenderPicture, X uint16, Y uint16) RenderCreateCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateCursorRequest(Cid, Source, X, Y), cookie) return RenderCreateCursorCookie{cookie} @@ -2942,7 +2964,7 @@ func (cook RenderCreateCursorCookie) Check() error { } // Write request to wire for RenderCreateCursor -func (c *Conn) renderCreateCursorRequest(Cid Id, Source Id, X uint16, Y uint16) []byte { +func (c *Conn) renderCreateCursorRequest(Cid Cursor, Source RenderPicture, X uint16, Y uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -2978,13 +3000,13 @@ type RenderSetPictureTransformCookie struct { } // Write request to wire for RenderSetPictureTransform -func (c *Conn) RenderSetPictureTransform(Picture Id, Transform RenderTransform) RenderSetPictureTransformCookie { +func (c *Conn) RenderSetPictureTransform(Picture RenderPicture, Transform RenderTransform) RenderSetPictureTransformCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderSetPictureTransformRequest(Picture, Transform), cookie) return RenderSetPictureTransformCookie{cookie} } -func (c *Conn) RenderSetPictureTransformChecked(Picture Id, Transform RenderTransform) RenderSetPictureTransformCookie { +func (c *Conn) RenderSetPictureTransformChecked(Picture RenderPicture, Transform RenderTransform) RenderSetPictureTransformCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderSetPictureTransformRequest(Picture, Transform), cookie) return RenderSetPictureTransformCookie{cookie} @@ -2995,7 +3017,7 @@ func (cook RenderSetPictureTransformCookie) Check() error { } // Write request to wire for RenderSetPictureTransform -func (c *Conn) renderSetPictureTransformRequest(Picture Id, Transform RenderTransform) []byte { +func (c *Conn) renderSetPictureTransformRequest(Picture RenderPicture, Transform RenderTransform) []byte { size := 44 b := 0 buf := make([]byte, size) @@ -3027,13 +3049,13 @@ type RenderQueryFiltersCookie struct { *cookie } -func (c *Conn) RenderQueryFilters(Drawable Id) RenderQueryFiltersCookie { +func (c *Conn) RenderQueryFilters(Drawable Drawable) RenderQueryFiltersCookie { cookie := c.newCookie(true, true) c.newRequest(c.renderQueryFiltersRequest(Drawable), cookie) return RenderQueryFiltersCookie{cookie} } -func (c *Conn) RenderQueryFiltersUnchecked(Drawable Id) RenderQueryFiltersCookie { +func (c *Conn) RenderQueryFiltersUnchecked(Drawable Drawable) RenderQueryFiltersCookie { cookie := c.newCookie(false, true) c.newRequest(c.renderQueryFiltersRequest(Drawable), cookie) return RenderQueryFiltersCookie{cookie} @@ -3103,7 +3125,7 @@ func (cook RenderQueryFiltersCookie) Check() error { } // Write request to wire for RenderQueryFilters -func (c *Conn) renderQueryFiltersRequest(Drawable Id) []byte { +func (c *Conn) renderQueryFiltersRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3130,13 +3152,13 @@ type RenderSetPictureFilterCookie struct { } // Write request to wire for RenderSetPictureFilter -func (c *Conn) RenderSetPictureFilter(Picture Id, FilterLen uint16, Filter string, Values []RenderFixed) RenderSetPictureFilterCookie { +func (c *Conn) RenderSetPictureFilter(Picture RenderPicture, FilterLen uint16, Filter string, Values []RenderFixed) RenderSetPictureFilterCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderSetPictureFilterRequest(Picture, FilterLen, Filter, Values), cookie) return RenderSetPictureFilterCookie{cookie} } -func (c *Conn) RenderSetPictureFilterChecked(Picture Id, FilterLen uint16, Filter string, Values []RenderFixed) RenderSetPictureFilterCookie { +func (c *Conn) RenderSetPictureFilterChecked(Picture RenderPicture, FilterLen uint16, Filter string, Values []RenderFixed) RenderSetPictureFilterCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderSetPictureFilterRequest(Picture, FilterLen, Filter, Values), cookie) return RenderSetPictureFilterCookie{cookie} @@ -3147,7 +3169,7 @@ func (cook RenderSetPictureFilterCookie) Check() error { } // Write request to wire for RenderSetPictureFilter -func (c *Conn) renderSetPictureFilterRequest(Picture Id, FilterLen uint16, Filter string, Values []RenderFixed) []byte { +func (c *Conn) renderSetPictureFilterRequest(Picture RenderPicture, FilterLen uint16, Filter string, Values []RenderFixed) []byte { size := pad(((12 + pad((int(FilterLen) * 1))) + pad((len(Values) * 4)))) b := 0 buf := make([]byte, size) @@ -3188,13 +3210,13 @@ type RenderCreateAnimCursorCookie struct { } // Write request to wire for RenderCreateAnimCursor -func (c *Conn) RenderCreateAnimCursor(Cid Id, Cursors []RenderAnimcursorelt) RenderCreateAnimCursorCookie { +func (c *Conn) RenderCreateAnimCursor(Cid Cursor, Cursors []RenderAnimcursorelt) RenderCreateAnimCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateAnimCursorRequest(Cid, Cursors), cookie) return RenderCreateAnimCursorCookie{cookie} } -func (c *Conn) RenderCreateAnimCursorChecked(Cid Id, Cursors []RenderAnimcursorelt) RenderCreateAnimCursorCookie { +func (c *Conn) RenderCreateAnimCursorChecked(Cid Cursor, Cursors []RenderAnimcursorelt) RenderCreateAnimCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateAnimCursorRequest(Cid, Cursors), cookie) return RenderCreateAnimCursorCookie{cookie} @@ -3205,7 +3227,7 @@ func (cook RenderCreateAnimCursorCookie) Check() error { } // Write request to wire for RenderCreateAnimCursor -func (c *Conn) renderCreateAnimCursorRequest(Cid Id, Cursors []RenderAnimcursorelt) []byte { +func (c *Conn) renderCreateAnimCursorRequest(Cid Cursor, Cursors []RenderAnimcursorelt) []byte { size := pad((8 + pad((len(Cursors) * 8)))) b := 0 buf := make([]byte, size) @@ -3234,13 +3256,13 @@ type RenderAddTrapsCookie struct { } // Write request to wire for RenderAddTraps -func (c *Conn) RenderAddTraps(Picture Id, XOff int16, YOff int16, Traps []RenderTrap) RenderAddTrapsCookie { +func (c *Conn) RenderAddTraps(Picture RenderPicture, XOff int16, YOff int16, Traps []RenderTrap) RenderAddTrapsCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderAddTrapsRequest(Picture, XOff, YOff, Traps), cookie) return RenderAddTrapsCookie{cookie} } -func (c *Conn) RenderAddTrapsChecked(Picture Id, XOff int16, YOff int16, Traps []RenderTrap) RenderAddTrapsCookie { +func (c *Conn) RenderAddTrapsChecked(Picture RenderPicture, XOff int16, YOff int16, Traps []RenderTrap) RenderAddTrapsCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderAddTrapsRequest(Picture, XOff, YOff, Traps), cookie) return RenderAddTrapsCookie{cookie} @@ -3251,7 +3273,7 @@ func (cook RenderAddTrapsCookie) Check() error { } // Write request to wire for RenderAddTraps -func (c *Conn) renderAddTrapsRequest(Picture Id, XOff int16, YOff int16, Traps []RenderTrap) []byte { +func (c *Conn) renderAddTrapsRequest(Picture RenderPicture, XOff int16, YOff int16, Traps []RenderTrap) []byte { size := pad((12 + pad((len(Traps) * 24)))) b := 0 buf := make([]byte, size) @@ -3286,13 +3308,13 @@ type RenderCreateSolidFillCookie struct { } // Write request to wire for RenderCreateSolidFill -func (c *Conn) RenderCreateSolidFill(Picture Id, Color RenderColor) RenderCreateSolidFillCookie { +func (c *Conn) RenderCreateSolidFill(Picture RenderPicture, Color RenderColor) RenderCreateSolidFillCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateSolidFillRequest(Picture, Color), cookie) return RenderCreateSolidFillCookie{cookie} } -func (c *Conn) RenderCreateSolidFillChecked(Picture Id, Color RenderColor) RenderCreateSolidFillCookie { +func (c *Conn) RenderCreateSolidFillChecked(Picture RenderPicture, Color RenderColor) RenderCreateSolidFillCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateSolidFillRequest(Picture, Color), cookie) return RenderCreateSolidFillCookie{cookie} @@ -3303,7 +3325,7 @@ func (cook RenderCreateSolidFillCookie) Check() error { } // Write request to wire for RenderCreateSolidFill -func (c *Conn) renderCreateSolidFillRequest(Picture Id, Color RenderColor) []byte { +func (c *Conn) renderCreateSolidFillRequest(Picture RenderPicture, Color RenderColor) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -3336,13 +3358,13 @@ type RenderCreateLinearGradientCookie struct { } // Write request to wire for RenderCreateLinearGradient -func (c *Conn) RenderCreateLinearGradient(Picture Id, P1 RenderPointfix, P2 RenderPointfix, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateLinearGradientCookie { +func (c *Conn) RenderCreateLinearGradient(Picture RenderPicture, P1 RenderPointfix, P2 RenderPointfix, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateLinearGradientCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateLinearGradientRequest(Picture, P1, P2, NumStops, Stops, Colors), cookie) return RenderCreateLinearGradientCookie{cookie} } -func (c *Conn) RenderCreateLinearGradientChecked(Picture Id, P1 RenderPointfix, P2 RenderPointfix, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateLinearGradientCookie { +func (c *Conn) RenderCreateLinearGradientChecked(Picture RenderPicture, P1 RenderPointfix, P2 RenderPointfix, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateLinearGradientCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateLinearGradientRequest(Picture, P1, P2, NumStops, Stops, Colors), cookie) return RenderCreateLinearGradientCookie{cookie} @@ -3353,7 +3375,7 @@ func (cook RenderCreateLinearGradientCookie) Check() error { } // Write request to wire for RenderCreateLinearGradient -func (c *Conn) renderCreateLinearGradientRequest(Picture Id, P1 RenderPointfix, P2 RenderPointfix, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) []byte { +func (c *Conn) renderCreateLinearGradientRequest(Picture RenderPicture, P1 RenderPointfix, P2 RenderPointfix, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) []byte { size := pad(((28 + pad((int(NumStops) * 4))) + pad((int(NumStops) * 8)))) b := 0 buf := make([]byte, size) @@ -3403,13 +3425,13 @@ type RenderCreateRadialGradientCookie struct { } // Write request to wire for RenderCreateRadialGradient -func (c *Conn) RenderCreateRadialGradient(Picture Id, Inner RenderPointfix, Outer RenderPointfix, InnerRadius RenderFixed, OuterRadius RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateRadialGradientCookie { +func (c *Conn) RenderCreateRadialGradient(Picture RenderPicture, Inner RenderPointfix, Outer RenderPointfix, InnerRadius RenderFixed, OuterRadius RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateRadialGradientCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateRadialGradientRequest(Picture, Inner, Outer, InnerRadius, OuterRadius, NumStops, Stops, Colors), cookie) return RenderCreateRadialGradientCookie{cookie} } -func (c *Conn) RenderCreateRadialGradientChecked(Picture Id, Inner RenderPointfix, Outer RenderPointfix, InnerRadius RenderFixed, OuterRadius RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateRadialGradientCookie { +func (c *Conn) RenderCreateRadialGradientChecked(Picture RenderPicture, Inner RenderPointfix, Outer RenderPointfix, InnerRadius RenderFixed, OuterRadius RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateRadialGradientCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateRadialGradientRequest(Picture, Inner, Outer, InnerRadius, OuterRadius, NumStops, Stops, Colors), cookie) return RenderCreateRadialGradientCookie{cookie} @@ -3420,7 +3442,7 @@ func (cook RenderCreateRadialGradientCookie) Check() error { } // Write request to wire for RenderCreateRadialGradient -func (c *Conn) renderCreateRadialGradientRequest(Picture Id, Inner RenderPointfix, Outer RenderPointfix, InnerRadius RenderFixed, OuterRadius RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) []byte { +func (c *Conn) renderCreateRadialGradientRequest(Picture RenderPicture, Inner RenderPointfix, Outer RenderPointfix, InnerRadius RenderFixed, OuterRadius RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) []byte { size := pad(((36 + pad((int(NumStops) * 4))) + pad((int(NumStops) * 8)))) b := 0 buf := make([]byte, size) @@ -3476,13 +3498,13 @@ type RenderCreateConicalGradientCookie struct { } // Write request to wire for RenderCreateConicalGradient -func (c *Conn) RenderCreateConicalGradient(Picture Id, Center RenderPointfix, Angle RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateConicalGradientCookie { +func (c *Conn) RenderCreateConicalGradient(Picture RenderPicture, Center RenderPointfix, Angle RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateConicalGradientCookie { cookie := c.newCookie(false, false) c.newRequest(c.renderCreateConicalGradientRequest(Picture, Center, Angle, NumStops, Stops, Colors), cookie) return RenderCreateConicalGradientCookie{cookie} } -func (c *Conn) RenderCreateConicalGradientChecked(Picture Id, Center RenderPointfix, Angle RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateConicalGradientCookie { +func (c *Conn) RenderCreateConicalGradientChecked(Picture RenderPicture, Center RenderPointfix, Angle RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) RenderCreateConicalGradientCookie { cookie := c.newCookie(true, false) c.newRequest(c.renderCreateConicalGradientRequest(Picture, Center, Angle, NumStops, Stops, Colors), cookie) return RenderCreateConicalGradientCookie{cookie} @@ -3493,7 +3515,7 @@ func (cook RenderCreateConicalGradientCookie) Check() error { } // Write request to wire for RenderCreateConicalGradient -func (c *Conn) renderCreateConicalGradientRequest(Picture Id, Center RenderPointfix, Angle RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) []byte { +func (c *Conn) renderCreateConicalGradientRequest(Picture RenderPicture, Center RenderPointfix, Angle RenderFixed, NumStops uint32, Stops []RenderFixed, Colors []RenderColor) []byte { size := pad(((24 + pad((int(NumStops) * 4))) + pad((int(NumStops) * 8)))) b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_res.go b/nexgb/auto_res.go index 3aca143..a2f9914 100644 --- a/nexgb/auto_res.go +++ b/nexgb/auto_res.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by res.xml on May 8 2012 11:03:24pm EDT. + This file was generated by res.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,12 +37,20 @@ func init() { newExtErrorFuncs["X-Resource"] = make(map[int]newErrorFun) } +// 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' + // Skipping definition for base type 'Bool' // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -53,16 +61,6 @@ func init() { // Skipping definition for base type 'Byte' -// 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' - // 'ResClient' struct definition // Size: 8 type ResClient struct { @@ -122,7 +120,7 @@ func ResClientListBytes(buf []byte, list []ResClient) int { // 'ResType' struct definition // Size: 8 type ResType struct { - ResourceType Id + ResourceType Atom Count uint32 } @@ -130,7 +128,7 @@ type ResType struct { func ReadResType(buf []byte, v *ResType) int { b := 0 - v.ResourceType = Id(Get32(buf[b:])) + v.ResourceType = Atom(Get32(buf[b:])) b += 4 v.Count = Get32(buf[b:]) diff --git a/nexgb/auto_screensaver.go b/nexgb/auto_screensaver.go index 9bb8d13..4f6fea0 100644 --- a/nexgb/auto_screensaver.go +++ b/nexgb/auto_screensaver.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by screensaver.xml on May 8 2012 11:03:24pm EDT. + This file was generated by screensaver.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,16 @@ func init() { newExtErrorFuncs["MIT-SCREEN-SAVER"] = make(map[int]newErrorFun) } +// 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' + // Skipping definition for base type 'Int8' // Skipping definition for base type 'Card16' @@ -51,18 +61,6 @@ 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 ( ScreensaverKindBlanked = 0 ScreensaverKindInternal = 1 @@ -93,8 +91,8 @@ type ScreensaverNotifyEvent struct { // padding: 1 bytes SequenceNumber uint16 Time Timestamp - Root Id - Window Id + Root Window + Window Window Kind byte Forced bool // padding: 14 bytes @@ -122,10 +120,10 @@ func NewScreensaverNotifyEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.Kind = buf[b] @@ -314,13 +312,13 @@ type ScreensaverQueryInfoCookie struct { *cookie } -func (c *Conn) ScreensaverQueryInfo(Drawable Id) ScreensaverQueryInfoCookie { +func (c *Conn) ScreensaverQueryInfo(Drawable Drawable) ScreensaverQueryInfoCookie { cookie := c.newCookie(true, true) c.newRequest(c.screensaverQueryInfoRequest(Drawable), cookie) return ScreensaverQueryInfoCookie{cookie} } -func (c *Conn) ScreensaverQueryInfoUnchecked(Drawable Id) ScreensaverQueryInfoCookie { +func (c *Conn) ScreensaverQueryInfoUnchecked(Drawable Drawable) ScreensaverQueryInfoCookie { cookie := c.newCookie(false, true) c.newRequest(c.screensaverQueryInfoRequest(Drawable), cookie) return ScreensaverQueryInfoCookie{cookie} @@ -332,7 +330,7 @@ type ScreensaverQueryInfoReply struct { Sequence uint16 Length uint32 State byte - SaverWindow Id + SaverWindow Window MsUntilServer uint32 MsSinceUserInput uint32 EventMask uint32 @@ -366,7 +364,7 @@ func screensaverQueryInfoReply(buf []byte) *ScreensaverQueryInfoReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.SaverWindow = Id(Get32(buf[b:])) + v.SaverWindow = Window(Get32(buf[b:])) b += 4 v.MsUntilServer = Get32(buf[b:]) @@ -391,7 +389,7 @@ func (cook ScreensaverQueryInfoCookie) Check() error { } // Write request to wire for ScreensaverQueryInfo -func (c *Conn) screensaverQueryInfoRequest(Drawable Id) []byte { +func (c *Conn) screensaverQueryInfoRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -418,13 +416,13 @@ type ScreensaverSelectInputCookie struct { } // Write request to wire for ScreensaverSelectInput -func (c *Conn) ScreensaverSelectInput(Drawable Id, EventMask uint32) ScreensaverSelectInputCookie { +func (c *Conn) ScreensaverSelectInput(Drawable Drawable, EventMask uint32) ScreensaverSelectInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.screensaverSelectInputRequest(Drawable, EventMask), cookie) return ScreensaverSelectInputCookie{cookie} } -func (c *Conn) ScreensaverSelectInputChecked(Drawable Id, EventMask uint32) ScreensaverSelectInputCookie { +func (c *Conn) ScreensaverSelectInputChecked(Drawable Drawable, EventMask uint32) ScreensaverSelectInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.screensaverSelectInputRequest(Drawable, EventMask), cookie) return ScreensaverSelectInputCookie{cookie} @@ -435,7 +433,7 @@ func (cook ScreensaverSelectInputCookie) Check() error { } // Write request to wire for ScreensaverSelectInput -func (c *Conn) screensaverSelectInputRequest(Drawable Id, EventMask uint32) []byte { +func (c *Conn) screensaverSelectInputRequest(Drawable Drawable, EventMask uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -465,13 +463,13 @@ type ScreensaverSetAttributesCookie struct { } // Write request to wire for ScreensaverSetAttributes -func (c *Conn) ScreensaverSetAttributes(Drawable Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class byte, Depth byte, Visual Visualid, ValueMask uint32, ValueList []uint32) ScreensaverSetAttributesCookie { +func (c *Conn) ScreensaverSetAttributes(Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class byte, Depth byte, Visual Visualid, ValueMask uint32, ValueList []uint32) ScreensaverSetAttributesCookie { cookie := c.newCookie(false, false) c.newRequest(c.screensaverSetAttributesRequest(Drawable, X, Y, Width, Height, BorderWidth, Class, Depth, Visual, ValueMask, ValueList), cookie) return ScreensaverSetAttributesCookie{cookie} } -func (c *Conn) ScreensaverSetAttributesChecked(Drawable Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class byte, Depth byte, Visual Visualid, ValueMask uint32, ValueList []uint32) ScreensaverSetAttributesCookie { +func (c *Conn) ScreensaverSetAttributesChecked(Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class byte, Depth byte, Visual Visualid, ValueMask uint32, ValueList []uint32) ScreensaverSetAttributesCookie { cookie := c.newCookie(true, false) c.newRequest(c.screensaverSetAttributesRequest(Drawable, X, Y, Width, Height, BorderWidth, Class, Depth, Visual, ValueMask, ValueList), cookie) return ScreensaverSetAttributesCookie{cookie} @@ -482,7 +480,7 @@ func (cook ScreensaverSetAttributesCookie) Check() error { } // Write request to wire for ScreensaverSetAttributes -func (c *Conn) screensaverSetAttributesRequest(Drawable Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class byte, Depth byte, Visual Visualid, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) screensaverSetAttributesRequest(Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class byte, Depth byte, Visual Visualid, ValueMask uint32, ValueList []uint32) []byte { size := pad((24 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -541,13 +539,13 @@ type ScreensaverUnsetAttributesCookie struct { } // Write request to wire for ScreensaverUnsetAttributes -func (c *Conn) ScreensaverUnsetAttributes(Drawable Id) ScreensaverUnsetAttributesCookie { +func (c *Conn) ScreensaverUnsetAttributes(Drawable Drawable) ScreensaverUnsetAttributesCookie { cookie := c.newCookie(false, false) c.newRequest(c.screensaverUnsetAttributesRequest(Drawable), cookie) return ScreensaverUnsetAttributesCookie{cookie} } -func (c *Conn) ScreensaverUnsetAttributesChecked(Drawable Id) ScreensaverUnsetAttributesCookie { +func (c *Conn) ScreensaverUnsetAttributesChecked(Drawable Drawable) ScreensaverUnsetAttributesCookie { cookie := c.newCookie(true, false) c.newRequest(c.screensaverUnsetAttributesRequest(Drawable), cookie) return ScreensaverUnsetAttributesCookie{cookie} @@ -558,7 +556,7 @@ func (cook ScreensaverUnsetAttributesCookie) Check() error { } // Write request to wire for ScreensaverUnsetAttributes -func (c *Conn) screensaverUnsetAttributesRequest(Drawable Id) []byte { +func (c *Conn) screensaverUnsetAttributesRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_shape.go b/nexgb/auto_shape.go index bad291a..90d67cf 100644 --- a/nexgb/auto_shape.go +++ b/nexgb/auto_shape.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by shape.xml on May 8 2012 11:03:24pm EDT. + This file was generated by shape.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,14 @@ func init() { newExtErrorFuncs["SHAPE"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Int16' + +// 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' @@ -51,18 +59,8 @@ 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 ( ShapeSoSet = 0 ShapeSoUnion = 1 @@ -89,7 +87,7 @@ const ShapeNotify = 0 type ShapeNotifyEvent struct { Sequence uint16 ShapeKind ShapeKind - AffectedWindow Id + AffectedWindow Window ExtentsX int16 ExtentsY int16 ExtentsWidth uint16 @@ -110,7 +108,7 @@ func NewShapeNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.AffectedWindow = Id(Get32(buf[b:])) + v.AffectedWindow = Window(Get32(buf[b:])) b += 4 v.ExtentsX = int16(Get16(buf[b:])) @@ -299,13 +297,13 @@ type ShapeRectanglesCookie struct { } // Write request to wire for ShapeRectangles -func (c *Conn) ShapeRectangles(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Id, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie { +func (c *Conn) ShapeRectangles(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Window, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie { cookie := c.newCookie(false, false) c.newRequest(c.shapeRectanglesRequest(Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie) return ShapeRectanglesCookie{cookie} } -func (c *Conn) ShapeRectanglesChecked(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Id, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie { +func (c *Conn) ShapeRectanglesChecked(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Window, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie { cookie := c.newCookie(true, false) c.newRequest(c.shapeRectanglesRequest(Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie) return ShapeRectanglesCookie{cookie} @@ -316,7 +314,7 @@ func (cook ShapeRectanglesCookie) Check() error { } // Write request to wire for ShapeRectangles -func (c *Conn) shapeRectanglesRequest(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Id, XOffset int16, YOffset int16, Rectangles []Rectangle) []byte { +func (c *Conn) shapeRectanglesRequest(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Window, XOffset int16, YOffset int16, Rectangles []Rectangle) []byte { size := pad((16 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -362,13 +360,13 @@ type ShapeMaskCookie struct { } // Write request to wire for ShapeMask -func (c *Conn) ShapeMask(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceBitmap Id) ShapeMaskCookie { +func (c *Conn) ShapeMask(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceBitmap Pixmap) ShapeMaskCookie { cookie := c.newCookie(false, false) c.newRequest(c.shapeMaskRequest(Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie) return ShapeMaskCookie{cookie} } -func (c *Conn) ShapeMaskChecked(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceBitmap Id) ShapeMaskCookie { +func (c *Conn) ShapeMaskChecked(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceBitmap Pixmap) ShapeMaskCookie { cookie := c.newCookie(true, false) c.newRequest(c.shapeMaskRequest(Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie) return ShapeMaskCookie{cookie} @@ -379,7 +377,7 @@ func (cook ShapeMaskCookie) Check() error { } // Write request to wire for ShapeMask -func (c *Conn) shapeMaskRequest(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceBitmap Id) []byte { +func (c *Conn) shapeMaskRequest(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceBitmap Pixmap) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -423,13 +421,13 @@ type ShapeCombineCookie struct { } // Write request to wire for ShapeCombine -func (c *Conn) ShapeCombine(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceWindow Id) ShapeCombineCookie { +func (c *Conn) ShapeCombine(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceWindow Window) ShapeCombineCookie { cookie := c.newCookie(false, false) c.newRequest(c.shapeCombineRequest(Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie) return ShapeCombineCookie{cookie} } -func (c *Conn) ShapeCombineChecked(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceWindow Id) ShapeCombineCookie { +func (c *Conn) ShapeCombineChecked(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceWindow Window) ShapeCombineCookie { cookie := c.newCookie(true, false) c.newRequest(c.shapeCombineRequest(Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie) return ShapeCombineCookie{cookie} @@ -440,7 +438,7 @@ func (cook ShapeCombineCookie) Check() error { } // Write request to wire for ShapeCombine -func (c *Conn) shapeCombineRequest(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceWindow Id) []byte { +func (c *Conn) shapeCombineRequest(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceWindow Window) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -487,13 +485,13 @@ type ShapeOffsetCookie struct { } // Write request to wire for ShapeOffset -func (c *Conn) ShapeOffset(DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16) ShapeOffsetCookie { +func (c *Conn) ShapeOffset(DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16) ShapeOffsetCookie { cookie := c.newCookie(false, false) c.newRequest(c.shapeOffsetRequest(DestinationKind, DestinationWindow, XOffset, YOffset), cookie) return ShapeOffsetCookie{cookie} } -func (c *Conn) ShapeOffsetChecked(DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16) ShapeOffsetCookie { +func (c *Conn) ShapeOffsetChecked(DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16) ShapeOffsetCookie { cookie := c.newCookie(true, false) c.newRequest(c.shapeOffsetRequest(DestinationKind, DestinationWindow, XOffset, YOffset), cookie) return ShapeOffsetCookie{cookie} @@ -504,7 +502,7 @@ func (cook ShapeOffsetCookie) Check() error { } // Write request to wire for ShapeOffset -func (c *Conn) shapeOffsetRequest(DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16) []byte { +func (c *Conn) shapeOffsetRequest(DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -541,13 +539,13 @@ type ShapeQueryExtentsCookie struct { *cookie } -func (c *Conn) ShapeQueryExtents(DestinationWindow Id) ShapeQueryExtentsCookie { +func (c *Conn) ShapeQueryExtents(DestinationWindow Window) ShapeQueryExtentsCookie { cookie := c.newCookie(true, true) c.newRequest(c.shapeQueryExtentsRequest(DestinationWindow), cookie) return ShapeQueryExtentsCookie{cookie} } -func (c *Conn) ShapeQueryExtentsUnchecked(DestinationWindow Id) ShapeQueryExtentsCookie { +func (c *Conn) ShapeQueryExtentsUnchecked(DestinationWindow Window) ShapeQueryExtentsCookie { cookie := c.newCookie(false, true) c.newRequest(c.shapeQueryExtentsRequest(DestinationWindow), cookie) return ShapeQueryExtentsCookie{cookie} @@ -645,7 +643,7 @@ func (cook ShapeQueryExtentsCookie) Check() error { } // Write request to wire for ShapeQueryExtents -func (c *Conn) shapeQueryExtentsRequest(DestinationWindow Id) []byte { +func (c *Conn) shapeQueryExtentsRequest(DestinationWindow Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -672,13 +670,13 @@ type ShapeSelectInputCookie struct { } // Write request to wire for ShapeSelectInput -func (c *Conn) ShapeSelectInput(DestinationWindow Id, Enable bool) ShapeSelectInputCookie { +func (c *Conn) ShapeSelectInput(DestinationWindow Window, Enable bool) ShapeSelectInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.shapeSelectInputRequest(DestinationWindow, Enable), cookie) return ShapeSelectInputCookie{cookie} } -func (c *Conn) ShapeSelectInputChecked(DestinationWindow Id, Enable bool) ShapeSelectInputCookie { +func (c *Conn) ShapeSelectInputChecked(DestinationWindow Window, Enable bool) ShapeSelectInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.shapeSelectInputRequest(DestinationWindow, Enable), cookie) return ShapeSelectInputCookie{cookie} @@ -689,7 +687,7 @@ func (cook ShapeSelectInputCookie) Check() error { } // Write request to wire for ShapeSelectInput -func (c *Conn) shapeSelectInputRequest(DestinationWindow Id, Enable bool) []byte { +func (c *Conn) shapeSelectInputRequest(DestinationWindow Window, Enable bool) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -724,13 +722,13 @@ type ShapeInputSelectedCookie struct { *cookie } -func (c *Conn) ShapeInputSelected(DestinationWindow Id) ShapeInputSelectedCookie { +func (c *Conn) ShapeInputSelected(DestinationWindow Window) ShapeInputSelectedCookie { cookie := c.newCookie(true, true) c.newRequest(c.shapeInputSelectedRequest(DestinationWindow), cookie) return ShapeInputSelectedCookie{cookie} } -func (c *Conn) ShapeInputSelectedUnchecked(DestinationWindow Id) ShapeInputSelectedCookie { +func (c *Conn) ShapeInputSelectedUnchecked(DestinationWindow Window) ShapeInputSelectedCookie { cookie := c.newCookie(false, true) c.newRequest(c.shapeInputSelectedRequest(DestinationWindow), cookie) return ShapeInputSelectedCookie{cookie} @@ -782,7 +780,7 @@ func (cook ShapeInputSelectedCookie) Check() error { } // Write request to wire for ShapeInputSelected -func (c *Conn) shapeInputSelectedRequest(DestinationWindow Id) []byte { +func (c *Conn) shapeInputSelectedRequest(DestinationWindow Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -808,13 +806,13 @@ type ShapeGetRectanglesCookie struct { *cookie } -func (c *Conn) ShapeGetRectangles(Window Id, SourceKind ShapeKind) ShapeGetRectanglesCookie { +func (c *Conn) ShapeGetRectangles(Window Window, SourceKind ShapeKind) ShapeGetRectanglesCookie { cookie := c.newCookie(true, true) c.newRequest(c.shapeGetRectanglesRequest(Window, SourceKind), cookie) return ShapeGetRectanglesCookie{cookie} } -func (c *Conn) ShapeGetRectanglesUnchecked(Window Id, SourceKind ShapeKind) ShapeGetRectanglesCookie { +func (c *Conn) ShapeGetRectanglesUnchecked(Window Window, SourceKind ShapeKind) ShapeGetRectanglesCookie { cookie := c.newCookie(false, true) c.newRequest(c.shapeGetRectanglesRequest(Window, SourceKind), cookie) return ShapeGetRectanglesCookie{cookie} @@ -873,7 +871,7 @@ func (cook ShapeGetRectanglesCookie) Check() error { } // Write request to wire for ShapeGetRectangles -func (c *Conn) shapeGetRectanglesRequest(Window Id, SourceKind ShapeKind) []byte { +func (c *Conn) shapeGetRectanglesRequest(Window Window, SourceKind ShapeKind) []byte { size := 12 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_shm.go b/nexgb/auto_shm.go index a3dfcf7..392c5ff 100644 --- a/nexgb/auto_shm.go +++ b/nexgb/auto_shm.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by shm.xml on May 8 2012 11:03:24pm EDT. + This file was generated by shm.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,18 +37,6 @@ func init() { newExtErrorFuncs["MIT-SHM"] = make(map[int]newErrorFun) } -// 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' - -// Skipping definition for base type 'Int8' - // Skipping definition for base type 'Card16' // Skipping definition for base type 'Char' @@ -61,9 +49,27 @@ func init() { // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' +// Skipping definition for base type 'Card8' -// Skipping resource definition of 'Seg' +// Skipping definition for base type 'Int16' + +// Skipping definition for base type 'Int32' + +// Skipping definition for base type 'Void' + +// Skipping definition for base type 'Byte' + +// Skipping definition for base type 'Int8' + +type ShmSeg uint32 + +func (c *Conn) NewShmSegId() (ShmSeg, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return ShmSeg(id), nil +} // Event definition ShmCompletion (0) // Size: 32 @@ -73,11 +79,11 @@ const ShmCompletion = 0 type ShmCompletionEvent struct { Sequence uint16 // padding: 1 bytes - Drawable Id + Drawable Drawable MinorEvent uint16 MajorEvent byte // padding: 1 bytes - Shmseg Id + Shmseg ShmSeg Offset uint32 } @@ -91,7 +97,7 @@ func NewShmCompletionEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 v.MinorEvent = Get16(buf[b:]) @@ -102,7 +108,7 @@ func NewShmCompletionEvent(buf []byte) Event { b += 1 // padding - v.Shmseg = Id(Get32(buf[b:])) + v.Shmseg = ShmSeg(Get32(buf[b:])) b += 4 v.Offset = Get32(buf[b:]) @@ -183,8 +189,8 @@ func (err ShmBadSegError) SequenceId() uint16 { return err.Sequence } -func (err ShmBadSegError) BadId() Id { - return Id(err.BadValue) +func (err ShmBadSegError) BadId() uint32 { + return 0 } func (err ShmBadSegError) Error() string { @@ -312,13 +318,13 @@ type ShmAttachCookie struct { } // Write request to wire for ShmAttach -func (c *Conn) ShmAttach(Shmseg Id, Shmid uint32, ReadOnly bool) ShmAttachCookie { +func (c *Conn) ShmAttach(Shmseg ShmSeg, Shmid uint32, ReadOnly bool) ShmAttachCookie { cookie := c.newCookie(false, false) c.newRequest(c.shmAttachRequest(Shmseg, Shmid, ReadOnly), cookie) return ShmAttachCookie{cookie} } -func (c *Conn) ShmAttachChecked(Shmseg Id, Shmid uint32, ReadOnly bool) ShmAttachCookie { +func (c *Conn) ShmAttachChecked(Shmseg ShmSeg, Shmid uint32, ReadOnly bool) ShmAttachCookie { cookie := c.newCookie(true, false) c.newRequest(c.shmAttachRequest(Shmseg, Shmid, ReadOnly), cookie) return ShmAttachCookie{cookie} @@ -329,7 +335,7 @@ func (cook ShmAttachCookie) Check() error { } // Write request to wire for ShmAttach -func (c *Conn) shmAttachRequest(Shmseg Id, Shmid uint32, ReadOnly bool) []byte { +func (c *Conn) shmAttachRequest(Shmseg ShmSeg, Shmid uint32, ReadOnly bool) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -368,13 +374,13 @@ type ShmDetachCookie struct { } // Write request to wire for ShmDetach -func (c *Conn) ShmDetach(Shmseg Id) ShmDetachCookie { +func (c *Conn) ShmDetach(Shmseg ShmSeg) ShmDetachCookie { cookie := c.newCookie(false, false) c.newRequest(c.shmDetachRequest(Shmseg), cookie) return ShmDetachCookie{cookie} } -func (c *Conn) ShmDetachChecked(Shmseg Id) ShmDetachCookie { +func (c *Conn) ShmDetachChecked(Shmseg ShmSeg) ShmDetachCookie { cookie := c.newCookie(true, false) c.newRequest(c.shmDetachRequest(Shmseg), cookie) return ShmDetachCookie{cookie} @@ -385,7 +391,7 @@ func (cook ShmDetachCookie) Check() error { } // Write request to wire for ShmDetach -func (c *Conn) shmDetachRequest(Shmseg Id) []byte { +func (c *Conn) shmDetachRequest(Shmseg ShmSeg) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -412,13 +418,13 @@ type ShmPutImageCookie struct { } // Write request to wire for ShmPutImage -func (c *Conn) ShmPutImage(Drawable Id, Gc Id, TotalWidth uint16, TotalHeight uint16, SrcX uint16, SrcY uint16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16, Depth byte, Format byte, SendEvent byte, Shmseg Id, Offset uint32) ShmPutImageCookie { +func (c *Conn) ShmPutImage(Drawable Drawable, Gc Gcontext, TotalWidth uint16, TotalHeight uint16, SrcX uint16, SrcY uint16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16, Depth byte, Format byte, SendEvent byte, Shmseg ShmSeg, Offset uint32) ShmPutImageCookie { cookie := c.newCookie(false, false) c.newRequest(c.shmPutImageRequest(Drawable, Gc, TotalWidth, TotalHeight, SrcX, SrcY, SrcWidth, SrcHeight, DstX, DstY, Depth, Format, SendEvent, Shmseg, Offset), cookie) return ShmPutImageCookie{cookie} } -func (c *Conn) ShmPutImageChecked(Drawable Id, Gc Id, TotalWidth uint16, TotalHeight uint16, SrcX uint16, SrcY uint16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16, Depth byte, Format byte, SendEvent byte, Shmseg Id, Offset uint32) ShmPutImageCookie { +func (c *Conn) ShmPutImageChecked(Drawable Drawable, Gc Gcontext, TotalWidth uint16, TotalHeight uint16, SrcX uint16, SrcY uint16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16, Depth byte, Format byte, SendEvent byte, Shmseg ShmSeg, Offset uint32) ShmPutImageCookie { cookie := c.newCookie(true, false) c.newRequest(c.shmPutImageRequest(Drawable, Gc, TotalWidth, TotalHeight, SrcX, SrcY, SrcWidth, SrcHeight, DstX, DstY, Depth, Format, SendEvent, Shmseg, Offset), cookie) return ShmPutImageCookie{cookie} @@ -429,7 +435,7 @@ func (cook ShmPutImageCookie) Check() error { } // Write request to wire for ShmPutImage -func (c *Conn) shmPutImageRequest(Drawable Id, Gc Id, TotalWidth uint16, TotalHeight uint16, SrcX uint16, SrcY uint16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16, Depth byte, Format byte, SendEvent byte, Shmseg Id, Offset uint32) []byte { +func (c *Conn) shmPutImageRequest(Drawable Drawable, Gc Gcontext, TotalWidth uint16, TotalHeight uint16, SrcX uint16, SrcY uint16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16, Depth byte, Format byte, SendEvent byte, Shmseg ShmSeg, Offset uint32) []byte { size := 40 b := 0 buf := make([]byte, size) @@ -499,13 +505,13 @@ type ShmGetImageCookie struct { *cookie } -func (c *Conn) ShmGetImage(Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32, Format byte, Shmseg Id, Offset uint32) ShmGetImageCookie { +func (c *Conn) ShmGetImage(Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32, Format byte, Shmseg ShmSeg, Offset uint32) ShmGetImageCookie { cookie := c.newCookie(true, true) c.newRequest(c.shmGetImageRequest(Drawable, X, Y, Width, Height, PlaneMask, Format, Shmseg, Offset), cookie) return ShmGetImageCookie{cookie} } -func (c *Conn) ShmGetImageUnchecked(Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32, Format byte, Shmseg Id, Offset uint32) ShmGetImageCookie { +func (c *Conn) ShmGetImageUnchecked(Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32, Format byte, Shmseg ShmSeg, Offset uint32) ShmGetImageCookie { cookie := c.newCookie(false, true) c.newRequest(c.shmGetImageRequest(Drawable, X, Y, Width, Height, PlaneMask, Format, Shmseg, Offset), cookie) return ShmGetImageCookie{cookie} @@ -561,7 +567,7 @@ func (cook ShmGetImageCookie) Check() error { } // Write request to wire for ShmGetImage -func (c *Conn) shmGetImageRequest(Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32, Format byte, Shmseg Id, Offset uint32) []byte { +func (c *Conn) shmGetImageRequest(Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32, Format byte, Shmseg ShmSeg, Offset uint32) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -614,13 +620,13 @@ type ShmCreatePixmapCookie struct { } // Write request to wire for ShmCreatePixmap -func (c *Conn) ShmCreatePixmap(Pid Id, Drawable Id, Width uint16, Height uint16, Depth byte, Shmseg Id, Offset uint32) ShmCreatePixmapCookie { +func (c *Conn) ShmCreatePixmap(Pid Pixmap, Drawable Drawable, Width uint16, Height uint16, Depth byte, Shmseg ShmSeg, Offset uint32) ShmCreatePixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.shmCreatePixmapRequest(Pid, Drawable, Width, Height, Depth, Shmseg, Offset), cookie) return ShmCreatePixmapCookie{cookie} } -func (c *Conn) ShmCreatePixmapChecked(Pid Id, Drawable Id, Width uint16, Height uint16, Depth byte, Shmseg Id, Offset uint32) ShmCreatePixmapCookie { +func (c *Conn) ShmCreatePixmapChecked(Pid Pixmap, Drawable Drawable, Width uint16, Height uint16, Depth byte, Shmseg ShmSeg, Offset uint32) ShmCreatePixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.shmCreatePixmapRequest(Pid, Drawable, Width, Height, Depth, Shmseg, Offset), cookie) return ShmCreatePixmapCookie{cookie} @@ -631,7 +637,7 @@ func (cook ShmCreatePixmapCookie) Check() error { } // Write request to wire for ShmCreatePixmap -func (c *Conn) shmCreatePixmapRequest(Pid Id, Drawable Id, Width uint16, Height uint16, Depth byte, Shmseg Id, Offset uint32) []byte { +func (c *Conn) shmCreatePixmapRequest(Pid Pixmap, Drawable Drawable, Width uint16, Height uint16, Depth byte, Shmseg ShmSeg, Offset uint32) []byte { size := 28 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_sync.go b/nexgb/auto_sync.go index b043b9f..2fc2982 100644 --- a/nexgb/auto_sync.go +++ b/nexgb/auto_sync.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by sync.xml on May 8 2012 11:03:24pm EDT. + This file was generated by sync.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,18 +37,6 @@ func init() { newExtErrorFuncs["SYNC"] = make(map[int]newErrorFun) } -// 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' - -// Skipping definition for base type 'Int8' - // Skipping definition for base type 'Card16' // Skipping definition for base type 'Char' @@ -61,7 +49,17 @@ 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' + +// Skipping definition for base type 'Int8' const ( SyncAlarmstateActive = 0 @@ -90,11 +88,35 @@ const ( SyncCaEvents = 32 ) -// Skipping resource definition of 'Alarm' +type SyncAlarm uint32 + +func (c *Conn) NewSyncAlarmId() (SyncAlarm, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return SyncAlarm(id), nil +} -// Skipping resource definition of 'Counter' +type SyncCounter uint32 -// Skipping resource definition of 'Fence' +func (c *Conn) NewSyncCounterId() (SyncCounter, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return SyncCounter(id), nil +} + +type SyncFence uint32 + +func (c *Conn) NewSyncFenceId() (SyncFence, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return SyncFence(id), nil +} // 'SyncInt64' struct definition // Size: 8 @@ -155,7 +177,7 @@ func SyncInt64ListBytes(buf []byte, list []SyncInt64) int { // 'SyncSystemcounter' struct definition // Size: (14 + pad((int(NameLen) * 1))) type SyncSystemcounter struct { - Counter Id + Counter SyncCounter Resolution SyncInt64 NameLen uint16 Name string // size: pad((int(NameLen) * 1)) @@ -165,7 +187,7 @@ type SyncSystemcounter struct { func ReadSyncSystemcounter(buf []byte, v *SyncSystemcounter) int { b := 0 - v.Counter = Id(Get32(buf[b:])) + v.Counter = SyncCounter(Get32(buf[b:])) b += 4 v.Resolution = SyncInt64{} @@ -241,7 +263,7 @@ func SyncSystemcounterListSize(list []SyncSystemcounter) int { // 'SyncTrigger' struct definition // Size: 20 type SyncTrigger struct { - Counter Id + Counter SyncCounter WaitType uint32 WaitValue SyncInt64 TestType uint32 @@ -251,7 +273,7 @@ type SyncTrigger struct { func ReadSyncTrigger(buf []byte, v *SyncTrigger) int { b := 0 - v.Counter = Id(Get32(buf[b:])) + v.Counter = SyncCounter(Get32(buf[b:])) b += 4 v.WaitType = Get32(buf[b:]) @@ -381,7 +403,7 @@ const SyncCounterNotify = 0 type SyncCounterNotifyEvent struct { Sequence uint16 Kind byte - Counter Id + Counter SyncCounter WaitValue SyncInt64 CounterValue SyncInt64 Timestamp Timestamp @@ -401,7 +423,7 @@ func NewSyncCounterNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Counter = Id(Get32(buf[b:])) + v.Counter = SyncCounter(Get32(buf[b:])) b += 4 v.WaitValue = SyncInt64{} @@ -504,7 +526,7 @@ const SyncAlarmNotify = 1 type SyncAlarmNotifyEvent struct { Sequence uint16 Kind byte - Alarm Id + Alarm SyncAlarm CounterValue SyncInt64 AlarmValue SyncInt64 Timestamp Timestamp @@ -523,7 +545,7 @@ func NewSyncAlarmNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Alarm = Id(Get32(buf[b:])) + v.Alarm = SyncAlarm(Get32(buf[b:])) b += 4 v.CounterValue = SyncInt64{} @@ -645,7 +667,7 @@ func (err SyncCounterError) SequenceId() uint16 { return err.Sequence } -func (err SyncCounterError) BadId() Id { +func (err SyncCounterError) BadId() uint32 { return 0 } @@ -705,7 +727,7 @@ func (err SyncAlarmError) SequenceId() uint16 { return err.Sequence } -func (err SyncAlarmError) BadId() Id { +func (err SyncAlarmError) BadId() uint32 { return 0 } @@ -910,13 +932,13 @@ type SyncCreateCounterCookie struct { } // Write request to wire for SyncCreateCounter -func (c *Conn) SyncCreateCounter(Id Id, InitialValue SyncInt64) SyncCreateCounterCookie { +func (c *Conn) SyncCreateCounter(Id SyncCounter, InitialValue SyncInt64) SyncCreateCounterCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncCreateCounterRequest(Id, InitialValue), cookie) return SyncCreateCounterCookie{cookie} } -func (c *Conn) SyncCreateCounterChecked(Id Id, InitialValue SyncInt64) SyncCreateCounterCookie { +func (c *Conn) SyncCreateCounterChecked(Id SyncCounter, InitialValue SyncInt64) SyncCreateCounterCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncCreateCounterRequest(Id, InitialValue), cookie) return SyncCreateCounterCookie{cookie} @@ -927,7 +949,7 @@ func (cook SyncCreateCounterCookie) Check() error { } // Write request to wire for SyncCreateCounter -func (c *Conn) syncCreateCounterRequest(Id Id, InitialValue SyncInt64) []byte { +func (c *Conn) syncCreateCounterRequest(Id SyncCounter, InitialValue SyncInt64) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -960,13 +982,13 @@ type SyncDestroyCounterCookie struct { } // Write request to wire for SyncDestroyCounter -func (c *Conn) SyncDestroyCounter(Counter Id) SyncDestroyCounterCookie { +func (c *Conn) SyncDestroyCounter(Counter SyncCounter) SyncDestroyCounterCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncDestroyCounterRequest(Counter), cookie) return SyncDestroyCounterCookie{cookie} } -func (c *Conn) SyncDestroyCounterChecked(Counter Id) SyncDestroyCounterCookie { +func (c *Conn) SyncDestroyCounterChecked(Counter SyncCounter) SyncDestroyCounterCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncDestroyCounterRequest(Counter), cookie) return SyncDestroyCounterCookie{cookie} @@ -977,7 +999,7 @@ func (cook SyncDestroyCounterCookie) Check() error { } // Write request to wire for SyncDestroyCounter -func (c *Conn) syncDestroyCounterRequest(Counter Id) []byte { +func (c *Conn) syncDestroyCounterRequest(Counter SyncCounter) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1003,13 +1025,13 @@ type SyncQueryCounterCookie struct { *cookie } -func (c *Conn) SyncQueryCounter(Counter Id) SyncQueryCounterCookie { +func (c *Conn) SyncQueryCounter(Counter SyncCounter) SyncQueryCounterCookie { cookie := c.newCookie(true, true) c.newRequest(c.syncQueryCounterRequest(Counter), cookie) return SyncQueryCounterCookie{cookie} } -func (c *Conn) SyncQueryCounterUnchecked(Counter Id) SyncQueryCounterCookie { +func (c *Conn) SyncQueryCounterUnchecked(Counter SyncCounter) SyncQueryCounterCookie { cookie := c.newCookie(false, true) c.newRequest(c.syncQueryCounterRequest(Counter), cookie) return SyncQueryCounterCookie{cookie} @@ -1060,7 +1082,7 @@ func (cook SyncQueryCounterCookie) Check() error { } // Write request to wire for SyncQueryCounter -func (c *Conn) syncQueryCounterRequest(Counter Id) []byte { +func (c *Conn) syncQueryCounterRequest(Counter SyncCounter) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1130,13 +1152,13 @@ type SyncChangeCounterCookie struct { } // Write request to wire for SyncChangeCounter -func (c *Conn) SyncChangeCounter(Counter Id, Amount SyncInt64) SyncChangeCounterCookie { +func (c *Conn) SyncChangeCounter(Counter SyncCounter, Amount SyncInt64) SyncChangeCounterCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncChangeCounterRequest(Counter, Amount), cookie) return SyncChangeCounterCookie{cookie} } -func (c *Conn) SyncChangeCounterChecked(Counter Id, Amount SyncInt64) SyncChangeCounterCookie { +func (c *Conn) SyncChangeCounterChecked(Counter SyncCounter, Amount SyncInt64) SyncChangeCounterCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncChangeCounterRequest(Counter, Amount), cookie) return SyncChangeCounterCookie{cookie} @@ -1147,7 +1169,7 @@ func (cook SyncChangeCounterCookie) Check() error { } // Write request to wire for SyncChangeCounter -func (c *Conn) syncChangeCounterRequest(Counter Id, Amount SyncInt64) []byte { +func (c *Conn) syncChangeCounterRequest(Counter SyncCounter, Amount SyncInt64) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1180,13 +1202,13 @@ type SyncSetCounterCookie struct { } // Write request to wire for SyncSetCounter -func (c *Conn) SyncSetCounter(Counter Id, Value SyncInt64) SyncSetCounterCookie { +func (c *Conn) SyncSetCounter(Counter SyncCounter, Value SyncInt64) SyncSetCounterCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncSetCounterRequest(Counter, Value), cookie) return SyncSetCounterCookie{cookie} } -func (c *Conn) SyncSetCounterChecked(Counter Id, Value SyncInt64) SyncSetCounterCookie { +func (c *Conn) SyncSetCounterChecked(Counter SyncCounter, Value SyncInt64) SyncSetCounterCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncSetCounterRequest(Counter, Value), cookie) return SyncSetCounterCookie{cookie} @@ -1197,7 +1219,7 @@ func (cook SyncSetCounterCookie) Check() error { } // Write request to wire for SyncSetCounter -func (c *Conn) syncSetCounterRequest(Counter Id, Value SyncInt64) []byte { +func (c *Conn) syncSetCounterRequest(Counter SyncCounter, Value SyncInt64) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1230,13 +1252,13 @@ type SyncCreateAlarmCookie struct { } // Write request to wire for SyncCreateAlarm -func (c *Conn) SyncCreateAlarm(Id Id, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie { +func (c *Conn) SyncCreateAlarm(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncCreateAlarmRequest(Id, ValueMask, ValueList), cookie) return SyncCreateAlarmCookie{cookie} } -func (c *Conn) SyncCreateAlarmChecked(Id Id, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie { +func (c *Conn) SyncCreateAlarmChecked(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncCreateAlarmRequest(Id, ValueMask, ValueList), cookie) return SyncCreateAlarmCookie{cookie} @@ -1247,7 +1269,7 @@ func (cook SyncCreateAlarmCookie) Check() error { } // Write request to wire for SyncCreateAlarm -func (c *Conn) syncCreateAlarmRequest(Id Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) syncCreateAlarmRequest(Id SyncAlarm, ValueMask uint32, ValueList []uint32) []byte { size := pad((8 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -1282,13 +1304,13 @@ type SyncChangeAlarmCookie struct { } // Write request to wire for SyncChangeAlarm -func (c *Conn) SyncChangeAlarm(Id Id, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie { +func (c *Conn) SyncChangeAlarm(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncChangeAlarmRequest(Id, ValueMask, ValueList), cookie) return SyncChangeAlarmCookie{cookie} } -func (c *Conn) SyncChangeAlarmChecked(Id Id, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie { +func (c *Conn) SyncChangeAlarmChecked(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncChangeAlarmRequest(Id, ValueMask, ValueList), cookie) return SyncChangeAlarmCookie{cookie} @@ -1299,7 +1321,7 @@ func (cook SyncChangeAlarmCookie) Check() error { } // Write request to wire for SyncChangeAlarm -func (c *Conn) syncChangeAlarmRequest(Id Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) syncChangeAlarmRequest(Id SyncAlarm, ValueMask uint32, ValueList []uint32) []byte { size := pad((8 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -1334,13 +1356,13 @@ type SyncDestroyAlarmCookie struct { } // Write request to wire for SyncDestroyAlarm -func (c *Conn) SyncDestroyAlarm(Alarm Id) SyncDestroyAlarmCookie { +func (c *Conn) SyncDestroyAlarm(Alarm SyncAlarm) SyncDestroyAlarmCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncDestroyAlarmRequest(Alarm), cookie) return SyncDestroyAlarmCookie{cookie} } -func (c *Conn) SyncDestroyAlarmChecked(Alarm Id) SyncDestroyAlarmCookie { +func (c *Conn) SyncDestroyAlarmChecked(Alarm SyncAlarm) SyncDestroyAlarmCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncDestroyAlarmRequest(Alarm), cookie) return SyncDestroyAlarmCookie{cookie} @@ -1351,7 +1373,7 @@ func (cook SyncDestroyAlarmCookie) Check() error { } // Write request to wire for SyncDestroyAlarm -func (c *Conn) syncDestroyAlarmRequest(Alarm Id) []byte { +func (c *Conn) syncDestroyAlarmRequest(Alarm SyncAlarm) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1377,13 +1399,13 @@ type SyncQueryAlarmCookie struct { *cookie } -func (c *Conn) SyncQueryAlarm(Alarm Id) SyncQueryAlarmCookie { +func (c *Conn) SyncQueryAlarm(Alarm SyncAlarm) SyncQueryAlarmCookie { cookie := c.newCookie(true, true) c.newRequest(c.syncQueryAlarmRequest(Alarm), cookie) return SyncQueryAlarmCookie{cookie} } -func (c *Conn) SyncQueryAlarmUnchecked(Alarm Id) SyncQueryAlarmCookie { +func (c *Conn) SyncQueryAlarmUnchecked(Alarm SyncAlarm) SyncQueryAlarmCookie { cookie := c.newCookie(false, true) c.newRequest(c.syncQueryAlarmRequest(Alarm), cookie) return SyncQueryAlarmCookie{cookie} @@ -1453,7 +1475,7 @@ func (cook SyncQueryAlarmCookie) Check() error { } // Write request to wire for SyncQueryAlarm -func (c *Conn) syncQueryAlarmRequest(Alarm Id) []byte { +func (c *Conn) syncQueryAlarmRequest(Alarm SyncAlarm) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1610,13 +1632,13 @@ type SyncCreateFenceCookie struct { } // Write request to wire for SyncCreateFence -func (c *Conn) SyncCreateFence(Drawable Id, Fence Id, InitiallyTriggered bool) SyncCreateFenceCookie { +func (c *Conn) SyncCreateFence(Drawable Drawable, Fence SyncFence, InitiallyTriggered bool) SyncCreateFenceCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncCreateFenceRequest(Drawable, Fence, InitiallyTriggered), cookie) return SyncCreateFenceCookie{cookie} } -func (c *Conn) SyncCreateFenceChecked(Drawable Id, Fence Id, InitiallyTriggered bool) SyncCreateFenceCookie { +func (c *Conn) SyncCreateFenceChecked(Drawable Drawable, Fence SyncFence, InitiallyTriggered bool) SyncCreateFenceCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncCreateFenceRequest(Drawable, Fence, InitiallyTriggered), cookie) return SyncCreateFenceCookie{cookie} @@ -1627,7 +1649,7 @@ func (cook SyncCreateFenceCookie) Check() error { } // Write request to wire for SyncCreateFence -func (c *Conn) syncCreateFenceRequest(Drawable Id, Fence Id, InitiallyTriggered bool) []byte { +func (c *Conn) syncCreateFenceRequest(Drawable Drawable, Fence SyncFence, InitiallyTriggered bool) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1664,13 +1686,13 @@ type SyncTriggerFenceCookie struct { } // Write request to wire for SyncTriggerFence -func (c *Conn) SyncTriggerFence(Fence Id) SyncTriggerFenceCookie { +func (c *Conn) SyncTriggerFence(Fence SyncFence) SyncTriggerFenceCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncTriggerFenceRequest(Fence), cookie) return SyncTriggerFenceCookie{cookie} } -func (c *Conn) SyncTriggerFenceChecked(Fence Id) SyncTriggerFenceCookie { +func (c *Conn) SyncTriggerFenceChecked(Fence SyncFence) SyncTriggerFenceCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncTriggerFenceRequest(Fence), cookie) return SyncTriggerFenceCookie{cookie} @@ -1681,7 +1703,7 @@ func (cook SyncTriggerFenceCookie) Check() error { } // Write request to wire for SyncTriggerFence -func (c *Conn) syncTriggerFenceRequest(Fence Id) []byte { +func (c *Conn) syncTriggerFenceRequest(Fence SyncFence) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1708,13 +1730,13 @@ type SyncResetFenceCookie struct { } // Write request to wire for SyncResetFence -func (c *Conn) SyncResetFence(Fence Id) SyncResetFenceCookie { +func (c *Conn) SyncResetFence(Fence SyncFence) SyncResetFenceCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncResetFenceRequest(Fence), cookie) return SyncResetFenceCookie{cookie} } -func (c *Conn) SyncResetFenceChecked(Fence Id) SyncResetFenceCookie { +func (c *Conn) SyncResetFenceChecked(Fence SyncFence) SyncResetFenceCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncResetFenceRequest(Fence), cookie) return SyncResetFenceCookie{cookie} @@ -1725,7 +1747,7 @@ func (cook SyncResetFenceCookie) Check() error { } // Write request to wire for SyncResetFence -func (c *Conn) syncResetFenceRequest(Fence Id) []byte { +func (c *Conn) syncResetFenceRequest(Fence SyncFence) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1752,13 +1774,13 @@ type SyncDestroyFenceCookie struct { } // Write request to wire for SyncDestroyFence -func (c *Conn) SyncDestroyFence(Fence Id) SyncDestroyFenceCookie { +func (c *Conn) SyncDestroyFence(Fence SyncFence) SyncDestroyFenceCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncDestroyFenceRequest(Fence), cookie) return SyncDestroyFenceCookie{cookie} } -func (c *Conn) SyncDestroyFenceChecked(Fence Id) SyncDestroyFenceCookie { +func (c *Conn) SyncDestroyFenceChecked(Fence SyncFence) SyncDestroyFenceCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncDestroyFenceRequest(Fence), cookie) return SyncDestroyFenceCookie{cookie} @@ -1769,7 +1791,7 @@ func (cook SyncDestroyFenceCookie) Check() error { } // Write request to wire for SyncDestroyFence -func (c *Conn) syncDestroyFenceRequest(Fence Id) []byte { +func (c *Conn) syncDestroyFenceRequest(Fence SyncFence) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1795,13 +1817,13 @@ type SyncQueryFenceCookie struct { *cookie } -func (c *Conn) SyncQueryFence(Fence Id) SyncQueryFenceCookie { +func (c *Conn) SyncQueryFence(Fence SyncFence) SyncQueryFenceCookie { cookie := c.newCookie(true, true) c.newRequest(c.syncQueryFenceRequest(Fence), cookie) return SyncQueryFenceCookie{cookie} } -func (c *Conn) SyncQueryFenceUnchecked(Fence Id) SyncQueryFenceCookie { +func (c *Conn) SyncQueryFenceUnchecked(Fence SyncFence) SyncQueryFenceCookie { cookie := c.newCookie(false, true) c.newRequest(c.syncQueryFenceRequest(Fence), cookie) return SyncQueryFenceCookie{cookie} @@ -1859,7 +1881,7 @@ func (cook SyncQueryFenceCookie) Check() error { } // Write request to wire for SyncQueryFence -func (c *Conn) syncQueryFenceRequest(Fence Id) []byte { +func (c *Conn) syncQueryFenceRequest(Fence SyncFence) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1886,13 +1908,13 @@ type SyncAwaitFenceCookie struct { } // Write request to wire for SyncAwaitFence -func (c *Conn) SyncAwaitFence(FenceList []Id) SyncAwaitFenceCookie { +func (c *Conn) SyncAwaitFence(FenceList []SyncFence) SyncAwaitFenceCookie { cookie := c.newCookie(false, false) c.newRequest(c.syncAwaitFenceRequest(FenceList), cookie) return SyncAwaitFenceCookie{cookie} } -func (c *Conn) SyncAwaitFenceChecked(FenceList []Id) SyncAwaitFenceCookie { +func (c *Conn) SyncAwaitFenceChecked(FenceList []SyncFence) SyncAwaitFenceCookie { cookie := c.newCookie(true, false) c.newRequest(c.syncAwaitFenceRequest(FenceList), cookie) return SyncAwaitFenceCookie{cookie} @@ -1903,7 +1925,7 @@ func (cook SyncAwaitFenceCookie) Check() error { } // Write request to wire for SyncAwaitFence -func (c *Conn) syncAwaitFenceRequest(FenceList []Id) []byte { +func (c *Conn) syncAwaitFenceRequest(FenceList []SyncFence) []byte { size := pad((4 + pad((len(FenceList) * 4)))) b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xc_misc.go b/nexgb/auto_xc_misc.go index 5088e25..bce7d29 100644 --- a/nexgb/auto_xc_misc.go +++ b/nexgb/auto_xc_misc.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xc_misc.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xc_misc.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -33,6 +33,10 @@ func init() { newExtErrorFuncs["XC-MISC"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Float' + +// Skipping definition for base type 'Card8' + // Skipping definition for base type 'Int16' // Skipping definition for base type 'Int32' @@ -53,12 +57,6 @@ func init() { // Skipping definition for base type 'Bool' -// Skipping definition for base type 'Float' - -// Skipping definition for base type 'Id' - -// Skipping definition for base type 'Card8' - // Request Xc_miscGetVersion // size: 8 type Xc_miscGetVersionCookie struct { diff --git a/nexgb/auto_xevie.go b/nexgb/auto_xevie.go index 56a8e32..33a05cf 100644 --- a/nexgb/auto_xevie.go +++ b/nexgb/auto_xevie.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xevie.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xevie.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -47,8 +47,6 @@ 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' diff --git a/nexgb/auto_xf86dri.go b/nexgb/auto_xf86dri.go index eb9b14a..4caa416 100644 --- a/nexgb/auto_xf86dri.go +++ b/nexgb/auto_xf86dri.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xf86dri.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xf86dri.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -33,6 +33,8 @@ func init() { newExtErrorFuncs["XFree86-DRI"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Float' + // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -55,10 +57,6 @@ func init() { // Skipping definition for base type 'Bool' -// Skipping definition for base type 'Float' - -// Skipping definition for base type 'Id' - // 'Xf86driDrmClipRect' struct definition // Size: 8 type Xf86driDrmClipRect struct { diff --git a/nexgb/auto_xf86vidmode.go b/nexgb/auto_xf86vidmode.go index 459dc9e..983c021 100644 --- a/nexgb/auto_xf86vidmode.go +++ b/nexgb/auto_xf86vidmode.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xf86vidmode.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xf86vidmode.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -33,8 +33,6 @@ func init() { newExtErrorFuncs["XFree86-VidModeExtension"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Int8' - // Skipping definition for base type 'Card16' // Skipping definition for base type 'Char' @@ -47,8 +45,6 @@ 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' @@ -59,6 +55,8 @@ func init() { // Skipping definition for base type 'Byte' +// Skipping definition for base type 'Int8' + const ( Xf86vidmodeModeFlagPositiveHsync = 1 Xf86vidmodeModeFlagNegativeHsync = 2 @@ -254,7 +252,7 @@ func (err Xf86vidmodeBadClockError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeBadClockError) BadId() Id { +func (err Xf86vidmodeBadClockError) BadId() uint32 { return 0 } @@ -299,7 +297,7 @@ func (err Xf86vidmodeBadHTimingsError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeBadHTimingsError) BadId() Id { +func (err Xf86vidmodeBadHTimingsError) BadId() uint32 { return 0 } @@ -344,7 +342,7 @@ func (err Xf86vidmodeBadVTimingsError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeBadVTimingsError) BadId() Id { +func (err Xf86vidmodeBadVTimingsError) BadId() uint32 { return 0 } @@ -389,7 +387,7 @@ func (err Xf86vidmodeModeUnsuitableError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeModeUnsuitableError) BadId() Id { +func (err Xf86vidmodeModeUnsuitableError) BadId() uint32 { return 0 } @@ -434,7 +432,7 @@ func (err Xf86vidmodeExtensionDisabledError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeExtensionDisabledError) BadId() Id { +func (err Xf86vidmodeExtensionDisabledError) BadId() uint32 { return 0 } @@ -479,7 +477,7 @@ func (err Xf86vidmodeClientNotLocalError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeClientNotLocalError) BadId() Id { +func (err Xf86vidmodeClientNotLocalError) BadId() uint32 { return 0 } @@ -524,7 +522,7 @@ func (err Xf86vidmodeZoomLockedError) SequenceId() uint16 { return err.Sequence } -func (err Xf86vidmodeZoomLockedError) BadId() Id { +func (err Xf86vidmodeZoomLockedError) BadId() uint32 { return 0 } diff --git a/nexgb/auto_xfixes.go b/nexgb/auto_xfixes.go index 1518044..9284f6b 100644 --- a/nexgb/auto_xfixes.go +++ b/nexgb/auto_xfixes.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xfixes.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xfixes.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -39,14 +39,6 @@ func init() { newExtErrorFuncs["XFIXES"] = make(map[int]newErrorFun) } -// 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' @@ -65,6 +57,12 @@ func init() { // 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 ( XfixesSaveSetModeInsert = 0 XfixesSaveSetModeDelete = 1 @@ -104,7 +102,15 @@ const ( XfixesRegionNone = 0 ) -// Skipping resource definition of 'Region' +type XfixesRegion uint32 + +func (c *Conn) NewXfixesRegionId() (XfixesRegion, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XfixesRegion(id), nil +} // Event definition XfixesSelectionNotify (0) // Size: 32 @@ -114,9 +120,9 @@ const XfixesSelectionNotify = 0 type XfixesSelectionNotifyEvent struct { Sequence uint16 Subtype byte - Window Id - Owner Id - Selection Id + Window Window + Owner Window + Selection Atom Timestamp Timestamp SelectionTimestamp Timestamp // padding: 8 bytes @@ -133,13 +139,13 @@ func NewXfixesSelectionNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Owner = Id(Get32(buf[b:])) + v.Owner = Window(Get32(buf[b:])) b += 4 - v.Selection = Id(Get32(buf[b:])) + v.Selection = Atom(Get32(buf[b:])) b += 4 v.Timestamp = Timestamp(Get32(buf[b:])) @@ -217,10 +223,10 @@ const XfixesCursorNotify = 1 type XfixesCursorNotifyEvent struct { Sequence uint16 Subtype byte - Window Id + Window Window CursorSerial uint32 Timestamp Timestamp - Name Id + Name Atom // padding: 12 bytes } @@ -235,7 +241,7 @@ func NewXfixesCursorNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.CursorSerial = Get32(buf[b:]) @@ -244,7 +250,7 @@ func NewXfixesCursorNotifyEvent(buf []byte) Event { v.Timestamp = Timestamp(Get32(buf[b:])) b += 4 - v.Name = Id(Get32(buf[b:])) + v.Name = Atom(Get32(buf[b:])) b += 4 b += 12 // padding @@ -334,7 +340,7 @@ func (err XfixesBadRegionError) SequenceId() uint16 { return err.Sequence } -func (err XfixesBadRegionError) BadId() Id { +func (err XfixesBadRegionError) BadId() uint32 { return 0 } @@ -449,13 +455,13 @@ type XfixesChangeSaveSetCookie struct { } // Write request to wire for XfixesChangeSaveSet -func (c *Conn) XfixesChangeSaveSet(Mode byte, Target byte, Map byte, Window Id) XfixesChangeSaveSetCookie { +func (c *Conn) XfixesChangeSaveSet(Mode byte, Target byte, Map byte, Window Window) XfixesChangeSaveSetCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesChangeSaveSetRequest(Mode, Target, Map, Window), cookie) return XfixesChangeSaveSetCookie{cookie} } -func (c *Conn) XfixesChangeSaveSetChecked(Mode byte, Target byte, Map byte, Window Id) XfixesChangeSaveSetCookie { +func (c *Conn) XfixesChangeSaveSetChecked(Mode byte, Target byte, Map byte, Window Window) XfixesChangeSaveSetCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesChangeSaveSetRequest(Mode, Target, Map, Window), cookie) return XfixesChangeSaveSetCookie{cookie} @@ -466,7 +472,7 @@ func (cook XfixesChangeSaveSetCookie) Check() error { } // Write request to wire for XfixesChangeSaveSet -func (c *Conn) xfixesChangeSaveSetRequest(Mode byte, Target byte, Map byte, Window Id) []byte { +func (c *Conn) xfixesChangeSaveSetRequest(Mode byte, Target byte, Map byte, Window Window) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -504,13 +510,13 @@ type XfixesSelectSelectionInputCookie struct { } // Write request to wire for XfixesSelectSelectionInput -func (c *Conn) XfixesSelectSelectionInput(Window Id, Selection Id, EventMask uint32) XfixesSelectSelectionInputCookie { +func (c *Conn) XfixesSelectSelectionInput(Window Window, Selection Atom, EventMask uint32) XfixesSelectSelectionInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSelectSelectionInputRequest(Window, Selection, EventMask), cookie) return XfixesSelectSelectionInputCookie{cookie} } -func (c *Conn) XfixesSelectSelectionInputChecked(Window Id, Selection Id, EventMask uint32) XfixesSelectSelectionInputCookie { +func (c *Conn) XfixesSelectSelectionInputChecked(Window Window, Selection Atom, EventMask uint32) XfixesSelectSelectionInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSelectSelectionInputRequest(Window, Selection, EventMask), cookie) return XfixesSelectSelectionInputCookie{cookie} @@ -521,7 +527,7 @@ func (cook XfixesSelectSelectionInputCookie) Check() error { } // Write request to wire for XfixesSelectSelectionInput -func (c *Conn) xfixesSelectSelectionInputRequest(Window Id, Selection Id, EventMask uint32) []byte { +func (c *Conn) xfixesSelectSelectionInputRequest(Window Window, Selection Atom, EventMask uint32) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -554,13 +560,13 @@ type XfixesSelectCursorInputCookie struct { } // Write request to wire for XfixesSelectCursorInput -func (c *Conn) XfixesSelectCursorInput(Window Id, EventMask uint32) XfixesSelectCursorInputCookie { +func (c *Conn) XfixesSelectCursorInput(Window Window, EventMask uint32) XfixesSelectCursorInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSelectCursorInputRequest(Window, EventMask), cookie) return XfixesSelectCursorInputCookie{cookie} } -func (c *Conn) XfixesSelectCursorInputChecked(Window Id, EventMask uint32) XfixesSelectCursorInputCookie { +func (c *Conn) XfixesSelectCursorInputChecked(Window Window, EventMask uint32) XfixesSelectCursorInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSelectCursorInputRequest(Window, EventMask), cookie) return XfixesSelectCursorInputCookie{cookie} @@ -571,7 +577,7 @@ func (cook XfixesSelectCursorInputCookie) Check() error { } // Write request to wire for XfixesSelectCursorInput -func (c *Conn) xfixesSelectCursorInputRequest(Window Id, EventMask uint32) []byte { +func (c *Conn) xfixesSelectCursorInputRequest(Window Window, EventMask uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -716,13 +722,13 @@ type XfixesCreateRegionCookie struct { } // Write request to wire for XfixesCreateRegion -func (c *Conn) XfixesCreateRegion(Region Id, Rectangles []Rectangle) XfixesCreateRegionCookie { +func (c *Conn) XfixesCreateRegion(Region XfixesRegion, Rectangles []Rectangle) XfixesCreateRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesCreateRegionRequest(Region, Rectangles), cookie) return XfixesCreateRegionCookie{cookie} } -func (c *Conn) XfixesCreateRegionChecked(Region Id, Rectangles []Rectangle) XfixesCreateRegionCookie { +func (c *Conn) XfixesCreateRegionChecked(Region XfixesRegion, Rectangles []Rectangle) XfixesCreateRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesCreateRegionRequest(Region, Rectangles), cookie) return XfixesCreateRegionCookie{cookie} @@ -733,7 +739,7 @@ func (cook XfixesCreateRegionCookie) Check() error { } // Write request to wire for XfixesCreateRegion -func (c *Conn) xfixesCreateRegionRequest(Region Id, Rectangles []Rectangle) []byte { +func (c *Conn) xfixesCreateRegionRequest(Region XfixesRegion, Rectangles []Rectangle) []byte { size := pad((8 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -762,13 +768,13 @@ type XfixesCreateRegionFromBitmapCookie struct { } // Write request to wire for XfixesCreateRegionFromBitmap -func (c *Conn) XfixesCreateRegionFromBitmap(Region Id, Bitmap Id) XfixesCreateRegionFromBitmapCookie { +func (c *Conn) XfixesCreateRegionFromBitmap(Region XfixesRegion, Bitmap Pixmap) XfixesCreateRegionFromBitmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesCreateRegionFromBitmapRequest(Region, Bitmap), cookie) return XfixesCreateRegionFromBitmapCookie{cookie} } -func (c *Conn) XfixesCreateRegionFromBitmapChecked(Region Id, Bitmap Id) XfixesCreateRegionFromBitmapCookie { +func (c *Conn) XfixesCreateRegionFromBitmapChecked(Region XfixesRegion, Bitmap Pixmap) XfixesCreateRegionFromBitmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesCreateRegionFromBitmapRequest(Region, Bitmap), cookie) return XfixesCreateRegionFromBitmapCookie{cookie} @@ -779,7 +785,7 @@ func (cook XfixesCreateRegionFromBitmapCookie) Check() error { } // Write request to wire for XfixesCreateRegionFromBitmap -func (c *Conn) xfixesCreateRegionFromBitmapRequest(Region Id, Bitmap Id) []byte { +func (c *Conn) xfixesCreateRegionFromBitmapRequest(Region XfixesRegion, Bitmap Pixmap) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -809,13 +815,13 @@ type XfixesCreateRegionFromWindowCookie struct { } // Write request to wire for XfixesCreateRegionFromWindow -func (c *Conn) XfixesCreateRegionFromWindow(Region Id, Window Id, Kind ShapeKind) XfixesCreateRegionFromWindowCookie { +func (c *Conn) XfixesCreateRegionFromWindow(Region XfixesRegion, Window Window, Kind ShapeKind) XfixesCreateRegionFromWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesCreateRegionFromWindowRequest(Region, Window, Kind), cookie) return XfixesCreateRegionFromWindowCookie{cookie} } -func (c *Conn) XfixesCreateRegionFromWindowChecked(Region Id, Window Id, Kind ShapeKind) XfixesCreateRegionFromWindowCookie { +func (c *Conn) XfixesCreateRegionFromWindowChecked(Region XfixesRegion, Window Window, Kind ShapeKind) XfixesCreateRegionFromWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesCreateRegionFromWindowRequest(Region, Window, Kind), cookie) return XfixesCreateRegionFromWindowCookie{cookie} @@ -826,7 +832,7 @@ func (cook XfixesCreateRegionFromWindowCookie) Check() error { } // Write request to wire for XfixesCreateRegionFromWindow -func (c *Conn) xfixesCreateRegionFromWindowRequest(Region Id, Window Id, Kind ShapeKind) []byte { +func (c *Conn) xfixesCreateRegionFromWindowRequest(Region XfixesRegion, Window Window, Kind ShapeKind) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -861,13 +867,13 @@ type XfixesCreateRegionFromGCCookie struct { } // Write request to wire for XfixesCreateRegionFromGC -func (c *Conn) XfixesCreateRegionFromGC(Region Id, Gc Id) XfixesCreateRegionFromGCCookie { +func (c *Conn) XfixesCreateRegionFromGC(Region XfixesRegion, Gc Gcontext) XfixesCreateRegionFromGCCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesCreateRegionFromGCRequest(Region, Gc), cookie) return XfixesCreateRegionFromGCCookie{cookie} } -func (c *Conn) XfixesCreateRegionFromGCChecked(Region Id, Gc Id) XfixesCreateRegionFromGCCookie { +func (c *Conn) XfixesCreateRegionFromGCChecked(Region XfixesRegion, Gc Gcontext) XfixesCreateRegionFromGCCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesCreateRegionFromGCRequest(Region, Gc), cookie) return XfixesCreateRegionFromGCCookie{cookie} @@ -878,7 +884,7 @@ func (cook XfixesCreateRegionFromGCCookie) Check() error { } // Write request to wire for XfixesCreateRegionFromGC -func (c *Conn) xfixesCreateRegionFromGCRequest(Region Id, Gc Id) []byte { +func (c *Conn) xfixesCreateRegionFromGCRequest(Region XfixesRegion, Gc Gcontext) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -908,13 +914,13 @@ type XfixesCreateRegionFromPictureCookie struct { } // Write request to wire for XfixesCreateRegionFromPicture -func (c *Conn) XfixesCreateRegionFromPicture(Region Id, Picture Id) XfixesCreateRegionFromPictureCookie { +func (c *Conn) XfixesCreateRegionFromPicture(Region XfixesRegion, Picture RenderPicture) XfixesCreateRegionFromPictureCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesCreateRegionFromPictureRequest(Region, Picture), cookie) return XfixesCreateRegionFromPictureCookie{cookie} } -func (c *Conn) XfixesCreateRegionFromPictureChecked(Region Id, Picture Id) XfixesCreateRegionFromPictureCookie { +func (c *Conn) XfixesCreateRegionFromPictureChecked(Region XfixesRegion, Picture RenderPicture) XfixesCreateRegionFromPictureCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesCreateRegionFromPictureRequest(Region, Picture), cookie) return XfixesCreateRegionFromPictureCookie{cookie} @@ -925,7 +931,7 @@ func (cook XfixesCreateRegionFromPictureCookie) Check() error { } // Write request to wire for XfixesCreateRegionFromPicture -func (c *Conn) xfixesCreateRegionFromPictureRequest(Region Id, Picture Id) []byte { +func (c *Conn) xfixesCreateRegionFromPictureRequest(Region XfixesRegion, Picture RenderPicture) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -955,13 +961,13 @@ type XfixesDestroyRegionCookie struct { } // Write request to wire for XfixesDestroyRegion -func (c *Conn) XfixesDestroyRegion(Region Id) XfixesDestroyRegionCookie { +func (c *Conn) XfixesDestroyRegion(Region XfixesRegion) XfixesDestroyRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesDestroyRegionRequest(Region), cookie) return XfixesDestroyRegionCookie{cookie} } -func (c *Conn) XfixesDestroyRegionChecked(Region Id) XfixesDestroyRegionCookie { +func (c *Conn) XfixesDestroyRegionChecked(Region XfixesRegion) XfixesDestroyRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesDestroyRegionRequest(Region), cookie) return XfixesDestroyRegionCookie{cookie} @@ -972,7 +978,7 @@ func (cook XfixesDestroyRegionCookie) Check() error { } // Write request to wire for XfixesDestroyRegion -func (c *Conn) xfixesDestroyRegionRequest(Region Id) []byte { +func (c *Conn) xfixesDestroyRegionRequest(Region XfixesRegion) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -999,13 +1005,13 @@ type XfixesSetRegionCookie struct { } // Write request to wire for XfixesSetRegion -func (c *Conn) XfixesSetRegion(Region Id, Rectangles []Rectangle) XfixesSetRegionCookie { +func (c *Conn) XfixesSetRegion(Region XfixesRegion, Rectangles []Rectangle) XfixesSetRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSetRegionRequest(Region, Rectangles), cookie) return XfixesSetRegionCookie{cookie} } -func (c *Conn) XfixesSetRegionChecked(Region Id, Rectangles []Rectangle) XfixesSetRegionCookie { +func (c *Conn) XfixesSetRegionChecked(Region XfixesRegion, Rectangles []Rectangle) XfixesSetRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSetRegionRequest(Region, Rectangles), cookie) return XfixesSetRegionCookie{cookie} @@ -1016,7 +1022,7 @@ func (cook XfixesSetRegionCookie) Check() error { } // Write request to wire for XfixesSetRegion -func (c *Conn) xfixesSetRegionRequest(Region Id, Rectangles []Rectangle) []byte { +func (c *Conn) xfixesSetRegionRequest(Region XfixesRegion, Rectangles []Rectangle) []byte { size := pad((8 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -1045,13 +1051,13 @@ type XfixesCopyRegionCookie struct { } // Write request to wire for XfixesCopyRegion -func (c *Conn) XfixesCopyRegion(Source Id, Destination Id) XfixesCopyRegionCookie { +func (c *Conn) XfixesCopyRegion(Source XfixesRegion, Destination XfixesRegion) XfixesCopyRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesCopyRegionRequest(Source, Destination), cookie) return XfixesCopyRegionCookie{cookie} } -func (c *Conn) XfixesCopyRegionChecked(Source Id, Destination Id) XfixesCopyRegionCookie { +func (c *Conn) XfixesCopyRegionChecked(Source XfixesRegion, Destination XfixesRegion) XfixesCopyRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesCopyRegionRequest(Source, Destination), cookie) return XfixesCopyRegionCookie{cookie} @@ -1062,7 +1068,7 @@ func (cook XfixesCopyRegionCookie) Check() error { } // Write request to wire for XfixesCopyRegion -func (c *Conn) xfixesCopyRegionRequest(Source Id, Destination Id) []byte { +func (c *Conn) xfixesCopyRegionRequest(Source XfixesRegion, Destination XfixesRegion) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1092,13 +1098,13 @@ type XfixesUnionRegionCookie struct { } // Write request to wire for XfixesUnionRegion -func (c *Conn) XfixesUnionRegion(Source1 Id, Source2 Id, Destination Id) XfixesUnionRegionCookie { +func (c *Conn) XfixesUnionRegion(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) XfixesUnionRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesUnionRegionRequest(Source1, Source2, Destination), cookie) return XfixesUnionRegionCookie{cookie} } -func (c *Conn) XfixesUnionRegionChecked(Source1 Id, Source2 Id, Destination Id) XfixesUnionRegionCookie { +func (c *Conn) XfixesUnionRegionChecked(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) XfixesUnionRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesUnionRegionRequest(Source1, Source2, Destination), cookie) return XfixesUnionRegionCookie{cookie} @@ -1109,7 +1115,7 @@ func (cook XfixesUnionRegionCookie) Check() error { } // Write request to wire for XfixesUnionRegion -func (c *Conn) xfixesUnionRegionRequest(Source1 Id, Source2 Id, Destination Id) []byte { +func (c *Conn) xfixesUnionRegionRequest(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1142,13 +1148,13 @@ type XfixesIntersectRegionCookie struct { } // Write request to wire for XfixesIntersectRegion -func (c *Conn) XfixesIntersectRegion(Source1 Id, Source2 Id, Destination Id) XfixesIntersectRegionCookie { +func (c *Conn) XfixesIntersectRegion(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) XfixesIntersectRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesIntersectRegionRequest(Source1, Source2, Destination), cookie) return XfixesIntersectRegionCookie{cookie} } -func (c *Conn) XfixesIntersectRegionChecked(Source1 Id, Source2 Id, Destination Id) XfixesIntersectRegionCookie { +func (c *Conn) XfixesIntersectRegionChecked(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) XfixesIntersectRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesIntersectRegionRequest(Source1, Source2, Destination), cookie) return XfixesIntersectRegionCookie{cookie} @@ -1159,7 +1165,7 @@ func (cook XfixesIntersectRegionCookie) Check() error { } // Write request to wire for XfixesIntersectRegion -func (c *Conn) xfixesIntersectRegionRequest(Source1 Id, Source2 Id, Destination Id) []byte { +func (c *Conn) xfixesIntersectRegionRequest(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1192,13 +1198,13 @@ type XfixesSubtractRegionCookie struct { } // Write request to wire for XfixesSubtractRegion -func (c *Conn) XfixesSubtractRegion(Source1 Id, Source2 Id, Destination Id) XfixesSubtractRegionCookie { +func (c *Conn) XfixesSubtractRegion(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) XfixesSubtractRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSubtractRegionRequest(Source1, Source2, Destination), cookie) return XfixesSubtractRegionCookie{cookie} } -func (c *Conn) XfixesSubtractRegionChecked(Source1 Id, Source2 Id, Destination Id) XfixesSubtractRegionCookie { +func (c *Conn) XfixesSubtractRegionChecked(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) XfixesSubtractRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSubtractRegionRequest(Source1, Source2, Destination), cookie) return XfixesSubtractRegionCookie{cookie} @@ -1209,7 +1215,7 @@ func (cook XfixesSubtractRegionCookie) Check() error { } // Write request to wire for XfixesSubtractRegion -func (c *Conn) xfixesSubtractRegionRequest(Source1 Id, Source2 Id, Destination Id) []byte { +func (c *Conn) xfixesSubtractRegionRequest(Source1 XfixesRegion, Source2 XfixesRegion, Destination XfixesRegion) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1242,13 +1248,13 @@ type XfixesInvertRegionCookie struct { } // Write request to wire for XfixesInvertRegion -func (c *Conn) XfixesInvertRegion(Source Id, Bounds Rectangle, Destination Id) XfixesInvertRegionCookie { +func (c *Conn) XfixesInvertRegion(Source XfixesRegion, Bounds Rectangle, Destination XfixesRegion) XfixesInvertRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesInvertRegionRequest(Source, Bounds, Destination), cookie) return XfixesInvertRegionCookie{cookie} } -func (c *Conn) XfixesInvertRegionChecked(Source Id, Bounds Rectangle, Destination Id) XfixesInvertRegionCookie { +func (c *Conn) XfixesInvertRegionChecked(Source XfixesRegion, Bounds Rectangle, Destination XfixesRegion) XfixesInvertRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesInvertRegionRequest(Source, Bounds, Destination), cookie) return XfixesInvertRegionCookie{cookie} @@ -1259,7 +1265,7 @@ func (cook XfixesInvertRegionCookie) Check() error { } // Write request to wire for XfixesInvertRegion -func (c *Conn) xfixesInvertRegionRequest(Source Id, Bounds Rectangle, Destination Id) []byte { +func (c *Conn) xfixesInvertRegionRequest(Source XfixesRegion, Bounds Rectangle, Destination XfixesRegion) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1295,13 +1301,13 @@ type XfixesTranslateRegionCookie struct { } // Write request to wire for XfixesTranslateRegion -func (c *Conn) XfixesTranslateRegion(Region Id, Dx int16, Dy int16) XfixesTranslateRegionCookie { +func (c *Conn) XfixesTranslateRegion(Region XfixesRegion, Dx int16, Dy int16) XfixesTranslateRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesTranslateRegionRequest(Region, Dx, Dy), cookie) return XfixesTranslateRegionCookie{cookie} } -func (c *Conn) XfixesTranslateRegionChecked(Region Id, Dx int16, Dy int16) XfixesTranslateRegionCookie { +func (c *Conn) XfixesTranslateRegionChecked(Region XfixesRegion, Dx int16, Dy int16) XfixesTranslateRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesTranslateRegionRequest(Region, Dx, Dy), cookie) return XfixesTranslateRegionCookie{cookie} @@ -1312,7 +1318,7 @@ func (cook XfixesTranslateRegionCookie) Check() error { } // Write request to wire for XfixesTranslateRegion -func (c *Conn) xfixesTranslateRegionRequest(Region Id, Dx int16, Dy int16) []byte { +func (c *Conn) xfixesTranslateRegionRequest(Region XfixesRegion, Dx int16, Dy int16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1345,13 +1351,13 @@ type XfixesRegionExtentsCookie struct { } // Write request to wire for XfixesRegionExtents -func (c *Conn) XfixesRegionExtents(Source Id, Destination Id) XfixesRegionExtentsCookie { +func (c *Conn) XfixesRegionExtents(Source XfixesRegion, Destination XfixesRegion) XfixesRegionExtentsCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesRegionExtentsRequest(Source, Destination), cookie) return XfixesRegionExtentsCookie{cookie} } -func (c *Conn) XfixesRegionExtentsChecked(Source Id, Destination Id) XfixesRegionExtentsCookie { +func (c *Conn) XfixesRegionExtentsChecked(Source XfixesRegion, Destination XfixesRegion) XfixesRegionExtentsCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesRegionExtentsRequest(Source, Destination), cookie) return XfixesRegionExtentsCookie{cookie} @@ -1362,7 +1368,7 @@ func (cook XfixesRegionExtentsCookie) Check() error { } // Write request to wire for XfixesRegionExtents -func (c *Conn) xfixesRegionExtentsRequest(Source Id, Destination Id) []byte { +func (c *Conn) xfixesRegionExtentsRequest(Source XfixesRegion, Destination XfixesRegion) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1391,13 +1397,13 @@ type XfixesFetchRegionCookie struct { *cookie } -func (c *Conn) XfixesFetchRegion(Region Id) XfixesFetchRegionCookie { +func (c *Conn) XfixesFetchRegion(Region XfixesRegion) XfixesFetchRegionCookie { cookie := c.newCookie(true, true) c.newRequest(c.xfixesFetchRegionRequest(Region), cookie) return XfixesFetchRegionCookie{cookie} } -func (c *Conn) XfixesFetchRegionUnchecked(Region Id) XfixesFetchRegionCookie { +func (c *Conn) XfixesFetchRegionUnchecked(Region XfixesRegion) XfixesFetchRegionCookie { cookie := c.newCookie(false, true) c.newRequest(c.xfixesFetchRegionRequest(Region), cookie) return XfixesFetchRegionCookie{cookie} @@ -1455,7 +1461,7 @@ func (cook XfixesFetchRegionCookie) Check() error { } // Write request to wire for XfixesFetchRegion -func (c *Conn) xfixesFetchRegionRequest(Region Id) []byte { +func (c *Conn) xfixesFetchRegionRequest(Region XfixesRegion) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1482,13 +1488,13 @@ type XfixesSetGCClipRegionCookie struct { } // Write request to wire for XfixesSetGCClipRegion -func (c *Conn) XfixesSetGCClipRegion(Gc Id, Region Id, XOrigin int16, YOrigin int16) XfixesSetGCClipRegionCookie { +func (c *Conn) XfixesSetGCClipRegion(Gc Gcontext, Region XfixesRegion, XOrigin int16, YOrigin int16) XfixesSetGCClipRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSetGCClipRegionRequest(Gc, Region, XOrigin, YOrigin), cookie) return XfixesSetGCClipRegionCookie{cookie} } -func (c *Conn) XfixesSetGCClipRegionChecked(Gc Id, Region Id, XOrigin int16, YOrigin int16) XfixesSetGCClipRegionCookie { +func (c *Conn) XfixesSetGCClipRegionChecked(Gc Gcontext, Region XfixesRegion, XOrigin int16, YOrigin int16) XfixesSetGCClipRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSetGCClipRegionRequest(Gc, Region, XOrigin, YOrigin), cookie) return XfixesSetGCClipRegionCookie{cookie} @@ -1499,7 +1505,7 @@ func (cook XfixesSetGCClipRegionCookie) Check() error { } // Write request to wire for XfixesSetGCClipRegion -func (c *Conn) xfixesSetGCClipRegionRequest(Gc Id, Region Id, XOrigin int16, YOrigin int16) []byte { +func (c *Conn) xfixesSetGCClipRegionRequest(Gc Gcontext, Region XfixesRegion, XOrigin int16, YOrigin int16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1535,13 +1541,13 @@ type XfixesSetWindowShapeRegionCookie struct { } // Write request to wire for XfixesSetWindowShapeRegion -func (c *Conn) XfixesSetWindowShapeRegion(Dest Id, DestKind ShapeKind, XOffset int16, YOffset int16, Region Id) XfixesSetWindowShapeRegionCookie { +func (c *Conn) XfixesSetWindowShapeRegion(Dest Window, DestKind ShapeKind, XOffset int16, YOffset int16, Region XfixesRegion) XfixesSetWindowShapeRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSetWindowShapeRegionRequest(Dest, DestKind, XOffset, YOffset, Region), cookie) return XfixesSetWindowShapeRegionCookie{cookie} } -func (c *Conn) XfixesSetWindowShapeRegionChecked(Dest Id, DestKind ShapeKind, XOffset int16, YOffset int16, Region Id) XfixesSetWindowShapeRegionCookie { +func (c *Conn) XfixesSetWindowShapeRegionChecked(Dest Window, DestKind ShapeKind, XOffset int16, YOffset int16, Region XfixesRegion) XfixesSetWindowShapeRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSetWindowShapeRegionRequest(Dest, DestKind, XOffset, YOffset, Region), cookie) return XfixesSetWindowShapeRegionCookie{cookie} @@ -1552,7 +1558,7 @@ func (cook XfixesSetWindowShapeRegionCookie) Check() error { } // Write request to wire for XfixesSetWindowShapeRegion -func (c *Conn) xfixesSetWindowShapeRegionRequest(Dest Id, DestKind ShapeKind, XOffset int16, YOffset int16, Region Id) []byte { +func (c *Conn) xfixesSetWindowShapeRegionRequest(Dest Window, DestKind ShapeKind, XOffset int16, YOffset int16, Region XfixesRegion) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1593,13 +1599,13 @@ type XfixesSetPictureClipRegionCookie struct { } // Write request to wire for XfixesSetPictureClipRegion -func (c *Conn) XfixesSetPictureClipRegion(Picture Id, Region Id, XOrigin int16, YOrigin int16) XfixesSetPictureClipRegionCookie { +func (c *Conn) XfixesSetPictureClipRegion(Picture RenderPicture, Region XfixesRegion, XOrigin int16, YOrigin int16) XfixesSetPictureClipRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSetPictureClipRegionRequest(Picture, Region, XOrigin, YOrigin), cookie) return XfixesSetPictureClipRegionCookie{cookie} } -func (c *Conn) XfixesSetPictureClipRegionChecked(Picture Id, Region Id, XOrigin int16, YOrigin int16) XfixesSetPictureClipRegionCookie { +func (c *Conn) XfixesSetPictureClipRegionChecked(Picture RenderPicture, Region XfixesRegion, XOrigin int16, YOrigin int16) XfixesSetPictureClipRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSetPictureClipRegionRequest(Picture, Region, XOrigin, YOrigin), cookie) return XfixesSetPictureClipRegionCookie{cookie} @@ -1610,7 +1616,7 @@ func (cook XfixesSetPictureClipRegionCookie) Check() error { } // Write request to wire for XfixesSetPictureClipRegion -func (c *Conn) xfixesSetPictureClipRegionRequest(Picture Id, Region Id, XOrigin int16, YOrigin int16) []byte { +func (c *Conn) xfixesSetPictureClipRegionRequest(Picture RenderPicture, Region XfixesRegion, XOrigin int16, YOrigin int16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1646,13 +1652,13 @@ type XfixesSetCursorNameCookie struct { } // Write request to wire for XfixesSetCursorName -func (c *Conn) XfixesSetCursorName(Cursor Id, Nbytes uint16, Name string) XfixesSetCursorNameCookie { +func (c *Conn) XfixesSetCursorName(Cursor Cursor, Nbytes uint16, Name string) XfixesSetCursorNameCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesSetCursorNameRequest(Cursor, Nbytes, Name), cookie) return XfixesSetCursorNameCookie{cookie} } -func (c *Conn) XfixesSetCursorNameChecked(Cursor Id, Nbytes uint16, Name string) XfixesSetCursorNameCookie { +func (c *Conn) XfixesSetCursorNameChecked(Cursor Cursor, Nbytes uint16, Name string) XfixesSetCursorNameCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesSetCursorNameRequest(Cursor, Nbytes, Name), cookie) return XfixesSetCursorNameCookie{cookie} @@ -1663,7 +1669,7 @@ func (cook XfixesSetCursorNameCookie) Check() error { } // Write request to wire for XfixesSetCursorName -func (c *Conn) xfixesSetCursorNameRequest(Cursor Id, Nbytes uint16, Name string) []byte { +func (c *Conn) xfixesSetCursorNameRequest(Cursor Cursor, Nbytes uint16, Name string) []byte { size := pad((12 + pad((int(Nbytes) * 1)))) b := 0 buf := make([]byte, size) @@ -1697,13 +1703,13 @@ type XfixesGetCursorNameCookie struct { *cookie } -func (c *Conn) XfixesGetCursorName(Cursor Id) XfixesGetCursorNameCookie { +func (c *Conn) XfixesGetCursorName(Cursor Cursor) XfixesGetCursorNameCookie { cookie := c.newCookie(true, true) c.newRequest(c.xfixesGetCursorNameRequest(Cursor), cookie) return XfixesGetCursorNameCookie{cookie} } -func (c *Conn) XfixesGetCursorNameUnchecked(Cursor Id) XfixesGetCursorNameCookie { +func (c *Conn) XfixesGetCursorNameUnchecked(Cursor Cursor) XfixesGetCursorNameCookie { cookie := c.newCookie(false, true) c.newRequest(c.xfixesGetCursorNameRequest(Cursor), cookie) return XfixesGetCursorNameCookie{cookie} @@ -1715,7 +1721,7 @@ type XfixesGetCursorNameReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Atom Id + Atom Atom Nbytes uint16 // padding: 18 bytes Name string // size: pad((int(Nbytes) * 1)) @@ -1746,7 +1752,7 @@ func xfixesGetCursorNameReply(buf []byte) *XfixesGetCursorNameReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Atom = Id(Get32(buf[b:])) + v.Atom = Atom(Get32(buf[b:])) b += 4 v.Nbytes = Get16(buf[b:]) @@ -1769,7 +1775,7 @@ func (cook XfixesGetCursorNameCookie) Check() error { } // Write request to wire for XfixesGetCursorName -func (c *Conn) xfixesGetCursorNameRequest(Cursor Id) []byte { +func (c *Conn) xfixesGetCursorNameRequest(Cursor Cursor) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1820,7 +1826,7 @@ type XfixesGetCursorImageAndNameReply struct { Xhot uint16 Yhot uint16 CursorSerial uint32 - CursorAtom Id + CursorAtom Atom Nbytes uint16 // padding: 2 bytes Name string // size: pad((int(Nbytes) * 1)) @@ -1873,7 +1879,7 @@ func xfixesGetCursorImageAndNameReply(buf []byte) *XfixesGetCursorImageAndNameRe v.CursorSerial = Get32(buf[b:]) b += 4 - v.CursorAtom = Id(Get32(buf[b:])) + v.CursorAtom = Atom(Get32(buf[b:])) b += 4 v.Nbytes = Get16(buf[b:]) @@ -1927,13 +1933,13 @@ type XfixesChangeCursorCookie struct { } // Write request to wire for XfixesChangeCursor -func (c *Conn) XfixesChangeCursor(Source Id, Destination Id) XfixesChangeCursorCookie { +func (c *Conn) XfixesChangeCursor(Source Cursor, Destination Cursor) XfixesChangeCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesChangeCursorRequest(Source, Destination), cookie) return XfixesChangeCursorCookie{cookie} } -func (c *Conn) XfixesChangeCursorChecked(Source Id, Destination Id) XfixesChangeCursorCookie { +func (c *Conn) XfixesChangeCursorChecked(Source Cursor, Destination Cursor) XfixesChangeCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesChangeCursorRequest(Source, Destination), cookie) return XfixesChangeCursorCookie{cookie} @@ -1944,7 +1950,7 @@ func (cook XfixesChangeCursorCookie) Check() error { } // Write request to wire for XfixesChangeCursor -func (c *Conn) xfixesChangeCursorRequest(Source Id, Destination Id) []byte { +func (c *Conn) xfixesChangeCursorRequest(Source Cursor, Destination Cursor) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1974,13 +1980,13 @@ type XfixesChangeCursorByNameCookie struct { } // Write request to wire for XfixesChangeCursorByName -func (c *Conn) XfixesChangeCursorByName(Src Id, Nbytes uint16, Name string) XfixesChangeCursorByNameCookie { +func (c *Conn) XfixesChangeCursorByName(Src Cursor, Nbytes uint16, Name string) XfixesChangeCursorByNameCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesChangeCursorByNameRequest(Src, Nbytes, Name), cookie) return XfixesChangeCursorByNameCookie{cookie} } -func (c *Conn) XfixesChangeCursorByNameChecked(Src Id, Nbytes uint16, Name string) XfixesChangeCursorByNameCookie { +func (c *Conn) XfixesChangeCursorByNameChecked(Src Cursor, Nbytes uint16, Name string) XfixesChangeCursorByNameCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesChangeCursorByNameRequest(Src, Nbytes, Name), cookie) return XfixesChangeCursorByNameCookie{cookie} @@ -1991,7 +1997,7 @@ func (cook XfixesChangeCursorByNameCookie) Check() error { } // Write request to wire for XfixesChangeCursorByName -func (c *Conn) xfixesChangeCursorByNameRequest(Src Id, Nbytes uint16, Name string) []byte { +func (c *Conn) xfixesChangeCursorByNameRequest(Src Cursor, Nbytes uint16, Name string) []byte { size := pad((12 + pad((int(Nbytes) * 1)))) b := 0 buf := make([]byte, size) @@ -2026,13 +2032,13 @@ type XfixesExpandRegionCookie struct { } // Write request to wire for XfixesExpandRegion -func (c *Conn) XfixesExpandRegion(Source Id, Destination Id, Left uint16, Right uint16, Top uint16, Bottom uint16) XfixesExpandRegionCookie { +func (c *Conn) XfixesExpandRegion(Source XfixesRegion, Destination XfixesRegion, Left uint16, Right uint16, Top uint16, Bottom uint16) XfixesExpandRegionCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesExpandRegionRequest(Source, Destination, Left, Right, Top, Bottom), cookie) return XfixesExpandRegionCookie{cookie} } -func (c *Conn) XfixesExpandRegionChecked(Source Id, Destination Id, Left uint16, Right uint16, Top uint16, Bottom uint16) XfixesExpandRegionCookie { +func (c *Conn) XfixesExpandRegionChecked(Source XfixesRegion, Destination XfixesRegion, Left uint16, Right uint16, Top uint16, Bottom uint16) XfixesExpandRegionCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesExpandRegionRequest(Source, Destination, Left, Right, Top, Bottom), cookie) return XfixesExpandRegionCookie{cookie} @@ -2043,7 +2049,7 @@ func (cook XfixesExpandRegionCookie) Check() error { } // Write request to wire for XfixesExpandRegion -func (c *Conn) xfixesExpandRegionRequest(Source Id, Destination Id, Left uint16, Right uint16, Top uint16, Bottom uint16) []byte { +func (c *Conn) xfixesExpandRegionRequest(Source XfixesRegion, Destination XfixesRegion, Left uint16, Right uint16, Top uint16, Bottom uint16) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -2085,13 +2091,13 @@ type XfixesHideCursorCookie struct { } // Write request to wire for XfixesHideCursor -func (c *Conn) XfixesHideCursor(Window Id) XfixesHideCursorCookie { +func (c *Conn) XfixesHideCursor(Window Window) XfixesHideCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesHideCursorRequest(Window), cookie) return XfixesHideCursorCookie{cookie} } -func (c *Conn) XfixesHideCursorChecked(Window Id) XfixesHideCursorCookie { +func (c *Conn) XfixesHideCursorChecked(Window Window) XfixesHideCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesHideCursorRequest(Window), cookie) return XfixesHideCursorCookie{cookie} @@ -2102,7 +2108,7 @@ func (cook XfixesHideCursorCookie) Check() error { } // Write request to wire for XfixesHideCursor -func (c *Conn) xfixesHideCursorRequest(Window Id) []byte { +func (c *Conn) xfixesHideCursorRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2129,13 +2135,13 @@ type XfixesShowCursorCookie struct { } // Write request to wire for XfixesShowCursor -func (c *Conn) XfixesShowCursor(Window Id) XfixesShowCursorCookie { +func (c *Conn) XfixesShowCursor(Window Window) XfixesShowCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.xfixesShowCursorRequest(Window), cookie) return XfixesShowCursorCookie{cookie} } -func (c *Conn) XfixesShowCursorChecked(Window Id) XfixesShowCursorCookie { +func (c *Conn) XfixesShowCursorChecked(Window Window) XfixesShowCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.xfixesShowCursorRequest(Window), cookie) return XfixesShowCursorCookie{cookie} @@ -2146,7 +2152,7 @@ func (cook XfixesShowCursorCookie) Check() error { } // Write request to wire for XfixesShowCursor -func (c *Conn) xfixesShowCursorRequest(Window Id) []byte { +func (c *Conn) xfixesShowCursorRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xinerama.go b/nexgb/auto_xinerama.go index 0f52bf2..fc24ae3 100644 --- a/nexgb/auto_xinerama.go +++ b/nexgb/auto_xinerama.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xinerama.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xinerama.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,14 +37,6 @@ func init() { newExtErrorFuncs["XINERAMA"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Int16' - -// 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' @@ -59,10 +51,16 @@ 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' + // 'XineramaScreenInfo' struct definition // Size: 8 type XineramaScreenInfo struct { @@ -229,13 +227,13 @@ type XineramaGetStateCookie struct { *cookie } -func (c *Conn) XineramaGetState(Window Id) XineramaGetStateCookie { +func (c *Conn) XineramaGetState(Window Window) XineramaGetStateCookie { cookie := c.newCookie(true, true) c.newRequest(c.xineramaGetStateRequest(Window), cookie) return XineramaGetStateCookie{cookie} } -func (c *Conn) XineramaGetStateUnchecked(Window Id) XineramaGetStateCookie { +func (c *Conn) XineramaGetStateUnchecked(Window Window) XineramaGetStateCookie { cookie := c.newCookie(false, true) c.newRequest(c.xineramaGetStateRequest(Window), cookie) return XineramaGetStateCookie{cookie} @@ -247,7 +245,7 @@ type XineramaGetStateReply struct { Sequence uint16 Length uint32 State byte - Window Id + Window Window } // Waits and reads reply data from request XineramaGetState @@ -276,7 +274,7 @@ func xineramaGetStateReply(buf []byte) *XineramaGetStateReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 return v @@ -287,7 +285,7 @@ func (cook XineramaGetStateCookie) Check() error { } // Write request to wire for XineramaGetState -func (c *Conn) xineramaGetStateRequest(Window Id) []byte { +func (c *Conn) xineramaGetStateRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -313,13 +311,13 @@ type XineramaGetScreenCountCookie struct { *cookie } -func (c *Conn) XineramaGetScreenCount(Window Id) XineramaGetScreenCountCookie { +func (c *Conn) XineramaGetScreenCount(Window Window) XineramaGetScreenCountCookie { cookie := c.newCookie(true, true) c.newRequest(c.xineramaGetScreenCountRequest(Window), cookie) return XineramaGetScreenCountCookie{cookie} } -func (c *Conn) XineramaGetScreenCountUnchecked(Window Id) XineramaGetScreenCountCookie { +func (c *Conn) XineramaGetScreenCountUnchecked(Window Window) XineramaGetScreenCountCookie { cookie := c.newCookie(false, true) c.newRequest(c.xineramaGetScreenCountRequest(Window), cookie) return XineramaGetScreenCountCookie{cookie} @@ -331,7 +329,7 @@ type XineramaGetScreenCountReply struct { Sequence uint16 Length uint32 ScreenCount byte - Window Id + Window Window } // Waits and reads reply data from request XineramaGetScreenCount @@ -360,7 +358,7 @@ func xineramaGetScreenCountReply(buf []byte) *XineramaGetScreenCountReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 return v @@ -371,7 +369,7 @@ func (cook XineramaGetScreenCountCookie) Check() error { } // Write request to wire for XineramaGetScreenCount -func (c *Conn) xineramaGetScreenCountRequest(Window Id) []byte { +func (c *Conn) xineramaGetScreenCountRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -397,13 +395,13 @@ type XineramaGetScreenSizeCookie struct { *cookie } -func (c *Conn) XineramaGetScreenSize(Window Id, Screen uint32) XineramaGetScreenSizeCookie { +func (c *Conn) XineramaGetScreenSize(Window Window, Screen uint32) XineramaGetScreenSizeCookie { cookie := c.newCookie(true, true) c.newRequest(c.xineramaGetScreenSizeRequest(Window, Screen), cookie) return XineramaGetScreenSizeCookie{cookie} } -func (c *Conn) XineramaGetScreenSizeUnchecked(Window Id, Screen uint32) XineramaGetScreenSizeCookie { +func (c *Conn) XineramaGetScreenSizeUnchecked(Window Window, Screen uint32) XineramaGetScreenSizeCookie { cookie := c.newCookie(false, true) c.newRequest(c.xineramaGetScreenSizeRequest(Window, Screen), cookie) return XineramaGetScreenSizeCookie{cookie} @@ -417,7 +415,7 @@ type XineramaGetScreenSizeReply struct { // padding: 1 bytes Width uint32 Height uint32 - Window Id + Window Window Screen uint32 } @@ -452,7 +450,7 @@ func xineramaGetScreenSizeReply(buf []byte) *XineramaGetScreenSizeReply { v.Height = Get32(buf[b:]) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.Screen = Get32(buf[b:]) @@ -466,7 +464,7 @@ func (cook XineramaGetScreenSizeCookie) Check() error { } // Write request to wire for XineramaGetScreenSize -func (c *Conn) xineramaGetScreenSizeRequest(Window Id, Screen uint32) []byte { +func (c *Conn) xineramaGetScreenSizeRequest(Window Window, Screen uint32) []byte { size := 12 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xinput.go b/nexgb/auto_xinput.go index a15c426..78142b6 100644 --- a/nexgb/auto_xinput.go +++ b/nexgb/auto_xinput.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xinput.xml on May 8 2012 11:03:24pm EDT. + This file was generated by xinput.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,10 @@ func init() { newExtErrorFuncs["XInputExtension"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Int16' + +// Skipping definition for base type 'Int32' + // Skipping definition for base type 'Void' // Skipping definition for base type 'Byte' @@ -55,14 +59,8 @@ 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' - const ( XinputValuatorModeRelative = 0 XinputValuatorModeAbsolute = 1 @@ -116,7 +114,7 @@ type XinputEventClass uint32 // 'XinputDeviceInfo' struct definition // Size: 8 type XinputDeviceInfo struct { - DeviceType Id + DeviceType Atom DeviceId byte NumClassInfo byte DeviceUse byte @@ -127,7 +125,7 @@ type XinputDeviceInfo struct { func ReadXinputDeviceInfo(buf []byte, v *XinputDeviceInfo) int { b := 0 - v.DeviceType = Id(Get32(buf[b:])) + v.DeviceType = Atom(Get32(buf[b:])) b += 4 v.DeviceId = buf[b] @@ -3347,9 +3345,9 @@ type XinputDeviceKeyPressEvent struct { Sequence uint16 Detail byte Time Timestamp - Root Id - Event Id - Child Id + Root Window + Event Window + Child Window RootX int16 RootY int16 EventX int16 @@ -3373,13 +3371,13 @@ func NewXinputDeviceKeyPressEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -3501,7 +3499,7 @@ type XinputFocusInEvent struct { Sequence uint16 Detail byte Time Timestamp - Window Id + Window Window Mode byte DeviceId byte // padding: 18 bytes @@ -3521,7 +3519,7 @@ func NewXinputFocusInEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.Mode = buf[b] @@ -4435,7 +4433,7 @@ func (err XinputDeviceError) SequenceId() uint16 { return err.Sequence } -func (err XinputDeviceError) BadId() Id { +func (err XinputDeviceError) BadId() uint32 { return 0 } @@ -4480,7 +4478,7 @@ func (err XinputEventError) SequenceId() uint16 { return err.Sequence } -func (err XinputEventError) BadId() Id { +func (err XinputEventError) BadId() uint32 { return 0 } @@ -4525,7 +4523,7 @@ func (err XinputModeError) SequenceId() uint16 { return err.Sequence } -func (err XinputModeError) BadId() Id { +func (err XinputModeError) BadId() uint32 { return 0 } @@ -4570,7 +4568,7 @@ func (err XinputDeviceBusyError) SequenceId() uint16 { return err.Sequence } -func (err XinputDeviceBusyError) BadId() Id { +func (err XinputDeviceBusyError) BadId() uint32 { return 0 } @@ -4615,7 +4613,7 @@ func (err XinputClassError) SequenceId() uint16 { return err.Sequence } -func (err XinputClassError) BadId() Id { +func (err XinputClassError) BadId() uint32 { return 0 } @@ -5056,13 +5054,13 @@ type XinputSelectExtensionEventCookie struct { } // Write request to wire for XinputSelectExtensionEvent -func (c *Conn) XinputSelectExtensionEvent(Window Id, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { +func (c *Conn) XinputSelectExtensionEvent(Window Window, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputSelectExtensionEventRequest(Window, NumClasses, Classes), cookie) return XinputSelectExtensionEventCookie{cookie} } -func (c *Conn) XinputSelectExtensionEventChecked(Window Id, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { +func (c *Conn) XinputSelectExtensionEventChecked(Window Window, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputSelectExtensionEventRequest(Window, NumClasses, Classes), cookie) return XinputSelectExtensionEventCookie{cookie} @@ -5073,7 +5071,7 @@ func (cook XinputSelectExtensionEventCookie) Check() error { } // Write request to wire for XinputSelectExtensionEvent -func (c *Conn) xinputSelectExtensionEventRequest(Window Id, NumClasses uint16, Classes []XinputEventClass) []byte { +func (c *Conn) xinputSelectExtensionEventRequest(Window Window, NumClasses uint16, Classes []XinputEventClass) []byte { size := pad((12 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5110,13 +5108,13 @@ type XinputGetSelectedExtensionEventsCookie struct { *cookie } -func (c *Conn) XinputGetSelectedExtensionEvents(Window Id) XinputGetSelectedExtensionEventsCookie { +func (c *Conn) XinputGetSelectedExtensionEvents(Window Window) XinputGetSelectedExtensionEventsCookie { cookie := c.newCookie(true, true) c.newRequest(c.xinputGetSelectedExtensionEventsRequest(Window), cookie) return XinputGetSelectedExtensionEventsCookie{cookie} } -func (c *Conn) XinputGetSelectedExtensionEventsUnchecked(Window Id) XinputGetSelectedExtensionEventsCookie { +func (c *Conn) XinputGetSelectedExtensionEventsUnchecked(Window Window) XinputGetSelectedExtensionEventsCookie { cookie := c.newCookie(false, true) c.newRequest(c.xinputGetSelectedExtensionEventsRequest(Window), cookie) return XinputGetSelectedExtensionEventsCookie{cookie} @@ -5190,7 +5188,7 @@ func (cook XinputGetSelectedExtensionEventsCookie) Check() error { } // Write request to wire for XinputGetSelectedExtensionEvents -func (c *Conn) xinputGetSelectedExtensionEventsRequest(Window Id) []byte { +func (c *Conn) xinputGetSelectedExtensionEventsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -5217,13 +5215,13 @@ type XinputChangeDeviceDontPropagateListCookie struct { } // Write request to wire for XinputChangeDeviceDontPropagateList -func (c *Conn) XinputChangeDeviceDontPropagateList(Window Id, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { +func (c *Conn) XinputChangeDeviceDontPropagateList(Window Window, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputChangeDeviceDontPropagateListRequest(Window, NumClasses, Mode, Classes), cookie) return XinputChangeDeviceDontPropagateListCookie{cookie} } -func (c *Conn) XinputChangeDeviceDontPropagateListChecked(Window Id, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { +func (c *Conn) XinputChangeDeviceDontPropagateListChecked(Window Window, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputChangeDeviceDontPropagateListRequest(Window, NumClasses, Mode, Classes), cookie) return XinputChangeDeviceDontPropagateListCookie{cookie} @@ -5234,7 +5232,7 @@ func (cook XinputChangeDeviceDontPropagateListCookie) Check() error { } // Write request to wire for XinputChangeDeviceDontPropagateList -func (c *Conn) xinputChangeDeviceDontPropagateListRequest(Window Id, NumClasses uint16, Mode byte, Classes []XinputEventClass) []byte { +func (c *Conn) xinputChangeDeviceDontPropagateListRequest(Window Window, NumClasses uint16, Mode byte, Classes []XinputEventClass) []byte { size := pad((12 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5274,13 +5272,13 @@ type XinputGetDeviceDontPropagateListCookie struct { *cookie } -func (c *Conn) XinputGetDeviceDontPropagateList(Window Id) XinputGetDeviceDontPropagateListCookie { +func (c *Conn) XinputGetDeviceDontPropagateList(Window Window) XinputGetDeviceDontPropagateListCookie { cookie := c.newCookie(true, true) c.newRequest(c.xinputGetDeviceDontPropagateListRequest(Window), cookie) return XinputGetDeviceDontPropagateListCookie{cookie} } -func (c *Conn) XinputGetDeviceDontPropagateListUnchecked(Window Id) XinputGetDeviceDontPropagateListCookie { +func (c *Conn) XinputGetDeviceDontPropagateListUnchecked(Window Window) XinputGetDeviceDontPropagateListCookie { cookie := c.newCookie(false, true) c.newRequest(c.xinputGetDeviceDontPropagateListRequest(Window), cookie) return XinputGetDeviceDontPropagateListCookie{cookie} @@ -5342,7 +5340,7 @@ func (cook XinputGetDeviceDontPropagateListCookie) Check() error { } // Write request to wire for XinputGetDeviceDontPropagateList -func (c *Conn) xinputGetDeviceDontPropagateListRequest(Window Id) []byte { +func (c *Conn) xinputGetDeviceDontPropagateListRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -5650,13 +5648,13 @@ type XinputGrabDeviceCookie struct { *cookie } -func (c *Conn) XinputGrabDevice(GrabWindow Id, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { +func (c *Conn) XinputGrabDevice(GrabWindow Window, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { cookie := c.newCookie(true, true) c.newRequest(c.xinputGrabDeviceRequest(GrabWindow, Time, NumClasses, ThisDeviceMode, OtherDeviceMode, OwnerEvents, DeviceId, Classes), cookie) return XinputGrabDeviceCookie{cookie} } -func (c *Conn) XinputGrabDeviceUnchecked(GrabWindow Id, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { +func (c *Conn) XinputGrabDeviceUnchecked(GrabWindow Window, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { cookie := c.newCookie(false, true) c.newRequest(c.xinputGrabDeviceRequest(GrabWindow, Time, NumClasses, ThisDeviceMode, OtherDeviceMode, OwnerEvents, DeviceId, Classes), cookie) return XinputGrabDeviceCookie{cookie} @@ -5710,7 +5708,7 @@ func (cook XinputGrabDeviceCookie) Check() error { } // Write request to wire for XinputGrabDevice -func (c *Conn) xinputGrabDeviceRequest(GrabWindow Id, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) []byte { +func (c *Conn) xinputGrabDeviceRequest(GrabWindow Window, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) []byte { size := pad((20 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5814,13 +5812,13 @@ type XinputGrabDeviceKeyCookie struct { } // Write request to wire for XinputGrabDeviceKey -func (c *Conn) XinputGrabDeviceKey(GrabWindow Id, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { +func (c *Conn) XinputGrabDeviceKey(GrabWindow Window, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputGrabDeviceKeyRequest(GrabWindow, NumClasses, Modifiers, ModifierDevice, GrabbedDevice, Key, ThisDeviceMode, OtherDeviceMode, OwnerEvents, Classes), cookie) return XinputGrabDeviceKeyCookie{cookie} } -func (c *Conn) XinputGrabDeviceKeyChecked(GrabWindow Id, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { +func (c *Conn) XinputGrabDeviceKeyChecked(GrabWindow Window, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputGrabDeviceKeyRequest(GrabWindow, NumClasses, Modifiers, ModifierDevice, GrabbedDevice, Key, ThisDeviceMode, OtherDeviceMode, OwnerEvents, Classes), cookie) return XinputGrabDeviceKeyCookie{cookie} @@ -5831,7 +5829,7 @@ func (cook XinputGrabDeviceKeyCookie) Check() error { } // Write request to wire for XinputGrabDeviceKey -func (c *Conn) xinputGrabDeviceKeyRequest(GrabWindow Id, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) []byte { +func (c *Conn) xinputGrabDeviceKeyRequest(GrabWindow Window, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) []byte { size := pad((20 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5894,13 +5892,13 @@ type XinputUngrabDeviceKeyCookie struct { } // Write request to wire for XinputUngrabDeviceKey -func (c *Conn) XinputUngrabDeviceKey(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { +func (c *Conn) XinputUngrabDeviceKey(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputUngrabDeviceKeyRequest(GrabWindow, Modifiers, ModifierDevice, Key, GrabbedDevice), cookie) return XinputUngrabDeviceKeyCookie{cookie} } -func (c *Conn) XinputUngrabDeviceKeyChecked(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { +func (c *Conn) XinputUngrabDeviceKeyChecked(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputUngrabDeviceKeyRequest(GrabWindow, Modifiers, ModifierDevice, Key, GrabbedDevice), cookie) return XinputUngrabDeviceKeyCookie{cookie} @@ -5911,7 +5909,7 @@ func (cook XinputUngrabDeviceKeyCookie) Check() error { } // Write request to wire for XinputUngrabDeviceKey -func (c *Conn) xinputUngrabDeviceKeyRequest(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) []byte { +func (c *Conn) xinputUngrabDeviceKeyRequest(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -5950,13 +5948,13 @@ type XinputGrabDeviceButtonCookie struct { } // Write request to wire for XinputGrabDeviceButton -func (c *Conn) XinputGrabDeviceButton(GrabWindow Id, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { +func (c *Conn) XinputGrabDeviceButton(GrabWindow Window, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputGrabDeviceButtonRequest(GrabWindow, GrabbedDevice, ModifierDevice, NumClasses, Modifiers, ThisDeviceMode, OtherDeviceMode, Button, OwnerEvents, Classes), cookie) return XinputGrabDeviceButtonCookie{cookie} } -func (c *Conn) XinputGrabDeviceButtonChecked(GrabWindow Id, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { +func (c *Conn) XinputGrabDeviceButtonChecked(GrabWindow Window, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputGrabDeviceButtonRequest(GrabWindow, GrabbedDevice, ModifierDevice, NumClasses, Modifiers, ThisDeviceMode, OtherDeviceMode, Button, OwnerEvents, Classes), cookie) return XinputGrabDeviceButtonCookie{cookie} @@ -5967,7 +5965,7 @@ func (cook XinputGrabDeviceButtonCookie) Check() error { } // Write request to wire for XinputGrabDeviceButton -func (c *Conn) xinputGrabDeviceButtonRequest(GrabWindow Id, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) []byte { +func (c *Conn) xinputGrabDeviceButtonRequest(GrabWindow Window, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) []byte { size := pad((20 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -6026,13 +6024,13 @@ type XinputUngrabDeviceButtonCookie struct { } // Write request to wire for XinputUngrabDeviceButton -func (c *Conn) XinputUngrabDeviceButton(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { +func (c *Conn) XinputUngrabDeviceButton(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputUngrabDeviceButtonRequest(GrabWindow, Modifiers, ModifierDevice, Button, GrabbedDevice), cookie) return XinputUngrabDeviceButtonCookie{cookie} } -func (c *Conn) XinputUngrabDeviceButtonChecked(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { +func (c *Conn) XinputUngrabDeviceButtonChecked(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputUngrabDeviceButtonRequest(GrabWindow, Modifiers, ModifierDevice, Button, GrabbedDevice), cookie) return XinputUngrabDeviceButtonCookie{cookie} @@ -6043,7 +6041,7 @@ func (cook XinputUngrabDeviceButtonCookie) Check() error { } // Write request to wire for XinputUngrabDeviceButton -func (c *Conn) xinputUngrabDeviceButtonRequest(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) []byte { +func (c *Conn) xinputUngrabDeviceButtonRequest(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -6149,7 +6147,7 @@ type XinputGetDeviceFocusReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Focus Id + Focus Window Time Timestamp RevertTo byte // padding: 15 bytes @@ -6180,7 +6178,7 @@ func xinputGetDeviceFocusReply(buf []byte) *XinputGetDeviceFocusReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Focus = Id(Get32(buf[b:])) + v.Focus = Window(Get32(buf[b:])) b += 4 v.Time = Timestamp(Get32(buf[b:])) @@ -6228,13 +6226,13 @@ type XinputSetDeviceFocusCookie struct { } // Write request to wire for XinputSetDeviceFocus -func (c *Conn) XinputSetDeviceFocus(Focus Id, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { +func (c *Conn) XinputSetDeviceFocus(Focus Window, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputSetDeviceFocusRequest(Focus, Time, RevertTo, DeviceId), cookie) return XinputSetDeviceFocusCookie{cookie} } -func (c *Conn) XinputSetDeviceFocusChecked(Focus Id, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { +func (c *Conn) XinputSetDeviceFocusChecked(Focus Window, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputSetDeviceFocusRequest(Focus, Time, RevertTo, DeviceId), cookie) return XinputSetDeviceFocusCookie{cookie} @@ -6245,7 +6243,7 @@ func (cook XinputSetDeviceFocusCookie) Check() error { } // Write request to wire for XinputSetDeviceFocus -func (c *Conn) xinputSetDeviceFocusRequest(Focus Id, Time Timestamp, RevertTo byte, DeviceId byte) []byte { +func (c *Conn) xinputSetDeviceFocusRequest(Focus Window, Time Timestamp, RevertTo byte, DeviceId byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -6990,13 +6988,13 @@ type XinputSendExtensionEventCookie struct { } // Write request to wire for XinputSendExtensionEvent -func (c *Conn) XinputSendExtensionEvent(Destination Id, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { +func (c *Conn) XinputSendExtensionEvent(Destination Window, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputSendExtensionEventRequest(Destination, DeviceId, Propagate, NumClasses, NumEvents, Events, Classes), cookie) return XinputSendExtensionEventCookie{cookie} } -func (c *Conn) XinputSendExtensionEventChecked(Destination Id, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { +func (c *Conn) XinputSendExtensionEventChecked(Destination Window, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputSendExtensionEventRequest(Destination, DeviceId, Propagate, NumClasses, NumEvents, Events, Classes), cookie) return XinputSendExtensionEventCookie{cookie} @@ -7007,7 +7005,7 @@ func (cook XinputSendExtensionEventCookie) Check() error { } // Write request to wire for XinputSendExtensionEvent -func (c *Conn) xinputSendExtensionEventRequest(Destination Id, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) []byte { +func (c *Conn) xinputSendExtensionEventRequest(Destination Window, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) []byte { size := pad(((16 + pad(((int(NumEvents) * 32) * 1))) + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xprint.go b/nexgb/auto_xprint.go index 5cd086a..cab145e 100644 --- a/nexgb/auto_xprint.go +++ b/nexgb/auto_xprint.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xprint.xml on May 8 2012 11:03:25pm EDT. + This file was generated by xprint.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,8 +37,6 @@ func init() { newExtErrorFuncs["XpExtension"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Int16' - // Skipping definition for base type 'Int32' // Skipping definition for base type 'Void' @@ -59,10 +57,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' + const ( XprintGetDocFinished = 0 XprintGetDocSecondConsumer = 1 @@ -93,7 +91,15 @@ const ( XprintAttrSpoolerAttr = 7 ) -// Skipping resource definition of 'Pcontext' +type XprintPcontext uint32 + +func (c *Conn) NewXprintPcontextId() (XprintPcontext, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XprintPcontext(id), nil +} type XprintString8 byte @@ -198,7 +204,7 @@ const XprintNotify = 0 type XprintNotifyEvent struct { Sequence uint16 Detail byte - Context Id + Context XprintPcontext Cancel bool } @@ -213,7 +219,7 @@ func NewXprintNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Context = Id(Get32(buf[b:])) + v.Context = XprintPcontext(Get32(buf[b:])) b += 4 if buf[b] == 1 { @@ -280,7 +286,7 @@ const XprintAttributNotify = 1 type XprintAttributNotifyEvent struct { Sequence uint16 Detail byte - Context Id + Context XprintPcontext } // Event read XprintAttributNotify @@ -294,7 +300,7 @@ func NewXprintAttributNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Context = Id(Get32(buf[b:])) + v.Context = XprintPcontext(Get32(buf[b:])) b += 4 return v @@ -368,7 +374,7 @@ func (err XprintBadContextError) SequenceId() uint16 { return err.Sequence } -func (err XprintBadContextError) BadId() Id { +func (err XprintBadContextError) BadId() uint32 { return 0 } @@ -413,7 +419,7 @@ func (err XprintBadSequenceError) SequenceId() uint16 { return err.Sequence } -func (err XprintBadSequenceError) BadId() Id { +func (err XprintBadSequenceError) BadId() uint32 { return 0 } @@ -912,7 +918,7 @@ type XprintPrintGetScreenOfContextReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Root Id + Root Window } // Waits and reads reply data from request XprintPrintGetScreenOfContext @@ -940,7 +946,7 @@ func xprintPrintGetScreenOfContextReply(buf []byte) *XprintPrintGetScreenOfConte v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 return v @@ -1159,13 +1165,13 @@ type XprintPrintPutDocumentDataCookie struct { } // Write request to wire for XprintPrintPutDocumentData -func (c *Conn) XprintPrintPutDocumentData(Drawable Id, LenData uint32, LenFmt uint16, LenOptions uint16, Data []byte, DocFormat []XprintString8, Options []XprintString8) XprintPrintPutDocumentDataCookie { +func (c *Conn) XprintPrintPutDocumentData(Drawable Drawable, LenData uint32, LenFmt uint16, LenOptions uint16, Data []byte, DocFormat []XprintString8, Options []XprintString8) XprintPrintPutDocumentDataCookie { cookie := c.newCookie(false, false) c.newRequest(c.xprintPrintPutDocumentDataRequest(Drawable, LenData, LenFmt, LenOptions, Data, DocFormat, Options), cookie) return XprintPrintPutDocumentDataCookie{cookie} } -func (c *Conn) XprintPrintPutDocumentDataChecked(Drawable Id, LenData uint32, LenFmt uint16, LenOptions uint16, Data []byte, DocFormat []XprintString8, Options []XprintString8) XprintPrintPutDocumentDataCookie { +func (c *Conn) XprintPrintPutDocumentDataChecked(Drawable Drawable, LenData uint32, LenFmt uint16, LenOptions uint16, Data []byte, DocFormat []XprintString8, Options []XprintString8) XprintPrintPutDocumentDataCookie { cookie := c.newCookie(true, false) c.newRequest(c.xprintPrintPutDocumentDataRequest(Drawable, LenData, LenFmt, LenOptions, Data, DocFormat, Options), cookie) return XprintPrintPutDocumentDataCookie{cookie} @@ -1176,7 +1182,7 @@ func (cook XprintPrintPutDocumentDataCookie) Check() error { } // Write request to wire for XprintPrintPutDocumentData -func (c *Conn) xprintPrintPutDocumentDataRequest(Drawable Id, LenData uint32, LenFmt uint16, LenOptions uint16, Data []byte, DocFormat []XprintString8, Options []XprintString8) []byte { +func (c *Conn) xprintPrintPutDocumentDataRequest(Drawable Drawable, LenData uint32, LenFmt uint16, LenOptions uint16, Data []byte, DocFormat []XprintString8, Options []XprintString8) []byte { size := pad((((16 + pad((int(LenData) * 1))) + pad((len(DocFormat) * 1))) + pad((len(Options) * 1)))) b := 0 buf := make([]byte, size) @@ -1226,13 +1232,13 @@ type XprintPrintGetDocumentDataCookie struct { *cookie } -func (c *Conn) XprintPrintGetDocumentData(Context Id, MaxBytes uint32) XprintPrintGetDocumentDataCookie { +func (c *Conn) XprintPrintGetDocumentData(Context XprintPcontext, MaxBytes uint32) XprintPrintGetDocumentDataCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintGetDocumentDataRequest(Context, MaxBytes), cookie) return XprintPrintGetDocumentDataCookie{cookie} } -func (c *Conn) XprintPrintGetDocumentDataUnchecked(Context Id, MaxBytes uint32) XprintPrintGetDocumentDataCookie { +func (c *Conn) XprintPrintGetDocumentDataUnchecked(Context XprintPcontext, MaxBytes uint32) XprintPrintGetDocumentDataCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintGetDocumentDataRequest(Context, MaxBytes), cookie) return XprintPrintGetDocumentDataCookie{cookie} @@ -1299,7 +1305,7 @@ func (cook XprintPrintGetDocumentDataCookie) Check() error { } // Write request to wire for XprintPrintGetDocumentData -func (c *Conn) xprintPrintGetDocumentDataRequest(Context Id, MaxBytes uint32) []byte { +func (c *Conn) xprintPrintGetDocumentDataRequest(Context XprintPcontext, MaxBytes uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1329,13 +1335,13 @@ type XprintPrintStartPageCookie struct { } // Write request to wire for XprintPrintStartPage -func (c *Conn) XprintPrintStartPage(Window Id) XprintPrintStartPageCookie { +func (c *Conn) XprintPrintStartPage(Window Window) XprintPrintStartPageCookie { cookie := c.newCookie(false, false) c.newRequest(c.xprintPrintStartPageRequest(Window), cookie) return XprintPrintStartPageCookie{cookie} } -func (c *Conn) XprintPrintStartPageChecked(Window Id) XprintPrintStartPageCookie { +func (c *Conn) XprintPrintStartPageChecked(Window Window) XprintPrintStartPageCookie { cookie := c.newCookie(true, false) c.newRequest(c.xprintPrintStartPageRequest(Window), cookie) return XprintPrintStartPageCookie{cookie} @@ -1346,7 +1352,7 @@ func (cook XprintPrintStartPageCookie) Check() error { } // Write request to wire for XprintPrintStartPage -func (c *Conn) xprintPrintStartPageRequest(Window Id) []byte { +func (c *Conn) xprintPrintStartPageRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1423,13 +1429,13 @@ type XprintPrintSelectInputCookie struct { } // Write request to wire for XprintPrintSelectInput -func (c *Conn) XprintPrintSelectInput(Context Id, EventMask uint32, EventList []uint32) XprintPrintSelectInputCookie { +func (c *Conn) XprintPrintSelectInput(Context XprintPcontext, EventMask uint32, EventList []uint32) XprintPrintSelectInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.xprintPrintSelectInputRequest(Context, EventMask, EventList), cookie) return XprintPrintSelectInputCookie{cookie} } -func (c *Conn) XprintPrintSelectInputChecked(Context Id, EventMask uint32, EventList []uint32) XprintPrintSelectInputCookie { +func (c *Conn) XprintPrintSelectInputChecked(Context XprintPcontext, EventMask uint32, EventList []uint32) XprintPrintSelectInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.xprintPrintSelectInputRequest(Context, EventMask, EventList), cookie) return XprintPrintSelectInputCookie{cookie} @@ -1440,7 +1446,7 @@ func (cook XprintPrintSelectInputCookie) Check() error { } // Write request to wire for XprintPrintSelectInput -func (c *Conn) xprintPrintSelectInputRequest(Context Id, EventMask uint32, EventList []uint32) []byte { +func (c *Conn) xprintPrintSelectInputRequest(Context XprintPcontext, EventMask uint32, EventList []uint32) []byte { size := pad((8 + (4 + pad((4 * popCount(int(EventMask))))))) b := 0 buf := make([]byte, size) @@ -1474,13 +1480,13 @@ type XprintPrintInputSelectedCookie struct { *cookie } -func (c *Conn) XprintPrintInputSelected(Context Id) XprintPrintInputSelectedCookie { +func (c *Conn) XprintPrintInputSelected(Context XprintPcontext) XprintPrintInputSelectedCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintInputSelectedRequest(Context), cookie) return XprintPrintInputSelectedCookie{cookie} } -func (c *Conn) XprintPrintInputSelectedUnchecked(Context Id) XprintPrintInputSelectedCookie { +func (c *Conn) XprintPrintInputSelectedUnchecked(Context XprintPcontext) XprintPrintInputSelectedCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintInputSelectedRequest(Context), cookie) return XprintPrintInputSelectedCookie{cookie} @@ -1551,7 +1557,7 @@ func (cook XprintPrintInputSelectedCookie) Check() error { } // Write request to wire for XprintPrintInputSelected -func (c *Conn) xprintPrintInputSelectedRequest(Context Id) []byte { +func (c *Conn) xprintPrintInputSelectedRequest(Context XprintPcontext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1577,13 +1583,13 @@ type XprintPrintGetAttributesCookie struct { *cookie } -func (c *Conn) XprintPrintGetAttributes(Context Id, Pool byte) XprintPrintGetAttributesCookie { +func (c *Conn) XprintPrintGetAttributes(Context XprintPcontext, Pool byte) XprintPrintGetAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintGetAttributesRequest(Context, Pool), cookie) return XprintPrintGetAttributesCookie{cookie} } -func (c *Conn) XprintPrintGetAttributesUnchecked(Context Id, Pool byte) XprintPrintGetAttributesCookie { +func (c *Conn) XprintPrintGetAttributesUnchecked(Context XprintPcontext, Pool byte) XprintPrintGetAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintGetAttributesRequest(Context, Pool), cookie) return XprintPrintGetAttributesCookie{cookie} @@ -1641,7 +1647,7 @@ func (cook XprintPrintGetAttributesCookie) Check() error { } // Write request to wire for XprintPrintGetAttributes -func (c *Conn) xprintPrintGetAttributesRequest(Context Id, Pool byte) []byte { +func (c *Conn) xprintPrintGetAttributesRequest(Context XprintPcontext, Pool byte) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1672,13 +1678,13 @@ type XprintPrintGetOneAttributesCookie struct { *cookie } -func (c *Conn) XprintPrintGetOneAttributes(Context Id, NameLen uint32, Pool byte, Name []XprintString8) XprintPrintGetOneAttributesCookie { +func (c *Conn) XprintPrintGetOneAttributes(Context XprintPcontext, NameLen uint32, Pool byte, Name []XprintString8) XprintPrintGetOneAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintGetOneAttributesRequest(Context, NameLen, Pool, Name), cookie) return XprintPrintGetOneAttributesCookie{cookie} } -func (c *Conn) XprintPrintGetOneAttributesUnchecked(Context Id, NameLen uint32, Pool byte, Name []XprintString8) XprintPrintGetOneAttributesCookie { +func (c *Conn) XprintPrintGetOneAttributesUnchecked(Context XprintPcontext, NameLen uint32, Pool byte, Name []XprintString8) XprintPrintGetOneAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintGetOneAttributesRequest(Context, NameLen, Pool, Name), cookie) return XprintPrintGetOneAttributesCookie{cookie} @@ -1740,7 +1746,7 @@ func (cook XprintPrintGetOneAttributesCookie) Check() error { } // Write request to wire for XprintPrintGetOneAttributes -func (c *Conn) xprintPrintGetOneAttributesRequest(Context Id, NameLen uint32, Pool byte, Name []XprintString8) []byte { +func (c *Conn) xprintPrintGetOneAttributesRequest(Context XprintPcontext, NameLen uint32, Pool byte, Name []XprintString8) []byte { size := pad((16 + pad((int(NameLen) * 1)))) b := 0 buf := make([]byte, size) @@ -1781,13 +1787,13 @@ type XprintPrintSetAttributesCookie struct { } // Write request to wire for XprintPrintSetAttributes -func (c *Conn) XprintPrintSetAttributes(Context Id, StringLen uint32, Pool byte, Rule byte, Attributes []XprintString8) XprintPrintSetAttributesCookie { +func (c *Conn) XprintPrintSetAttributes(Context XprintPcontext, StringLen uint32, Pool byte, Rule byte, Attributes []XprintString8) XprintPrintSetAttributesCookie { cookie := c.newCookie(false, false) c.newRequest(c.xprintPrintSetAttributesRequest(Context, StringLen, Pool, Rule, Attributes), cookie) return XprintPrintSetAttributesCookie{cookie} } -func (c *Conn) XprintPrintSetAttributesChecked(Context Id, StringLen uint32, Pool byte, Rule byte, Attributes []XprintString8) XprintPrintSetAttributesCookie { +func (c *Conn) XprintPrintSetAttributesChecked(Context XprintPcontext, StringLen uint32, Pool byte, Rule byte, Attributes []XprintString8) XprintPrintSetAttributesCookie { cookie := c.newCookie(true, false) c.newRequest(c.xprintPrintSetAttributesRequest(Context, StringLen, Pool, Rule, Attributes), cookie) return XprintPrintSetAttributesCookie{cookie} @@ -1798,7 +1804,7 @@ func (cook XprintPrintSetAttributesCookie) Check() error { } // Write request to wire for XprintPrintSetAttributes -func (c *Conn) xprintPrintSetAttributesRequest(Context Id, StringLen uint32, Pool byte, Rule byte, Attributes []XprintString8) []byte { +func (c *Conn) xprintPrintSetAttributesRequest(Context XprintPcontext, StringLen uint32, Pool byte, Rule byte, Attributes []XprintString8) []byte { size := pad((16 + pad((len(Attributes) * 1)))) b := 0 buf := make([]byte, size) @@ -1841,13 +1847,13 @@ type XprintPrintGetPageDimensionsCookie struct { *cookie } -func (c *Conn) XprintPrintGetPageDimensions(Context Id) XprintPrintGetPageDimensionsCookie { +func (c *Conn) XprintPrintGetPageDimensions(Context XprintPcontext) XprintPrintGetPageDimensionsCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintGetPageDimensionsRequest(Context), cookie) return XprintPrintGetPageDimensionsCookie{cookie} } -func (c *Conn) XprintPrintGetPageDimensionsUnchecked(Context Id) XprintPrintGetPageDimensionsCookie { +func (c *Conn) XprintPrintGetPageDimensionsUnchecked(Context XprintPcontext) XprintPrintGetPageDimensionsCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintGetPageDimensionsRequest(Context), cookie) return XprintPrintGetPageDimensionsCookie{cookie} @@ -1918,7 +1924,7 @@ func (cook XprintPrintGetPageDimensionsCookie) Check() error { } // Write request to wire for XprintPrintGetPageDimensions -func (c *Conn) xprintPrintGetPageDimensionsRequest(Context Id) []byte { +func (c *Conn) xprintPrintGetPageDimensionsRequest(Context XprintPcontext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1964,7 +1970,7 @@ type XprintPrintQueryScreensReply struct { // padding: 1 bytes ListCount uint32 // padding: 20 bytes - Roots []Id // size: pad((int(ListCount) * 4)) + Roots []Window // size: pad((int(ListCount) * 4)) } // Waits and reads reply data from request XprintPrintQueryScreens @@ -1997,9 +2003,9 @@ func xprintPrintQueryScreensReply(buf []byte) *XprintPrintQueryScreensReply { b += 20 // padding - v.Roots = make([]Id, v.ListCount) + v.Roots = make([]Window, v.ListCount) for i := 0; i < int(v.ListCount); i++ { - v.Roots[i] = Id(Get32(buf[b:])) + v.Roots[i] = Window(Get32(buf[b:])) b += 4 } b = pad(b) @@ -2035,13 +2041,13 @@ type XprintPrintSetImageResolutionCookie struct { *cookie } -func (c *Conn) XprintPrintSetImageResolution(Context Id, ImageResolution uint16) XprintPrintSetImageResolutionCookie { +func (c *Conn) XprintPrintSetImageResolution(Context XprintPcontext, ImageResolution uint16) XprintPrintSetImageResolutionCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintSetImageResolutionRequest(Context, ImageResolution), cookie) return XprintPrintSetImageResolutionCookie{cookie} } -func (c *Conn) XprintPrintSetImageResolutionUnchecked(Context Id, ImageResolution uint16) XprintPrintSetImageResolutionCookie { +func (c *Conn) XprintPrintSetImageResolutionUnchecked(Context XprintPcontext, ImageResolution uint16) XprintPrintSetImageResolutionCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintSetImageResolutionRequest(Context, ImageResolution), cookie) return XprintPrintSetImageResolutionCookie{cookie} @@ -2097,7 +2103,7 @@ func (cook XprintPrintSetImageResolutionCookie) Check() error { } // Write request to wire for XprintPrintSetImageResolution -func (c *Conn) xprintPrintSetImageResolutionRequest(Context Id, ImageResolution uint16) []byte { +func (c *Conn) xprintPrintSetImageResolutionRequest(Context XprintPcontext, ImageResolution uint16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2126,13 +2132,13 @@ type XprintPrintGetImageResolutionCookie struct { *cookie } -func (c *Conn) XprintPrintGetImageResolution(Context Id) XprintPrintGetImageResolutionCookie { +func (c *Conn) XprintPrintGetImageResolution(Context XprintPcontext) XprintPrintGetImageResolutionCookie { cookie := c.newCookie(true, true) c.newRequest(c.xprintPrintGetImageResolutionRequest(Context), cookie) return XprintPrintGetImageResolutionCookie{cookie} } -func (c *Conn) XprintPrintGetImageResolutionUnchecked(Context Id) XprintPrintGetImageResolutionCookie { +func (c *Conn) XprintPrintGetImageResolutionUnchecked(Context XprintPcontext) XprintPrintGetImageResolutionCookie { cookie := c.newCookie(false, true) c.newRequest(c.xprintPrintGetImageResolutionRequest(Context), cookie) return XprintPrintGetImageResolutionCookie{cookie} @@ -2183,7 +2189,7 @@ func (cook XprintPrintGetImageResolutionCookie) Check() error { } // Write request to wire for XprintPrintGetImageResolution -func (c *Conn) xprintPrintGetImageResolutionRequest(Context Id) []byte { +func (c *Conn) xprintPrintGetImageResolutionRequest(Context XprintPcontext) []byte { size := 8 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xproto.go b/nexgb/auto_xproto.go index 6e8e9ee..8bd39b3 100644 --- a/nexgb/auto_xproto.go +++ b/nexgb/auto_xproto.go @@ -1,20 +1,10 @@ package xgb /* - This file was generated by xproto.xml on May 8 2012 11:03:25pm EDT. + This file was generated by xproto.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ -// 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' - // Skipping definition for base type 'Int8' // Skipping definition for base type 'Card16' @@ -29,7 +19,15 @@ package xgb // 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 ( VisualClassStaticGray = 0 @@ -617,23 +615,95 @@ const ( MapIndex5 = 7 ) -// Skipping resource definition of 'Window' +type Window uint32 -// Skipping resource definition of 'Pixmap' +func (c *Conn) NewWindowId() (Window, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Window(id), nil +} -// Skipping resource definition of 'Cursor' +type Pixmap uint32 -// Skipping resource definition of 'Font' +func (c *Conn) NewPixmapId() (Pixmap, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Pixmap(id), nil +} -// Skipping resource definition of 'Gcontext' +type Cursor uint32 -// Skipping resource definition of 'Colormap' +func (c *Conn) NewCursorId() (Cursor, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Cursor(id), nil +} -// Skipping resource definition of 'Atom' +type Font uint32 -// Skipping resource definition of 'Drawable' +func (c *Conn) NewFontId() (Font, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Font(id), nil +} + +type Gcontext uint32 + +func (c *Conn) NewGcontextId() (Gcontext, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Gcontext(id), nil +} + +type Colormap uint32 + +func (c *Conn) NewColormapId() (Colormap, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Colormap(id), nil +} + +type Atom uint32 -// Skipping resource definition of 'Fontable' +func (c *Conn) NewAtomId() (Atom, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Atom(id), nil +} + +type Drawable uint32 + +func (c *Conn) NewDrawableId() (Drawable, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Drawable(id), nil +} + +type Fontable uint32 + +func (c *Conn) NewFontableId() (Fontable, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return Fontable(id), nil +} type Visualid uint32 @@ -1159,8 +1229,8 @@ func DepthInfoListSize(list []DepthInfo) int { // 'ScreenInfo' struct definition // Size: (40 + DepthInfoListSize(AllowedDepths)) type ScreenInfo struct { - Root Id - DefaultColormap Id + Root Window + DefaultColormap Colormap WhitePixel uint32 BlackPixel uint32 CurrentInputMasks uint32 @@ -1182,10 +1252,10 @@ type ScreenInfo struct { func ReadScreenInfo(buf []byte, v *ScreenInfo) int { b := 0 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.DefaultColormap = Id(Get32(buf[b:])) + v.DefaultColormap = Colormap(Get32(buf[b:])) b += 4 v.WhitePixel = Get32(buf[b:]) @@ -1905,7 +1975,7 @@ func TimecoordListBytes(buf []byte, list []Timecoord) int { // 'Fontprop' struct definition // Size: 8 type Fontprop struct { - Name Id + Name Atom Value uint32 } @@ -1913,7 +1983,7 @@ type Fontprop struct { func ReadFontprop(buf []byte, v *Fontprop) int { b := 0 - v.Name = Id(Get32(buf[b:])) + v.Name = Atom(Get32(buf[b:])) b += 4 v.Value = Get32(buf[b:]) @@ -2610,9 +2680,9 @@ type KeyPressEvent struct { Sequence uint16 Detail Keycode Time Timestamp - Root Id - Event Id - Child Id + Root Window + Event Window + Child Window RootX int16 RootY int16 EventX int16 @@ -2636,13 +2706,13 @@ func NewKeyPressEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -2761,9 +2831,9 @@ type ButtonPressEvent struct { Sequence uint16 Detail Button Time Timestamp - Root Id - Event Id - Child Id + Root Window + Event Window + Child Window RootX int16 RootY int16 EventX int16 @@ -2787,13 +2857,13 @@ func NewButtonPressEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -2912,9 +2982,9 @@ type MotionNotifyEvent struct { Sequence uint16 Detail byte Time Timestamp - Root Id - Event Id - Child Id + Root Window + Event Window + Child Window RootX int16 RootY int16 EventX int16 @@ -2938,13 +3008,13 @@ func NewMotionNotifyEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -3063,9 +3133,9 @@ type EnterNotifyEvent struct { Sequence uint16 Detail byte Time Timestamp - Root Id - Event Id - Child Id + Root Window + Event Window + Child Window RootX int16 RootY int16 EventX int16 @@ -3089,13 +3159,13 @@ func NewEnterNotifyEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -3208,7 +3278,7 @@ const FocusIn = 9 type FocusInEvent struct { Sequence uint16 Detail byte - Event Id + Event Window Mode byte // padding: 3 bytes } @@ -3224,7 +3294,7 @@ func NewFocusInEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 v.Mode = buf[b] @@ -3338,7 +3408,7 @@ const Expose = 12 type ExposeEvent struct { Sequence uint16 // padding: 1 bytes - Window Id + Window Window X uint16 Y uint16 Width uint16 @@ -3357,7 +3427,7 @@ func NewExposeEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.X = Get16(buf[b:]) @@ -3446,7 +3516,7 @@ const GraphicsExposure = 13 type GraphicsExposureEvent struct { Sequence uint16 // padding: 1 bytes - Drawable Id + Drawable Drawable X uint16 Y uint16 Width uint16 @@ -3467,7 +3537,7 @@ func NewGraphicsExposureEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 v.X = Get16(buf[b:]) @@ -3570,7 +3640,7 @@ const NoExposure = 14 type NoExposureEvent struct { Sequence uint16 // padding: 1 bytes - Drawable Id + Drawable Drawable MinorOpcode uint16 MajorOpcode byte // padding: 1 bytes @@ -3586,7 +3656,7 @@ func NewNoExposureEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 v.MinorOpcode = Get16(buf[b:]) @@ -3654,7 +3724,7 @@ const VisibilityNotify = 15 type VisibilityNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Window Id + Window Window State byte // padding: 3 bytes } @@ -3669,7 +3739,7 @@ func NewVisibilityNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.State = buf[b] @@ -3730,8 +3800,8 @@ const CreateNotify = 16 type CreateNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Parent Id - Window Id + Parent Window + Window Window X int16 Y int16 Width uint16 @@ -3751,10 +3821,10 @@ func NewCreateNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Parent = Id(Get32(buf[b:])) + v.Parent = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.X = int16(Get16(buf[b:])) @@ -3862,8 +3932,8 @@ const DestroyNotify = 17 type DestroyNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id + Event Window + Window Window } // Event read DestroyNotify @@ -3876,10 +3946,10 @@ func NewDestroyNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 return v @@ -3933,8 +4003,8 @@ const UnmapNotify = 18 type UnmapNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id + Event Window + Window Window FromConfigure bool // padding: 3 bytes } @@ -3949,10 +4019,10 @@ func NewUnmapNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 if buf[b] == 1 { @@ -4025,8 +4095,8 @@ const MapNotify = 19 type MapNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id + Event Window + Window Window OverrideRedirect bool // padding: 3 bytes } @@ -4041,10 +4111,10 @@ func NewMapNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 if buf[b] == 1 { @@ -4117,8 +4187,8 @@ const MapRequest = 20 type MapRequestEvent struct { Sequence uint16 // padding: 1 bytes - Parent Id - Window Id + Parent Window + Window Window } // Event read MapRequest @@ -4131,10 +4201,10 @@ func NewMapRequestEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Parent = Id(Get32(buf[b:])) + v.Parent = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 return v @@ -4188,9 +4258,9 @@ const ReparentNotify = 21 type ReparentNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id - Parent Id + Event Window + Window Window + Parent Window X int16 Y int16 OverrideRedirect bool @@ -4207,13 +4277,13 @@ func NewReparentNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Parent = Id(Get32(buf[b:])) + v.Parent = Window(Get32(buf[b:])) b += 4 v.X = int16(Get16(buf[b:])) @@ -4304,9 +4374,9 @@ const ConfigureNotify = 22 type ConfigureNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id - AboveSibling Id + Event Window + Window Window + AboveSibling Window X int16 Y int16 Width uint16 @@ -4326,13 +4396,13 @@ func NewConfigureNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.AboveSibling = Id(Get32(buf[b:])) + v.AboveSibling = Window(Get32(buf[b:])) b += 4 v.X = int16(Get16(buf[b:])) @@ -4444,9 +4514,9 @@ const ConfigureRequest = 23 type ConfigureRequestEvent struct { Sequence uint16 StackMode byte - Parent Id - Window Id - Sibling Id + Parent Window + Window Window + Sibling Window X int16 Y int16 Width uint16 @@ -4466,13 +4536,13 @@ func NewConfigureRequestEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Parent = Id(Get32(buf[b:])) + v.Parent = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Sibling = Id(Get32(buf[b:])) + v.Sibling = Window(Get32(buf[b:])) b += 4 v.X = int16(Get16(buf[b:])) @@ -4574,8 +4644,8 @@ const GravityNotify = 24 type GravityNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id + Event Window + Window Window X int16 Y int16 } @@ -4590,10 +4660,10 @@ func NewGravityNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.X = int16(Get16(buf[b:])) @@ -4661,7 +4731,7 @@ const ResizeRequest = 25 type ResizeRequestEvent struct { Sequence uint16 // padding: 1 bytes - Window Id + Window Window Width uint16 Height uint16 } @@ -4676,7 +4746,7 @@ func NewResizeRequestEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.Width = Get16(buf[b:]) @@ -4740,8 +4810,8 @@ const CirculateNotify = 26 type CirculateNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Event Id - Window Id + Event Window + Window Window // padding: 4 bytes Place byte // padding: 3 bytes @@ -4757,10 +4827,10 @@ func NewCirculateNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 b += 4 // padding @@ -4829,8 +4899,8 @@ const PropertyNotify = 28 type PropertyNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Window Id - Atom Id + Window Window + Atom Atom Time Timestamp State byte // padding: 3 bytes @@ -4846,10 +4916,10 @@ func NewPropertyNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Atom = Id(Get32(buf[b:])) + v.Atom = Atom(Get32(buf[b:])) b += 4 v.Time = Timestamp(Get32(buf[b:])) @@ -4922,8 +4992,8 @@ type SelectionClearEvent struct { Sequence uint16 // padding: 1 bytes Time Timestamp - Owner Id - Selection Id + Owner Window + Selection Atom } // Event read SelectionClear @@ -4939,10 +5009,10 @@ func NewSelectionClearEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Owner = Id(Get32(buf[b:])) + v.Owner = Window(Get32(buf[b:])) b += 4 - v.Selection = Id(Get32(buf[b:])) + v.Selection = Atom(Get32(buf[b:])) b += 4 return v @@ -5001,11 +5071,11 @@ type SelectionRequestEvent struct { Sequence uint16 // padding: 1 bytes Time Timestamp - Owner Id - Requestor Id - Selection Id - Target Id - Property Id + Owner Window + Requestor Window + Selection Atom + Target Atom + Property Atom } // Event read SelectionRequest @@ -5021,19 +5091,19 @@ func NewSelectionRequestEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Owner = Id(Get32(buf[b:])) + v.Owner = Window(Get32(buf[b:])) b += 4 - v.Requestor = Id(Get32(buf[b:])) + v.Requestor = Window(Get32(buf[b:])) b += 4 - v.Selection = Id(Get32(buf[b:])) + v.Selection = Atom(Get32(buf[b:])) b += 4 - v.Target = Id(Get32(buf[b:])) + v.Target = Atom(Get32(buf[b:])) b += 4 - v.Property = Id(Get32(buf[b:])) + v.Property = Atom(Get32(buf[b:])) b += 4 return v @@ -5104,10 +5174,10 @@ type SelectionNotifyEvent struct { Sequence uint16 // padding: 1 bytes Time Timestamp - Requestor Id - Selection Id - Target Id - Property Id + Requestor Window + Selection Atom + Target Atom + Property Atom } // Event read SelectionNotify @@ -5123,16 +5193,16 @@ func NewSelectionNotifyEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Requestor = Id(Get32(buf[b:])) + v.Requestor = Window(Get32(buf[b:])) b += 4 - v.Selection = Id(Get32(buf[b:])) + v.Selection = Atom(Get32(buf[b:])) b += 4 - v.Target = Id(Get32(buf[b:])) + v.Target = Atom(Get32(buf[b:])) b += 4 - v.Property = Id(Get32(buf[b:])) + v.Property = Atom(Get32(buf[b:])) b += 4 return v @@ -5198,8 +5268,8 @@ const ColormapNotify = 32 type ColormapNotifyEvent struct { Sequence uint16 // padding: 1 bytes - Window Id - Colormap Id + Window Window + Colormap Colormap New bool State byte // padding: 2 bytes @@ -5215,10 +5285,10 @@ func NewColormapNotifyEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Colormap = Id(Get32(buf[b:])) + v.Colormap = Colormap(Get32(buf[b:])) b += 4 if buf[b] == 1 { @@ -5298,8 +5368,8 @@ const ClientMessage = 33 type ClientMessageEvent struct { Sequence uint16 Format byte - Window Id - Type Id + Window Window + Type Atom Data ClientMessageDataUnion } @@ -5314,10 +5384,10 @@ func NewClientMessageEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 - v.Type = Id(Get32(buf[b:])) + v.Type = Atom(Get32(buf[b:])) b += 4 v.Data = ClientMessageDataUnion{} @@ -5693,8 +5763,8 @@ func (err RequestError) SequenceId() uint16 { return err.Sequence } -func (err RequestError) BadId() Id { - return Id(err.BadValue) +func (err RequestError) BadId() uint32 { + return err.BadValue } func (err RequestError) Error() string { @@ -5756,8 +5826,8 @@ func (err ValueError) SequenceId() uint16 { return err.Sequence } -func (err ValueError) BadId() Id { - return Id(err.BadValue) +func (err ValueError) BadId() uint32 { + return err.BadValue } func (err ValueError) Error() string { @@ -5792,8 +5862,8 @@ func (err WindowError) SequenceId() uint16 { return err.Sequence } -func (err WindowError) BadId() Id { - return Id(err.BadValue) +func (err WindowError) BadId() uint32 { + return err.BadValue } func (err WindowError) Error() string { @@ -5828,8 +5898,8 @@ func (err PixmapError) SequenceId() uint16 { return err.Sequence } -func (err PixmapError) BadId() Id { - return Id(err.BadValue) +func (err PixmapError) BadId() uint32 { + return err.BadValue } func (err PixmapError) Error() string { @@ -5864,8 +5934,8 @@ func (err AtomError) SequenceId() uint16 { return err.Sequence } -func (err AtomError) BadId() Id { - return Id(err.BadValue) +func (err AtomError) BadId() uint32 { + return err.BadValue } func (err AtomError) Error() string { @@ -5900,8 +5970,8 @@ func (err CursorError) SequenceId() uint16 { return err.Sequence } -func (err CursorError) BadId() Id { - return Id(err.BadValue) +func (err CursorError) BadId() uint32 { + return err.BadValue } func (err CursorError) Error() string { @@ -5936,8 +6006,8 @@ func (err FontError) SequenceId() uint16 { return err.Sequence } -func (err FontError) BadId() Id { - return Id(err.BadValue) +func (err FontError) BadId() uint32 { + return err.BadValue } func (err FontError) Error() string { @@ -5972,8 +6042,8 @@ func (err MatchError) SequenceId() uint16 { return err.Sequence } -func (err MatchError) BadId() Id { - return Id(err.BadValue) +func (err MatchError) BadId() uint32 { + return err.BadValue } func (err MatchError) Error() string { @@ -6008,8 +6078,8 @@ func (err DrawableError) SequenceId() uint16 { return err.Sequence } -func (err DrawableError) BadId() Id { - return Id(err.BadValue) +func (err DrawableError) BadId() uint32 { + return err.BadValue } func (err DrawableError) Error() string { @@ -6044,8 +6114,8 @@ func (err AccessError) SequenceId() uint16 { return err.Sequence } -func (err AccessError) BadId() Id { - return Id(err.BadValue) +func (err AccessError) BadId() uint32 { + return err.BadValue } func (err AccessError) Error() string { @@ -6080,8 +6150,8 @@ func (err AllocError) SequenceId() uint16 { return err.Sequence } -func (err AllocError) BadId() Id { - return Id(err.BadValue) +func (err AllocError) BadId() uint32 { + return err.BadValue } func (err AllocError) Error() string { @@ -6116,8 +6186,8 @@ func (err ColormapError) SequenceId() uint16 { return err.Sequence } -func (err ColormapError) BadId() Id { - return Id(err.BadValue) +func (err ColormapError) BadId() uint32 { + return err.BadValue } func (err ColormapError) Error() string { @@ -6152,8 +6222,8 @@ func (err GContextError) SequenceId() uint16 { return err.Sequence } -func (err GContextError) BadId() Id { - return Id(err.BadValue) +func (err GContextError) BadId() uint32 { + return err.BadValue } func (err GContextError) Error() string { @@ -6188,8 +6258,8 @@ func (err IDChoiceError) SequenceId() uint16 { return err.Sequence } -func (err IDChoiceError) BadId() Id { - return Id(err.BadValue) +func (err IDChoiceError) BadId() uint32 { + return err.BadValue } func (err IDChoiceError) Error() string { @@ -6224,8 +6294,8 @@ func (err NameError) SequenceId() uint16 { return err.Sequence } -func (err NameError) BadId() Id { - return Id(err.BadValue) +func (err NameError) BadId() uint32 { + return err.BadValue } func (err NameError) Error() string { @@ -6260,8 +6330,8 @@ func (err LengthError) SequenceId() uint16 { return err.Sequence } -func (err LengthError) BadId() Id { - return Id(err.BadValue) +func (err LengthError) BadId() uint32 { + return err.BadValue } func (err LengthError) Error() string { @@ -6296,8 +6366,8 @@ func (err ImplementationError) SequenceId() uint16 { return err.Sequence } -func (err ImplementationError) BadId() Id { - return Id(err.BadValue) +func (err ImplementationError) BadId() uint32 { + return err.BadValue } func (err ImplementationError) Error() string { @@ -6321,13 +6391,13 @@ type CreateWindowCookie struct { } // Write request to wire for CreateWindow -func (c *Conn) CreateWindow(Depth byte, Wid Id, Parent Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie { +func (c *Conn) CreateWindow(Depth byte, Wid Window, Parent Window, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.createWindowRequest(Depth, Wid, Parent, X, Y, Width, Height, BorderWidth, Class, Visual, ValueMask, ValueList), cookie) return CreateWindowCookie{cookie} } -func (c *Conn) CreateWindowChecked(Depth byte, Wid Id, Parent Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie { +func (c *Conn) CreateWindowChecked(Depth byte, Wid Window, Parent Window, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.createWindowRequest(Depth, Wid, Parent, X, Y, Width, Height, BorderWidth, Class, Visual, ValueMask, ValueList), cookie) return CreateWindowCookie{cookie} @@ -6338,7 +6408,7 @@ func (cook CreateWindowCookie) Check() error { } // Write request to wire for CreateWindow -func (c *Conn) createWindowRequest(Depth byte, Wid Id, Parent Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) createWindowRequest(Depth byte, Wid Window, Parent Window, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) []byte { size := pad((28 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -6397,13 +6467,13 @@ type ChangeWindowAttributesCookie struct { } // Write request to wire for ChangeWindowAttributes -func (c *Conn) ChangeWindowAttributes(Window Id, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie { +func (c *Conn) ChangeWindowAttributes(Window Window, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie { cookie := c.newCookie(false, false) c.newRequest(c.changeWindowAttributesRequest(Window, ValueMask, ValueList), cookie) return ChangeWindowAttributesCookie{cookie} } -func (c *Conn) ChangeWindowAttributesChecked(Window Id, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie { +func (c *Conn) ChangeWindowAttributesChecked(Window Window, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie { cookie := c.newCookie(true, false) c.newRequest(c.changeWindowAttributesRequest(Window, ValueMask, ValueList), cookie) return ChangeWindowAttributesCookie{cookie} @@ -6414,7 +6484,7 @@ func (cook ChangeWindowAttributesCookie) Check() error { } // Write request to wire for ChangeWindowAttributes -func (c *Conn) changeWindowAttributesRequest(Window Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) changeWindowAttributesRequest(Window Window, ValueMask uint32, ValueList []uint32) []byte { size := pad((8 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -6447,13 +6517,13 @@ type GetWindowAttributesCookie struct { *cookie } -func (c *Conn) GetWindowAttributes(Window Id) GetWindowAttributesCookie { +func (c *Conn) GetWindowAttributes(Window Window) GetWindowAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.getWindowAttributesRequest(Window), cookie) return GetWindowAttributesCookie{cookie} } -func (c *Conn) GetWindowAttributesUnchecked(Window Id) GetWindowAttributesCookie { +func (c *Conn) GetWindowAttributesUnchecked(Window Window) GetWindowAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.getWindowAttributesRequest(Window), cookie) return GetWindowAttributesCookie{cookie} @@ -6475,7 +6545,7 @@ type GetWindowAttributesReply struct { MapIsInstalled bool MapState byte OverrideRedirect bool - Colormap Id + Colormap Colormap AllEventMasks uint32 YourEventMask uint32 DoNotPropagateMask uint16 @@ -6550,7 +6620,7 @@ func getWindowAttributesReply(buf []byte) *GetWindowAttributesReply { } b += 1 - v.Colormap = Id(Get32(buf[b:])) + v.Colormap = Colormap(Get32(buf[b:])) b += 4 v.AllEventMasks = Get32(buf[b:]) @@ -6572,7 +6642,7 @@ func (cook GetWindowAttributesCookie) Check() error { } // Write request to wire for GetWindowAttributes -func (c *Conn) getWindowAttributesRequest(Window Id) []byte { +func (c *Conn) getWindowAttributesRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6598,13 +6668,13 @@ type DestroyWindowCookie struct { } // Write request to wire for DestroyWindow -func (c *Conn) DestroyWindow(Window Id) DestroyWindowCookie { +func (c *Conn) DestroyWindow(Window Window) DestroyWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.destroyWindowRequest(Window), cookie) return DestroyWindowCookie{cookie} } -func (c *Conn) DestroyWindowChecked(Window Id) DestroyWindowCookie { +func (c *Conn) DestroyWindowChecked(Window Window) DestroyWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.destroyWindowRequest(Window), cookie) return DestroyWindowCookie{cookie} @@ -6615,7 +6685,7 @@ func (cook DestroyWindowCookie) Check() error { } // Write request to wire for DestroyWindow -func (c *Conn) destroyWindowRequest(Window Id) []byte { +func (c *Conn) destroyWindowRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6641,13 +6711,13 @@ type DestroySubwindowsCookie struct { } // Write request to wire for DestroySubwindows -func (c *Conn) DestroySubwindows(Window Id) DestroySubwindowsCookie { +func (c *Conn) DestroySubwindows(Window Window) DestroySubwindowsCookie { cookie := c.newCookie(false, false) c.newRequest(c.destroySubwindowsRequest(Window), cookie) return DestroySubwindowsCookie{cookie} } -func (c *Conn) DestroySubwindowsChecked(Window Id) DestroySubwindowsCookie { +func (c *Conn) DestroySubwindowsChecked(Window Window) DestroySubwindowsCookie { cookie := c.newCookie(true, false) c.newRequest(c.destroySubwindowsRequest(Window), cookie) return DestroySubwindowsCookie{cookie} @@ -6658,7 +6728,7 @@ func (cook DestroySubwindowsCookie) Check() error { } // Write request to wire for DestroySubwindows -func (c *Conn) destroySubwindowsRequest(Window Id) []byte { +func (c *Conn) destroySubwindowsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6684,13 +6754,13 @@ type ChangeSaveSetCookie struct { } // Write request to wire for ChangeSaveSet -func (c *Conn) ChangeSaveSet(Mode byte, Window Id) ChangeSaveSetCookie { +func (c *Conn) ChangeSaveSet(Mode byte, Window Window) ChangeSaveSetCookie { cookie := c.newCookie(false, false) c.newRequest(c.changeSaveSetRequest(Mode, Window), cookie) return ChangeSaveSetCookie{cookie} } -func (c *Conn) ChangeSaveSetChecked(Mode byte, Window Id) ChangeSaveSetCookie { +func (c *Conn) ChangeSaveSetChecked(Mode byte, Window Window) ChangeSaveSetCookie { cookie := c.newCookie(true, false) c.newRequest(c.changeSaveSetRequest(Mode, Window), cookie) return ChangeSaveSetCookie{cookie} @@ -6701,7 +6771,7 @@ func (cook ChangeSaveSetCookie) Check() error { } // Write request to wire for ChangeSaveSet -func (c *Conn) changeSaveSetRequest(Mode byte, Window Id) []byte { +func (c *Conn) changeSaveSetRequest(Mode byte, Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6728,13 +6798,13 @@ type ReparentWindowCookie struct { } // Write request to wire for ReparentWindow -func (c *Conn) ReparentWindow(Window Id, Parent Id, X int16, Y int16) ReparentWindowCookie { +func (c *Conn) ReparentWindow(Window Window, Parent Window, X int16, Y int16) ReparentWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.reparentWindowRequest(Window, Parent, X, Y), cookie) return ReparentWindowCookie{cookie} } -func (c *Conn) ReparentWindowChecked(Window Id, Parent Id, X int16, Y int16) ReparentWindowCookie { +func (c *Conn) ReparentWindowChecked(Window Window, Parent Window, X int16, Y int16) ReparentWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.reparentWindowRequest(Window, Parent, X, Y), cookie) return ReparentWindowCookie{cookie} @@ -6745,7 +6815,7 @@ func (cook ReparentWindowCookie) Check() error { } // Write request to wire for ReparentWindow -func (c *Conn) reparentWindowRequest(Window Id, Parent Id, X int16, Y int16) []byte { +func (c *Conn) reparentWindowRequest(Window Window, Parent Window, X int16, Y int16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -6780,13 +6850,13 @@ type MapWindowCookie struct { } // Write request to wire for MapWindow -func (c *Conn) MapWindow(Window Id) MapWindowCookie { +func (c *Conn) MapWindow(Window Window) MapWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.mapWindowRequest(Window), cookie) return MapWindowCookie{cookie} } -func (c *Conn) MapWindowChecked(Window Id) MapWindowCookie { +func (c *Conn) MapWindowChecked(Window Window) MapWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.mapWindowRequest(Window), cookie) return MapWindowCookie{cookie} @@ -6797,7 +6867,7 @@ func (cook MapWindowCookie) Check() error { } // Write request to wire for MapWindow -func (c *Conn) mapWindowRequest(Window Id) []byte { +func (c *Conn) mapWindowRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6823,13 +6893,13 @@ type MapSubwindowsCookie struct { } // Write request to wire for MapSubwindows -func (c *Conn) MapSubwindows(Window Id) MapSubwindowsCookie { +func (c *Conn) MapSubwindows(Window Window) MapSubwindowsCookie { cookie := c.newCookie(false, false) c.newRequest(c.mapSubwindowsRequest(Window), cookie) return MapSubwindowsCookie{cookie} } -func (c *Conn) MapSubwindowsChecked(Window Id) MapSubwindowsCookie { +func (c *Conn) MapSubwindowsChecked(Window Window) MapSubwindowsCookie { cookie := c.newCookie(true, false) c.newRequest(c.mapSubwindowsRequest(Window), cookie) return MapSubwindowsCookie{cookie} @@ -6840,7 +6910,7 @@ func (cook MapSubwindowsCookie) Check() error { } // Write request to wire for MapSubwindows -func (c *Conn) mapSubwindowsRequest(Window Id) []byte { +func (c *Conn) mapSubwindowsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6866,13 +6936,13 @@ type UnmapWindowCookie struct { } // Write request to wire for UnmapWindow -func (c *Conn) UnmapWindow(Window Id) UnmapWindowCookie { +func (c *Conn) UnmapWindow(Window Window) UnmapWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.unmapWindowRequest(Window), cookie) return UnmapWindowCookie{cookie} } -func (c *Conn) UnmapWindowChecked(Window Id) UnmapWindowCookie { +func (c *Conn) UnmapWindowChecked(Window Window) UnmapWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.unmapWindowRequest(Window), cookie) return UnmapWindowCookie{cookie} @@ -6883,7 +6953,7 @@ func (cook UnmapWindowCookie) Check() error { } // Write request to wire for UnmapWindow -func (c *Conn) unmapWindowRequest(Window Id) []byte { +func (c *Conn) unmapWindowRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6909,13 +6979,13 @@ type UnmapSubwindowsCookie struct { } // Write request to wire for UnmapSubwindows -func (c *Conn) UnmapSubwindows(Window Id) UnmapSubwindowsCookie { +func (c *Conn) UnmapSubwindows(Window Window) UnmapSubwindowsCookie { cookie := c.newCookie(false, false) c.newRequest(c.unmapSubwindowsRequest(Window), cookie) return UnmapSubwindowsCookie{cookie} } -func (c *Conn) UnmapSubwindowsChecked(Window Id) UnmapSubwindowsCookie { +func (c *Conn) UnmapSubwindowsChecked(Window Window) UnmapSubwindowsCookie { cookie := c.newCookie(true, false) c.newRequest(c.unmapSubwindowsRequest(Window), cookie) return UnmapSubwindowsCookie{cookie} @@ -6926,7 +6996,7 @@ func (cook UnmapSubwindowsCookie) Check() error { } // Write request to wire for UnmapSubwindows -func (c *Conn) unmapSubwindowsRequest(Window Id) []byte { +func (c *Conn) unmapSubwindowsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -6952,13 +7022,13 @@ type ConfigureWindowCookie struct { } // Write request to wire for ConfigureWindow -func (c *Conn) ConfigureWindow(Window Id, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie { +func (c *Conn) ConfigureWindow(Window Window, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.configureWindowRequest(Window, ValueMask, ValueList), cookie) return ConfigureWindowCookie{cookie} } -func (c *Conn) ConfigureWindowChecked(Window Id, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie { +func (c *Conn) ConfigureWindowChecked(Window Window, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.configureWindowRequest(Window, ValueMask, ValueList), cookie) return ConfigureWindowCookie{cookie} @@ -6969,7 +7039,7 @@ func (cook ConfigureWindowCookie) Check() error { } // Write request to wire for ConfigureWindow -func (c *Conn) configureWindowRequest(Window Id, ValueMask uint16, ValueList []uint32) []byte { +func (c *Conn) configureWindowRequest(Window Window, ValueMask uint16, ValueList []uint32) []byte { size := pad((10 + (2 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -7006,13 +7076,13 @@ type CirculateWindowCookie struct { } // Write request to wire for CirculateWindow -func (c *Conn) CirculateWindow(Direction byte, Window Id) CirculateWindowCookie { +func (c *Conn) CirculateWindow(Direction byte, Window Window) CirculateWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.circulateWindowRequest(Direction, Window), cookie) return CirculateWindowCookie{cookie} } -func (c *Conn) CirculateWindowChecked(Direction byte, Window Id) CirculateWindowCookie { +func (c *Conn) CirculateWindowChecked(Direction byte, Window Window) CirculateWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.circulateWindowRequest(Direction, Window), cookie) return CirculateWindowCookie{cookie} @@ -7023,7 +7093,7 @@ func (cook CirculateWindowCookie) Check() error { } // Write request to wire for CirculateWindow -func (c *Conn) circulateWindowRequest(Direction byte, Window Id) []byte { +func (c *Conn) circulateWindowRequest(Direction byte, Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -7049,13 +7119,13 @@ type GetGeometryCookie struct { *cookie } -func (c *Conn) GetGeometry(Drawable Id) GetGeometryCookie { +func (c *Conn) GetGeometry(Drawable Drawable) GetGeometryCookie { cookie := c.newCookie(true, true) c.newRequest(c.getGeometryRequest(Drawable), cookie) return GetGeometryCookie{cookie} } -func (c *Conn) GetGeometryUnchecked(Drawable Id) GetGeometryCookie { +func (c *Conn) GetGeometryUnchecked(Drawable Drawable) GetGeometryCookie { cookie := c.newCookie(false, true) c.newRequest(c.getGeometryRequest(Drawable), cookie) return GetGeometryCookie{cookie} @@ -7067,7 +7137,7 @@ type GetGeometryReply struct { Sequence uint16 Length uint32 Depth byte - Root Id + Root Window X int16 Y int16 Width uint16 @@ -7102,7 +7172,7 @@ func getGeometryReply(buf []byte) *GetGeometryReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 v.X = int16(Get16(buf[b:])) @@ -7130,7 +7200,7 @@ func (cook GetGeometryCookie) Check() error { } // Write request to wire for GetGeometry -func (c *Conn) getGeometryRequest(Drawable Id) []byte { +func (c *Conn) getGeometryRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -7155,13 +7225,13 @@ type QueryTreeCookie struct { *cookie } -func (c *Conn) QueryTree(Window Id) QueryTreeCookie { +func (c *Conn) QueryTree(Window Window) QueryTreeCookie { cookie := c.newCookie(true, true) c.newRequest(c.queryTreeRequest(Window), cookie) return QueryTreeCookie{cookie} } -func (c *Conn) QueryTreeUnchecked(Window Id) QueryTreeCookie { +func (c *Conn) QueryTreeUnchecked(Window Window) QueryTreeCookie { cookie := c.newCookie(false, true) c.newRequest(c.queryTreeRequest(Window), cookie) return QueryTreeCookie{cookie} @@ -7173,11 +7243,11 @@ type QueryTreeReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Root Id - Parent Id + Root Window + Parent Window ChildrenLen uint16 // padding: 14 bytes - Children []Id // size: pad((int(ChildrenLen) * 4)) + Children []Window // size: pad((int(ChildrenLen) * 4)) } // Waits and reads reply data from request QueryTree @@ -7205,10 +7275,10 @@ func queryTreeReply(buf []byte) *QueryTreeReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Parent = Id(Get32(buf[b:])) + v.Parent = Window(Get32(buf[b:])) b += 4 v.ChildrenLen = Get16(buf[b:]) @@ -7216,9 +7286,9 @@ func queryTreeReply(buf []byte) *QueryTreeReply { b += 14 // padding - v.Children = make([]Id, v.ChildrenLen) + v.Children = make([]Window, v.ChildrenLen) for i := 0; i < int(v.ChildrenLen); i++ { - v.Children[i] = Id(Get32(buf[b:])) + v.Children[i] = Window(Get32(buf[b:])) b += 4 } b = pad(b) @@ -7231,7 +7301,7 @@ func (cook QueryTreeCookie) Check() error { } // Write request to wire for QueryTree -func (c *Conn) queryTreeRequest(Window Id) []byte { +func (c *Conn) queryTreeRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -7274,7 +7344,7 @@ type InternAtomReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Atom Id + Atom Atom } // Waits and reads reply data from request InternAtom @@ -7302,7 +7372,7 @@ func internAtomReply(buf []byte) *InternAtomReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Atom = Id(Get32(buf[b:])) + v.Atom = Atom(Get32(buf[b:])) b += 4 return v @@ -7348,13 +7418,13 @@ type GetAtomNameCookie struct { *cookie } -func (c *Conn) GetAtomName(Atom Id) GetAtomNameCookie { +func (c *Conn) GetAtomName(Atom Atom) GetAtomNameCookie { cookie := c.newCookie(true, true) c.newRequest(c.getAtomNameRequest(Atom), cookie) return GetAtomNameCookie{cookie} } -func (c *Conn) GetAtomNameUnchecked(Atom Id) GetAtomNameCookie { +func (c *Conn) GetAtomNameUnchecked(Atom Atom) GetAtomNameCookie { cookie := c.newCookie(false, true) c.newRequest(c.getAtomNameRequest(Atom), cookie) return GetAtomNameCookie{cookie} @@ -7416,7 +7486,7 @@ func (cook GetAtomNameCookie) Check() error { } // Write request to wire for GetAtomName -func (c *Conn) getAtomNameRequest(Atom Id) []byte { +func (c *Conn) getAtomNameRequest(Atom Atom) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -7442,13 +7512,13 @@ type ChangePropertyCookie struct { } // Write request to wire for ChangeProperty -func (c *Conn) ChangeProperty(Mode byte, Window Id, Property Id, Type Id, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie { +func (c *Conn) ChangeProperty(Mode byte, Window Window, Property Atom, Type Atom, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie { cookie := c.newCookie(false, false) c.newRequest(c.changePropertyRequest(Mode, Window, Property, Type, Format, DataLen, Data), cookie) return ChangePropertyCookie{cookie} } -func (c *Conn) ChangePropertyChecked(Mode byte, Window Id, Property Id, Type Id, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie { +func (c *Conn) ChangePropertyChecked(Mode byte, Window Window, Property Atom, Type Atom, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie { cookie := c.newCookie(true, false) c.newRequest(c.changePropertyRequest(Mode, Window, Property, Type, Format, DataLen, Data), cookie) return ChangePropertyCookie{cookie} @@ -7459,7 +7529,7 @@ func (cook ChangePropertyCookie) Check() error { } // Write request to wire for ChangeProperty -func (c *Conn) changePropertyRequest(Mode byte, Window Id, Property Id, Type Id, Format byte, DataLen uint32, Data []byte) []byte { +func (c *Conn) changePropertyRequest(Mode byte, Window Window, Property Atom, Type Atom, Format byte, DataLen uint32, Data []byte) []byte { size := pad((24 + pad((((int(DataLen) * int(Format)) / 8) * 1)))) b := 0 buf := make([]byte, size) @@ -7503,13 +7573,13 @@ type DeletePropertyCookie struct { } // Write request to wire for DeleteProperty -func (c *Conn) DeleteProperty(Window Id, Property Id) DeletePropertyCookie { +func (c *Conn) DeleteProperty(Window Window, Property Atom) DeletePropertyCookie { cookie := c.newCookie(false, false) c.newRequest(c.deletePropertyRequest(Window, Property), cookie) return DeletePropertyCookie{cookie} } -func (c *Conn) DeletePropertyChecked(Window Id, Property Id) DeletePropertyCookie { +func (c *Conn) DeletePropertyChecked(Window Window, Property Atom) DeletePropertyCookie { cookie := c.newCookie(true, false) c.newRequest(c.deletePropertyRequest(Window, Property), cookie) return DeletePropertyCookie{cookie} @@ -7520,7 +7590,7 @@ func (cook DeletePropertyCookie) Check() error { } // Write request to wire for DeleteProperty -func (c *Conn) deletePropertyRequest(Window Id, Property Id) []byte { +func (c *Conn) deletePropertyRequest(Window Window, Property Atom) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -7548,13 +7618,13 @@ type GetPropertyCookie struct { *cookie } -func (c *Conn) GetProperty(Delete bool, Window Id, Property Id, Type Id, LongOffset uint32, LongLength uint32) GetPropertyCookie { +func (c *Conn) GetProperty(Delete bool, Window Window, Property Atom, Type Atom, LongOffset uint32, LongLength uint32) GetPropertyCookie { cookie := c.newCookie(true, true) c.newRequest(c.getPropertyRequest(Delete, Window, Property, Type, LongOffset, LongLength), cookie) return GetPropertyCookie{cookie} } -func (c *Conn) GetPropertyUnchecked(Delete bool, Window Id, Property Id, Type Id, LongOffset uint32, LongLength uint32) GetPropertyCookie { +func (c *Conn) GetPropertyUnchecked(Delete bool, Window Window, Property Atom, Type Atom, LongOffset uint32, LongLength uint32) GetPropertyCookie { cookie := c.newCookie(false, true) c.newRequest(c.getPropertyRequest(Delete, Window, Property, Type, LongOffset, LongLength), cookie) return GetPropertyCookie{cookie} @@ -7566,7 +7636,7 @@ type GetPropertyReply struct { Sequence uint16 Length uint32 Format byte - Type Id + Type Atom BytesAfter uint32 ValueLen uint32 // padding: 12 bytes @@ -7599,7 +7669,7 @@ func getPropertyReply(buf []byte) *GetPropertyReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Type = Id(Get32(buf[b:])) + v.Type = Atom(Get32(buf[b:])) b += 4 v.BytesAfter = Get32(buf[b:]) @@ -7622,7 +7692,7 @@ func (cook GetPropertyCookie) Check() error { } // Write request to wire for GetProperty -func (c *Conn) getPropertyRequest(Delete bool, Window Id, Property Id, Type Id, LongOffset uint32, LongLength uint32) []byte { +func (c *Conn) getPropertyRequest(Delete bool, Window Window, Property Atom, Type Atom, LongOffset uint32, LongLength uint32) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -7664,13 +7734,13 @@ type ListPropertiesCookie struct { *cookie } -func (c *Conn) ListProperties(Window Id) ListPropertiesCookie { +func (c *Conn) ListProperties(Window Window) ListPropertiesCookie { cookie := c.newCookie(true, true) c.newRequest(c.listPropertiesRequest(Window), cookie) return ListPropertiesCookie{cookie} } -func (c *Conn) ListPropertiesUnchecked(Window Id) ListPropertiesCookie { +func (c *Conn) ListPropertiesUnchecked(Window Window) ListPropertiesCookie { cookie := c.newCookie(false, true) c.newRequest(c.listPropertiesRequest(Window), cookie) return ListPropertiesCookie{cookie} @@ -7684,7 +7754,7 @@ type ListPropertiesReply struct { // padding: 1 bytes AtomsLen uint16 // padding: 22 bytes - Atoms []Id // size: pad((int(AtomsLen) * 4)) + Atoms []Atom // size: pad((int(AtomsLen) * 4)) } // Waits and reads reply data from request ListProperties @@ -7717,9 +7787,9 @@ func listPropertiesReply(buf []byte) *ListPropertiesReply { b += 22 // padding - v.Atoms = make([]Id, v.AtomsLen) + v.Atoms = make([]Atom, v.AtomsLen) for i := 0; i < int(v.AtomsLen); i++ { - v.Atoms[i] = Id(Get32(buf[b:])) + v.Atoms[i] = Atom(Get32(buf[b:])) b += 4 } b = pad(b) @@ -7732,7 +7802,7 @@ func (cook ListPropertiesCookie) Check() error { } // Write request to wire for ListProperties -func (c *Conn) listPropertiesRequest(Window Id) []byte { +func (c *Conn) listPropertiesRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -7758,13 +7828,13 @@ type SetSelectionOwnerCookie struct { } // Write request to wire for SetSelectionOwner -func (c *Conn) SetSelectionOwner(Owner Id, Selection Id, Time Timestamp) SetSelectionOwnerCookie { +func (c *Conn) SetSelectionOwner(Owner Window, Selection Atom, Time Timestamp) SetSelectionOwnerCookie { cookie := c.newCookie(false, false) c.newRequest(c.setSelectionOwnerRequest(Owner, Selection, Time), cookie) return SetSelectionOwnerCookie{cookie} } -func (c *Conn) SetSelectionOwnerChecked(Owner Id, Selection Id, Time Timestamp) SetSelectionOwnerCookie { +func (c *Conn) SetSelectionOwnerChecked(Owner Window, Selection Atom, Time Timestamp) SetSelectionOwnerCookie { cookie := c.newCookie(true, false) c.newRequest(c.setSelectionOwnerRequest(Owner, Selection, Time), cookie) return SetSelectionOwnerCookie{cookie} @@ -7775,7 +7845,7 @@ func (cook SetSelectionOwnerCookie) Check() error { } // Write request to wire for SetSelectionOwner -func (c *Conn) setSelectionOwnerRequest(Owner Id, Selection Id, Time Timestamp) []byte { +func (c *Conn) setSelectionOwnerRequest(Owner Window, Selection Atom, Time Timestamp) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -7806,13 +7876,13 @@ type GetSelectionOwnerCookie struct { *cookie } -func (c *Conn) GetSelectionOwner(Selection Id) GetSelectionOwnerCookie { +func (c *Conn) GetSelectionOwner(Selection Atom) GetSelectionOwnerCookie { cookie := c.newCookie(true, true) c.newRequest(c.getSelectionOwnerRequest(Selection), cookie) return GetSelectionOwnerCookie{cookie} } -func (c *Conn) GetSelectionOwnerUnchecked(Selection Id) GetSelectionOwnerCookie { +func (c *Conn) GetSelectionOwnerUnchecked(Selection Atom) GetSelectionOwnerCookie { cookie := c.newCookie(false, true) c.newRequest(c.getSelectionOwnerRequest(Selection), cookie) return GetSelectionOwnerCookie{cookie} @@ -7824,7 +7894,7 @@ type GetSelectionOwnerReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Owner Id + Owner Window } // Waits and reads reply data from request GetSelectionOwner @@ -7852,7 +7922,7 @@ func getSelectionOwnerReply(buf []byte) *GetSelectionOwnerReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Owner = Id(Get32(buf[b:])) + v.Owner = Window(Get32(buf[b:])) b += 4 return v @@ -7863,7 +7933,7 @@ func (cook GetSelectionOwnerCookie) Check() error { } // Write request to wire for GetSelectionOwner -func (c *Conn) getSelectionOwnerRequest(Selection Id) []byte { +func (c *Conn) getSelectionOwnerRequest(Selection Atom) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -7889,13 +7959,13 @@ type ConvertSelectionCookie struct { } // Write request to wire for ConvertSelection -func (c *Conn) ConvertSelection(Requestor Id, Selection Id, Target Id, Property Id, Time Timestamp) ConvertSelectionCookie { +func (c *Conn) ConvertSelection(Requestor Window, Selection Atom, Target Atom, Property Atom, Time Timestamp) ConvertSelectionCookie { cookie := c.newCookie(false, false) c.newRequest(c.convertSelectionRequest(Requestor, Selection, Target, Property, Time), cookie) return ConvertSelectionCookie{cookie} } -func (c *Conn) ConvertSelectionChecked(Requestor Id, Selection Id, Target Id, Property Id, Time Timestamp) ConvertSelectionCookie { +func (c *Conn) ConvertSelectionChecked(Requestor Window, Selection Atom, Target Atom, Property Atom, Time Timestamp) ConvertSelectionCookie { cookie := c.newCookie(true, false) c.newRequest(c.convertSelectionRequest(Requestor, Selection, Target, Property, Time), cookie) return ConvertSelectionCookie{cookie} @@ -7906,7 +7976,7 @@ func (cook ConvertSelectionCookie) Check() error { } // Write request to wire for ConvertSelection -func (c *Conn) convertSelectionRequest(Requestor Id, Selection Id, Target Id, Property Id, Time Timestamp) []byte { +func (c *Conn) convertSelectionRequest(Requestor Window, Selection Atom, Target Atom, Property Atom, Time Timestamp) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -7944,13 +8014,13 @@ type SendEventCookie struct { } // Write request to wire for SendEvent -func (c *Conn) SendEvent(Propagate bool, Destination Id, EventMask uint32, Event string) SendEventCookie { +func (c *Conn) SendEvent(Propagate bool, Destination Window, EventMask uint32, Event string) SendEventCookie { cookie := c.newCookie(false, false) c.newRequest(c.sendEventRequest(Propagate, Destination, EventMask, Event), cookie) return SendEventCookie{cookie} } -func (c *Conn) SendEventChecked(Propagate bool, Destination Id, EventMask uint32, Event string) SendEventCookie { +func (c *Conn) SendEventChecked(Propagate bool, Destination Window, EventMask uint32, Event string) SendEventCookie { cookie := c.newCookie(true, false) c.newRequest(c.sendEventRequest(Propagate, Destination, EventMask, Event), cookie) return SendEventCookie{cookie} @@ -7961,7 +8031,7 @@ func (cook SendEventCookie) Check() error { } // Write request to wire for SendEvent -func (c *Conn) sendEventRequest(Propagate bool, Destination Id, EventMask uint32, Event string) []byte { +func (c *Conn) sendEventRequest(Propagate bool, Destination Window, EventMask uint32, Event string) []byte { size := 44 b := 0 buf := make([]byte, size) @@ -7997,13 +8067,13 @@ type GrabPointerCookie struct { *cookie } -func (c *Conn) GrabPointer(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Time Timestamp) GrabPointerCookie { +func (c *Conn) GrabPointer(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Time Timestamp) GrabPointerCookie { cookie := c.newCookie(true, true) c.newRequest(c.grabPointerRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Time), cookie) return GrabPointerCookie{cookie} } -func (c *Conn) GrabPointerUnchecked(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Time Timestamp) GrabPointerCookie { +func (c *Conn) GrabPointerUnchecked(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Time Timestamp) GrabPointerCookie { cookie := c.newCookie(false, true) c.newRequest(c.grabPointerRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Time), cookie) return GrabPointerCookie{cookie} @@ -8051,7 +8121,7 @@ func (cook GrabPointerCookie) Check() error { } // Write request to wire for GrabPointer -func (c *Conn) grabPointerRequest(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Time Timestamp) []byte { +func (c *Conn) grabPointerRequest(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Time Timestamp) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -8143,13 +8213,13 @@ type GrabButtonCookie struct { } // Write request to wire for GrabButton -func (c *Conn) GrabButton(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Button byte, Modifiers uint16) GrabButtonCookie { +func (c *Conn) GrabButton(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Button byte, Modifiers uint16) GrabButtonCookie { cookie := c.newCookie(false, false) c.newRequest(c.grabButtonRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Button, Modifiers), cookie) return GrabButtonCookie{cookie} } -func (c *Conn) GrabButtonChecked(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Button byte, Modifiers uint16) GrabButtonCookie { +func (c *Conn) GrabButtonChecked(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Button byte, Modifiers uint16) GrabButtonCookie { cookie := c.newCookie(true, false) c.newRequest(c.grabButtonRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Button, Modifiers), cookie) return GrabButtonCookie{cookie} @@ -8160,7 +8230,7 @@ func (cook GrabButtonCookie) Check() error { } // Write request to wire for GrabButton -func (c *Conn) grabButtonRequest(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Button byte, Modifiers uint16) []byte { +func (c *Conn) grabButtonRequest(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Button byte, Modifiers uint16) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -8214,13 +8284,13 @@ type UngrabButtonCookie struct { } // Write request to wire for UngrabButton -func (c *Conn) UngrabButton(Button byte, GrabWindow Id, Modifiers uint16) UngrabButtonCookie { +func (c *Conn) UngrabButton(Button byte, GrabWindow Window, Modifiers uint16) UngrabButtonCookie { cookie := c.newCookie(false, false) c.newRequest(c.ungrabButtonRequest(Button, GrabWindow, Modifiers), cookie) return UngrabButtonCookie{cookie} } -func (c *Conn) UngrabButtonChecked(Button byte, GrabWindow Id, Modifiers uint16) UngrabButtonCookie { +func (c *Conn) UngrabButtonChecked(Button byte, GrabWindow Window, Modifiers uint16) UngrabButtonCookie { cookie := c.newCookie(true, false) c.newRequest(c.ungrabButtonRequest(Button, GrabWindow, Modifiers), cookie) return UngrabButtonCookie{cookie} @@ -8231,7 +8301,7 @@ func (cook UngrabButtonCookie) Check() error { } // Write request to wire for UngrabButton -func (c *Conn) ungrabButtonRequest(Button byte, GrabWindow Id, Modifiers uint16) []byte { +func (c *Conn) ungrabButtonRequest(Button byte, GrabWindow Window, Modifiers uint16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -8263,13 +8333,13 @@ type ChangeActivePointerGrabCookie struct { } // Write request to wire for ChangeActivePointerGrab -func (c *Conn) ChangeActivePointerGrab(Cursor Id, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie { +func (c *Conn) ChangeActivePointerGrab(Cursor Cursor, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie { cookie := c.newCookie(false, false) c.newRequest(c.changeActivePointerGrabRequest(Cursor, Time, EventMask), cookie) return ChangeActivePointerGrabCookie{cookie} } -func (c *Conn) ChangeActivePointerGrabChecked(Cursor Id, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie { +func (c *Conn) ChangeActivePointerGrabChecked(Cursor Cursor, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie { cookie := c.newCookie(true, false) c.newRequest(c.changeActivePointerGrabRequest(Cursor, Time, EventMask), cookie) return ChangeActivePointerGrabCookie{cookie} @@ -8280,7 +8350,7 @@ func (cook ChangeActivePointerGrabCookie) Check() error { } // Write request to wire for ChangeActivePointerGrab -func (c *Conn) changeActivePointerGrabRequest(Cursor Id, Time Timestamp, EventMask uint16) []byte { +func (c *Conn) changeActivePointerGrabRequest(Cursor Cursor, Time Timestamp, EventMask uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -8313,13 +8383,13 @@ type GrabKeyboardCookie struct { *cookie } -func (c *Conn) GrabKeyboard(OwnerEvents bool, GrabWindow Id, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie { +func (c *Conn) GrabKeyboard(OwnerEvents bool, GrabWindow Window, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie { cookie := c.newCookie(true, true) c.newRequest(c.grabKeyboardRequest(OwnerEvents, GrabWindow, Time, PointerMode, KeyboardMode), cookie) return GrabKeyboardCookie{cookie} } -func (c *Conn) GrabKeyboardUnchecked(OwnerEvents bool, GrabWindow Id, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie { +func (c *Conn) GrabKeyboardUnchecked(OwnerEvents bool, GrabWindow Window, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie { cookie := c.newCookie(false, true) c.newRequest(c.grabKeyboardRequest(OwnerEvents, GrabWindow, Time, PointerMode, KeyboardMode), cookie) return GrabKeyboardCookie{cookie} @@ -8367,7 +8437,7 @@ func (cook GrabKeyboardCookie) Check() error { } // Write request to wire for GrabKeyboard -func (c *Conn) grabKeyboardRequest(OwnerEvents bool, GrabWindow Id, Time Timestamp, PointerMode byte, KeyboardMode byte) []byte { +func (c *Conn) grabKeyboardRequest(OwnerEvents bool, GrabWindow Window, Time Timestamp, PointerMode byte, KeyboardMode byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -8452,13 +8522,13 @@ type GrabKeyCookie struct { } // Write request to wire for GrabKey -func (c *Conn) GrabKey(OwnerEvents bool, GrabWindow Id, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie { +func (c *Conn) GrabKey(OwnerEvents bool, GrabWindow Window, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie { cookie := c.newCookie(false, false) c.newRequest(c.grabKeyRequest(OwnerEvents, GrabWindow, Modifiers, Key, PointerMode, KeyboardMode), cookie) return GrabKeyCookie{cookie} } -func (c *Conn) GrabKeyChecked(OwnerEvents bool, GrabWindow Id, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie { +func (c *Conn) GrabKeyChecked(OwnerEvents bool, GrabWindow Window, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie { cookie := c.newCookie(true, false) c.newRequest(c.grabKeyRequest(OwnerEvents, GrabWindow, Modifiers, Key, PointerMode, KeyboardMode), cookie) return GrabKeyCookie{cookie} @@ -8469,7 +8539,7 @@ func (cook GrabKeyCookie) Check() error { } // Write request to wire for GrabKey -func (c *Conn) grabKeyRequest(OwnerEvents bool, GrabWindow Id, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) []byte { +func (c *Conn) grabKeyRequest(OwnerEvents bool, GrabWindow Window, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -8514,13 +8584,13 @@ type UngrabKeyCookie struct { } // Write request to wire for UngrabKey -func (c *Conn) UngrabKey(Key Keycode, GrabWindow Id, Modifiers uint16) UngrabKeyCookie { +func (c *Conn) UngrabKey(Key Keycode, GrabWindow Window, Modifiers uint16) UngrabKeyCookie { cookie := c.newCookie(false, false) c.newRequest(c.ungrabKeyRequest(Key, GrabWindow, Modifiers), cookie) return UngrabKeyCookie{cookie} } -func (c *Conn) UngrabKeyChecked(Key Keycode, GrabWindow Id, Modifiers uint16) UngrabKeyCookie { +func (c *Conn) UngrabKeyChecked(Key Keycode, GrabWindow Window, Modifiers uint16) UngrabKeyCookie { cookie := c.newCookie(true, false) c.newRequest(c.ungrabKeyRequest(Key, GrabWindow, Modifiers), cookie) return UngrabKeyCookie{cookie} @@ -8531,7 +8601,7 @@ func (cook UngrabKeyCookie) Check() error { } // Write request to wire for UngrabKey -func (c *Conn) ungrabKeyRequest(Key Keycode, GrabWindow Id, Modifiers uint16) []byte { +func (c *Conn) ungrabKeyRequest(Key Keycode, GrabWindow Window, Modifiers uint16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -8684,13 +8754,13 @@ type QueryPointerCookie struct { *cookie } -func (c *Conn) QueryPointer(Window Id) QueryPointerCookie { +func (c *Conn) QueryPointer(Window Window) QueryPointerCookie { cookie := c.newCookie(true, true) c.newRequest(c.queryPointerRequest(Window), cookie) return QueryPointerCookie{cookie} } -func (c *Conn) QueryPointerUnchecked(Window Id) QueryPointerCookie { +func (c *Conn) QueryPointerUnchecked(Window Window) QueryPointerCookie { cookie := c.newCookie(false, true) c.newRequest(c.queryPointerRequest(Window), cookie) return QueryPointerCookie{cookie} @@ -8702,8 +8772,8 @@ type QueryPointerReply struct { Sequence uint16 Length uint32 SameScreen bool - Root Id - Child Id + Root Window + Child Window RootX int16 RootY int16 WinX int16 @@ -8742,10 +8812,10 @@ func queryPointerReply(buf []byte) *QueryPointerReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -8773,7 +8843,7 @@ func (cook QueryPointerCookie) Check() error { } // Write request to wire for QueryPointer -func (c *Conn) queryPointerRequest(Window Id) []byte { +func (c *Conn) queryPointerRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -8798,13 +8868,13 @@ type GetMotionEventsCookie struct { *cookie } -func (c *Conn) GetMotionEvents(Window Id, Start Timestamp, Stop Timestamp) GetMotionEventsCookie { +func (c *Conn) GetMotionEvents(Window Window, Start Timestamp, Stop Timestamp) GetMotionEventsCookie { cookie := c.newCookie(true, true) c.newRequest(c.getMotionEventsRequest(Window, Start, Stop), cookie) return GetMotionEventsCookie{cookie} } -func (c *Conn) GetMotionEventsUnchecked(Window Id, Start Timestamp, Stop Timestamp) GetMotionEventsCookie { +func (c *Conn) GetMotionEventsUnchecked(Window Window, Start Timestamp, Stop Timestamp) GetMotionEventsCookie { cookie := c.newCookie(false, true) c.newRequest(c.getMotionEventsRequest(Window, Start, Stop), cookie) return GetMotionEventsCookie{cookie} @@ -8862,7 +8932,7 @@ func (cook GetMotionEventsCookie) Check() error { } // Write request to wire for GetMotionEvents -func (c *Conn) getMotionEventsRequest(Window Id, Start Timestamp, Stop Timestamp) []byte { +func (c *Conn) getMotionEventsRequest(Window Window, Start Timestamp, Stop Timestamp) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -8893,13 +8963,13 @@ type TranslateCoordinatesCookie struct { *cookie } -func (c *Conn) TranslateCoordinates(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16) TranslateCoordinatesCookie { +func (c *Conn) TranslateCoordinates(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16) TranslateCoordinatesCookie { cookie := c.newCookie(true, true) c.newRequest(c.translateCoordinatesRequest(SrcWindow, DstWindow, SrcX, SrcY), cookie) return TranslateCoordinatesCookie{cookie} } -func (c *Conn) TranslateCoordinatesUnchecked(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16) TranslateCoordinatesCookie { +func (c *Conn) TranslateCoordinatesUnchecked(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16) TranslateCoordinatesCookie { cookie := c.newCookie(false, true) c.newRequest(c.translateCoordinatesRequest(SrcWindow, DstWindow, SrcX, SrcY), cookie) return TranslateCoordinatesCookie{cookie} @@ -8911,7 +8981,7 @@ type TranslateCoordinatesReply struct { Sequence uint16 Length uint32 SameScreen bool - Child Id + Child Window DstX int16 DstY int16 } @@ -8946,7 +9016,7 @@ func translateCoordinatesReply(buf []byte) *TranslateCoordinatesReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.DstX = int16(Get16(buf[b:])) @@ -8963,7 +9033,7 @@ func (cook TranslateCoordinatesCookie) Check() error { } // Write request to wire for TranslateCoordinates -func (c *Conn) translateCoordinatesRequest(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16) []byte { +func (c *Conn) translateCoordinatesRequest(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -8998,13 +9068,13 @@ type WarpPointerCookie struct { } // Write request to wire for WarpPointer -func (c *Conn) WarpPointer(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie { +func (c *Conn) WarpPointer(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie { cookie := c.newCookie(false, false) c.newRequest(c.warpPointerRequest(SrcWindow, DstWindow, SrcX, SrcY, SrcWidth, SrcHeight, DstX, DstY), cookie) return WarpPointerCookie{cookie} } -func (c *Conn) WarpPointerChecked(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie { +func (c *Conn) WarpPointerChecked(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie { cookie := c.newCookie(true, false) c.newRequest(c.warpPointerRequest(SrcWindow, DstWindow, SrcX, SrcY, SrcWidth, SrcHeight, DstX, DstY), cookie) return WarpPointerCookie{cookie} @@ -9015,7 +9085,7 @@ func (cook WarpPointerCookie) Check() error { } // Write request to wire for WarpPointer -func (c *Conn) warpPointerRequest(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) []byte { +func (c *Conn) warpPointerRequest(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -9062,13 +9132,13 @@ type SetInputFocusCookie struct { } // Write request to wire for SetInputFocus -func (c *Conn) SetInputFocus(RevertTo byte, Focus Id, Time Timestamp) SetInputFocusCookie { +func (c *Conn) SetInputFocus(RevertTo byte, Focus Window, Time Timestamp) SetInputFocusCookie { cookie := c.newCookie(false, false) c.newRequest(c.setInputFocusRequest(RevertTo, Focus, Time), cookie) return SetInputFocusCookie{cookie} } -func (c *Conn) SetInputFocusChecked(RevertTo byte, Focus Id, Time Timestamp) SetInputFocusCookie { +func (c *Conn) SetInputFocusChecked(RevertTo byte, Focus Window, Time Timestamp) SetInputFocusCookie { cookie := c.newCookie(true, false) c.newRequest(c.setInputFocusRequest(RevertTo, Focus, Time), cookie) return SetInputFocusCookie{cookie} @@ -9079,7 +9149,7 @@ func (cook SetInputFocusCookie) Check() error { } // Write request to wire for SetInputFocus -func (c *Conn) setInputFocusRequest(RevertTo byte, Focus Id, Time Timestamp) []byte { +func (c *Conn) setInputFocusRequest(RevertTo byte, Focus Window, Time Timestamp) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -9126,7 +9196,7 @@ type GetInputFocusReply struct { Sequence uint16 Length uint32 RevertTo byte - Focus Id + Focus Window } // Waits and reads reply data from request GetInputFocus @@ -9155,7 +9225,7 @@ func getInputFocusReply(buf []byte) *GetInputFocusReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Focus = Id(Get32(buf[b:])) + v.Focus = Window(Get32(buf[b:])) b += 4 return v @@ -9267,13 +9337,13 @@ type OpenFontCookie struct { } // Write request to wire for OpenFont -func (c *Conn) OpenFont(Fid Id, NameLen uint16, Name string) OpenFontCookie { +func (c *Conn) OpenFont(Fid Font, NameLen uint16, Name string) OpenFontCookie { cookie := c.newCookie(false, false) c.newRequest(c.openFontRequest(Fid, NameLen, Name), cookie) return OpenFontCookie{cookie} } -func (c *Conn) OpenFontChecked(Fid Id, NameLen uint16, Name string) OpenFontCookie { +func (c *Conn) OpenFontChecked(Fid Font, NameLen uint16, Name string) OpenFontCookie { cookie := c.newCookie(true, false) c.newRequest(c.openFontRequest(Fid, NameLen, Name), cookie) return OpenFontCookie{cookie} @@ -9284,7 +9354,7 @@ func (cook OpenFontCookie) Check() error { } // Write request to wire for OpenFont -func (c *Conn) openFontRequest(Fid Id, NameLen uint16, Name string) []byte { +func (c *Conn) openFontRequest(Fid Font, NameLen uint16, Name string) []byte { size := pad((12 + pad((int(NameLen) * 1)))) b := 0 buf := make([]byte, size) @@ -9318,13 +9388,13 @@ type CloseFontCookie struct { } // Write request to wire for CloseFont -func (c *Conn) CloseFont(Font Id) CloseFontCookie { +func (c *Conn) CloseFont(Font Font) CloseFontCookie { cookie := c.newCookie(false, false) c.newRequest(c.closeFontRequest(Font), cookie) return CloseFontCookie{cookie} } -func (c *Conn) CloseFontChecked(Font Id) CloseFontCookie { +func (c *Conn) CloseFontChecked(Font Font) CloseFontCookie { cookie := c.newCookie(true, false) c.newRequest(c.closeFontRequest(Font), cookie) return CloseFontCookie{cookie} @@ -9335,7 +9405,7 @@ func (cook CloseFontCookie) Check() error { } // Write request to wire for CloseFont -func (c *Conn) closeFontRequest(Font Id) []byte { +func (c *Conn) closeFontRequest(Font Font) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -9360,13 +9430,13 @@ type QueryFontCookie struct { *cookie } -func (c *Conn) QueryFont(Font Id) QueryFontCookie { +func (c *Conn) QueryFont(Font Fontable) QueryFontCookie { cookie := c.newCookie(true, true) c.newRequest(c.queryFontRequest(Font), cookie) return QueryFontCookie{cookie} } -func (c *Conn) QueryFontUnchecked(Font Id) QueryFontCookie { +func (c *Conn) QueryFontUnchecked(Font Fontable) QueryFontCookie { cookie := c.newCookie(false, true) c.newRequest(c.queryFontRequest(Font), cookie) return QueryFontCookie{cookie} @@ -9483,7 +9553,7 @@ func (cook QueryFontCookie) Check() error { } // Write request to wire for QueryFont -func (c *Conn) queryFontRequest(Font Id) []byte { +func (c *Conn) queryFontRequest(Font Fontable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -9508,13 +9578,13 @@ type QueryTextExtentsCookie struct { *cookie } -func (c *Conn) QueryTextExtents(Font Id, String []Char2b, StringLen uint16) QueryTextExtentsCookie { +func (c *Conn) QueryTextExtents(Font Fontable, String []Char2b, StringLen uint16) QueryTextExtentsCookie { cookie := c.newCookie(true, true) c.newRequest(c.queryTextExtentsRequest(Font, String, StringLen), cookie) return QueryTextExtentsCookie{cookie} } -func (c *Conn) QueryTextExtentsUnchecked(Font Id, String []Char2b, StringLen uint16) QueryTextExtentsCookie { +func (c *Conn) QueryTextExtentsUnchecked(Font Fontable, String []Char2b, StringLen uint16) QueryTextExtentsCookie { cookie := c.newCookie(false, true) c.newRequest(c.queryTextExtentsRequest(Font, String, StringLen), cookie) return QueryTextExtentsCookie{cookie} @@ -9590,7 +9660,7 @@ func (cook QueryTextExtentsCookie) Check() error { } // Write request to wire for QueryTextExtents -func (c *Conn) queryTextExtentsRequest(Font Id, String []Char2b, StringLen uint16) []byte { +func (c *Conn) queryTextExtentsRequest(Font Fontable, String []Char2b, StringLen uint16) []byte { size := pad((8 + pad((len(String) * 2)))) b := 0 buf := make([]byte, size) @@ -10007,13 +10077,13 @@ type CreatePixmapCookie struct { } // Write request to wire for CreatePixmap -func (c *Conn) CreatePixmap(Depth byte, Pid Id, Drawable Id, Width uint16, Height uint16) CreatePixmapCookie { +func (c *Conn) CreatePixmap(Depth byte, Pid Pixmap, Drawable Drawable, Width uint16, Height uint16) CreatePixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.createPixmapRequest(Depth, Pid, Drawable, Width, Height), cookie) return CreatePixmapCookie{cookie} } -func (c *Conn) CreatePixmapChecked(Depth byte, Pid Id, Drawable Id, Width uint16, Height uint16) CreatePixmapCookie { +func (c *Conn) CreatePixmapChecked(Depth byte, Pid Pixmap, Drawable Drawable, Width uint16, Height uint16) CreatePixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.createPixmapRequest(Depth, Pid, Drawable, Width, Height), cookie) return CreatePixmapCookie{cookie} @@ -10024,7 +10094,7 @@ func (cook CreatePixmapCookie) Check() error { } // Write request to wire for CreatePixmap -func (c *Conn) createPixmapRequest(Depth byte, Pid Id, Drawable Id, Width uint16, Height uint16) []byte { +func (c *Conn) createPixmapRequest(Depth byte, Pid Pixmap, Drawable Drawable, Width uint16, Height uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -10060,13 +10130,13 @@ type FreePixmapCookie struct { } // Write request to wire for FreePixmap -func (c *Conn) FreePixmap(Pixmap Id) FreePixmapCookie { +func (c *Conn) FreePixmap(Pixmap Pixmap) FreePixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.freePixmapRequest(Pixmap), cookie) return FreePixmapCookie{cookie} } -func (c *Conn) FreePixmapChecked(Pixmap Id) FreePixmapCookie { +func (c *Conn) FreePixmapChecked(Pixmap Pixmap) FreePixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.freePixmapRequest(Pixmap), cookie) return FreePixmapCookie{cookie} @@ -10077,7 +10147,7 @@ func (cook FreePixmapCookie) Check() error { } // Write request to wire for FreePixmap -func (c *Conn) freePixmapRequest(Pixmap Id) []byte { +func (c *Conn) freePixmapRequest(Pixmap Pixmap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -10103,13 +10173,13 @@ type CreateGCCookie struct { } // Write request to wire for CreateGC -func (c *Conn) CreateGC(Cid Id, Drawable Id, ValueMask uint32, ValueList []uint32) CreateGCCookie { +func (c *Conn) CreateGC(Cid Gcontext, Drawable Drawable, ValueMask uint32, ValueList []uint32) CreateGCCookie { cookie := c.newCookie(false, false) c.newRequest(c.createGCRequest(Cid, Drawable, ValueMask, ValueList), cookie) return CreateGCCookie{cookie} } -func (c *Conn) CreateGCChecked(Cid Id, Drawable Id, ValueMask uint32, ValueList []uint32) CreateGCCookie { +func (c *Conn) CreateGCChecked(Cid Gcontext, Drawable Drawable, ValueMask uint32, ValueList []uint32) CreateGCCookie { cookie := c.newCookie(true, false) c.newRequest(c.createGCRequest(Cid, Drawable, ValueMask, ValueList), cookie) return CreateGCCookie{cookie} @@ -10120,7 +10190,7 @@ func (cook CreateGCCookie) Check() error { } // Write request to wire for CreateGC -func (c *Conn) createGCRequest(Cid Id, Drawable Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) createGCRequest(Cid Gcontext, Drawable Drawable, ValueMask uint32, ValueList []uint32) []byte { size := pad((12 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -10157,13 +10227,13 @@ type ChangeGCCookie struct { } // Write request to wire for ChangeGC -func (c *Conn) ChangeGC(Gc Id, ValueMask uint32, ValueList []uint32) ChangeGCCookie { +func (c *Conn) ChangeGC(Gc Gcontext, ValueMask uint32, ValueList []uint32) ChangeGCCookie { cookie := c.newCookie(false, false) c.newRequest(c.changeGCRequest(Gc, ValueMask, ValueList), cookie) return ChangeGCCookie{cookie} } -func (c *Conn) ChangeGCChecked(Gc Id, ValueMask uint32, ValueList []uint32) ChangeGCCookie { +func (c *Conn) ChangeGCChecked(Gc Gcontext, ValueMask uint32, ValueList []uint32) ChangeGCCookie { cookie := c.newCookie(true, false) c.newRequest(c.changeGCRequest(Gc, ValueMask, ValueList), cookie) return ChangeGCCookie{cookie} @@ -10174,7 +10244,7 @@ func (cook ChangeGCCookie) Check() error { } // Write request to wire for ChangeGC -func (c *Conn) changeGCRequest(Gc Id, ValueMask uint32, ValueList []uint32) []byte { +func (c *Conn) changeGCRequest(Gc Gcontext, ValueMask uint32, ValueList []uint32) []byte { size := pad((8 + (4 + pad((4 * popCount(int(ValueMask))))))) b := 0 buf := make([]byte, size) @@ -10208,13 +10278,13 @@ type CopyGCCookie struct { } // Write request to wire for CopyGC -func (c *Conn) CopyGC(SrcGc Id, DstGc Id, ValueMask uint32) CopyGCCookie { +func (c *Conn) CopyGC(SrcGc Gcontext, DstGc Gcontext, ValueMask uint32) CopyGCCookie { cookie := c.newCookie(false, false) c.newRequest(c.copyGCRequest(SrcGc, DstGc, ValueMask), cookie) return CopyGCCookie{cookie} } -func (c *Conn) CopyGCChecked(SrcGc Id, DstGc Id, ValueMask uint32) CopyGCCookie { +func (c *Conn) CopyGCChecked(SrcGc Gcontext, DstGc Gcontext, ValueMask uint32) CopyGCCookie { cookie := c.newCookie(true, false) c.newRequest(c.copyGCRequest(SrcGc, DstGc, ValueMask), cookie) return CopyGCCookie{cookie} @@ -10225,7 +10295,7 @@ func (cook CopyGCCookie) Check() error { } // Write request to wire for CopyGC -func (c *Conn) copyGCRequest(SrcGc Id, DstGc Id, ValueMask uint32) []byte { +func (c *Conn) copyGCRequest(SrcGc Gcontext, DstGc Gcontext, ValueMask uint32) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -10257,13 +10327,13 @@ type SetDashesCookie struct { } // Write request to wire for SetDashes -func (c *Conn) SetDashes(Gc Id, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie { +func (c *Conn) SetDashes(Gc Gcontext, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie { cookie := c.newCookie(false, false) c.newRequest(c.setDashesRequest(Gc, DashOffset, DashesLen, Dashes), cookie) return SetDashesCookie{cookie} } -func (c *Conn) SetDashesChecked(Gc Id, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie { +func (c *Conn) SetDashesChecked(Gc Gcontext, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie { cookie := c.newCookie(true, false) c.newRequest(c.setDashesRequest(Gc, DashOffset, DashesLen, Dashes), cookie) return SetDashesCookie{cookie} @@ -10274,7 +10344,7 @@ func (cook SetDashesCookie) Check() error { } // Write request to wire for SetDashes -func (c *Conn) setDashesRequest(Gc Id, DashOffset uint16, DashesLen uint16, Dashes []byte) []byte { +func (c *Conn) setDashesRequest(Gc Gcontext, DashOffset uint16, DashesLen uint16, Dashes []byte) []byte { size := pad((12 + pad((int(DashesLen) * 1)))) b := 0 buf := make([]byte, size) @@ -10309,13 +10379,13 @@ type SetClipRectanglesCookie struct { } // Write request to wire for SetClipRectangles -func (c *Conn) SetClipRectangles(Ordering byte, Gc Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie { +func (c *Conn) SetClipRectangles(Ordering byte, Gc Gcontext, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie { cookie := c.newCookie(false, false) c.newRequest(c.setClipRectanglesRequest(Ordering, Gc, ClipXOrigin, ClipYOrigin, Rectangles), cookie) return SetClipRectanglesCookie{cookie} } -func (c *Conn) SetClipRectanglesChecked(Ordering byte, Gc Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie { +func (c *Conn) SetClipRectanglesChecked(Ordering byte, Gc Gcontext, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie { cookie := c.newCookie(true, false) c.newRequest(c.setClipRectanglesRequest(Ordering, Gc, ClipXOrigin, ClipYOrigin, Rectangles), cookie) return SetClipRectanglesCookie{cookie} @@ -10326,7 +10396,7 @@ func (cook SetClipRectanglesCookie) Check() error { } // Write request to wire for SetClipRectangles -func (c *Conn) setClipRectanglesRequest(Ordering byte, Gc Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) []byte { +func (c *Conn) setClipRectanglesRequest(Ordering byte, Gc Gcontext, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) []byte { size := pad((12 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -10361,13 +10431,13 @@ type FreeGCCookie struct { } // Write request to wire for FreeGC -func (c *Conn) FreeGC(Gc Id) FreeGCCookie { +func (c *Conn) FreeGC(Gc Gcontext) FreeGCCookie { cookie := c.newCookie(false, false) c.newRequest(c.freeGCRequest(Gc), cookie) return FreeGCCookie{cookie} } -func (c *Conn) FreeGCChecked(Gc Id) FreeGCCookie { +func (c *Conn) FreeGCChecked(Gc Gcontext) FreeGCCookie { cookie := c.newCookie(true, false) c.newRequest(c.freeGCRequest(Gc), cookie) return FreeGCCookie{cookie} @@ -10378,7 +10448,7 @@ func (cook FreeGCCookie) Check() error { } // Write request to wire for FreeGC -func (c *Conn) freeGCRequest(Gc Id) []byte { +func (c *Conn) freeGCRequest(Gc Gcontext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -10404,13 +10474,13 @@ type ClearAreaCookie struct { } // Write request to wire for ClearArea -func (c *Conn) ClearArea(Exposures bool, Window Id, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie { +func (c *Conn) ClearArea(Exposures bool, Window Window, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie { cookie := c.newCookie(false, false) c.newRequest(c.clearAreaRequest(Exposures, Window, X, Y, Width, Height), cookie) return ClearAreaCookie{cookie} } -func (c *Conn) ClearAreaChecked(Exposures bool, Window Id, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie { +func (c *Conn) ClearAreaChecked(Exposures bool, Window Window, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie { cookie := c.newCookie(true, false) c.newRequest(c.clearAreaRequest(Exposures, Window, X, Y, Width, Height), cookie) return ClearAreaCookie{cookie} @@ -10421,7 +10491,7 @@ func (cook ClearAreaCookie) Check() error { } // Write request to wire for ClearArea -func (c *Conn) clearAreaRequest(Exposures bool, Window Id, X int16, Y int16, Width uint16, Height uint16) []byte { +func (c *Conn) clearAreaRequest(Exposures bool, Window Window, X int16, Y int16, Width uint16, Height uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -10464,13 +10534,13 @@ type CopyAreaCookie struct { } // Write request to wire for CopyArea -func (c *Conn) CopyArea(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie { +func (c *Conn) CopyArea(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie { cookie := c.newCookie(false, false) c.newRequest(c.copyAreaRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height), cookie) return CopyAreaCookie{cookie} } -func (c *Conn) CopyAreaChecked(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie { +func (c *Conn) CopyAreaChecked(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie { cookie := c.newCookie(true, false) c.newRequest(c.copyAreaRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height), cookie) return CopyAreaCookie{cookie} @@ -10481,7 +10551,7 @@ func (cook CopyAreaCookie) Check() error { } // Write request to wire for CopyArea -func (c *Conn) copyAreaRequest(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) []byte { +func (c *Conn) copyAreaRequest(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) []byte { size := 28 b := 0 buf := make([]byte, size) @@ -10531,13 +10601,13 @@ type CopyPlaneCookie struct { } // Write request to wire for CopyPlane -func (c *Conn) CopyPlane(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie { +func (c *Conn) CopyPlane(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie { cookie := c.newCookie(false, false) c.newRequest(c.copyPlaneRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height, BitPlane), cookie) return CopyPlaneCookie{cookie} } -func (c *Conn) CopyPlaneChecked(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie { +func (c *Conn) CopyPlaneChecked(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie { cookie := c.newCookie(true, false) c.newRequest(c.copyPlaneRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height, BitPlane), cookie) return CopyPlaneCookie{cookie} @@ -10548,7 +10618,7 @@ func (cook CopyPlaneCookie) Check() error { } // Write request to wire for CopyPlane -func (c *Conn) copyPlaneRequest(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) []byte { +func (c *Conn) copyPlaneRequest(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -10601,13 +10671,13 @@ type PolyPointCookie struct { } // Write request to wire for PolyPoint -func (c *Conn) PolyPoint(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyPointCookie { +func (c *Conn) PolyPoint(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyPointCookie { cookie := c.newCookie(false, false) c.newRequest(c.polyPointRequest(CoordinateMode, Drawable, Gc, Points), cookie) return PolyPointCookie{cookie} } -func (c *Conn) PolyPointChecked(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyPointCookie { +func (c *Conn) PolyPointChecked(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyPointCookie { cookie := c.newCookie(true, false) c.newRequest(c.polyPointRequest(CoordinateMode, Drawable, Gc, Points), cookie) return PolyPointCookie{cookie} @@ -10618,7 +10688,7 @@ func (cook PolyPointCookie) Check() error { } // Write request to wire for PolyPoint -func (c *Conn) polyPointRequest(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) []byte { +func (c *Conn) polyPointRequest(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) []byte { size := pad((12 + pad((len(Points) * 4)))) b := 0 buf := make([]byte, size) @@ -10650,13 +10720,13 @@ type PolyLineCookie struct { } // Write request to wire for PolyLine -func (c *Conn) PolyLine(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyLineCookie { +func (c *Conn) PolyLine(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyLineCookie { cookie := c.newCookie(false, false) c.newRequest(c.polyLineRequest(CoordinateMode, Drawable, Gc, Points), cookie) return PolyLineCookie{cookie} } -func (c *Conn) PolyLineChecked(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyLineCookie { +func (c *Conn) PolyLineChecked(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyLineCookie { cookie := c.newCookie(true, false) c.newRequest(c.polyLineRequest(CoordinateMode, Drawable, Gc, Points), cookie) return PolyLineCookie{cookie} @@ -10667,7 +10737,7 @@ func (cook PolyLineCookie) Check() error { } // Write request to wire for PolyLine -func (c *Conn) polyLineRequest(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) []byte { +func (c *Conn) polyLineRequest(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) []byte { size := pad((12 + pad((len(Points) * 4)))) b := 0 buf := make([]byte, size) @@ -10699,13 +10769,13 @@ type PolySegmentCookie struct { } // Write request to wire for PolySegment -func (c *Conn) PolySegment(Drawable Id, Gc Id, Segments []Segment) PolySegmentCookie { +func (c *Conn) PolySegment(Drawable Drawable, Gc Gcontext, Segments []Segment) PolySegmentCookie { cookie := c.newCookie(false, false) c.newRequest(c.polySegmentRequest(Drawable, Gc, Segments), cookie) return PolySegmentCookie{cookie} } -func (c *Conn) PolySegmentChecked(Drawable Id, Gc Id, Segments []Segment) PolySegmentCookie { +func (c *Conn) PolySegmentChecked(Drawable Drawable, Gc Gcontext, Segments []Segment) PolySegmentCookie { cookie := c.newCookie(true, false) c.newRequest(c.polySegmentRequest(Drawable, Gc, Segments), cookie) return PolySegmentCookie{cookie} @@ -10716,7 +10786,7 @@ func (cook PolySegmentCookie) Check() error { } // Write request to wire for PolySegment -func (c *Conn) polySegmentRequest(Drawable Id, Gc Id, Segments []Segment) []byte { +func (c *Conn) polySegmentRequest(Drawable Drawable, Gc Gcontext, Segments []Segment) []byte { size := pad((12 + pad((len(Segments) * 8)))) b := 0 buf := make([]byte, size) @@ -10747,13 +10817,13 @@ type PolyRectangleCookie struct { } // Write request to wire for PolyRectangle -func (c *Conn) PolyRectangle(Drawable Id, Gc Id, Rectangles []Rectangle) PolyRectangleCookie { +func (c *Conn) PolyRectangle(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyRectangleCookie { cookie := c.newCookie(false, false) c.newRequest(c.polyRectangleRequest(Drawable, Gc, Rectangles), cookie) return PolyRectangleCookie{cookie} } -func (c *Conn) PolyRectangleChecked(Drawable Id, Gc Id, Rectangles []Rectangle) PolyRectangleCookie { +func (c *Conn) PolyRectangleChecked(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyRectangleCookie { cookie := c.newCookie(true, false) c.newRequest(c.polyRectangleRequest(Drawable, Gc, Rectangles), cookie) return PolyRectangleCookie{cookie} @@ -10764,7 +10834,7 @@ func (cook PolyRectangleCookie) Check() error { } // Write request to wire for PolyRectangle -func (c *Conn) polyRectangleRequest(Drawable Id, Gc Id, Rectangles []Rectangle) []byte { +func (c *Conn) polyRectangleRequest(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) []byte { size := pad((12 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -10795,13 +10865,13 @@ type PolyArcCookie struct { } // Write request to wire for PolyArc -func (c *Conn) PolyArc(Drawable Id, Gc Id, Arcs []Arc) PolyArcCookie { +func (c *Conn) PolyArc(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyArcCookie { cookie := c.newCookie(false, false) c.newRequest(c.polyArcRequest(Drawable, Gc, Arcs), cookie) return PolyArcCookie{cookie} } -func (c *Conn) PolyArcChecked(Drawable Id, Gc Id, Arcs []Arc) PolyArcCookie { +func (c *Conn) PolyArcChecked(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyArcCookie { cookie := c.newCookie(true, false) c.newRequest(c.polyArcRequest(Drawable, Gc, Arcs), cookie) return PolyArcCookie{cookie} @@ -10812,7 +10882,7 @@ func (cook PolyArcCookie) Check() error { } // Write request to wire for PolyArc -func (c *Conn) polyArcRequest(Drawable Id, Gc Id, Arcs []Arc) []byte { +func (c *Conn) polyArcRequest(Drawable Drawable, Gc Gcontext, Arcs []Arc) []byte { size := pad((12 + pad((len(Arcs) * 12)))) b := 0 buf := make([]byte, size) @@ -10843,13 +10913,13 @@ type FillPolyCookie struct { } // Write request to wire for FillPoly -func (c *Conn) FillPoly(Drawable Id, Gc Id, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie { +func (c *Conn) FillPoly(Drawable Drawable, Gc Gcontext, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie { cookie := c.newCookie(false, false) c.newRequest(c.fillPolyRequest(Drawable, Gc, Shape, CoordinateMode, Points), cookie) return FillPolyCookie{cookie} } -func (c *Conn) FillPolyChecked(Drawable Id, Gc Id, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie { +func (c *Conn) FillPolyChecked(Drawable Drawable, Gc Gcontext, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie { cookie := c.newCookie(true, false) c.newRequest(c.fillPolyRequest(Drawable, Gc, Shape, CoordinateMode, Points), cookie) return FillPolyCookie{cookie} @@ -10860,7 +10930,7 @@ func (cook FillPolyCookie) Check() error { } // Write request to wire for FillPoly -func (c *Conn) fillPolyRequest(Drawable Id, Gc Id, Shape byte, CoordinateMode byte, Points []Point) []byte { +func (c *Conn) fillPolyRequest(Drawable Drawable, Gc Gcontext, Shape byte, CoordinateMode byte, Points []Point) []byte { size := pad((16 + pad((len(Points) * 4)))) b := 0 buf := make([]byte, size) @@ -10899,13 +10969,13 @@ type PolyFillRectangleCookie struct { } // Write request to wire for PolyFillRectangle -func (c *Conn) PolyFillRectangle(Drawable Id, Gc Id, Rectangles []Rectangle) PolyFillRectangleCookie { +func (c *Conn) PolyFillRectangle(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyFillRectangleCookie { cookie := c.newCookie(false, false) c.newRequest(c.polyFillRectangleRequest(Drawable, Gc, Rectangles), cookie) return PolyFillRectangleCookie{cookie} } -func (c *Conn) PolyFillRectangleChecked(Drawable Id, Gc Id, Rectangles []Rectangle) PolyFillRectangleCookie { +func (c *Conn) PolyFillRectangleChecked(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyFillRectangleCookie { cookie := c.newCookie(true, false) c.newRequest(c.polyFillRectangleRequest(Drawable, Gc, Rectangles), cookie) return PolyFillRectangleCookie{cookie} @@ -10916,7 +10986,7 @@ func (cook PolyFillRectangleCookie) Check() error { } // Write request to wire for PolyFillRectangle -func (c *Conn) polyFillRectangleRequest(Drawable Id, Gc Id, Rectangles []Rectangle) []byte { +func (c *Conn) polyFillRectangleRequest(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) []byte { size := pad((12 + pad((len(Rectangles) * 8)))) b := 0 buf := make([]byte, size) @@ -10947,13 +11017,13 @@ type PolyFillArcCookie struct { } // Write request to wire for PolyFillArc -func (c *Conn) PolyFillArc(Drawable Id, Gc Id, Arcs []Arc) PolyFillArcCookie { +func (c *Conn) PolyFillArc(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyFillArcCookie { cookie := c.newCookie(false, false) c.newRequest(c.polyFillArcRequest(Drawable, Gc, Arcs), cookie) return PolyFillArcCookie{cookie} } -func (c *Conn) PolyFillArcChecked(Drawable Id, Gc Id, Arcs []Arc) PolyFillArcCookie { +func (c *Conn) PolyFillArcChecked(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyFillArcCookie { cookie := c.newCookie(true, false) c.newRequest(c.polyFillArcRequest(Drawable, Gc, Arcs), cookie) return PolyFillArcCookie{cookie} @@ -10964,7 +11034,7 @@ func (cook PolyFillArcCookie) Check() error { } // Write request to wire for PolyFillArc -func (c *Conn) polyFillArcRequest(Drawable Id, Gc Id, Arcs []Arc) []byte { +func (c *Conn) polyFillArcRequest(Drawable Drawable, Gc Gcontext, Arcs []Arc) []byte { size := pad((12 + pad((len(Arcs) * 12)))) b := 0 buf := make([]byte, size) @@ -10995,13 +11065,13 @@ type PutImageCookie struct { } // Write request to wire for PutImage -func (c *Conn) PutImage(Format byte, Drawable Id, Gc Id, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie { +func (c *Conn) PutImage(Format byte, Drawable Drawable, Gc Gcontext, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie { cookie := c.newCookie(false, false) c.newRequest(c.putImageRequest(Format, Drawable, Gc, Width, Height, DstX, DstY, LeftPad, Depth, Data), cookie) return PutImageCookie{cookie} } -func (c *Conn) PutImageChecked(Format byte, Drawable Id, Gc Id, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie { +func (c *Conn) PutImageChecked(Format byte, Drawable Drawable, Gc Gcontext, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie { cookie := c.newCookie(true, false) c.newRequest(c.putImageRequest(Format, Drawable, Gc, Width, Height, DstX, DstY, LeftPad, Depth, Data), cookie) return PutImageCookie{cookie} @@ -11012,7 +11082,7 @@ func (cook PutImageCookie) Check() error { } // Write request to wire for PutImage -func (c *Conn) putImageRequest(Format byte, Drawable Id, Gc Id, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) []byte { +func (c *Conn) putImageRequest(Format byte, Drawable Drawable, Gc Gcontext, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) []byte { size := pad((24 + pad((len(Data) * 1)))) b := 0 buf := make([]byte, size) @@ -11064,13 +11134,13 @@ type GetImageCookie struct { *cookie } -func (c *Conn) GetImage(Format byte, Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie { +func (c *Conn) GetImage(Format byte, Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie { cookie := c.newCookie(true, true) c.newRequest(c.getImageRequest(Format, Drawable, X, Y, Width, Height, PlaneMask), cookie) return GetImageCookie{cookie} } -func (c *Conn) GetImageUnchecked(Format byte, Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie { +func (c *Conn) GetImageUnchecked(Format byte, Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie { cookie := c.newCookie(false, true) c.newRequest(c.getImageRequest(Format, Drawable, X, Y, Width, Height, PlaneMask), cookie) return GetImageCookie{cookie} @@ -11130,7 +11200,7 @@ func (cook GetImageCookie) Check() error { } // Write request to wire for GetImage -func (c *Conn) getImageRequest(Format byte, Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) []byte { +func (c *Conn) getImageRequest(Format byte, Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -11172,13 +11242,13 @@ type PolyText8Cookie struct { } // Write request to wire for PolyText8 -func (c *Conn) PolyText8(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText8Cookie { +func (c *Conn) PolyText8(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText8Cookie { cookie := c.newCookie(false, false) c.newRequest(c.polyText8Request(Drawable, Gc, X, Y, Items), cookie) return PolyText8Cookie{cookie} } -func (c *Conn) PolyText8Checked(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText8Cookie { +func (c *Conn) PolyText8Checked(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText8Cookie { cookie := c.newCookie(true, false) c.newRequest(c.polyText8Request(Drawable, Gc, X, Y, Items), cookie) return PolyText8Cookie{cookie} @@ -11189,7 +11259,7 @@ func (cook PolyText8Cookie) Check() error { } // Write request to wire for PolyText8 -func (c *Conn) polyText8Request(Drawable Id, Gc Id, X int16, Y int16, Items []byte) []byte { +func (c *Conn) polyText8Request(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) []byte { size := pad((16 + pad((len(Items) * 1)))) b := 0 buf := make([]byte, size) @@ -11227,13 +11297,13 @@ type PolyText16Cookie struct { } // Write request to wire for PolyText16 -func (c *Conn) PolyText16(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText16Cookie { +func (c *Conn) PolyText16(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText16Cookie { cookie := c.newCookie(false, false) c.newRequest(c.polyText16Request(Drawable, Gc, X, Y, Items), cookie) return PolyText16Cookie{cookie} } -func (c *Conn) PolyText16Checked(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText16Cookie { +func (c *Conn) PolyText16Checked(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText16Cookie { cookie := c.newCookie(true, false) c.newRequest(c.polyText16Request(Drawable, Gc, X, Y, Items), cookie) return PolyText16Cookie{cookie} @@ -11244,7 +11314,7 @@ func (cook PolyText16Cookie) Check() error { } // Write request to wire for PolyText16 -func (c *Conn) polyText16Request(Drawable Id, Gc Id, X int16, Y int16, Items []byte) []byte { +func (c *Conn) polyText16Request(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) []byte { size := pad((16 + pad((len(Items) * 1)))) b := 0 buf := make([]byte, size) @@ -11282,13 +11352,13 @@ type ImageText8Cookie struct { } // Write request to wire for ImageText8 -func (c *Conn) ImageText8(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String string) ImageText8Cookie { +func (c *Conn) ImageText8(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String string) ImageText8Cookie { cookie := c.newCookie(false, false) c.newRequest(c.imageText8Request(StringLen, Drawable, Gc, X, Y, String), cookie) return ImageText8Cookie{cookie} } -func (c *Conn) ImageText8Checked(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String string) ImageText8Cookie { +func (c *Conn) ImageText8Checked(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String string) ImageText8Cookie { cookie := c.newCookie(true, false) c.newRequest(c.imageText8Request(StringLen, Drawable, Gc, X, Y, String), cookie) return ImageText8Cookie{cookie} @@ -11299,7 +11369,7 @@ func (cook ImageText8Cookie) Check() error { } // Write request to wire for ImageText8 -func (c *Conn) imageText8Request(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String string) []byte { +func (c *Conn) imageText8Request(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String string) []byte { size := pad((16 + pad((int(StringLen) * 1)))) b := 0 buf := make([]byte, size) @@ -11338,13 +11408,13 @@ type ImageText16Cookie struct { } // Write request to wire for ImageText16 -func (c *Conn) ImageText16(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String []Char2b) ImageText16Cookie { +func (c *Conn) ImageText16(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String []Char2b) ImageText16Cookie { cookie := c.newCookie(false, false) c.newRequest(c.imageText16Request(StringLen, Drawable, Gc, X, Y, String), cookie) return ImageText16Cookie{cookie} } -func (c *Conn) ImageText16Checked(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String []Char2b) ImageText16Cookie { +func (c *Conn) ImageText16Checked(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String []Char2b) ImageText16Cookie { cookie := c.newCookie(true, false) c.newRequest(c.imageText16Request(StringLen, Drawable, Gc, X, Y, String), cookie) return ImageText16Cookie{cookie} @@ -11355,7 +11425,7 @@ func (cook ImageText16Cookie) Check() error { } // Write request to wire for ImageText16 -func (c *Conn) imageText16Request(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String []Char2b) []byte { +func (c *Conn) imageText16Request(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String []Char2b) []byte { size := pad((16 + pad((int(StringLen) * 2)))) b := 0 buf := make([]byte, size) @@ -11393,13 +11463,13 @@ type CreateColormapCookie struct { } // Write request to wire for CreateColormap -func (c *Conn) CreateColormap(Alloc byte, Mid Id, Window Id, Visual Visualid) CreateColormapCookie { +func (c *Conn) CreateColormap(Alloc byte, Mid Colormap, Window Window, Visual Visualid) CreateColormapCookie { cookie := c.newCookie(false, false) c.newRequest(c.createColormapRequest(Alloc, Mid, Window, Visual), cookie) return CreateColormapCookie{cookie} } -func (c *Conn) CreateColormapChecked(Alloc byte, Mid Id, Window Id, Visual Visualid) CreateColormapCookie { +func (c *Conn) CreateColormapChecked(Alloc byte, Mid Colormap, Window Window, Visual Visualid) CreateColormapCookie { cookie := c.newCookie(true, false) c.newRequest(c.createColormapRequest(Alloc, Mid, Window, Visual), cookie) return CreateColormapCookie{cookie} @@ -11410,7 +11480,7 @@ func (cook CreateColormapCookie) Check() error { } // Write request to wire for CreateColormap -func (c *Conn) createColormapRequest(Alloc byte, Mid Id, Window Id, Visual Visualid) []byte { +func (c *Conn) createColormapRequest(Alloc byte, Mid Colormap, Window Window, Visual Visualid) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -11443,13 +11513,13 @@ type FreeColormapCookie struct { } // Write request to wire for FreeColormap -func (c *Conn) FreeColormap(Cmap Id) FreeColormapCookie { +func (c *Conn) FreeColormap(Cmap Colormap) FreeColormapCookie { cookie := c.newCookie(false, false) c.newRequest(c.freeColormapRequest(Cmap), cookie) return FreeColormapCookie{cookie} } -func (c *Conn) FreeColormapChecked(Cmap Id) FreeColormapCookie { +func (c *Conn) FreeColormapChecked(Cmap Colormap) FreeColormapCookie { cookie := c.newCookie(true, false) c.newRequest(c.freeColormapRequest(Cmap), cookie) return FreeColormapCookie{cookie} @@ -11460,7 +11530,7 @@ func (cook FreeColormapCookie) Check() error { } // Write request to wire for FreeColormap -func (c *Conn) freeColormapRequest(Cmap Id) []byte { +func (c *Conn) freeColormapRequest(Cmap Colormap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -11486,13 +11556,13 @@ type CopyColormapAndFreeCookie struct { } // Write request to wire for CopyColormapAndFree -func (c *Conn) CopyColormapAndFree(Mid Id, SrcCmap Id) CopyColormapAndFreeCookie { +func (c *Conn) CopyColormapAndFree(Mid Colormap, SrcCmap Colormap) CopyColormapAndFreeCookie { cookie := c.newCookie(false, false) c.newRequest(c.copyColormapAndFreeRequest(Mid, SrcCmap), cookie) return CopyColormapAndFreeCookie{cookie} } -func (c *Conn) CopyColormapAndFreeChecked(Mid Id, SrcCmap Id) CopyColormapAndFreeCookie { +func (c *Conn) CopyColormapAndFreeChecked(Mid Colormap, SrcCmap Colormap) CopyColormapAndFreeCookie { cookie := c.newCookie(true, false) c.newRequest(c.copyColormapAndFreeRequest(Mid, SrcCmap), cookie) return CopyColormapAndFreeCookie{cookie} @@ -11503,7 +11573,7 @@ func (cook CopyColormapAndFreeCookie) Check() error { } // Write request to wire for CopyColormapAndFree -func (c *Conn) copyColormapAndFreeRequest(Mid Id, SrcCmap Id) []byte { +func (c *Conn) copyColormapAndFreeRequest(Mid Colormap, SrcCmap Colormap) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -11532,13 +11602,13 @@ type InstallColormapCookie struct { } // Write request to wire for InstallColormap -func (c *Conn) InstallColormap(Cmap Id) InstallColormapCookie { +func (c *Conn) InstallColormap(Cmap Colormap) InstallColormapCookie { cookie := c.newCookie(false, false) c.newRequest(c.installColormapRequest(Cmap), cookie) return InstallColormapCookie{cookie} } -func (c *Conn) InstallColormapChecked(Cmap Id) InstallColormapCookie { +func (c *Conn) InstallColormapChecked(Cmap Colormap) InstallColormapCookie { cookie := c.newCookie(true, false) c.newRequest(c.installColormapRequest(Cmap), cookie) return InstallColormapCookie{cookie} @@ -11549,7 +11619,7 @@ func (cook InstallColormapCookie) Check() error { } // Write request to wire for InstallColormap -func (c *Conn) installColormapRequest(Cmap Id) []byte { +func (c *Conn) installColormapRequest(Cmap Colormap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -11575,13 +11645,13 @@ type UninstallColormapCookie struct { } // Write request to wire for UninstallColormap -func (c *Conn) UninstallColormap(Cmap Id) UninstallColormapCookie { +func (c *Conn) UninstallColormap(Cmap Colormap) UninstallColormapCookie { cookie := c.newCookie(false, false) c.newRequest(c.uninstallColormapRequest(Cmap), cookie) return UninstallColormapCookie{cookie} } -func (c *Conn) UninstallColormapChecked(Cmap Id) UninstallColormapCookie { +func (c *Conn) UninstallColormapChecked(Cmap Colormap) UninstallColormapCookie { cookie := c.newCookie(true, false) c.newRequest(c.uninstallColormapRequest(Cmap), cookie) return UninstallColormapCookie{cookie} @@ -11592,7 +11662,7 @@ func (cook UninstallColormapCookie) Check() error { } // Write request to wire for UninstallColormap -func (c *Conn) uninstallColormapRequest(Cmap Id) []byte { +func (c *Conn) uninstallColormapRequest(Cmap Colormap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -11617,13 +11687,13 @@ type ListInstalledColormapsCookie struct { *cookie } -func (c *Conn) ListInstalledColormaps(Window Id) ListInstalledColormapsCookie { +func (c *Conn) ListInstalledColormaps(Window Window) ListInstalledColormapsCookie { cookie := c.newCookie(true, true) c.newRequest(c.listInstalledColormapsRequest(Window), cookie) return ListInstalledColormapsCookie{cookie} } -func (c *Conn) ListInstalledColormapsUnchecked(Window Id) ListInstalledColormapsCookie { +func (c *Conn) ListInstalledColormapsUnchecked(Window Window) ListInstalledColormapsCookie { cookie := c.newCookie(false, true) c.newRequest(c.listInstalledColormapsRequest(Window), cookie) return ListInstalledColormapsCookie{cookie} @@ -11637,7 +11707,7 @@ type ListInstalledColormapsReply struct { // padding: 1 bytes CmapsLen uint16 // padding: 22 bytes - Cmaps []Id // size: pad((int(CmapsLen) * 4)) + Cmaps []Colormap // size: pad((int(CmapsLen) * 4)) } // Waits and reads reply data from request ListInstalledColormaps @@ -11670,9 +11740,9 @@ func listInstalledColormapsReply(buf []byte) *ListInstalledColormapsReply { b += 22 // padding - v.Cmaps = make([]Id, v.CmapsLen) + v.Cmaps = make([]Colormap, v.CmapsLen) for i := 0; i < int(v.CmapsLen); i++ { - v.Cmaps[i] = Id(Get32(buf[b:])) + v.Cmaps[i] = Colormap(Get32(buf[b:])) b += 4 } b = pad(b) @@ -11685,7 +11755,7 @@ func (cook ListInstalledColormapsCookie) Check() error { } // Write request to wire for ListInstalledColormaps -func (c *Conn) listInstalledColormapsRequest(Window Id) []byte { +func (c *Conn) listInstalledColormapsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -11710,13 +11780,13 @@ type AllocColorCookie struct { *cookie } -func (c *Conn) AllocColor(Cmap Id, Red uint16, Green uint16, Blue uint16) AllocColorCookie { +func (c *Conn) AllocColor(Cmap Colormap, Red uint16, Green uint16, Blue uint16) AllocColorCookie { cookie := c.newCookie(true, true) c.newRequest(c.allocColorRequest(Cmap, Red, Green, Blue), cookie) return AllocColorCookie{cookie} } -func (c *Conn) AllocColorUnchecked(Cmap Id, Red uint16, Green uint16, Blue uint16) AllocColorCookie { +func (c *Conn) AllocColorUnchecked(Cmap Colormap, Red uint16, Green uint16, Blue uint16) AllocColorCookie { cookie := c.newCookie(false, true) c.newRequest(c.allocColorRequest(Cmap, Red, Green, Blue), cookie) return AllocColorCookie{cookie} @@ -11782,7 +11852,7 @@ func (cook AllocColorCookie) Check() error { } // Write request to wire for AllocColor -func (c *Conn) allocColorRequest(Cmap Id, Red uint16, Green uint16, Blue uint16) []byte { +func (c *Conn) allocColorRequest(Cmap Colormap, Red uint16, Green uint16, Blue uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -11818,13 +11888,13 @@ type AllocNamedColorCookie struct { *cookie } -func (c *Conn) AllocNamedColor(Cmap Id, NameLen uint16, Name string) AllocNamedColorCookie { +func (c *Conn) AllocNamedColor(Cmap Colormap, NameLen uint16, Name string) AllocNamedColorCookie { cookie := c.newCookie(true, true) c.newRequest(c.allocNamedColorRequest(Cmap, NameLen, Name), cookie) return AllocNamedColorCookie{cookie} } -func (c *Conn) AllocNamedColorUnchecked(Cmap Id, NameLen uint16, Name string) AllocNamedColorCookie { +func (c *Conn) AllocNamedColorUnchecked(Cmap Colormap, NameLen uint16, Name string) AllocNamedColorCookie { cookie := c.newCookie(false, true) c.newRequest(c.allocNamedColorRequest(Cmap, NameLen, Name), cookie) return AllocNamedColorCookie{cookie} @@ -11899,7 +11969,7 @@ func (cook AllocNamedColorCookie) Check() error { } // Write request to wire for AllocNamedColor -func (c *Conn) allocNamedColorRequest(Cmap Id, NameLen uint16, Name string) []byte { +func (c *Conn) allocNamedColorRequest(Cmap Colormap, NameLen uint16, Name string) []byte { size := pad((12 + pad((int(NameLen) * 1)))) b := 0 buf := make([]byte, size) @@ -11932,13 +12002,13 @@ type AllocColorCellsCookie struct { *cookie } -func (c *Conn) AllocColorCells(Contiguous bool, Cmap Id, Colors uint16, Planes uint16) AllocColorCellsCookie { +func (c *Conn) AllocColorCells(Contiguous bool, Cmap Colormap, Colors uint16, Planes uint16) AllocColorCellsCookie { cookie := c.newCookie(true, true) c.newRequest(c.allocColorCellsRequest(Contiguous, Cmap, Colors, Planes), cookie) return AllocColorCellsCookie{cookie} } -func (c *Conn) AllocColorCellsUnchecked(Contiguous bool, Cmap Id, Colors uint16, Planes uint16) AllocColorCellsCookie { +func (c *Conn) AllocColorCellsUnchecked(Contiguous bool, Cmap Colormap, Colors uint16, Planes uint16) AllocColorCellsCookie { cookie := c.newCookie(false, true) c.newRequest(c.allocColorCellsRequest(Contiguous, Cmap, Colors, Planes), cookie) return AllocColorCellsCookie{cookie} @@ -12012,7 +12082,7 @@ func (cook AllocColorCellsCookie) Check() error { } // Write request to wire for AllocColorCells -func (c *Conn) allocColorCellsRequest(Contiguous bool, Cmap Id, Colors uint16, Planes uint16) []byte { +func (c *Conn) allocColorCellsRequest(Contiguous bool, Cmap Colormap, Colors uint16, Planes uint16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -12048,13 +12118,13 @@ type AllocColorPlanesCookie struct { *cookie } -func (c *Conn) AllocColorPlanes(Contiguous bool, Cmap Id, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie { +func (c *Conn) AllocColorPlanes(Contiguous bool, Cmap Colormap, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie { cookie := c.newCookie(true, true) c.newRequest(c.allocColorPlanesRequest(Contiguous, Cmap, Colors, Reds, Greens, Blues), cookie) return AllocColorPlanesCookie{cookie} } -func (c *Conn) AllocColorPlanesUnchecked(Contiguous bool, Cmap Id, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie { +func (c *Conn) AllocColorPlanesUnchecked(Contiguous bool, Cmap Colormap, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie { cookie := c.newCookie(false, true) c.newRequest(c.allocColorPlanesRequest(Contiguous, Cmap, Colors, Reds, Greens, Blues), cookie) return AllocColorPlanesCookie{cookie} @@ -12131,7 +12201,7 @@ func (cook AllocColorPlanesCookie) Check() error { } // Write request to wire for AllocColorPlanes -func (c *Conn) allocColorPlanesRequest(Contiguous bool, Cmap Id, Colors uint16, Reds uint16, Greens uint16, Blues uint16) []byte { +func (c *Conn) allocColorPlanesRequest(Contiguous bool, Cmap Colormap, Colors uint16, Reds uint16, Greens uint16, Blues uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -12174,13 +12244,13 @@ type FreeColorsCookie struct { } // Write request to wire for FreeColors -func (c *Conn) FreeColors(Cmap Id, PlaneMask uint32, Pixels []uint32) FreeColorsCookie { +func (c *Conn) FreeColors(Cmap Colormap, PlaneMask uint32, Pixels []uint32) FreeColorsCookie { cookie := c.newCookie(false, false) c.newRequest(c.freeColorsRequest(Cmap, PlaneMask, Pixels), cookie) return FreeColorsCookie{cookie} } -func (c *Conn) FreeColorsChecked(Cmap Id, PlaneMask uint32, Pixels []uint32) FreeColorsCookie { +func (c *Conn) FreeColorsChecked(Cmap Colormap, PlaneMask uint32, Pixels []uint32) FreeColorsCookie { cookie := c.newCookie(true, false) c.newRequest(c.freeColorsRequest(Cmap, PlaneMask, Pixels), cookie) return FreeColorsCookie{cookie} @@ -12191,7 +12261,7 @@ func (cook FreeColorsCookie) Check() error { } // Write request to wire for FreeColors -func (c *Conn) freeColorsRequest(Cmap Id, PlaneMask uint32, Pixels []uint32) []byte { +func (c *Conn) freeColorsRequest(Cmap Colormap, PlaneMask uint32, Pixels []uint32) []byte { size := pad((12 + pad((len(Pixels) * 4)))) b := 0 buf := make([]byte, size) @@ -12226,13 +12296,13 @@ type StoreColorsCookie struct { } // Write request to wire for StoreColors -func (c *Conn) StoreColors(Cmap Id, Items []Coloritem) StoreColorsCookie { +func (c *Conn) StoreColors(Cmap Colormap, Items []Coloritem) StoreColorsCookie { cookie := c.newCookie(false, false) c.newRequest(c.storeColorsRequest(Cmap, Items), cookie) return StoreColorsCookie{cookie} } -func (c *Conn) StoreColorsChecked(Cmap Id, Items []Coloritem) StoreColorsCookie { +func (c *Conn) StoreColorsChecked(Cmap Colormap, Items []Coloritem) StoreColorsCookie { cookie := c.newCookie(true, false) c.newRequest(c.storeColorsRequest(Cmap, Items), cookie) return StoreColorsCookie{cookie} @@ -12243,7 +12313,7 @@ func (cook StoreColorsCookie) Check() error { } // Write request to wire for StoreColors -func (c *Conn) storeColorsRequest(Cmap Id, Items []Coloritem) []byte { +func (c *Conn) storeColorsRequest(Cmap Colormap, Items []Coloritem) []byte { size := pad((8 + pad((len(Items) * 12)))) b := 0 buf := make([]byte, size) @@ -12271,13 +12341,13 @@ type StoreNamedColorCookie struct { } // Write request to wire for StoreNamedColor -func (c *Conn) StoreNamedColor(Flags byte, Cmap Id, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie { +func (c *Conn) StoreNamedColor(Flags byte, Cmap Colormap, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie { cookie := c.newCookie(false, false) c.newRequest(c.storeNamedColorRequest(Flags, Cmap, Pixel, NameLen, Name), cookie) return StoreNamedColorCookie{cookie} } -func (c *Conn) StoreNamedColorChecked(Flags byte, Cmap Id, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie { +func (c *Conn) StoreNamedColorChecked(Flags byte, Cmap Colormap, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie { cookie := c.newCookie(true, false) c.newRequest(c.storeNamedColorRequest(Flags, Cmap, Pixel, NameLen, Name), cookie) return StoreNamedColorCookie{cookie} @@ -12288,7 +12358,7 @@ func (cook StoreNamedColorCookie) Check() error { } // Write request to wire for StoreNamedColor -func (c *Conn) storeNamedColorRequest(Flags byte, Cmap Id, Pixel uint32, NameLen uint16, Name string) []byte { +func (c *Conn) storeNamedColorRequest(Flags byte, Cmap Colormap, Pixel uint32, NameLen uint16, Name string) []byte { size := pad((16 + pad((int(NameLen) * 1)))) b := 0 buf := make([]byte, size) @@ -12325,13 +12395,13 @@ type QueryColorsCookie struct { *cookie } -func (c *Conn) QueryColors(Cmap Id, Pixels []uint32) QueryColorsCookie { +func (c *Conn) QueryColors(Cmap Colormap, Pixels []uint32) QueryColorsCookie { cookie := c.newCookie(true, true) c.newRequest(c.queryColorsRequest(Cmap, Pixels), cookie) return QueryColorsCookie{cookie} } -func (c *Conn) QueryColorsUnchecked(Cmap Id, Pixels []uint32) QueryColorsCookie { +func (c *Conn) QueryColorsUnchecked(Cmap Colormap, Pixels []uint32) QueryColorsCookie { cookie := c.newCookie(false, true) c.newRequest(c.queryColorsRequest(Cmap, Pixels), cookie) return QueryColorsCookie{cookie} @@ -12389,7 +12459,7 @@ func (cook QueryColorsCookie) Check() error { } // Write request to wire for QueryColors -func (c *Conn) queryColorsRequest(Cmap Id, Pixels []uint32) []byte { +func (c *Conn) queryColorsRequest(Cmap Colormap, Pixels []uint32) []byte { size := pad((8 + pad((len(Pixels) * 4)))) b := 0 buf := make([]byte, size) @@ -12420,13 +12490,13 @@ type LookupColorCookie struct { *cookie } -func (c *Conn) LookupColor(Cmap Id, NameLen uint16, Name string) LookupColorCookie { +func (c *Conn) LookupColor(Cmap Colormap, NameLen uint16, Name string) LookupColorCookie { cookie := c.newCookie(true, true) c.newRequest(c.lookupColorRequest(Cmap, NameLen, Name), cookie) return LookupColorCookie{cookie} } -func (c *Conn) LookupColorUnchecked(Cmap Id, NameLen uint16, Name string) LookupColorCookie { +func (c *Conn) LookupColorUnchecked(Cmap Colormap, NameLen uint16, Name string) LookupColorCookie { cookie := c.newCookie(false, true) c.newRequest(c.lookupColorRequest(Cmap, NameLen, Name), cookie) return LookupColorCookie{cookie} @@ -12497,7 +12567,7 @@ func (cook LookupColorCookie) Check() error { } // Write request to wire for LookupColor -func (c *Conn) lookupColorRequest(Cmap Id, NameLen uint16, Name string) []byte { +func (c *Conn) lookupColorRequest(Cmap Colormap, NameLen uint16, Name string) []byte { size := pad((12 + pad((int(NameLen) * 1)))) b := 0 buf := make([]byte, size) @@ -12531,13 +12601,13 @@ type CreateCursorCookie struct { } // Write request to wire for CreateCursor -func (c *Conn) CreateCursor(Cid Id, Source Id, Mask Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie { +func (c *Conn) CreateCursor(Cid Cursor, Source Pixmap, Mask Pixmap, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.createCursorRequest(Cid, Source, Mask, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue, X, Y), cookie) return CreateCursorCookie{cookie} } -func (c *Conn) CreateCursorChecked(Cid Id, Source Id, Mask Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie { +func (c *Conn) CreateCursorChecked(Cid Cursor, Source Pixmap, Mask Pixmap, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.createCursorRequest(Cid, Source, Mask, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue, X, Y), cookie) return CreateCursorCookie{cookie} @@ -12548,7 +12618,7 @@ func (cook CreateCursorCookie) Check() error { } // Write request to wire for CreateCursor -func (c *Conn) createCursorRequest(Cid Id, Source Id, Mask Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) []byte { +func (c *Conn) createCursorRequest(Cid Cursor, Source Pixmap, Mask Pixmap, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -12604,13 +12674,13 @@ type CreateGlyphCursorCookie struct { } // Write request to wire for CreateGlyphCursor -func (c *Conn) CreateGlyphCursor(Cid Id, SourceFont Id, MaskFont Id, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie { +func (c *Conn) CreateGlyphCursor(Cid Cursor, SourceFont Font, MaskFont Font, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.createGlyphCursorRequest(Cid, SourceFont, MaskFont, SourceChar, MaskChar, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie) return CreateGlyphCursorCookie{cookie} } -func (c *Conn) CreateGlyphCursorChecked(Cid Id, SourceFont Id, MaskFont Id, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie { +func (c *Conn) CreateGlyphCursorChecked(Cid Cursor, SourceFont Font, MaskFont Font, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.createGlyphCursorRequest(Cid, SourceFont, MaskFont, SourceChar, MaskChar, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie) return CreateGlyphCursorCookie{cookie} @@ -12621,7 +12691,7 @@ func (cook CreateGlyphCursorCookie) Check() error { } // Write request to wire for CreateGlyphCursor -func (c *Conn) createGlyphCursorRequest(Cid Id, SourceFont Id, MaskFont Id, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte { +func (c *Conn) createGlyphCursorRequest(Cid Cursor, SourceFont Font, MaskFont Font, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -12677,13 +12747,13 @@ type FreeCursorCookie struct { } // Write request to wire for FreeCursor -func (c *Conn) FreeCursor(Cursor Id) FreeCursorCookie { +func (c *Conn) FreeCursor(Cursor Cursor) FreeCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.freeCursorRequest(Cursor), cookie) return FreeCursorCookie{cookie} } -func (c *Conn) FreeCursorChecked(Cursor Id) FreeCursorCookie { +func (c *Conn) FreeCursorChecked(Cursor Cursor) FreeCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.freeCursorRequest(Cursor), cookie) return FreeCursorCookie{cookie} @@ -12694,7 +12764,7 @@ func (cook FreeCursorCookie) Check() error { } // Write request to wire for FreeCursor -func (c *Conn) freeCursorRequest(Cursor Id) []byte { +func (c *Conn) freeCursorRequest(Cursor Cursor) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -12720,13 +12790,13 @@ type RecolorCursorCookie struct { } // Write request to wire for RecolorCursor -func (c *Conn) RecolorCursor(Cursor Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie { +func (c *Conn) RecolorCursor(Cursor Cursor, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie { cookie := c.newCookie(false, false) c.newRequest(c.recolorCursorRequest(Cursor, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie) return RecolorCursorCookie{cookie} } -func (c *Conn) RecolorCursorChecked(Cursor Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie { +func (c *Conn) RecolorCursorChecked(Cursor Cursor, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie { cookie := c.newCookie(true, false) c.newRequest(c.recolorCursorRequest(Cursor, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie) return RecolorCursorCookie{cookie} @@ -12737,7 +12807,7 @@ func (cook RecolorCursorCookie) Check() error { } // Write request to wire for RecolorCursor -func (c *Conn) recolorCursorRequest(Cursor Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte { +func (c *Conn) recolorCursorRequest(Cursor Cursor, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -12780,13 +12850,13 @@ type QueryBestSizeCookie struct { *cookie } -func (c *Conn) QueryBestSize(Class byte, Drawable Id, Width uint16, Height uint16) QueryBestSizeCookie { +func (c *Conn) QueryBestSize(Class byte, Drawable Drawable, Width uint16, Height uint16) QueryBestSizeCookie { cookie := c.newCookie(true, true) c.newRequest(c.queryBestSizeRequest(Class, Drawable, Width, Height), cookie) return QueryBestSizeCookie{cookie} } -func (c *Conn) QueryBestSizeUnchecked(Class byte, Drawable Id, Width uint16, Height uint16) QueryBestSizeCookie { +func (c *Conn) QueryBestSizeUnchecked(Class byte, Drawable Drawable, Width uint16, Height uint16) QueryBestSizeCookie { cookie := c.newCookie(false, true) c.newRequest(c.queryBestSizeRequest(Class, Drawable, Width, Height), cookie) return QueryBestSizeCookie{cookie} @@ -12841,7 +12911,7 @@ func (cook QueryBestSizeCookie) Check() error { } // Write request to wire for QueryBestSize -func (c *Conn) queryBestSizeRequest(Class byte, Drawable Id, Width uint16, Height uint16) []byte { +func (c *Conn) queryBestSizeRequest(Class byte, Drawable Drawable, Width uint16, Height uint16) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -13959,13 +14029,13 @@ type RotatePropertiesCookie struct { } // Write request to wire for RotateProperties -func (c *Conn) RotateProperties(Window Id, AtomsLen uint16, Delta int16, Atoms []Id) RotatePropertiesCookie { +func (c *Conn) RotateProperties(Window Window, AtomsLen uint16, Delta int16, Atoms []Atom) RotatePropertiesCookie { cookie := c.newCookie(false, false) c.newRequest(c.rotatePropertiesRequest(Window, AtomsLen, Delta, Atoms), cookie) return RotatePropertiesCookie{cookie} } -func (c *Conn) RotatePropertiesChecked(Window Id, AtomsLen uint16, Delta int16, Atoms []Id) RotatePropertiesCookie { +func (c *Conn) RotatePropertiesChecked(Window Window, AtomsLen uint16, Delta int16, Atoms []Atom) RotatePropertiesCookie { cookie := c.newCookie(true, false) c.newRequest(c.rotatePropertiesRequest(Window, AtomsLen, Delta, Atoms), cookie) return RotatePropertiesCookie{cookie} @@ -13976,7 +14046,7 @@ func (cook RotatePropertiesCookie) Check() error { } // Write request to wire for RotateProperties -func (c *Conn) rotatePropertiesRequest(Window Id, AtomsLen uint16, Delta int16, Atoms []Id) []byte { +func (c *Conn) rotatePropertiesRequest(Window Window, AtomsLen uint16, Delta int16, Atoms []Atom) []byte { size := pad((12 + pad((int(AtomsLen) * 4)))) b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xselinux.go b/nexgb/auto_xselinux.go index 34d40fd..4e7ee81 100644 --- a/nexgb/auto_xselinux.go +++ b/nexgb/auto_xselinux.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xselinux.xml on May 8 2012 11:03:25pm EDT. + This file was generated by xselinux.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,16 @@ func init() { newExtErrorFuncs["SELinux"] = make(map[int]newErrorFun) } +// 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' + // Skipping definition for base type 'Int8' // Skipping definition for base type 'Card16' @@ -51,22 +61,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' - // 'XselinuxListItem' struct definition // Size: ((12 + pad((int(ObjectContextLen) * 1))) + pad((int(DataContextLen) * 1))) type XselinuxListItem struct { - Name Id + Name Atom ObjectContextLen uint32 DataContextLen uint32 ObjectContext string // size: pad((int(ObjectContextLen) * 1)) @@ -77,7 +75,7 @@ type XselinuxListItem struct { func ReadXselinuxListItem(buf []byte, v *XselinuxListItem) int { b := 0 - v.Name = Id(Get32(buf[b:])) + v.Name = Atom(Get32(buf[b:])) b += 4 v.ObjectContextLen = Get32(buf[b:]) @@ -673,13 +671,13 @@ type XselinuxGetWindowContextCookie struct { *cookie } -func (c *Conn) XselinuxGetWindowContext(Window Id) XselinuxGetWindowContextCookie { +func (c *Conn) XselinuxGetWindowContext(Window Window) XselinuxGetWindowContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.xselinuxGetWindowContextRequest(Window), cookie) return XselinuxGetWindowContextCookie{cookie} } -func (c *Conn) XselinuxGetWindowContextUnchecked(Window Id) XselinuxGetWindowContextCookie { +func (c *Conn) XselinuxGetWindowContextUnchecked(Window Window) XselinuxGetWindowContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.xselinuxGetWindowContextRequest(Window), cookie) return XselinuxGetWindowContextCookie{cookie} @@ -741,7 +739,7 @@ func (cook XselinuxGetWindowContextCookie) Check() error { } // Write request to wire for XselinuxGetWindowContext -func (c *Conn) xselinuxGetWindowContextRequest(Window Id) []byte { +func (c *Conn) xselinuxGetWindowContextRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1043,13 +1041,13 @@ type XselinuxGetPropertyContextCookie struct { *cookie } -func (c *Conn) XselinuxGetPropertyContext(Window Id, Property Id) XselinuxGetPropertyContextCookie { +func (c *Conn) XselinuxGetPropertyContext(Window Window, Property Atom) XselinuxGetPropertyContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.xselinuxGetPropertyContextRequest(Window, Property), cookie) return XselinuxGetPropertyContextCookie{cookie} } -func (c *Conn) XselinuxGetPropertyContextUnchecked(Window Id, Property Id) XselinuxGetPropertyContextCookie { +func (c *Conn) XselinuxGetPropertyContextUnchecked(Window Window, Property Atom) XselinuxGetPropertyContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.xselinuxGetPropertyContextRequest(Window, Property), cookie) return XselinuxGetPropertyContextCookie{cookie} @@ -1111,7 +1109,7 @@ func (cook XselinuxGetPropertyContextCookie) Check() error { } // Write request to wire for XselinuxGetPropertyContext -func (c *Conn) xselinuxGetPropertyContextRequest(Window Id, Property Id) []byte { +func (c *Conn) xselinuxGetPropertyContextRequest(Window Window, Property Atom) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1140,13 +1138,13 @@ type XselinuxGetPropertyDataContextCookie struct { *cookie } -func (c *Conn) XselinuxGetPropertyDataContext(Window Id, Property Id) XselinuxGetPropertyDataContextCookie { +func (c *Conn) XselinuxGetPropertyDataContext(Window Window, Property Atom) XselinuxGetPropertyDataContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.xselinuxGetPropertyDataContextRequest(Window, Property), cookie) return XselinuxGetPropertyDataContextCookie{cookie} } -func (c *Conn) XselinuxGetPropertyDataContextUnchecked(Window Id, Property Id) XselinuxGetPropertyDataContextCookie { +func (c *Conn) XselinuxGetPropertyDataContextUnchecked(Window Window, Property Atom) XselinuxGetPropertyDataContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.xselinuxGetPropertyDataContextRequest(Window, Property), cookie) return XselinuxGetPropertyDataContextCookie{cookie} @@ -1208,7 +1206,7 @@ func (cook XselinuxGetPropertyDataContextCookie) Check() error { } // Write request to wire for XselinuxGetPropertyDataContext -func (c *Conn) xselinuxGetPropertyDataContextRequest(Window Id, Property Id) []byte { +func (c *Conn) xselinuxGetPropertyDataContextRequest(Window Window, Property Atom) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1237,13 +1235,13 @@ type XselinuxListPropertiesCookie struct { *cookie } -func (c *Conn) XselinuxListProperties(Window Id) XselinuxListPropertiesCookie { +func (c *Conn) XselinuxListProperties(Window Window) XselinuxListPropertiesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xselinuxListPropertiesRequest(Window), cookie) return XselinuxListPropertiesCookie{cookie} } -func (c *Conn) XselinuxListPropertiesUnchecked(Window Id) XselinuxListPropertiesCookie { +func (c *Conn) XselinuxListPropertiesUnchecked(Window Window) XselinuxListPropertiesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xselinuxListPropertiesRequest(Window), cookie) return XselinuxListPropertiesCookie{cookie} @@ -1301,7 +1299,7 @@ func (cook XselinuxListPropertiesCookie) Check() error { } // Write request to wire for XselinuxListProperties -func (c *Conn) xselinuxListPropertiesRequest(Window Id) []byte { +func (c *Conn) xselinuxListPropertiesRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1603,13 +1601,13 @@ type XselinuxGetSelectionContextCookie struct { *cookie } -func (c *Conn) XselinuxGetSelectionContext(Selection Id) XselinuxGetSelectionContextCookie { +func (c *Conn) XselinuxGetSelectionContext(Selection Atom) XselinuxGetSelectionContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.xselinuxGetSelectionContextRequest(Selection), cookie) return XselinuxGetSelectionContextCookie{cookie} } -func (c *Conn) XselinuxGetSelectionContextUnchecked(Selection Id) XselinuxGetSelectionContextCookie { +func (c *Conn) XselinuxGetSelectionContextUnchecked(Selection Atom) XselinuxGetSelectionContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.xselinuxGetSelectionContextRequest(Selection), cookie) return XselinuxGetSelectionContextCookie{cookie} @@ -1671,7 +1669,7 @@ func (cook XselinuxGetSelectionContextCookie) Check() error { } // Write request to wire for XselinuxGetSelectionContext -func (c *Conn) xselinuxGetSelectionContextRequest(Selection Id) []byte { +func (c *Conn) xselinuxGetSelectionContextRequest(Selection Atom) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1697,13 +1695,13 @@ type XselinuxGetSelectionDataContextCookie struct { *cookie } -func (c *Conn) XselinuxGetSelectionDataContext(Selection Id) XselinuxGetSelectionDataContextCookie { +func (c *Conn) XselinuxGetSelectionDataContext(Selection Atom) XselinuxGetSelectionDataContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.xselinuxGetSelectionDataContextRequest(Selection), cookie) return XselinuxGetSelectionDataContextCookie{cookie} } -func (c *Conn) XselinuxGetSelectionDataContextUnchecked(Selection Id) XselinuxGetSelectionDataContextCookie { +func (c *Conn) XselinuxGetSelectionDataContextUnchecked(Selection Atom) XselinuxGetSelectionDataContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.xselinuxGetSelectionDataContextRequest(Selection), cookie) return XselinuxGetSelectionDataContextCookie{cookie} @@ -1765,7 +1763,7 @@ func (cook XselinuxGetSelectionDataContextCookie) Check() error { } // Write request to wire for XselinuxGetSelectionDataContext -func (c *Conn) xselinuxGetSelectionDataContextRequest(Selection Id) []byte { +func (c *Conn) xselinuxGetSelectionDataContextRequest(Selection Atom) []byte { size := 8 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xtest.go b/nexgb/auto_xtest.go index 6410831..f3b92a2 100644 --- a/nexgb/auto_xtest.go +++ b/nexgb/auto_xtest.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xtest.xml on May 8 2012 11:03:25pm EDT. + This file was generated by xtest.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,16 @@ func init() { newExtErrorFuncs["XTEST"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Int16' + +// 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' // Skipping definition for base type 'Char' @@ -49,20 +59,8 @@ 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' - -// Skipping definition for base type 'Int8' - const ( XtestCursorNone = 0 XtestCursorCurrent = 1 @@ -163,13 +161,13 @@ type XtestCompareCursorCookie struct { *cookie } -func (c *Conn) XtestCompareCursor(Window Id, Cursor Id) XtestCompareCursorCookie { +func (c *Conn) XtestCompareCursor(Window Window, Cursor Cursor) XtestCompareCursorCookie { cookie := c.newCookie(true, true) c.newRequest(c.xtestCompareCursorRequest(Window, Cursor), cookie) return XtestCompareCursorCookie{cookie} } -func (c *Conn) XtestCompareCursorUnchecked(Window Id, Cursor Id) XtestCompareCursorCookie { +func (c *Conn) XtestCompareCursorUnchecked(Window Window, Cursor Cursor) XtestCompareCursorCookie { cookie := c.newCookie(false, true) c.newRequest(c.xtestCompareCursorRequest(Window, Cursor), cookie) return XtestCompareCursorCookie{cookie} @@ -221,7 +219,7 @@ func (cook XtestCompareCursorCookie) Check() error { } // Write request to wire for XtestCompareCursor -func (c *Conn) xtestCompareCursorRequest(Window Id, Cursor Id) []byte { +func (c *Conn) xtestCompareCursorRequest(Window Window, Cursor Cursor) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -251,13 +249,13 @@ type XtestFakeInputCookie struct { } // Write request to wire for XtestFakeInput -func (c *Conn) XtestFakeInput(Type byte, Detail byte, Time uint32, Root Id, RootX int16, RootY int16, Deviceid byte) XtestFakeInputCookie { +func (c *Conn) XtestFakeInput(Type byte, Detail byte, Time uint32, Root Window, RootX int16, RootY int16, Deviceid byte) XtestFakeInputCookie { cookie := c.newCookie(false, false) c.newRequest(c.xtestFakeInputRequest(Type, Detail, Time, Root, RootX, RootY, Deviceid), cookie) return XtestFakeInputCookie{cookie} } -func (c *Conn) XtestFakeInputChecked(Type byte, Detail byte, Time uint32, Root Id, RootX int16, RootY int16, Deviceid byte) XtestFakeInputCookie { +func (c *Conn) XtestFakeInputChecked(Type byte, Detail byte, Time uint32, Root Window, RootX int16, RootY int16, Deviceid byte) XtestFakeInputCookie { cookie := c.newCookie(true, false) c.newRequest(c.xtestFakeInputRequest(Type, Detail, Time, Root, RootX, RootY, Deviceid), cookie) return XtestFakeInputCookie{cookie} @@ -268,7 +266,7 @@ func (cook XtestFakeInputCookie) Check() error { } // Write request to wire for XtestFakeInput -func (c *Conn) xtestFakeInputRequest(Type byte, Detail byte, Time uint32, Root Id, RootX int16, RootY int16, Deviceid byte) []byte { +func (c *Conn) xtestFakeInputRequest(Type byte, Detail byte, Time uint32, Root Window, RootX int16, RootY int16, Deviceid byte) []byte { size := 36 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xv.go b/nexgb/auto_xv.go index 615c540..25f0491 100644 --- a/nexgb/auto_xv.go +++ b/nexgb/auto_xv.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xv.xml on May 8 2012 11:03:25pm EDT. + This file was generated by xv.xml on May 10 2012 12:39:35pm EDT. This file is automatically generated. Edit at your peril! */ @@ -38,18 +38,8 @@ func init() { newExtErrorFuncs["XVideo"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Char' - -// Skipping definition for base type 'Card32' - -// Skipping definition for base type 'Double' - -// Skipping definition for base type 'Bool' - // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -64,6 +54,14 @@ func init() { // Skipping definition for base type 'Card16' +// Skipping definition for base type 'Char' + +// Skipping definition for base type 'Card32' + +// Skipping definition for base type 'Double' + +// Skipping definition for base type 'Bool' + const ( XvTypeInputMask = 1 XvTypeOutputMask = 2 @@ -109,9 +107,25 @@ const ( XvGrabPortStatusBadAlloc = 5 ) -// Skipping resource definition of 'Port' +type XvPort uint32 + +func (c *Conn) NewXvPortId() (XvPort, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XvPort(id), nil +} + +type XvEncoding uint32 -// Skipping resource definition of 'Encoding' +func (c *Conn) NewXvEncodingId() (XvEncoding, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XvEncoding(id), nil +} // 'XvRational' struct definition // Size: 8 @@ -233,7 +247,7 @@ func XvFormatListBytes(buf []byte, list []XvFormat) int { // 'XvAdaptorInfo' struct definition // Size: ((12 + pad((int(NameSize) * 1))) + pad((int(NumFormats) * 8))) type XvAdaptorInfo struct { - BaseId Id + BaseId XvPort NameSize uint16 NumPorts uint16 NumFormats uint16 @@ -247,7 +261,7 @@ type XvAdaptorInfo struct { func ReadXvAdaptorInfo(buf []byte, v *XvAdaptorInfo) int { b := 0 - v.BaseId = Id(Get32(buf[b:])) + v.BaseId = XvPort(Get32(buf[b:])) b += 4 v.NameSize = Get16(buf[b:]) @@ -341,7 +355,7 @@ func XvAdaptorInfoListSize(list []XvAdaptorInfo) int { // 'XvEncodingInfo' struct definition // Size: (20 + pad((int(NameSize) * 1))) type XvEncodingInfo struct { - Encoding Id + Encoding XvEncoding NameSize uint16 Width uint16 Height uint16 @@ -354,7 +368,7 @@ type XvEncodingInfo struct { func ReadXvEncodingInfo(buf []byte, v *XvEncodingInfo) int { b := 0 - v.Encoding = Id(Get32(buf[b:])) + v.Encoding = XvEncoding(Get32(buf[b:])) b += 4 v.NameSize = Get16(buf[b:]) @@ -896,8 +910,8 @@ type XvVideoNotifyEvent struct { Sequence uint16 Reason byte Time Timestamp - Drawable Id - Port Id + Drawable Drawable + Port XvPort } // Event read XvVideoNotify @@ -914,10 +928,10 @@ func NewXvVideoNotifyEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 - v.Port = Id(Get32(buf[b:])) + v.Port = XvPort(Get32(buf[b:])) b += 4 return v @@ -978,8 +992,8 @@ type XvPortNotifyEvent struct { Sequence uint16 // padding: 1 bytes Time Timestamp - Port Id - Attribute Id + Port XvPort + Attribute Atom Value int32 } @@ -996,10 +1010,10 @@ func NewXvPortNotifyEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Port = Id(Get32(buf[b:])) + v.Port = XvPort(Get32(buf[b:])) b += 4 - v.Attribute = Id(Get32(buf[b:])) + v.Attribute = Atom(Get32(buf[b:])) b += 4 v.Value = int32(Get32(buf[b:])) @@ -1086,7 +1100,7 @@ func (err XvBadPortError) SequenceId() uint16 { return err.Sequence } -func (err XvBadPortError) BadId() Id { +func (err XvBadPortError) BadId() uint32 { return 0 } @@ -1131,7 +1145,7 @@ func (err XvBadEncodingError) SequenceId() uint16 { return err.Sequence } -func (err XvBadEncodingError) BadId() Id { +func (err XvBadEncodingError) BadId() uint32 { return 0 } @@ -1176,7 +1190,7 @@ func (err XvBadControlError) SequenceId() uint16 { return err.Sequence } -func (err XvBadControlError) BadId() Id { +func (err XvBadControlError) BadId() uint32 { return 0 } @@ -1281,13 +1295,13 @@ type XvQueryAdaptorsCookie struct { *cookie } -func (c *Conn) XvQueryAdaptors(Window Id) XvQueryAdaptorsCookie { +func (c *Conn) XvQueryAdaptors(Window Window) XvQueryAdaptorsCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvQueryAdaptorsRequest(Window), cookie) return XvQueryAdaptorsCookie{cookie} } -func (c *Conn) XvQueryAdaptorsUnchecked(Window Id) XvQueryAdaptorsCookie { +func (c *Conn) XvQueryAdaptorsUnchecked(Window Window) XvQueryAdaptorsCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvQueryAdaptorsRequest(Window), cookie) return XvQueryAdaptorsCookie{cookie} @@ -1345,7 +1359,7 @@ func (cook XvQueryAdaptorsCookie) Check() error { } // Write request to wire for XvQueryAdaptors -func (c *Conn) xvQueryAdaptorsRequest(Window Id) []byte { +func (c *Conn) xvQueryAdaptorsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1371,13 +1385,13 @@ type XvQueryEncodingsCookie struct { *cookie } -func (c *Conn) XvQueryEncodings(Port Id) XvQueryEncodingsCookie { +func (c *Conn) XvQueryEncodings(Port XvPort) XvQueryEncodingsCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvQueryEncodingsRequest(Port), cookie) return XvQueryEncodingsCookie{cookie} } -func (c *Conn) XvQueryEncodingsUnchecked(Port Id) XvQueryEncodingsCookie { +func (c *Conn) XvQueryEncodingsUnchecked(Port XvPort) XvQueryEncodingsCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvQueryEncodingsRequest(Port), cookie) return XvQueryEncodingsCookie{cookie} @@ -1435,7 +1449,7 @@ func (cook XvQueryEncodingsCookie) Check() error { } // Write request to wire for XvQueryEncodings -func (c *Conn) xvQueryEncodingsRequest(Port Id) []byte { +func (c *Conn) xvQueryEncodingsRequest(Port XvPort) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1461,13 +1475,13 @@ type XvGrabPortCookie struct { *cookie } -func (c *Conn) XvGrabPort(Port Id, Time Timestamp) XvGrabPortCookie { +func (c *Conn) XvGrabPort(Port XvPort, Time Timestamp) XvGrabPortCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvGrabPortRequest(Port, Time), cookie) return XvGrabPortCookie{cookie} } -func (c *Conn) XvGrabPortUnchecked(Port Id, Time Timestamp) XvGrabPortCookie { +func (c *Conn) XvGrabPortUnchecked(Port XvPort, Time Timestamp) XvGrabPortCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvGrabPortRequest(Port, Time), cookie) return XvGrabPortCookie{cookie} @@ -1515,7 +1529,7 @@ func (cook XvGrabPortCookie) Check() error { } // Write request to wire for XvGrabPort -func (c *Conn) xvGrabPortRequest(Port Id, Time Timestamp) []byte { +func (c *Conn) xvGrabPortRequest(Port XvPort, Time Timestamp) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1545,13 +1559,13 @@ type XvUngrabPortCookie struct { } // Write request to wire for XvUngrabPort -func (c *Conn) XvUngrabPort(Port Id, Time Timestamp) XvUngrabPortCookie { +func (c *Conn) XvUngrabPort(Port XvPort, Time Timestamp) XvUngrabPortCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvUngrabPortRequest(Port, Time), cookie) return XvUngrabPortCookie{cookie} } -func (c *Conn) XvUngrabPortChecked(Port Id, Time Timestamp) XvUngrabPortCookie { +func (c *Conn) XvUngrabPortChecked(Port XvPort, Time Timestamp) XvUngrabPortCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvUngrabPortRequest(Port, Time), cookie) return XvUngrabPortCookie{cookie} @@ -1562,7 +1576,7 @@ func (cook XvUngrabPortCookie) Check() error { } // Write request to wire for XvUngrabPort -func (c *Conn) xvUngrabPortRequest(Port Id, Time Timestamp) []byte { +func (c *Conn) xvUngrabPortRequest(Port XvPort, Time Timestamp) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1592,13 +1606,13 @@ type XvPutVideoCookie struct { } // Write request to wire for XvPutVideo -func (c *Conn) XvPutVideo(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutVideoCookie { +func (c *Conn) XvPutVideo(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutVideoCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvPutVideoRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvPutVideoCookie{cookie} } -func (c *Conn) XvPutVideoChecked(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutVideoCookie { +func (c *Conn) XvPutVideoChecked(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutVideoCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvPutVideoRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvPutVideoCookie{cookie} @@ -1609,7 +1623,7 @@ func (cook XvPutVideoCookie) Check() error { } // Write request to wire for XvPutVideo -func (c *Conn) xvPutVideoRequest(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { +func (c *Conn) xvPutVideoRequest(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1666,13 +1680,13 @@ type XvPutStillCookie struct { } // Write request to wire for XvPutStill -func (c *Conn) XvPutStill(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutStillCookie { +func (c *Conn) XvPutStill(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutStillCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvPutStillRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvPutStillCookie{cookie} } -func (c *Conn) XvPutStillChecked(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutStillCookie { +func (c *Conn) XvPutStillChecked(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvPutStillCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvPutStillRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvPutStillCookie{cookie} @@ -1683,7 +1697,7 @@ func (cook XvPutStillCookie) Check() error { } // Write request to wire for XvPutStill -func (c *Conn) xvPutStillRequest(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { +func (c *Conn) xvPutStillRequest(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1740,13 +1754,13 @@ type XvGetVideoCookie struct { } // Write request to wire for XvGetVideo -func (c *Conn) XvGetVideo(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetVideoCookie { +func (c *Conn) XvGetVideo(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetVideoCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvGetVideoRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvGetVideoCookie{cookie} } -func (c *Conn) XvGetVideoChecked(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetVideoCookie { +func (c *Conn) XvGetVideoChecked(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetVideoCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvGetVideoRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvGetVideoCookie{cookie} @@ -1757,7 +1771,7 @@ func (cook XvGetVideoCookie) Check() error { } // Write request to wire for XvGetVideo -func (c *Conn) xvGetVideoRequest(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { +func (c *Conn) xvGetVideoRequest(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1814,13 +1828,13 @@ type XvGetStillCookie struct { } // Write request to wire for XvGetStill -func (c *Conn) XvGetStill(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetStillCookie { +func (c *Conn) XvGetStill(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetStillCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvGetStillRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvGetStillCookie{cookie} } -func (c *Conn) XvGetStillChecked(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetStillCookie { +func (c *Conn) XvGetStillChecked(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) XvGetStillCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvGetStillRequest(Port, Drawable, Gc, VidX, VidY, VidW, VidH, DrwX, DrwY, DrwW, DrwH), cookie) return XvGetStillCookie{cookie} @@ -1831,7 +1845,7 @@ func (cook XvGetStillCookie) Check() error { } // Write request to wire for XvGetStill -func (c *Conn) xvGetStillRequest(Port Id, Drawable Id, Gc Id, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { +func (c *Conn) xvGetStillRequest(Port XvPort, Drawable Drawable, Gc Gcontext, VidX int16, VidY int16, VidW uint16, VidH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1888,13 +1902,13 @@ type XvStopVideoCookie struct { } // Write request to wire for XvStopVideo -func (c *Conn) XvStopVideo(Port Id, Drawable Id) XvStopVideoCookie { +func (c *Conn) XvStopVideo(Port XvPort, Drawable Drawable) XvStopVideoCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvStopVideoRequest(Port, Drawable), cookie) return XvStopVideoCookie{cookie} } -func (c *Conn) XvStopVideoChecked(Port Id, Drawable Id) XvStopVideoCookie { +func (c *Conn) XvStopVideoChecked(Port XvPort, Drawable Drawable) XvStopVideoCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvStopVideoRequest(Port, Drawable), cookie) return XvStopVideoCookie{cookie} @@ -1905,7 +1919,7 @@ func (cook XvStopVideoCookie) Check() error { } // Write request to wire for XvStopVideo -func (c *Conn) xvStopVideoRequest(Port Id, Drawable Id) []byte { +func (c *Conn) xvStopVideoRequest(Port XvPort, Drawable Drawable) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1935,13 +1949,13 @@ type XvSelectVideoNotifyCookie struct { } // Write request to wire for XvSelectVideoNotify -func (c *Conn) XvSelectVideoNotify(Drawable Id, Onoff bool) XvSelectVideoNotifyCookie { +func (c *Conn) XvSelectVideoNotify(Drawable Drawable, Onoff bool) XvSelectVideoNotifyCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvSelectVideoNotifyRequest(Drawable, Onoff), cookie) return XvSelectVideoNotifyCookie{cookie} } -func (c *Conn) XvSelectVideoNotifyChecked(Drawable Id, Onoff bool) XvSelectVideoNotifyCookie { +func (c *Conn) XvSelectVideoNotifyChecked(Drawable Drawable, Onoff bool) XvSelectVideoNotifyCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvSelectVideoNotifyRequest(Drawable, Onoff), cookie) return XvSelectVideoNotifyCookie{cookie} @@ -1952,7 +1966,7 @@ func (cook XvSelectVideoNotifyCookie) Check() error { } // Write request to wire for XvSelectVideoNotify -func (c *Conn) xvSelectVideoNotifyRequest(Drawable Id, Onoff bool) []byte { +func (c *Conn) xvSelectVideoNotifyRequest(Drawable Drawable, Onoff bool) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1988,13 +2002,13 @@ type XvSelectPortNotifyCookie struct { } // Write request to wire for XvSelectPortNotify -func (c *Conn) XvSelectPortNotify(Port Id, Onoff bool) XvSelectPortNotifyCookie { +func (c *Conn) XvSelectPortNotify(Port XvPort, Onoff bool) XvSelectPortNotifyCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvSelectPortNotifyRequest(Port, Onoff), cookie) return XvSelectPortNotifyCookie{cookie} } -func (c *Conn) XvSelectPortNotifyChecked(Port Id, Onoff bool) XvSelectPortNotifyCookie { +func (c *Conn) XvSelectPortNotifyChecked(Port XvPort, Onoff bool) XvSelectPortNotifyCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvSelectPortNotifyRequest(Port, Onoff), cookie) return XvSelectPortNotifyCookie{cookie} @@ -2005,7 +2019,7 @@ func (cook XvSelectPortNotifyCookie) Check() error { } // Write request to wire for XvSelectPortNotify -func (c *Conn) xvSelectPortNotifyRequest(Port Id, Onoff bool) []byte { +func (c *Conn) xvSelectPortNotifyRequest(Port XvPort, Onoff bool) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2040,13 +2054,13 @@ type XvQueryBestSizeCookie struct { *cookie } -func (c *Conn) XvQueryBestSize(Port Id, VidW uint16, VidH uint16, DrwW uint16, DrwH uint16, Motion bool) XvQueryBestSizeCookie { +func (c *Conn) XvQueryBestSize(Port XvPort, VidW uint16, VidH uint16, DrwW uint16, DrwH uint16, Motion bool) XvQueryBestSizeCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvQueryBestSizeRequest(Port, VidW, VidH, DrwW, DrwH, Motion), cookie) return XvQueryBestSizeCookie{cookie} } -func (c *Conn) XvQueryBestSizeUnchecked(Port Id, VidW uint16, VidH uint16, DrwW uint16, DrwH uint16, Motion bool) XvQueryBestSizeCookie { +func (c *Conn) XvQueryBestSizeUnchecked(Port XvPort, VidW uint16, VidH uint16, DrwW uint16, DrwH uint16, Motion bool) XvQueryBestSizeCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvQueryBestSizeRequest(Port, VidW, VidH, DrwW, DrwH, Motion), cookie) return XvQueryBestSizeCookie{cookie} @@ -2101,7 +2115,7 @@ func (cook XvQueryBestSizeCookie) Check() error { } // Write request to wire for XvQueryBestSize -func (c *Conn) xvQueryBestSizeRequest(Port Id, VidW uint16, VidH uint16, DrwW uint16, DrwH uint16, Motion bool) []byte { +func (c *Conn) xvQueryBestSizeRequest(Port XvPort, VidW uint16, VidH uint16, DrwW uint16, DrwH uint16, Motion bool) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -2149,13 +2163,13 @@ type XvSetPortAttributeCookie struct { } // Write request to wire for XvSetPortAttribute -func (c *Conn) XvSetPortAttribute(Port Id, Attribute Id, Value int32) XvSetPortAttributeCookie { +func (c *Conn) XvSetPortAttribute(Port XvPort, Attribute Atom, Value int32) XvSetPortAttributeCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvSetPortAttributeRequest(Port, Attribute, Value), cookie) return XvSetPortAttributeCookie{cookie} } -func (c *Conn) XvSetPortAttributeChecked(Port Id, Attribute Id, Value int32) XvSetPortAttributeCookie { +func (c *Conn) XvSetPortAttributeChecked(Port XvPort, Attribute Atom, Value int32) XvSetPortAttributeCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvSetPortAttributeRequest(Port, Attribute, Value), cookie) return XvSetPortAttributeCookie{cookie} @@ -2166,7 +2180,7 @@ func (cook XvSetPortAttributeCookie) Check() error { } // Write request to wire for XvSetPortAttribute -func (c *Conn) xvSetPortAttributeRequest(Port Id, Attribute Id, Value int32) []byte { +func (c *Conn) xvSetPortAttributeRequest(Port XvPort, Attribute Atom, Value int32) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -2198,13 +2212,13 @@ type XvGetPortAttributeCookie struct { *cookie } -func (c *Conn) XvGetPortAttribute(Port Id, Attribute Id) XvGetPortAttributeCookie { +func (c *Conn) XvGetPortAttribute(Port XvPort, Attribute Atom) XvGetPortAttributeCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvGetPortAttributeRequest(Port, Attribute), cookie) return XvGetPortAttributeCookie{cookie} } -func (c *Conn) XvGetPortAttributeUnchecked(Port Id, Attribute Id) XvGetPortAttributeCookie { +func (c *Conn) XvGetPortAttributeUnchecked(Port XvPort, Attribute Atom) XvGetPortAttributeCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvGetPortAttributeRequest(Port, Attribute), cookie) return XvGetPortAttributeCookie{cookie} @@ -2255,7 +2269,7 @@ func (cook XvGetPortAttributeCookie) Check() error { } // Write request to wire for XvGetPortAttribute -func (c *Conn) xvGetPortAttributeRequest(Port Id, Attribute Id) []byte { +func (c *Conn) xvGetPortAttributeRequest(Port XvPort, Attribute Atom) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -2284,13 +2298,13 @@ type XvQueryPortAttributesCookie struct { *cookie } -func (c *Conn) XvQueryPortAttributes(Port Id) XvQueryPortAttributesCookie { +func (c *Conn) XvQueryPortAttributes(Port XvPort) XvQueryPortAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvQueryPortAttributesRequest(Port), cookie) return XvQueryPortAttributesCookie{cookie} } -func (c *Conn) XvQueryPortAttributesUnchecked(Port Id) XvQueryPortAttributesCookie { +func (c *Conn) XvQueryPortAttributesUnchecked(Port XvPort) XvQueryPortAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvQueryPortAttributesRequest(Port), cookie) return XvQueryPortAttributesCookie{cookie} @@ -2352,7 +2366,7 @@ func (cook XvQueryPortAttributesCookie) Check() error { } // Write request to wire for XvQueryPortAttributes -func (c *Conn) xvQueryPortAttributesRequest(Port Id) []byte { +func (c *Conn) xvQueryPortAttributesRequest(Port XvPort) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2378,13 +2392,13 @@ type XvListImageFormatsCookie struct { *cookie } -func (c *Conn) XvListImageFormats(Port Id) XvListImageFormatsCookie { +func (c *Conn) XvListImageFormats(Port XvPort) XvListImageFormatsCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvListImageFormatsRequest(Port), cookie) return XvListImageFormatsCookie{cookie} } -func (c *Conn) XvListImageFormatsUnchecked(Port Id) XvListImageFormatsCookie { +func (c *Conn) XvListImageFormatsUnchecked(Port XvPort) XvListImageFormatsCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvListImageFormatsRequest(Port), cookie) return XvListImageFormatsCookie{cookie} @@ -2442,7 +2456,7 @@ func (cook XvListImageFormatsCookie) Check() error { } // Write request to wire for XvListImageFormats -func (c *Conn) xvListImageFormatsRequest(Port Id) []byte { +func (c *Conn) xvListImageFormatsRequest(Port XvPort) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2468,13 +2482,13 @@ type XvQueryImageAttributesCookie struct { *cookie } -func (c *Conn) XvQueryImageAttributes(Port Id, Id uint32, Width uint16, Height uint16) XvQueryImageAttributesCookie { +func (c *Conn) XvQueryImageAttributes(Port XvPort, Id uint32, Width uint16, Height uint16) XvQueryImageAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvQueryImageAttributesRequest(Port, Id, Width, Height), cookie) return XvQueryImageAttributesCookie{cookie} } -func (c *Conn) XvQueryImageAttributesUnchecked(Port Id, Id uint32, Width uint16, Height uint16) XvQueryImageAttributesCookie { +func (c *Conn) XvQueryImageAttributesUnchecked(Port XvPort, Id uint32, Width uint16, Height uint16) XvQueryImageAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvQueryImageAttributesRequest(Port, Id, Width, Height), cookie) return XvQueryImageAttributesCookie{cookie} @@ -2556,7 +2570,7 @@ func (cook XvQueryImageAttributesCookie) Check() error { } // Write request to wire for XvQueryImageAttributes -func (c *Conn) xvQueryImageAttributesRequest(Port Id, Id uint32, Width uint16, Height uint16) []byte { +func (c *Conn) xvQueryImageAttributesRequest(Port XvPort, Id uint32, Width uint16, Height uint16) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -2592,13 +2606,13 @@ type XvPutImageCookie struct { } // Write request to wire for XvPutImage -func (c *Conn) XvPutImage(Port Id, Drawable Id, Gc Id, Id uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, Data []byte) XvPutImageCookie { +func (c *Conn) XvPutImage(Port XvPort, Drawable Drawable, Gc Gcontext, Id uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, Data []byte) XvPutImageCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvPutImageRequest(Port, Drawable, Gc, Id, SrcX, SrcY, SrcW, SrcH, DrwX, DrwY, DrwW, DrwH, Width, Height, Data), cookie) return XvPutImageCookie{cookie} } -func (c *Conn) XvPutImageChecked(Port Id, Drawable Id, Gc Id, Id uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, Data []byte) XvPutImageCookie { +func (c *Conn) XvPutImageChecked(Port XvPort, Drawable Drawable, Gc Gcontext, Id uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, Data []byte) XvPutImageCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvPutImageRequest(Port, Drawable, Gc, Id, SrcX, SrcY, SrcW, SrcH, DrwX, DrwY, DrwW, DrwH, Width, Height, Data), cookie) return XvPutImageCookie{cookie} @@ -2609,7 +2623,7 @@ func (cook XvPutImageCookie) Check() error { } // Write request to wire for XvPutImage -func (c *Conn) xvPutImageRequest(Port Id, Drawable Id, Gc Id, Id uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, Data []byte) []byte { +func (c *Conn) xvPutImageRequest(Port XvPort, Drawable Drawable, Gc Gcontext, Id uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, Data []byte) []byte { size := pad((40 + pad((len(Data) * 1)))) b := 0 buf := make([]byte, size) @@ -2678,13 +2692,13 @@ type XvShmPutImageCookie struct { } // Write request to wire for XvShmPutImage -func (c *Conn) XvShmPutImage(Port Id, Drawable Id, Gc Id, Shmseg Id, Id uint32, Offset uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, SendEvent byte) XvShmPutImageCookie { +func (c *Conn) XvShmPutImage(Port XvPort, Drawable Drawable, Gc Gcontext, Shmseg ShmSeg, Id uint32, Offset uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, SendEvent byte) XvShmPutImageCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvShmPutImageRequest(Port, Drawable, Gc, Shmseg, Id, Offset, SrcX, SrcY, SrcW, SrcH, DrwX, DrwY, DrwW, DrwH, Width, Height, SendEvent), cookie) return XvShmPutImageCookie{cookie} } -func (c *Conn) XvShmPutImageChecked(Port Id, Drawable Id, Gc Id, Shmseg Id, Id uint32, Offset uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, SendEvent byte) XvShmPutImageCookie { +func (c *Conn) XvShmPutImageChecked(Port XvPort, Drawable Drawable, Gc Gcontext, Shmseg ShmSeg, Id uint32, Offset uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, SendEvent byte) XvShmPutImageCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvShmPutImageRequest(Port, Drawable, Gc, Shmseg, Id, Offset, SrcX, SrcY, SrcW, SrcH, DrwX, DrwY, DrwW, DrwH, Width, Height, SendEvent), cookie) return XvShmPutImageCookie{cookie} @@ -2695,7 +2709,7 @@ func (cook XvShmPutImageCookie) Check() error { } // Write request to wire for XvShmPutImage -func (c *Conn) xvShmPutImageRequest(Port Id, Drawable Id, Gc Id, Shmseg Id, Id uint32, Offset uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, SendEvent byte) []byte { +func (c *Conn) xvShmPutImageRequest(Port XvPort, Drawable Drawable, Gc Gcontext, Shmseg ShmSeg, Id uint32, Offset uint32, SrcX int16, SrcY int16, SrcW uint16, SrcH uint16, DrwX int16, DrwY int16, DrwW uint16, DrwH uint16, Width uint16, Height uint16, SendEvent byte) []byte { size := 52 b := 0 buf := make([]byte, size) diff --git a/nexgb/auto_xvmc.go b/nexgb/auto_xvmc.go index 4797488..ba4bd44 100644 --- a/nexgb/auto_xvmc.go +++ b/nexgb/auto_xvmc.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by xvmc.xml on May 8 2012 11:03:25pm EDT. + This file was generated by xvmc.xml on May 10 2012 12:39:35pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,14 +37,6 @@ func init() { newExtErrorFuncs["XVideo-MotionCompensation"] = make(map[int]newErrorFun) } -// Skipping definition for base type 'Int16' - -// 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' @@ -59,20 +51,50 @@ func init() { // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' -// Skipping resource definition of 'Context' +// Skipping definition for base type 'Int16' + +// Skipping definition for base type 'Int32' -// Skipping resource definition of 'Surface' +// Skipping definition for base type 'Void' + +// Skipping definition for base type 'Byte' -// Skipping resource definition of 'Subpicture' +type XvmcContext uint32 + +func (c *Conn) NewXvmcContextId() (XvmcContext, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XvmcContext(id), nil +} + +type XvmcSurface uint32 + +func (c *Conn) NewXvmcSurfaceId() (XvmcSurface, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XvmcSurface(id), nil +} + +type XvmcSubpicture uint32 + +func (c *Conn) NewXvmcSubpictureId() (XvmcSubpicture, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return XvmcSubpicture(id), nil +} // 'XvmcSurfaceInfo' struct definition // Size: 24 type XvmcSurfaceInfo struct { - Id Id + Id XvmcSurface ChromaFormat uint16 Pad0 uint16 MaxWidth uint16 @@ -87,7 +109,7 @@ type XvmcSurfaceInfo struct { func ReadXvmcSurfaceInfo(buf []byte, v *XvmcSurfaceInfo) int { b := 0 - v.Id = Id(Get32(buf[b:])) + v.Id = XvmcSurface(Get32(buf[b:])) b += 4 v.ChromaFormat = Get16(buf[b:]) @@ -264,13 +286,13 @@ type XvmcListSurfaceTypesCookie struct { *cookie } -func (c *Conn) XvmcListSurfaceTypes(PortId Id) XvmcListSurfaceTypesCookie { +func (c *Conn) XvmcListSurfaceTypes(PortId XvPort) XvmcListSurfaceTypesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvmcListSurfaceTypesRequest(PortId), cookie) return XvmcListSurfaceTypesCookie{cookie} } -func (c *Conn) XvmcListSurfaceTypesUnchecked(PortId Id) XvmcListSurfaceTypesCookie { +func (c *Conn) XvmcListSurfaceTypesUnchecked(PortId XvPort) XvmcListSurfaceTypesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvmcListSurfaceTypesRequest(PortId), cookie) return XvmcListSurfaceTypesCookie{cookie} @@ -328,7 +350,7 @@ func (cook XvmcListSurfaceTypesCookie) Check() error { } // Write request to wire for XvmcListSurfaceTypes -func (c *Conn) xvmcListSurfaceTypesRequest(PortId Id) []byte { +func (c *Conn) xvmcListSurfaceTypesRequest(PortId XvPort) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -354,13 +376,13 @@ type XvmcCreateContextCookie struct { *cookie } -func (c *Conn) XvmcCreateContext(ContextId Id, PortId Id, SurfaceId Id, Width uint16, Height uint16, Flags uint32) XvmcCreateContextCookie { +func (c *Conn) XvmcCreateContext(ContextId XvmcContext, PortId XvPort, SurfaceId XvmcSurface, Width uint16, Height uint16, Flags uint32) XvmcCreateContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvmcCreateContextRequest(ContextId, PortId, SurfaceId, Width, Height, Flags), cookie) return XvmcCreateContextCookie{cookie} } -func (c *Conn) XvmcCreateContextUnchecked(ContextId Id, PortId Id, SurfaceId Id, Width uint16, Height uint16, Flags uint32) XvmcCreateContextCookie { +func (c *Conn) XvmcCreateContextUnchecked(ContextId XvmcContext, PortId XvPort, SurfaceId XvmcSurface, Width uint16, Height uint16, Flags uint32) XvmcCreateContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvmcCreateContextRequest(ContextId, PortId, SurfaceId, Width, Height, Flags), cookie) return XvmcCreateContextCookie{cookie} @@ -430,7 +452,7 @@ func (cook XvmcCreateContextCookie) Check() error { } // Write request to wire for XvmcCreateContext -func (c *Conn) xvmcCreateContextRequest(ContextId Id, PortId Id, SurfaceId Id, Width uint16, Height uint16, Flags uint32) []byte { +func (c *Conn) xvmcCreateContextRequest(ContextId XvmcContext, PortId XvPort, SurfaceId XvmcSurface, Width uint16, Height uint16, Flags uint32) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -472,13 +494,13 @@ type XvmcDestroyContextCookie struct { } // Write request to wire for XvmcDestroyContext -func (c *Conn) XvmcDestroyContext(ContextId Id) XvmcDestroyContextCookie { +func (c *Conn) XvmcDestroyContext(ContextId XvmcContext) XvmcDestroyContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvmcDestroyContextRequest(ContextId), cookie) return XvmcDestroyContextCookie{cookie} } -func (c *Conn) XvmcDestroyContextChecked(ContextId Id) XvmcDestroyContextCookie { +func (c *Conn) XvmcDestroyContextChecked(ContextId XvmcContext) XvmcDestroyContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvmcDestroyContextRequest(ContextId), cookie) return XvmcDestroyContextCookie{cookie} @@ -489,7 +511,7 @@ func (cook XvmcDestroyContextCookie) Check() error { } // Write request to wire for XvmcDestroyContext -func (c *Conn) xvmcDestroyContextRequest(ContextId Id) []byte { +func (c *Conn) xvmcDestroyContextRequest(ContextId XvmcContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -515,13 +537,13 @@ type XvmcCreateSurfaceCookie struct { *cookie } -func (c *Conn) XvmcCreateSurface(SurfaceId Id, ContextId Id) XvmcCreateSurfaceCookie { +func (c *Conn) XvmcCreateSurface(SurfaceId XvmcSurface, ContextId XvmcContext) XvmcCreateSurfaceCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvmcCreateSurfaceRequest(SurfaceId, ContextId), cookie) return XvmcCreateSurfaceCookie{cookie} } -func (c *Conn) XvmcCreateSurfaceUnchecked(SurfaceId Id, ContextId Id) XvmcCreateSurfaceCookie { +func (c *Conn) XvmcCreateSurfaceUnchecked(SurfaceId XvmcSurface, ContextId XvmcContext) XvmcCreateSurfaceCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvmcCreateSurfaceRequest(SurfaceId, ContextId), cookie) return XvmcCreateSurfaceCookie{cookie} @@ -579,7 +601,7 @@ func (cook XvmcCreateSurfaceCookie) Check() error { } // Write request to wire for XvmcCreateSurface -func (c *Conn) xvmcCreateSurfaceRequest(SurfaceId Id, ContextId Id) []byte { +func (c *Conn) xvmcCreateSurfaceRequest(SurfaceId XvmcSurface, ContextId XvmcContext) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -609,13 +631,13 @@ type XvmcDestroySurfaceCookie struct { } // Write request to wire for XvmcDestroySurface -func (c *Conn) XvmcDestroySurface(SurfaceId Id) XvmcDestroySurfaceCookie { +func (c *Conn) XvmcDestroySurface(SurfaceId XvmcSurface) XvmcDestroySurfaceCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvmcDestroySurfaceRequest(SurfaceId), cookie) return XvmcDestroySurfaceCookie{cookie} } -func (c *Conn) XvmcDestroySurfaceChecked(SurfaceId Id) XvmcDestroySurfaceCookie { +func (c *Conn) XvmcDestroySurfaceChecked(SurfaceId XvmcSurface) XvmcDestroySurfaceCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvmcDestroySurfaceRequest(SurfaceId), cookie) return XvmcDestroySurfaceCookie{cookie} @@ -626,7 +648,7 @@ func (cook XvmcDestroySurfaceCookie) Check() error { } // Write request to wire for XvmcDestroySurface -func (c *Conn) xvmcDestroySurfaceRequest(SurfaceId Id) []byte { +func (c *Conn) xvmcDestroySurfaceRequest(SurfaceId XvmcSurface) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -652,13 +674,13 @@ type XvmcCreateSubpictureCookie struct { *cookie } -func (c *Conn) XvmcCreateSubpicture(SubpictureId Id, Context Id, XvimageId uint32, Width uint16, Height uint16) XvmcCreateSubpictureCookie { +func (c *Conn) XvmcCreateSubpicture(SubpictureId XvmcSubpicture, Context XvmcContext, XvimageId uint32, Width uint16, Height uint16) XvmcCreateSubpictureCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvmcCreateSubpictureRequest(SubpictureId, Context, XvimageId, Width, Height), cookie) return XvmcCreateSubpictureCookie{cookie} } -func (c *Conn) XvmcCreateSubpictureUnchecked(SubpictureId Id, Context Id, XvimageId uint32, Width uint16, Height uint16) XvmcCreateSubpictureCookie { +func (c *Conn) XvmcCreateSubpictureUnchecked(SubpictureId XvmcSubpicture, Context XvmcContext, XvimageId uint32, Width uint16, Height uint16) XvmcCreateSubpictureCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvmcCreateSubpictureRequest(SubpictureId, Context, XvimageId, Width, Height), cookie) return XvmcCreateSubpictureCookie{cookie} @@ -737,7 +759,7 @@ func (cook XvmcCreateSubpictureCookie) Check() error { } // Write request to wire for XvmcCreateSubpicture -func (c *Conn) xvmcCreateSubpictureRequest(SubpictureId Id, Context Id, XvimageId uint32, Width uint16, Height uint16) []byte { +func (c *Conn) xvmcCreateSubpictureRequest(SubpictureId XvmcSubpicture, Context XvmcContext, XvimageId uint32, Width uint16, Height uint16) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -776,13 +798,13 @@ type XvmcDestroySubpictureCookie struct { } // Write request to wire for XvmcDestroySubpicture -func (c *Conn) XvmcDestroySubpicture(SubpictureId Id) XvmcDestroySubpictureCookie { +func (c *Conn) XvmcDestroySubpicture(SubpictureId XvmcSubpicture) XvmcDestroySubpictureCookie { cookie := c.newCookie(false, false) c.newRequest(c.xvmcDestroySubpictureRequest(SubpictureId), cookie) return XvmcDestroySubpictureCookie{cookie} } -func (c *Conn) XvmcDestroySubpictureChecked(SubpictureId Id) XvmcDestroySubpictureCookie { +func (c *Conn) XvmcDestroySubpictureChecked(SubpictureId XvmcSubpicture) XvmcDestroySubpictureCookie { cookie := c.newCookie(true, false) c.newRequest(c.xvmcDestroySubpictureRequest(SubpictureId), cookie) return XvmcDestroySubpictureCookie{cookie} @@ -793,7 +815,7 @@ func (cook XvmcDestroySubpictureCookie) Check() error { } // Write request to wire for XvmcDestroySubpicture -func (c *Conn) xvmcDestroySubpictureRequest(SubpictureId Id) []byte { +func (c *Conn) xvmcDestroySubpictureRequest(SubpictureId XvmcSubpicture) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -819,13 +841,13 @@ type XvmcListSubpictureTypesCookie struct { *cookie } -func (c *Conn) XvmcListSubpictureTypes(PortId Id, SurfaceId Id) XvmcListSubpictureTypesCookie { +func (c *Conn) XvmcListSubpictureTypes(PortId XvPort, SurfaceId XvmcSurface) XvmcListSubpictureTypesCookie { cookie := c.newCookie(true, true) c.newRequest(c.xvmcListSubpictureTypesRequest(PortId, SurfaceId), cookie) return XvmcListSubpictureTypesCookie{cookie} } -func (c *Conn) XvmcListSubpictureTypesUnchecked(PortId Id, SurfaceId Id) XvmcListSubpictureTypesCookie { +func (c *Conn) XvmcListSubpictureTypesUnchecked(PortId XvPort, SurfaceId XvmcSurface) XvmcListSubpictureTypesCookie { cookie := c.newCookie(false, true) c.newRequest(c.xvmcListSubpictureTypesRequest(PortId, SurfaceId), cookie) return XvmcListSubpictureTypesCookie{cookie} @@ -883,7 +905,7 @@ func (cook XvmcListSubpictureTypesCookie) Check() error { } // Write request to wire for XvmcListSubpictureTypes -func (c *Conn) xvmcListSubpictureTypesRequest(PortId Id, SurfaceId Id) []byte { +func (c *Conn) xvmcListSubpictureTypesRequest(PortId XvPort, SurfaceId XvmcSurface) []byte { size := 12 b := 0 buf := make([]byte, size) diff --git a/nexgb/xgb.go b/nexgb/xgb.go index 8baa208..6a71187 100644 --- a/nexgb/xgb.go +++ b/nexgb/xgb.go @@ -110,9 +110,6 @@ func (c *Conn) DefaultScreen() *ScreenInfo { return &c.Setup.Roots[c.defaultScreen] } -// Id is used for all X identifiers, such as windows, pixmaps, and GCs. -type Id uint32 - // Event is an interface that can contain any of the events returned by the // server. Use a type assertion switch to extract the Event structs. type Event interface { @@ -137,7 +134,7 @@ var newExtEventFuncs = make(map[string]map[int]newEventFun) type Error interface { ImplementsError() SequenceId() uint16 - BadId() Id + BadId() uint32 Error() string } @@ -158,7 +155,9 @@ type eventOrError interface{} // NewID generates a new unused ID for use with requests like CreateWindow. // If no new ids can be generated, the id returned is 0 and error is non-nil. -func (c *Conn) NewId() (Id, error) { +// Note that the value returned will need to be converted to the proper +// type. i.e., xproto.Window(id). +func (c *Conn) NewId() (uint32, error) { xid := <-c.xidChan if xid.err != nil { return 0, xid.err @@ -170,7 +169,7 @@ func (c *Conn) NewId() (Id, error) { // channel. If no new resource id can be generated, id is set to 0 and a // non-nil error is set in xid.err. type xid struct { - id Id + id uint32 err error } @@ -202,7 +201,7 @@ func (conn *Conn) generateXIds() { // TODO: Use the XC Misc extension to look for released ids. if last > 0 && last >= max-inc+1 { conn.xidChan <- xid{ - id: Id(0), + id: 0, err: errors.New("There are no more available resource" + "identifiers."), } @@ -210,7 +209,7 @@ func (conn *Conn) generateXIds() { last += inc conn.xidChan <- xid{ - id: Id(last | conn.Setup.ResourceIdBase), + id: last | conn.Setup.ResourceIdBase, err: nil, } } diff --git a/nexgb/xgb_test.go b/nexgb/xgb_test.go index 7eea19b..d0e840a 100644 --- a/nexgb/xgb_test.go +++ b/nexgb/xgb_test.go @@ -127,7 +127,7 @@ func TestWindowEvents(t *testing.T) { // The geometry to set the window. gx, gy, gw, gh := 200, 400, 1000, 300 - wid, err := X.NewId() + wid, err := X.NewWindowId() if err != nil { t.Fatalf("NewId: %s", err) } diff --git a/nexgb/xgbgen/go.go b/nexgb/xgbgen/go.go index e0d4579..2b2c191 100644 --- a/nexgb/xgbgen/go.go +++ b/nexgb/xgbgen/go.go @@ -4,10 +4,6 @@ import ( "fmt" ) -// xgbResourceIdName is the name of the type used for all resource identifiers. -// As of right now, it needs to be declared somewhere manually. -var xgbGenResourceIdName = "Id" - // BaseTypeMap is a map from X base types to Go types. // X base types should correspond to the smallest set of X types // that can be used to rewrite ALL X types in terms of Go types. @@ -27,7 +23,6 @@ var BaseTypeMap = map[string]string{ "double": "float64", "char": "byte", "void": "byte", - "Id": "Id", } // BaseTypeSizes should have precisely the same keys as in BaseTypeMap, @@ -45,7 +40,10 @@ var BaseTypeSizes = map[string]uint{ "double": 8, "char": 1, "void": 1, - "Id": 4, + + // Id is a special type used to determine the size of all Xid types. + // "Id" is not actually written in the source. + "Id": 4, } // TypeMap is a map from types in the XML to type names that is used @@ -82,8 +80,16 @@ func (enum *Enum) Define(c *Context) { // Resource types func (res *Resource) Define(c *Context) { - c.Putln("// Skipping resource definition of '%s'", - SrcName(c.protocol, res.XmlName())) + c.Putln("type %s uint32", res.SrcName()) + c.Putln("") + c.Putln("func (c *Conn) New%sId() (%s, error) {", + res.SrcName(), res.SrcName()) + c.Putln("id, err := c.NewId()") + c.Putln("if err != nil {") + c.Putln("return 0, err") + c.Putln("}") + c.Putln("return %s(id), nil", res.SrcName()) + c.Putln("}") c.Putln("") } diff --git a/nexgb/xgbgen/go_error.go b/nexgb/xgbgen/go_error.go index c96866c..f4577ef 100644 --- a/nexgb/xgbgen/go_error.go +++ b/nexgb/xgbgen/go_error.go @@ -68,9 +68,9 @@ func (e *Error) ImplementsError(c *Context) { c.Putln("return err.Sequence") c.Putln("}") c.Putln("") - c.Putln("func (err %s) BadId() Id {", e.ErrType()) + c.Putln("func (err %s) BadId() uint32 {", e.ErrType()) if !c.protocol.isExt() { - c.Putln("return Id(err.BadValue)") + c.Putln("return err.BadValue") } else { c.Putln("return 0") } @@ -128,8 +128,12 @@ func (e *ErrorCopy) ImplementsError(c *Context) { c.Putln("return err.Sequence") c.Putln("}") c.Putln("") - c.Putln("func (err %s) BadId() Id {", e.ErrType()) - c.Putln("return Id(err.BadValue)") + c.Putln("func (err %s) BadId() uint32 {", e.ErrType()) + if !c.protocol.isExt() { + c.Putln("return err.BadValue") + } else { + c.Putln("return 0") + } c.Putln("}") c.Putln("") c.Putln("func (err %s) Error() string {", e.ErrType()) diff --git a/nexgb/xgbgen/go_list.go b/nexgb/xgbgen/go_list.go index ad859bb..b01519b 100644 --- a/nexgb/xgbgen/go_list.go +++ b/nexgb/xgbgen/go_list.go @@ -16,7 +16,8 @@ func (f *ListField) Read(c *Context, prefix string) { switch t := f.Type.(type) { case *Resource: length := f.LengthExpr.Reduce(prefix) - c.Putln("%s%s = make([]Id, %s)", prefix, f.SrcName(), length) + c.Putln("%s%s = make([]%s, %s)", + prefix, f.SrcName(), t.SrcName(), length) c.Putln("for i := 0; i < int(%s); i++ {", length) ReadSimpleSingleField(c, fmt.Sprintf("%s%s[i]", prefix, f.SrcName()), t) c.Putln("}") diff --git a/nexgb/xgbgen/go_single_field.go b/nexgb/xgbgen/go_single_field.go index ea43d55..433ebe3 100644 --- a/nexgb/xgbgen/go_single_field.go +++ b/nexgb/xgbgen/go_single_field.go @@ -12,7 +12,7 @@ func (f *SingleField) Define(c *Context) { func ReadSimpleSingleField(c *Context, name string, typ Type) { switch t := typ.(type) { case *Resource: - c.Putln("%s = Id(Get32(buf[b:]))", name) + c.Putln("%s = %s(Get32(buf[b:]))", name, t.SrcName()) case *TypeDef: switch t.Size().Eval() { case 1: diff --git a/nexgb/xgbgen/translation.go b/nexgb/xgbgen/translation.go index e4d81bc..44d615d 100644 --- a/nexgb/xgbgen/translation.go +++ b/nexgb/xgbgen/translation.go @@ -395,11 +395,6 @@ func TypeSrcName(p *Protocol, typ Type) string { return newt } - // If it's a resource type, just use 'Id'. - if _, ok := typ.(*Resource); ok { - return xgbGenResourceIdName - } - // If there's a namespace to this type, just use it and be done. if colon := strings.Index(t, ":"); colon > -1 { namespace := t[:colon] |