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_screensaver.go | 60 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'nexgb/auto_screensaver.go') 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) -- cgit v1.2.3