From e239bb3c68a4981a3916534203c2fbd6b96f593c Mon Sep 17 00:00:00 2001 From: "Andrew Gallant (Ocelot)" Date: Thu, 10 May 2012 12:47:19 -0400 Subject: make resource ids their own individual types. last commit before overhaul to sub-packages --- nexgb/auto_render.go | 250 ++++++++++++++++++++++++++++----------------------- 1 file changed, 136 insertions(+), 114 deletions(-) (limited to 'nexgb/auto_render.go') 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) -- cgit v1.2.3-54-g00ecf