diff options
Diffstat (limited to 'nexgb/auto_xfixes.go')
| -rw-r--r-- | nexgb/auto_xfixes.go | 224 |
1 files changed, 115 insertions, 109 deletions
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) |