make resource ids their own individual types. last commit before overhaul to sub-packages

1 files changed, 24 insertions, 26 deletions

diff --git a/nexgb/auto_xinerama.go b/nexgb/auto_xinerama.go
index 0f52bf2..fc24ae3 100644
--- a/nexgb/auto_xinerama.go
+++ b/nexgb/auto_xinerama.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xinerama.xml on May 8 2012 11:03:24pm EDT.
+	This file was generated by xinerama.xml on May 10 2012 12:39:34pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,14 +37,6 @@ func init() {
 	newExtErrorFuncs["XINERAMA"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -59,10 +51,16 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Id'
-
 // Skipping definition for base type 'Card8'
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // 'XineramaScreenInfo' struct definition
 // Size: 8
 type XineramaScreenInfo struct {
@@ -229,13 +227,13 @@ type XineramaGetStateCookie struct {
 	*cookie
 }
 
-func (c *Conn) XineramaGetState(Window Id) XineramaGetStateCookie {
+func (c *Conn) XineramaGetState(Window Window) XineramaGetStateCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xineramaGetStateRequest(Window), cookie)
 	return XineramaGetStateCookie{cookie}
 }
 
-func (c *Conn) XineramaGetStateUnchecked(Window Id) XineramaGetStateCookie {
+func (c *Conn) XineramaGetStateUnchecked(Window Window) XineramaGetStateCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xineramaGetStateRequest(Window), cookie)
 	return XineramaGetStateCookie{cookie}
@@ -247,7 +245,7 @@ type XineramaGetStateReply struct {
 	Sequence uint16
 	Length   uint32
 	State    byte
-	Window   Id
+	Window   Window
 }
 
 // Waits and reads reply data from request XineramaGetState
@@ -276,7 +274,7 @@ func xineramaGetStateReply(buf []byte) *XineramaGetStateReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -287,7 +285,7 @@ func (cook XineramaGetStateCookie) Check() error {
 }
 
 // Write request to wire for XineramaGetState
-func (c *Conn) xineramaGetStateRequest(Window Id) []byte {
+func (c *Conn) xineramaGetStateRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -313,13 +311,13 @@ type XineramaGetScreenCountCookie struct {
 	*cookie
 }
 
-func (c *Conn) XineramaGetScreenCount(Window Id) XineramaGetScreenCountCookie {
+func (c *Conn) XineramaGetScreenCount(Window Window) XineramaGetScreenCountCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xineramaGetScreenCountRequest(Window), cookie)
 	return XineramaGetScreenCountCookie{cookie}
 }
 
-func (c *Conn) XineramaGetScreenCountUnchecked(Window Id) XineramaGetScreenCountCookie {
+func (c *Conn) XineramaGetScreenCountUnchecked(Window Window) XineramaGetScreenCountCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xineramaGetScreenCountRequest(Window), cookie)
 	return XineramaGetScreenCountCookie{cookie}
@@ -331,7 +329,7 @@ type XineramaGetScreenCountReply struct {
 	Sequence    uint16
 	Length      uint32
 	ScreenCount byte
-	Window      Id
+	Window      Window
 }
 
 // Waits and reads reply data from request XineramaGetScreenCount
@@ -360,7 +358,7 @@ func xineramaGetScreenCountReply(buf []byte) *XineramaGetScreenCountReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -371,7 +369,7 @@ func (cook XineramaGetScreenCountCookie) Check() error {
 }
 
 // Write request to wire for XineramaGetScreenCount
-func (c *Conn) xineramaGetScreenCountRequest(Window Id) []byte {
+func (c *Conn) xineramaGetScreenCountRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -397,13 +395,13 @@ type XineramaGetScreenSizeCookie struct {
 	*cookie
 }
 
-func (c *Conn) XineramaGetScreenSize(Window Id, Screen uint32) XineramaGetScreenSizeCookie {
+func (c *Conn) XineramaGetScreenSize(Window Window, Screen uint32) XineramaGetScreenSizeCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xineramaGetScreenSizeRequest(Window, Screen), cookie)
 	return XineramaGetScreenSizeCookie{cookie}
 }
 
-func (c *Conn) XineramaGetScreenSizeUnchecked(Window Id, Screen uint32) XineramaGetScreenSizeCookie {
+func (c *Conn) XineramaGetScreenSizeUnchecked(Window Window, Screen uint32) XineramaGetScreenSizeCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xineramaGetScreenSizeRequest(Window, Screen), cookie)
 	return XineramaGetScreenSizeCookie{cookie}
@@ -417,7 +415,7 @@ type XineramaGetScreenSizeReply struct {
 	// padding: 1 bytes
 	Width  uint32
 	Height uint32
-	Window Id
+	Window Window
 	Screen uint32
 }
 
@@ -452,7 +450,7 @@ func xineramaGetScreenSizeReply(buf []byte) *XineramaGetScreenSizeReply {
 	v.Height = Get32(buf[b:])
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	v.Screen = Get32(buf[b:])
@@ -466,7 +464,7 @@ func (cook XineramaGetScreenSizeCookie) Check() error {
 }
 
 // Write request to wire for XineramaGetScreenSize
-func (c *Conn) xineramaGetScreenSizeRequest(Window Id, Screen uint32) []byte {
+func (c *Conn) xineramaGetScreenSizeRequest(Window Window, Screen uint32) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)