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

1 files changed, 35 insertions, 37 deletions

diff --git a/nexgb/auto_shape.go b/nexgb/auto_shape.go
index bad291a..90d67cf 100644
--- a/nexgb/auto_shape.go
+++ b/nexgb/auto_shape.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by shape.xml on May 8 2012 11:03:24pm EDT.
+	This file was generated by shape.xml on May 10 2012 12:39:34pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,14 @@ func init() {
 	newExtErrorFuncs["SHAPE"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -51,18 +59,8 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Id'
-
 // Skipping definition for base type 'Card8'
 
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 const (
 	ShapeSoSet       = 0
 	ShapeSoUnion     = 1
@@ -89,7 +87,7 @@ const ShapeNotify = 0
 type ShapeNotifyEvent struct {
 	Sequence       uint16
 	ShapeKind      ShapeKind
-	AffectedWindow Id
+	AffectedWindow Window
 	ExtentsX       int16
 	ExtentsY       int16
 	ExtentsWidth   uint16
@@ -110,7 +108,7 @@ func NewShapeNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.AffectedWindow = Id(Get32(buf[b:]))
+	v.AffectedWindow = Window(Get32(buf[b:]))
 	b += 4
 
 	v.ExtentsX = int16(Get16(buf[b:]))
@@ -299,13 +297,13 @@ type ShapeRectanglesCookie struct {
 }
 
 // Write request to wire for ShapeRectangles
-func (c *Conn) ShapeRectangles(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Id, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie {
+func (c *Conn) ShapeRectangles(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Window, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.shapeRectanglesRequest(Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
 	return ShapeRectanglesCookie{cookie}
 }
 
-func (c *Conn) ShapeRectanglesChecked(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Id, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie {
+func (c *Conn) ShapeRectanglesChecked(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Window, XOffset int16, YOffset int16, Rectangles []Rectangle) ShapeRectanglesCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.shapeRectanglesRequest(Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
 	return ShapeRectanglesCookie{cookie}
@@ -316,7 +314,7 @@ func (cook ShapeRectanglesCookie) Check() error {
 }
 
 // Write request to wire for ShapeRectangles
-func (c *Conn) shapeRectanglesRequest(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Id, XOffset int16, YOffset int16, Rectangles []Rectangle) []byte {
+func (c *Conn) shapeRectanglesRequest(Operation ShapeOp, DestinationKind ShapeKind, Ordering byte, DestinationWindow Window, XOffset int16, YOffset int16, Rectangles []Rectangle) []byte {
 	size := pad((16 + pad((len(Rectangles) * 8))))
 	b := 0
 	buf := make([]byte, size)
@@ -362,13 +360,13 @@ type ShapeMaskCookie struct {
 }
 
 // Write request to wire for ShapeMask
-func (c *Conn) ShapeMask(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceBitmap Id) ShapeMaskCookie {
+func (c *Conn) ShapeMask(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceBitmap Pixmap) ShapeMaskCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.shapeMaskRequest(Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
 	return ShapeMaskCookie{cookie}
 }
 
-func (c *Conn) ShapeMaskChecked(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceBitmap Id) ShapeMaskCookie {
+func (c *Conn) ShapeMaskChecked(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceBitmap Pixmap) ShapeMaskCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.shapeMaskRequest(Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
 	return ShapeMaskCookie{cookie}
@@ -379,7 +377,7 @@ func (cook ShapeMaskCookie) Check() error {
 }
 
 // Write request to wire for ShapeMask
-func (c *Conn) shapeMaskRequest(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceBitmap Id) []byte {
+func (c *Conn) shapeMaskRequest(Operation ShapeOp, DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceBitmap Pixmap) []byte {
 	size := 20
 	b := 0
 	buf := make([]byte, size)
@@ -423,13 +421,13 @@ type ShapeCombineCookie struct {
 }
 
 // Write request to wire for ShapeCombine
-func (c *Conn) ShapeCombine(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceWindow Id) ShapeCombineCookie {
+func (c *Conn) ShapeCombine(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceWindow Window) ShapeCombineCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.shapeCombineRequest(Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
 	return ShapeCombineCookie{cookie}
 }
 
-func (c *Conn) ShapeCombineChecked(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceWindow Id) ShapeCombineCookie {
+func (c *Conn) ShapeCombineChecked(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceWindow Window) ShapeCombineCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.shapeCombineRequest(Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
 	return ShapeCombineCookie{cookie}
@@ -440,7 +438,7 @@ func (cook ShapeCombineCookie) Check() error {
 }
 
 // Write request to wire for ShapeCombine
-func (c *Conn) shapeCombineRequest(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16, SourceWindow Id) []byte {
+func (c *Conn) shapeCombineRequest(Operation ShapeOp, DestinationKind ShapeKind, SourceKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16, SourceWindow Window) []byte {
 	size := 20
 	b := 0
 	buf := make([]byte, size)
@@ -487,13 +485,13 @@ type ShapeOffsetCookie struct {
 }
 
 // Write request to wire for ShapeOffset
-func (c *Conn) ShapeOffset(DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16) ShapeOffsetCookie {
+func (c *Conn) ShapeOffset(DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16) ShapeOffsetCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.shapeOffsetRequest(DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
 	return ShapeOffsetCookie{cookie}
 }
 
-func (c *Conn) ShapeOffsetChecked(DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16) ShapeOffsetCookie {
+func (c *Conn) ShapeOffsetChecked(DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16) ShapeOffsetCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.shapeOffsetRequest(DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
 	return ShapeOffsetCookie{cookie}
@@ -504,7 +502,7 @@ func (cook ShapeOffsetCookie) Check() error {
 }
 
 // Write request to wire for ShapeOffset
-func (c *Conn) shapeOffsetRequest(DestinationKind ShapeKind, DestinationWindow Id, XOffset int16, YOffset int16) []byte {
+func (c *Conn) shapeOffsetRequest(DestinationKind ShapeKind, DestinationWindow Window, XOffset int16, YOffset int16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -541,13 +539,13 @@ type ShapeQueryExtentsCookie struct {
 	*cookie
 }
 
-func (c *Conn) ShapeQueryExtents(DestinationWindow Id) ShapeQueryExtentsCookie {
+func (c *Conn) ShapeQueryExtents(DestinationWindow Window) ShapeQueryExtentsCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.shapeQueryExtentsRequest(DestinationWindow), cookie)
 	return ShapeQueryExtentsCookie{cookie}
 }
 
-func (c *Conn) ShapeQueryExtentsUnchecked(DestinationWindow Id) ShapeQueryExtentsCookie {
+func (c *Conn) ShapeQueryExtentsUnchecked(DestinationWindow Window) ShapeQueryExtentsCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.shapeQueryExtentsRequest(DestinationWindow), cookie)
 	return ShapeQueryExtentsCookie{cookie}
@@ -645,7 +643,7 @@ func (cook ShapeQueryExtentsCookie) Check() error {
 }
 
 // Write request to wire for ShapeQueryExtents
-func (c *Conn) shapeQueryExtentsRequest(DestinationWindow Id) []byte {
+func (c *Conn) shapeQueryExtentsRequest(DestinationWindow Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -672,13 +670,13 @@ type ShapeSelectInputCookie struct {
 }
 
 // Write request to wire for ShapeSelectInput
-func (c *Conn) ShapeSelectInput(DestinationWindow Id, Enable bool) ShapeSelectInputCookie {
+func (c *Conn) ShapeSelectInput(DestinationWindow Window, Enable bool) ShapeSelectInputCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.shapeSelectInputRequest(DestinationWindow, Enable), cookie)
 	return ShapeSelectInputCookie{cookie}
 }
 
-func (c *Conn) ShapeSelectInputChecked(DestinationWindow Id, Enable bool) ShapeSelectInputCookie {
+func (c *Conn) ShapeSelectInputChecked(DestinationWindow Window, Enable bool) ShapeSelectInputCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.shapeSelectInputRequest(DestinationWindow, Enable), cookie)
 	return ShapeSelectInputCookie{cookie}
@@ -689,7 +687,7 @@ func (cook ShapeSelectInputCookie) Check() error {
 }
 
 // Write request to wire for ShapeSelectInput
-func (c *Conn) shapeSelectInputRequest(DestinationWindow Id, Enable bool) []byte {
+func (c *Conn) shapeSelectInputRequest(DestinationWindow Window, Enable bool) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -724,13 +722,13 @@ type ShapeInputSelectedCookie struct {
 	*cookie
 }
 
-func (c *Conn) ShapeInputSelected(DestinationWindow Id) ShapeInputSelectedCookie {
+func (c *Conn) ShapeInputSelected(DestinationWindow Window) ShapeInputSelectedCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.shapeInputSelectedRequest(DestinationWindow), cookie)
 	return ShapeInputSelectedCookie{cookie}
 }
 
-func (c *Conn) ShapeInputSelectedUnchecked(DestinationWindow Id) ShapeInputSelectedCookie {
+func (c *Conn) ShapeInputSelectedUnchecked(DestinationWindow Window) ShapeInputSelectedCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.shapeInputSelectedRequest(DestinationWindow), cookie)
 	return ShapeInputSelectedCookie{cookie}
@@ -782,7 +780,7 @@ func (cook ShapeInputSelectedCookie) Check() error {
 }
 
 // Write request to wire for ShapeInputSelected
-func (c *Conn) shapeInputSelectedRequest(DestinationWindow Id) []byte {
+func (c *Conn) shapeInputSelectedRequest(DestinationWindow Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -808,13 +806,13 @@ type ShapeGetRectanglesCookie struct {
 	*cookie
 }
 
-func (c *Conn) ShapeGetRectangles(Window Id, SourceKind ShapeKind) ShapeGetRectanglesCookie {
+func (c *Conn) ShapeGetRectangles(Window Window, SourceKind ShapeKind) ShapeGetRectanglesCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.shapeGetRectanglesRequest(Window, SourceKind), cookie)
 	return ShapeGetRectanglesCookie{cookie}
 }
 
-func (c *Conn) ShapeGetRectanglesUnchecked(Window Id, SourceKind ShapeKind) ShapeGetRectanglesCookie {
+func (c *Conn) ShapeGetRectanglesUnchecked(Window Window, SourceKind ShapeKind) ShapeGetRectanglesCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.shapeGetRectanglesRequest(Window, SourceKind), cookie)
 	return ShapeGetRectanglesCookie{cookie}
@@ -873,7 +871,7 @@ func (cook ShapeGetRectanglesCookie) Check() error {
 }
 
 // Write request to wire for ShapeGetRectangles
-func (c *Conn) shapeGetRectanglesRequest(Window Id, SourceKind ShapeKind) []byte {
+func (c *Conn) shapeGetRectanglesRequest(Window Window, SourceKind ShapeKind) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)