From 0c50dc6241fa21712e041cfa2bfb9db4ccaef10a Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Thu, 10 May 2012 17:01:42 -0400
Subject: a huge commit. splitting extensions into their own sub-packages.

---
 nexgb/shape/shape.go | 883 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 883 insertions(+)
 create mode 100644 nexgb/shape/shape.go

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
new file mode 100644
index 0000000..5d9dbf3
--- /dev/null
+++ b/nexgb/shape/shape.go
@@ -0,0 +1,883 @@
+package shape
+
+/*
+	This file was generated by shape.xml on May 10 2012 4:20:28pm EDT.
+	This file is automatically generated. Edit at your peril!
+*/
+
+import (
+	"github.com/BurntSushi/xgb"
+
+	"github.com/BurntSushi/xgb/xproto"
+)
+
+// Init must be called before using the SHAPE extension.
+func Init(c *xgb.Conn) error {
+	reply, err := xproto.QueryExtension(c, 5, "SHAPE").Reply()
+	switch {
+	case err != nil:
+		return err
+	case !reply.Present:
+		return xgb.Errorf("No extension named SHAPE could be found on on the server.")
+	}
+
+	xgb.ExtLock.Lock()
+	c.Extensions["SHAPE"] = reply.MajorOpcode
+	for evNum, fun := range xgb.NewExtEventFuncs["SHAPE"] {
+		xgb.NewEventFuncs[int(reply.FirstEvent)+evNum] = fun
+	}
+	for errNum, fun := range xgb.NewExtErrorFuncs["SHAPE"] {
+		xgb.NewErrorFuncs[int(reply.FirstError)+errNum] = fun
+	}
+	xgb.ExtLock.Unlock()
+
+	return nil
+}
+
+func init() {
+	xgb.NewExtEventFuncs["SHAPE"] = make(map[int]xgb.NewEventFun)
+	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.NewErrorFun)
+}
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// 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'
+
+// Skipping definition for base type 'Char'
+
+const (
+	SoSet       = 0
+	SoUnion     = 1
+	SoIntersect = 2
+	SoSubtract  = 3
+	SoInvert    = 4
+)
+
+const (
+	SkBounding = 0
+	SkClip     = 1
+	SkInput    = 2
+)
+
+type Op byte
+
+type Kind byte
+
+// Event definition Notify (0)
+// Size: 32
+
+const Notify = 0
+
+type NotifyEvent struct {
+	Sequence       uint16
+	ShapeKind      Kind
+	AffectedWindow xproto.Window
+	ExtentsX       int16
+	ExtentsY       int16
+	ExtentsWidth   uint16
+	ExtentsHeight  uint16
+	ServerTime     xproto.Timestamp
+	Shaped         bool
+	// padding: 11 bytes
+}
+
+// Event read Notify
+func NotifyEventNew(buf []byte) xgb.Event {
+	v := NotifyEvent{}
+	b := 1 // don't read event number
+
+	v.ShapeKind = Kind(buf[b])
+	b += 1
+
+	v.Sequence = xgb.Get16(buf[b:])
+	b += 2
+
+	v.AffectedWindow = xproto.Window(xgb.Get32(buf[b:]))
+	b += 4
+
+	v.ExtentsX = int16(xgb.Get16(buf[b:]))
+	b += 2
+
+	v.ExtentsY = int16(xgb.Get16(buf[b:]))
+	b += 2
+
+	v.ExtentsWidth = xgb.Get16(buf[b:])
+	b += 2
+
+	v.ExtentsHeight = xgb.Get16(buf[b:])
+	b += 2
+
+	v.ServerTime = xproto.Timestamp(xgb.Get32(buf[b:]))
+	b += 4
+
+	if buf[b] == 1 {
+		v.Shaped = true
+	} else {
+		v.Shaped = false
+	}
+	b += 1
+
+	b += 11 // padding
+
+	return v
+}
+
+// Event write Notify
+func (v NotifyEvent) Bytes() []byte {
+	buf := make([]byte, 32)
+	b := 0
+
+	// write event number
+	buf[b] = 0
+	b += 1
+
+	buf[b] = byte(v.ShapeKind)
+	b += 1
+
+	b += 2 // skip sequence number
+
+	xgb.Put32(buf[b:], uint32(v.AffectedWindow))
+	b += 4
+
+	xgb.Put16(buf[b:], uint16(v.ExtentsX))
+	b += 2
+
+	xgb.Put16(buf[b:], uint16(v.ExtentsY))
+	b += 2
+
+	xgb.Put16(buf[b:], v.ExtentsWidth)
+	b += 2
+
+	xgb.Put16(buf[b:], v.ExtentsHeight)
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(v.ServerTime))
+	b += 4
+
+	if v.Shaped {
+		buf[b] = 1
+	} else {
+		buf[b] = 0
+	}
+	b += 1
+
+	b += 11 // padding
+
+	return buf
+}
+
+func (v NotifyEvent) ImplementsEvent() {}
+
+func (v NotifyEvent) SequenceId() uint16 {
+	return v.Sequence
+}
+
+func (v NotifyEvent) String() string {
+	fieldVals := make([]string, 0, 9)
+	fieldVals = append(fieldVals, xgb.Sprintf("Sequence: %d", v.Sequence))
+	fieldVals = append(fieldVals, xgb.Sprintf("ShapeKind: %d", v.ShapeKind))
+	fieldVals = append(fieldVals, xgb.Sprintf("AffectedWindow: %d", v.AffectedWindow))
+	fieldVals = append(fieldVals, xgb.Sprintf("ExtentsX: %d", v.ExtentsX))
+	fieldVals = append(fieldVals, xgb.Sprintf("ExtentsY: %d", v.ExtentsY))
+	fieldVals = append(fieldVals, xgb.Sprintf("ExtentsWidth: %d", v.ExtentsWidth))
+	fieldVals = append(fieldVals, xgb.Sprintf("ExtentsHeight: %d", v.ExtentsHeight))
+	fieldVals = append(fieldVals, xgb.Sprintf("ServerTime: %d", v.ServerTime))
+	fieldVals = append(fieldVals, xgb.Sprintf("Shaped: %t", v.Shaped))
+	return "Notify {" + xgb.StringsJoin(fieldVals, ", ") + "}"
+}
+
+func init() {
+	xgb.NewExtEventFuncs["SHAPE"][0] = NotifyEventNew
+}
+
+// Request QueryVersion
+// size: 4
+type QueryVersionCookie struct {
+	*xgb.Cookie
+}
+
+func QueryVersion(c *xgb.Conn) QueryVersionCookie {
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(queryVersionRequest(c), cookie)
+	return QueryVersionCookie{cookie}
+}
+
+func QueryVersionUnchecked(c *xgb.Conn) QueryVersionCookie {
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(queryVersionRequest(c), cookie)
+	return QueryVersionCookie{cookie}
+}
+
+// Request reply for QueryVersion
+// size: 12
+type QueryVersionReply struct {
+	Sequence uint16
+	Length   uint32
+	// padding: 1 bytes
+	MajorVersion uint16
+	MinorVersion uint16
+}
+
+// Waits and reads reply data from request QueryVersion
+func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return queryVersionReply(buf), nil
+}
+
+// Read reply into structure from buffer for QueryVersion
+func queryVersionReply(buf []byte) *QueryVersionReply {
+	v := new(QueryVersionReply)
+	b := 1 // skip reply determinant
+
+	b += 1 // padding
+
+	v.Sequence = xgb.Get16(buf[b:])
+	b += 2
+
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	v.MajorVersion = xgb.Get16(buf[b:])
+	b += 2
+
+	v.MinorVersion = xgb.Get16(buf[b:])
+	b += 2
+
+	return v
+}
+
+// Write request to wire for QueryVersion
+func queryVersionRequest(c *xgb.Conn) []byte {
+	size := 4
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 0 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	return buf
+}
+
+// Request Rectangles
+// size: xgb.Pad((16 + xgb.Pad((len(Rectangles) * 8))))
+type RectanglesCookie struct {
+	*xgb.Cookie
+}
+
+// Write request to wire for Rectangles
+func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
+	return RectanglesCookie{cookie}
+}
+
+func RectanglesChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
+	return RectanglesCookie{cookie}
+}
+
+func (cook RectanglesCookie) Check() error {
+	return cook.Cookie.Check()
+}
+
+// Write request to wire for Rectangles
+func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) []byte {
+	size := xgb.Pad((16 + xgb.Pad((len(Rectangles) * 8))))
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 1 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	buf[b] = byte(Operation)
+	b += 1
+
+	buf[b] = byte(DestinationKind)
+	b += 1
+
+	buf[b] = Ordering
+	b += 1
+
+	b += 1 // padding
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	xgb.Put16(buf[b:], uint16(XOffset))
+	b += 2
+
+	xgb.Put16(buf[b:], uint16(YOffset))
+	b += 2
+
+	b += xproto.RectangleListBytes(buf[b:], Rectangles)
+
+	return buf
+}
+
+// Request Mask
+// size: 20
+type MaskCookie struct {
+	*xgb.Cookie
+}
+
+// Write request to wire for Mask
+func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
+	return MaskCookie{cookie}
+}
+
+func MaskChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
+	return MaskCookie{cookie}
+}
+
+func (cook MaskCookie) Check() error {
+	return cook.Cookie.Check()
+}
+
+// Write request to wire for Mask
+func maskRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) []byte {
+	size := 20
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 2 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	buf[b] = byte(Operation)
+	b += 1
+
+	buf[b] = byte(DestinationKind)
+	b += 1
+
+	b += 2 // padding
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	xgb.Put16(buf[b:], uint16(XOffset))
+	b += 2
+
+	xgb.Put16(buf[b:], uint16(YOffset))
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(SourceBitmap))
+	b += 4
+
+	return buf
+}
+
+// Request Combine
+// size: 20
+type CombineCookie struct {
+	*xgb.Cookie
+}
+
+// Write request to wire for Combine
+func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
+	return CombineCookie{cookie}
+}
+
+func CombineChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
+	return CombineCookie{cookie}
+}
+
+func (cook CombineCookie) Check() error {
+	return cook.Cookie.Check()
+}
+
+// Write request to wire for Combine
+func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) []byte {
+	size := 20
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 3 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	buf[b] = byte(Operation)
+	b += 1
+
+	buf[b] = byte(DestinationKind)
+	b += 1
+
+	buf[b] = byte(SourceKind)
+	b += 1
+
+	b += 1 // padding
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	xgb.Put16(buf[b:], uint16(XOffset))
+	b += 2
+
+	xgb.Put16(buf[b:], uint16(YOffset))
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(SourceWindow))
+	b += 4
+
+	return buf
+}
+
+// Request Offset
+// size: 16
+type OffsetCookie struct {
+	*xgb.Cookie
+}
+
+// Write request to wire for Offset
+func Offset(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(offsetRequest(c, DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
+	return OffsetCookie{cookie}
+}
+
+func OffsetChecked(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(offsetRequest(c, DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
+	return OffsetCookie{cookie}
+}
+
+func (cook OffsetCookie) Check() error {
+	return cook.Cookie.Check()
+}
+
+// Write request to wire for Offset
+func offsetRequest(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) []byte {
+	size := 16
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 4 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	buf[b] = byte(DestinationKind)
+	b += 1
+
+	b += 3 // padding
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	xgb.Put16(buf[b:], uint16(XOffset))
+	b += 2
+
+	xgb.Put16(buf[b:], uint16(YOffset))
+	b += 2
+
+	return buf
+}
+
+// Request QueryExtents
+// size: 8
+type QueryExtentsCookie struct {
+	*xgb.Cookie
+}
+
+func QueryExtents(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(queryExtentsRequest(c, DestinationWindow), cookie)
+	return QueryExtentsCookie{cookie}
+}
+
+func QueryExtentsUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(queryExtentsRequest(c, DestinationWindow), cookie)
+	return QueryExtentsCookie{cookie}
+}
+
+// Request reply for QueryExtents
+// size: 28
+type QueryExtentsReply struct {
+	Sequence uint16
+	Length   uint32
+	// padding: 1 bytes
+	BoundingShaped bool
+	ClipShaped     bool
+	// padding: 2 bytes
+	BoundingShapeExtentsX      int16
+	BoundingShapeExtentsY      int16
+	BoundingShapeExtentsWidth  uint16
+	BoundingShapeExtentsHeight uint16
+	ClipShapeExtentsX          int16
+	ClipShapeExtentsY          int16
+	ClipShapeExtentsWidth      uint16
+	ClipShapeExtentsHeight     uint16
+}
+
+// Waits and reads reply data from request QueryExtents
+func (cook QueryExtentsCookie) Reply() (*QueryExtentsReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return queryExtentsReply(buf), nil
+}
+
+// Read reply into structure from buffer for QueryExtents
+func queryExtentsReply(buf []byte) *QueryExtentsReply {
+	v := new(QueryExtentsReply)
+	b := 1 // skip reply determinant
+
+	b += 1 // padding
+
+	v.Sequence = xgb.Get16(buf[b:])
+	b += 2
+
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	if buf[b] == 1 {
+		v.BoundingShaped = true
+	} else {
+		v.BoundingShaped = false
+	}
+	b += 1
+
+	if buf[b] == 1 {
+		v.ClipShaped = true
+	} else {
+		v.ClipShaped = false
+	}
+	b += 1
+
+	b += 2 // padding
+
+	v.BoundingShapeExtentsX = int16(xgb.Get16(buf[b:]))
+	b += 2
+
+	v.BoundingShapeExtentsY = int16(xgb.Get16(buf[b:]))
+	b += 2
+
+	v.BoundingShapeExtentsWidth = xgb.Get16(buf[b:])
+	b += 2
+
+	v.BoundingShapeExtentsHeight = xgb.Get16(buf[b:])
+	b += 2
+
+	v.ClipShapeExtentsX = int16(xgb.Get16(buf[b:]))
+	b += 2
+
+	v.ClipShapeExtentsY = int16(xgb.Get16(buf[b:]))
+	b += 2
+
+	v.ClipShapeExtentsWidth = xgb.Get16(buf[b:])
+	b += 2
+
+	v.ClipShapeExtentsHeight = xgb.Get16(buf[b:])
+	b += 2
+
+	return v
+}
+
+// Write request to wire for QueryExtents
+func queryExtentsRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
+	size := 8
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 5 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	return buf
+}
+
+// Request SelectInput
+// size: 12
+type SelectInputCookie struct {
+	*xgb.Cookie
+}
+
+// Write request to wire for SelectInput
+func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
+	return SelectInputCookie{cookie}
+}
+
+func SelectInputChecked(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
+	return SelectInputCookie{cookie}
+}
+
+func (cook SelectInputCookie) Check() error {
+	return cook.Cookie.Check()
+}
+
+// Write request to wire for SelectInput
+func selectInputRequest(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) []byte {
+	size := 12
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 6 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	if Enable {
+		buf[b] = 1
+	} else {
+		buf[b] = 0
+	}
+	b += 1
+
+	b += 3 // padding
+
+	return buf
+}
+
+// Request InputSelected
+// size: 8
+type InputSelectedCookie struct {
+	*xgb.Cookie
+}
+
+func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
+	return InputSelectedCookie{cookie}
+}
+
+func InputSelectedUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
+	return InputSelectedCookie{cookie}
+}
+
+// Request reply for InputSelected
+// size: 8
+type InputSelectedReply struct {
+	Sequence uint16
+	Length   uint32
+	Enabled  bool
+}
+
+// Waits and reads reply data from request InputSelected
+func (cook InputSelectedCookie) Reply() (*InputSelectedReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return inputSelectedReply(buf), nil
+}
+
+// Read reply into structure from buffer for InputSelected
+func inputSelectedReply(buf []byte) *InputSelectedReply {
+	v := new(InputSelectedReply)
+	b := 1 // skip reply determinant
+
+	if buf[b] == 1 {
+		v.Enabled = true
+	} else {
+		v.Enabled = false
+	}
+	b += 1
+
+	v.Sequence = xgb.Get16(buf[b:])
+	b += 2
+
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	return v
+}
+
+// Write request to wire for InputSelected
+func inputSelectedRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
+	size := 8
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 7 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	b += 4
+
+	return buf
+}
+
+// Request GetRectangles
+// size: 12
+type GetRectanglesCookie struct {
+	*xgb.Cookie
+}
+
+func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
+	return GetRectanglesCookie{cookie}
+}
+
+func GetRectanglesUnchecked(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
+	return GetRectanglesCookie{cookie}
+}
+
+// Request reply for GetRectangles
+// size: (32 + xgb.Pad((int(RectanglesLen) * 8)))
+type GetRectanglesReply struct {
+	Sequence      uint16
+	Length        uint32
+	Ordering      byte
+	RectanglesLen uint32
+	// padding: 20 bytes
+	Rectangles []xproto.Rectangle // size: xgb.Pad((int(RectanglesLen) * 8))
+}
+
+// Waits and reads reply data from request GetRectangles
+func (cook GetRectanglesCookie) Reply() (*GetRectanglesReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return getRectanglesReply(buf), nil
+}
+
+// Read reply into structure from buffer for GetRectangles
+func getRectanglesReply(buf []byte) *GetRectanglesReply {
+	v := new(GetRectanglesReply)
+	b := 1 // skip reply determinant
+
+	v.Ordering = buf[b]
+	b += 1
+
+	v.Sequence = xgb.Get16(buf[b:])
+	b += 2
+
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	v.RectanglesLen = xgb.Get32(buf[b:])
+	b += 4
+
+	b += 20 // padding
+
+	v.Rectangles = make([]xproto.Rectangle, v.RectanglesLen)
+	b += xproto.RectangleReadList(buf[b:], v.Rectangles)
+
+	return v
+}
+
+// Write request to wire for GetRectangles
+func getRectanglesRequest(c *xgb.Conn, Window xproto.Window, SourceKind Kind) []byte {
+	size := 12
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 8 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(Window))
+	b += 4
+
+	buf[b] = byte(SourceKind)
+	b += 1
+
+	b += 3 // padding
+
+	return buf
+}
-- 
cgit v1.2.3


From a3363755cdfdafdf02d5a772bd47a462e99af057 Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Thu, 10 May 2012 20:06:22 -0400
Subject: adding package header comments

---
 nexgb/shape/shape.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 5d9dbf3..97be0f7 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -1,7 +1,8 @@
+// Package shape is the X client API for the SHAPE extension.
 package shape
 
 /*
-	This file was generated by shape.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by shape.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,14 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -63,6 +56,14 @@ func init() {
 
 // Skipping definition for base type 'Char'
 
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
 const (
 	SoSet       = 0
 	SoUnion     = 1
-- 
cgit v1.2.3


From c00652934e4ec68016a152b9bea10273b0be8726 Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Thu, 10 May 2012 23:57:34 -0400
Subject: better docs

---
 nexgb/shape/shape.go | 147 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 92 insertions(+), 55 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 97be0f7..664c5f4 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on May 10 2012 8:04:32pm EDT.
+	This file was generated by shape.xml on May 10 2012 11:56:19pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -82,9 +82,7 @@ type Op byte
 
 type Kind byte
 
-// Event definition Notify (0)
-// Size: 32
-
+// Notify is the event number for a NotifyEvent.
 const Notify = 0
 
 type NotifyEvent struct {
@@ -100,7 +98,7 @@ type NotifyEvent struct {
 	// padding: 11 bytes
 }
 
-// Event read Notify
+// NotifyEventNew constructs a NotifyEvent value that implements xgb.Event from a byte slice.
 func NotifyEventNew(buf []byte) xgb.Event {
 	v := NotifyEvent{}
 	b := 1 // don't read event number
@@ -141,7 +139,7 @@ func NotifyEventNew(buf []byte) xgb.Event {
 	return v
 }
 
-// Event write Notify
+// Bytes writes a NotifyEvent value to a byte slice.
 func (v NotifyEvent) Bytes() []byte {
 	buf := make([]byte, 32)
 	b := 0
@@ -185,12 +183,14 @@ func (v NotifyEvent) Bytes() []byte {
 	return buf
 }
 
-func (v NotifyEvent) ImplementsEvent() {}
-
+// SequenceId returns the sequence id attached to the Notify event.
+// Events without a sequence number (KeymapNotify) return 0.
+// This is mostly used internally.
 func (v NotifyEvent) SequenceId() uint16 {
 	return v.Sequence
 }
 
+// String is a rudimentary string representation of NotifyEvent.
 func (v NotifyEvent) String() string {
 	fieldVals := make([]string, 0, 9)
 	fieldVals = append(fieldVals, xgb.Sprintf("Sequence: %d", v.Sequence))
@@ -209,35 +209,37 @@ func init() {
 	xgb.NewExtEventFuncs["SHAPE"][0] = NotifyEventNew
 }
 
-// Request QueryVersion
-// size: 4
+// QueryVersionCookie is a cookie used only for QueryVersion requests.
 type QueryVersionCookie struct {
 	*xgb.Cookie
 }
 
+// QueryVersion sends a checked request.
+// If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
 func QueryVersion(c *xgb.Conn) QueryVersionCookie {
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(queryVersionRequest(c), cookie)
 	return QueryVersionCookie{cookie}
 }
 
+// QueryVersionUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func QueryVersionUnchecked(c *xgb.Conn) QueryVersionCookie {
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(queryVersionRequest(c), cookie)
 	return QueryVersionCookie{cookie}
 }
 
-// Request reply for QueryVersion
-// size: 12
+// QueryVersionReply represents the data returned from a QueryVersion request.
 type QueryVersionReply struct {
-	Sequence uint16
-	Length   uint32
+	Sequence uint16 // sequence number of the request for this reply
+	Length   uint32 // number of bytes in this reply
 	// padding: 1 bytes
 	MajorVersion uint16
 	MinorVersion uint16
 }
 
-// Waits and reads reply data from request QueryVersion
+// Reply blocks and returns the reply data for a QueryVersion request.
 func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
 	buf, err := cook.Cookie.Reply()
 	if err != nil {
@@ -249,7 +251,7 @@ func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
 	return queryVersionReply(buf), nil
 }
 
-// Read reply into structure from buffer for QueryVersion
+// queryVersionReply reads a byte slice into a QueryVersionReply value.
 func queryVersionReply(buf []byte) *QueryVersionReply {
 	v := new(QueryVersionReply)
 	b := 1 // skip reply determinant
@@ -272,6 +274,7 @@ func queryVersionReply(buf []byte) *QueryVersionReply {
 }
 
 // Write request to wire for QueryVersion
+// queryVersionRequest writes a QueryVersion request to a byte slice.
 func queryVersionRequest(c *xgb.Conn) []byte {
 	size := 4
 	b := 0
@@ -289,30 +292,35 @@ func queryVersionRequest(c *xgb.Conn) []byte {
 	return buf
 }
 
-// Request Rectangles
-// size: xgb.Pad((16 + xgb.Pad((len(Rectangles) * 8))))
+// RectanglesCookie is a cookie used only for Rectangles requests.
 type RectanglesCookie struct {
 	*xgb.Cookie
 }
 
-// Write request to wire for Rectangles
+// Rectangles sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
 	return RectanglesCookie{cookie}
 }
 
+// RectanglesChecked sends a checked request.
+// If an error occurs, it can be retrieved using RectanglesCookie.Check()
 func RectanglesChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
 	return RectanglesCookie{cookie}
 }
 
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
 func (cook RectanglesCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
 // Write request to wire for Rectangles
+// rectanglesRequest writes a Rectangles request to a byte slice.
 func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) []byte {
 	size := xgb.Pad((16 + xgb.Pad((len(Rectangles) * 8))))
 	b := 0
@@ -352,30 +360,35 @@ func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering
 	return buf
 }
 
-// Request Mask
-// size: 20
+// MaskCookie is a cookie used only for Mask requests.
 type MaskCookie struct {
 	*xgb.Cookie
 }
 
-// Write request to wire for Mask
+// Mask sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
 	return MaskCookie{cookie}
 }
 
+// MaskChecked sends a checked request.
+// If an error occurs, it can be retrieved using MaskCookie.Check()
 func MaskChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
 	return MaskCookie{cookie}
 }
 
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
 func (cook MaskCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
 // Write request to wire for Mask
+// maskRequest writes a Mask request to a byte slice.
 func maskRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) []byte {
 	size := 20
 	b := 0
@@ -413,30 +426,35 @@ func maskRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWin
 	return buf
 }
 
-// Request Combine
-// size: 20
+// CombineCookie is a cookie used only for Combine requests.
 type CombineCookie struct {
 	*xgb.Cookie
 }
 
-// Write request to wire for Combine
+// Combine sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
 	return CombineCookie{cookie}
 }
 
+// CombineChecked sends a checked request.
+// If an error occurs, it can be retrieved using CombineCookie.Check()
 func CombineChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
 	return CombineCookie{cookie}
 }
 
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
 func (cook CombineCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
 // Write request to wire for Combine
+// combineRequest writes a Combine request to a byte slice.
 func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) []byte {
 	size := 20
 	b := 0
@@ -477,30 +495,35 @@ func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind
 	return buf
 }
 
-// Request Offset
-// size: 16
+// OffsetCookie is a cookie used only for Offset requests.
 type OffsetCookie struct {
 	*xgb.Cookie
 }
 
-// Write request to wire for Offset
+// Offset sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Offset(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(offsetRequest(c, DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
 	return OffsetCookie{cookie}
 }
 
+// OffsetChecked sends a checked request.
+// If an error occurs, it can be retrieved using OffsetCookie.Check()
 func OffsetChecked(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(offsetRequest(c, DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
 	return OffsetCookie{cookie}
 }
 
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
 func (cook OffsetCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
 // Write request to wire for Offset
+// offsetRequest writes a Offset request to a byte slice.
 func offsetRequest(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) []byte {
 	size := 16
 	b := 0
@@ -532,29 +555,31 @@ func offsetRequest(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.W
 	return buf
 }
 
-// Request QueryExtents
-// size: 8
+// QueryExtentsCookie is a cookie used only for QueryExtents requests.
 type QueryExtentsCookie struct {
 	*xgb.Cookie
 }
 
+// QueryExtents sends a checked request.
+// If an error occurs, it will be returned with the reply by calling QueryExtentsCookie.Reply()
 func QueryExtents(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(queryExtentsRequest(c, DestinationWindow), cookie)
 	return QueryExtentsCookie{cookie}
 }
 
+// QueryExtentsUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func QueryExtentsUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(queryExtentsRequest(c, DestinationWindow), cookie)
 	return QueryExtentsCookie{cookie}
 }
 
-// Request reply for QueryExtents
-// size: 28
+// QueryExtentsReply represents the data returned from a QueryExtents request.
 type QueryExtentsReply struct {
-	Sequence uint16
-	Length   uint32
+	Sequence uint16 // sequence number of the request for this reply
+	Length   uint32 // number of bytes in this reply
 	// padding: 1 bytes
 	BoundingShaped bool
 	ClipShaped     bool
@@ -569,7 +594,7 @@ type QueryExtentsReply struct {
 	ClipShapeExtentsHeight     uint16
 }
 
-// Waits and reads reply data from request QueryExtents
+// Reply blocks and returns the reply data for a QueryExtents request.
 func (cook QueryExtentsCookie) Reply() (*QueryExtentsReply, error) {
 	buf, err := cook.Cookie.Reply()
 	if err != nil {
@@ -581,7 +606,7 @@ func (cook QueryExtentsCookie) Reply() (*QueryExtentsReply, error) {
 	return queryExtentsReply(buf), nil
 }
 
-// Read reply into structure from buffer for QueryExtents
+// queryExtentsReply reads a byte slice into a QueryExtentsReply value.
 func queryExtentsReply(buf []byte) *QueryExtentsReply {
 	v := new(QueryExtentsReply)
 	b := 1 // skip reply determinant
@@ -638,6 +663,7 @@ func queryExtentsReply(buf []byte) *QueryExtentsReply {
 }
 
 // Write request to wire for QueryExtents
+// queryExtentsRequest writes a QueryExtents request to a byte slice.
 func queryExtentsRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	size := 8
 	b := 0
@@ -658,30 +684,35 @@ func queryExtentsRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	return buf
 }
 
-// Request SelectInput
-// size: 12
+// SelectInputCookie is a cookie used only for SelectInput requests.
 type SelectInputCookie struct {
 	*xgb.Cookie
 }
 
-// Write request to wire for SelectInput
+// SelectInput sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
 	return SelectInputCookie{cookie}
 }
 
+// SelectInputChecked sends a checked request.
+// If an error occurs, it can be retrieved using SelectInputCookie.Check()
 func SelectInputChecked(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
 	return SelectInputCookie{cookie}
 }
 
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
 func (cook SelectInputCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
 // Write request to wire for SelectInput
+// selectInputRequest writes a SelectInput request to a byte slice.
 func selectInputRequest(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) []byte {
 	size := 12
 	b := 0
@@ -711,33 +742,35 @@ func selectInputRequest(c *xgb.Conn, DestinationWindow xproto.Window, Enable boo
 	return buf
 }
 
-// Request InputSelected
-// size: 8
+// InputSelectedCookie is a cookie used only for InputSelected requests.
 type InputSelectedCookie struct {
 	*xgb.Cookie
 }
 
+// InputSelected sends a checked request.
+// If an error occurs, it will be returned with the reply by calling InputSelectedCookie.Reply()
 func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
 	return InputSelectedCookie{cookie}
 }
 
+// InputSelectedUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func InputSelectedUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
 	return InputSelectedCookie{cookie}
 }
 
-// Request reply for InputSelected
-// size: 8
+// InputSelectedReply represents the data returned from a InputSelected request.
 type InputSelectedReply struct {
-	Sequence uint16
-	Length   uint32
+	Sequence uint16 // sequence number of the request for this reply
+	Length   uint32 // number of bytes in this reply
 	Enabled  bool
 }
 
-// Waits and reads reply data from request InputSelected
+// Reply blocks and returns the reply data for a InputSelected request.
 func (cook InputSelectedCookie) Reply() (*InputSelectedReply, error) {
 	buf, err := cook.Cookie.Reply()
 	if err != nil {
@@ -749,7 +782,7 @@ func (cook InputSelectedCookie) Reply() (*InputSelectedReply, error) {
 	return inputSelectedReply(buf), nil
 }
 
-// Read reply into structure from buffer for InputSelected
+// inputSelectedReply reads a byte slice into a InputSelectedReply value.
 func inputSelectedReply(buf []byte) *InputSelectedReply {
 	v := new(InputSelectedReply)
 	b := 1 // skip reply determinant
@@ -771,6 +804,7 @@ func inputSelectedReply(buf []byte) *InputSelectedReply {
 }
 
 // Write request to wire for InputSelected
+// inputSelectedRequest writes a InputSelected request to a byte slice.
 func inputSelectedRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	size := 8
 	b := 0
@@ -791,36 +825,38 @@ func inputSelectedRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	return buf
 }
 
-// Request GetRectangles
-// size: 12
+// GetRectanglesCookie is a cookie used only for GetRectangles requests.
 type GetRectanglesCookie struct {
 	*xgb.Cookie
 }
 
+// GetRectangles sends a checked request.
+// If an error occurs, it will be returned with the reply by calling GetRectanglesCookie.Reply()
 func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
 	return GetRectanglesCookie{cookie}
 }
 
+// GetRectanglesUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func GetRectanglesUnchecked(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
 	return GetRectanglesCookie{cookie}
 }
 
-// Request reply for GetRectangles
-// size: (32 + xgb.Pad((int(RectanglesLen) * 8)))
+// GetRectanglesReply represents the data returned from a GetRectangles request.
 type GetRectanglesReply struct {
-	Sequence      uint16
-	Length        uint32
+	Sequence      uint16 // sequence number of the request for this reply
+	Length        uint32 // number of bytes in this reply
 	Ordering      byte
 	RectanglesLen uint32
 	// padding: 20 bytes
 	Rectangles []xproto.Rectangle // size: xgb.Pad((int(RectanglesLen) * 8))
 }
 
-// Waits and reads reply data from request GetRectangles
+// Reply blocks and returns the reply data for a GetRectangles request.
 func (cook GetRectanglesCookie) Reply() (*GetRectanglesReply, error) {
 	buf, err := cook.Cookie.Reply()
 	if err != nil {
@@ -832,7 +868,7 @@ func (cook GetRectanglesCookie) Reply() (*GetRectanglesReply, error) {
 	return getRectanglesReply(buf), nil
 }
 
-// Read reply into structure from buffer for GetRectangles
+// getRectanglesReply reads a byte slice into a GetRectanglesReply value.
 func getRectanglesReply(buf []byte) *GetRectanglesReply {
 	v := new(GetRectanglesReply)
 	b := 1 // skip reply determinant
@@ -858,6 +894,7 @@ func getRectanglesReply(buf []byte) *GetRectanglesReply {
 }
 
 // Write request to wire for GetRectangles
+// getRectanglesRequest writes a GetRectangles request to a byte slice.
 func getRectanglesRequest(c *xgb.Conn, Window xproto.Window, SourceKind Kind) []byte {
 	size := 12
 	b := 0
-- 
cgit v1.2.3


From 3e6b3544934cb71e3a3b0edf9bc184241ac1ad7f Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Fri, 11 May 2012 01:58:52 -0400
Subject: add a little more docs for errors

---
 nexgb/shape/shape.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 664c5f4..8989000 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on May 10 2012 11:56:19pm EDT.
+	This file was generated by shape.xml on May 11 2012 1:58:36am EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,10 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.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'
@@ -64,6 +60,10 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
 const (
 	SoSet       = 0
 	SoUnion     = 1
-- 
cgit v1.2.3


From 29942bf078c92fea681e42ca5029592526f00718 Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Fri, 11 May 2012 23:58:52 -0400
Subject: panic when an extension request is issued before an extension has
 been initialized. but give a nice error message for the happy people.

---
 nexgb/shape/shape.go | 64 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 5 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 8989000..83d9020 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on May 11 2012 1:58:36am EDT.
+	This file was generated by shape.xml on May 11 2012 11:57:19pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,6 +40,10 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.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'
@@ -60,10 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
 const (
 	SoSet       = 0
 	SoUnion     = 1
@@ -217,6 +217,9 @@ type QueryVersionCookie struct {
 // QueryVersion sends a checked request.
 // If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
 func QueryVersion(c *xgb.Conn) QueryVersionCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(queryVersionRequest(c), cookie)
 	return QueryVersionCookie{cookie}
@@ -225,6 +228,9 @@ func QueryVersion(c *xgb.Conn) QueryVersionCookie {
 // QueryVersionUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func QueryVersionUnchecked(c *xgb.Conn) QueryVersionCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(queryVersionRequest(c), cookie)
 	return QueryVersionCookie{cookie}
@@ -300,6 +306,9 @@ type RectanglesCookie struct {
 // Rectangles sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
 	return RectanglesCookie{cookie}
@@ -308,6 +317,9 @@ func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte,
 // RectanglesChecked sends a checked request.
 // If an error occurs, it can be retrieved using RectanglesCookie.Check()
 func RectanglesChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
 	return RectanglesCookie{cookie}
@@ -368,6 +380,9 @@ type MaskCookie struct {
 // Mask sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
 	return MaskCookie{cookie}
@@ -376,6 +391,9 @@ func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xpr
 // MaskChecked sends a checked request.
 // If an error occurs, it can be retrieved using MaskCookie.Check()
 func MaskChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
 	return MaskCookie{cookie}
@@ -434,6 +452,9 @@ type CombineCookie struct {
 // Combine sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
 	return CombineCookie{cookie}
@@ -442,6 +463,9 @@ func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, D
 // CombineChecked sends a checked request.
 // If an error occurs, it can be retrieved using CombineCookie.Check()
 func CombineChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
 	return CombineCookie{cookie}
@@ -503,6 +527,9 @@ type OffsetCookie struct {
 // Offset sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Offset(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Offset' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(offsetRequest(c, DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
 	return OffsetCookie{cookie}
@@ -511,6 +538,9 @@ func Offset(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window,
 // OffsetChecked sends a checked request.
 // If an error occurs, it can be retrieved using OffsetCookie.Check()
 func OffsetChecked(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'Offset' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(offsetRequest(c, DestinationKind, DestinationWindow, XOffset, YOffset), cookie)
 	return OffsetCookie{cookie}
@@ -563,6 +593,9 @@ type QueryExtentsCookie struct {
 // QueryExtents sends a checked request.
 // If an error occurs, it will be returned with the reply by calling QueryExtentsCookie.Reply()
 func QueryExtents(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'QueryExtents' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(queryExtentsRequest(c, DestinationWindow), cookie)
 	return QueryExtentsCookie{cookie}
@@ -571,6 +604,9 @@ func QueryExtents(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCook
 // QueryExtentsUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func QueryExtentsUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'QueryExtents' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(queryExtentsRequest(c, DestinationWindow), cookie)
 	return QueryExtentsCookie{cookie}
@@ -692,6 +728,9 @@ type SelectInputCookie struct {
 // SelectInput sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, false)
 	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
 	return SelectInputCookie{cookie}
@@ -700,6 +739,9 @@ func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) Sele
 // SelectInputChecked sends a checked request.
 // If an error occurs, it can be retrieved using SelectInputCookie.Check()
 func SelectInputChecked(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, false)
 	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
 	return SelectInputCookie{cookie}
@@ -750,6 +792,9 @@ type InputSelectedCookie struct {
 // InputSelected sends a checked request.
 // If an error occurs, it will be returned with the reply by calling InputSelectedCookie.Reply()
 func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
 	return InputSelectedCookie{cookie}
@@ -758,6 +803,9 @@ func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCo
 // InputSelectedUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func InputSelectedUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
 	return InputSelectedCookie{cookie}
@@ -833,6 +881,9 @@ type GetRectanglesCookie struct {
 // GetRectangles sends a checked request.
 // If an error occurs, it will be returned with the reply by calling GetRectanglesCookie.Reply()
 func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(true, true)
 	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
 	return GetRectanglesCookie{cookie}
@@ -841,6 +892,9 @@ func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectan
 // GetRectanglesUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func GetRectanglesUnchecked(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
 	cookie := c.NewCookie(false, true)
 	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
 	return GetRectanglesCookie{cookie}
-- 
cgit v1.2.3


From 4ea94ca0fef7786ce21722cbb02a9cf069bdedd9 Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Sat, 26 May 2012 18:24:52 -0400
Subject: Bug fix in the generator that was outputting %(MISSING) crud.

---
 nexgb/shape/shape.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 83d9020..92ec1fd 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by shape.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.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'
@@ -64,6 +54,16 @@ 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'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	SoSet       = 0
 	SoUnion     = 1
-- 
cgit v1.2.3


From a9eae45cb3977bce5983e817d00d4584d176b044 Mon Sep 17 00:00:00 2001
From: "Andrew Gallant (Ocelot)" <Andrew.Gallant@tufts.edu>
Date: Tue, 5 Jun 2012 00:14:34 -0400
Subject: Refresh build. Eh.

---
 nexgb/shape/shape.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 92ec1fd..b98a001 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on May 26 2012 6:23:13pm EDT.
+	This file was generated by shape.xml on Jun 5 2012 12:11:59am EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,6 +40,16 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.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'
@@ -54,16 +64,6 @@ 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'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 const (
 	SoSet       = 0
 	SoUnion     = 1
-- 
cgit v1.2.3


From 0685fb57e14104ee4ad9f70ec94f787a9a22c028 Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Sun, 11 Aug 2013 20:43:26 -0400
Subject: Update to latest xproto XML.

---
 nexgb/shape/shape.go | 704 +++++++++++++++++++++++++--------------------------
 1 file changed, 352 insertions(+), 352 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index b98a001..d0d5b8c 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on Jun 5 2012 12:11:59am EDT.
+	This file was generated by shape.xml on Aug 11 2013 8:39:43pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,46 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.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'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
-const (
-	SoSet       = 0
-	SoUnion     = 1
-	SoIntersect = 2
-	SoSubtract  = 3
-	SoInvert    = 4
-)
-
-const (
-	SkBounding = 0
-	SkClip     = 1
-	SkInput    = 2
-)
-
-type Op byte
-
 type Kind byte
 
 // Notify is the event number for a NotifyEvent.
@@ -209,139 +169,90 @@ func init() {
 	xgb.NewExtEventFuncs["SHAPE"][0] = NotifyEventNew
 }
 
-// QueryVersionCookie is a cookie used only for QueryVersion requests.
-type QueryVersionCookie struct {
-	*xgb.Cookie
-}
-
-// QueryVersion sends a checked request.
-// If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
-func QueryVersion(c *xgb.Conn) QueryVersionCookie {
-	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
-	}
-	cookie := c.NewCookie(true, true)
-	c.NewRequest(queryVersionRequest(c), cookie)
-	return QueryVersionCookie{cookie}
-}
-
-// QueryVersionUnchecked sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func QueryVersionUnchecked(c *xgb.Conn) QueryVersionCookie {
-	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
-	}
-	cookie := c.NewCookie(false, true)
-	c.NewRequest(queryVersionRequest(c), cookie)
-	return QueryVersionCookie{cookie}
-}
+type Op byte
 
-// QueryVersionReply represents the data returned from a QueryVersion request.
-type QueryVersionReply struct {
-	Sequence uint16 // sequence number of the request for this reply
-	Length   uint32 // number of bytes in this reply
-	// padding: 1 bytes
-	MajorVersion uint16
-	MinorVersion uint16
-}
+const (
+	SkBounding = 0
+	SkClip     = 1
+	SkInput    = 2
+)
 
-// Reply blocks and returns the reply data for a QueryVersion request.
-func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
-	buf, err := cook.Cookie.Reply()
-	if err != nil {
-		return nil, err
-	}
-	if buf == nil {
-		return nil, nil
-	}
-	return queryVersionReply(buf), nil
-}
+const (
+	SoSet       = 0
+	SoUnion     = 1
+	SoIntersect = 2
+	SoSubtract  = 3
+	SoInvert    = 4
+)
 
-// queryVersionReply reads a byte slice into a QueryVersionReply value.
-func queryVersionReply(buf []byte) *QueryVersionReply {
-	v := new(QueryVersionReply)
-	b := 1 // skip reply determinant
+// Skipping definition for base type 'Bool'
 
-	b += 1 // padding
+// Skipping definition for base type 'Byte'
 
-	v.Sequence = xgb.Get16(buf[b:])
-	b += 2
+// Skipping definition for base type 'Card8'
 
-	v.Length = xgb.Get32(buf[b:]) // 4-byte units
-	b += 4
+// Skipping definition for base type 'Char'
 
-	v.MajorVersion = xgb.Get16(buf[b:])
-	b += 2
+// Skipping definition for base type 'Void'
 
-	v.MinorVersion = xgb.Get16(buf[b:])
-	b += 2
+// Skipping definition for base type 'Double'
 
-	return v
-}
+// Skipping definition for base type 'Float'
 
-// Write request to wire for QueryVersion
-// queryVersionRequest writes a QueryVersion request to a byte slice.
-func queryVersionRequest(c *xgb.Conn) []byte {
-	size := 4
-	b := 0
-	buf := make([]byte, size)
+// Skipping definition for base type 'Int16'
 
-	buf[b] = c.Extensions["SHAPE"]
-	b += 1
+// Skipping definition for base type 'Int32'
 
-	buf[b] = 0 // request opcode
-	b += 1
+// Skipping definition for base type 'Int8'
 
-	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
-	b += 2
+// Skipping definition for base type 'Card16'
 
-	return buf
-}
+// Skipping definition for base type 'Card32'
 
-// RectanglesCookie is a cookie used only for Rectangles requests.
-type RectanglesCookie struct {
+// CombineCookie is a cookie used only for Combine requests.
+type CombineCookie struct {
 	*xgb.Cookie
 }
 
-// Rectangles sends an unchecked request.
+// Combine sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
 	cookie := c.NewCookie(false, false)
-	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
-	return RectanglesCookie{cookie}
+	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
+	return CombineCookie{cookie}
 }
 
-// RectanglesChecked sends a checked request.
-// If an error occurs, it can be retrieved using RectanglesCookie.Check()
-func RectanglesChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+// CombineChecked sends a checked request.
+// If an error occurs, it can be retrieved using CombineCookie.Check()
+func CombineChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
 	cookie := c.NewCookie(true, false)
-	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
-	return RectanglesCookie{cookie}
+	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
+	return CombineCookie{cookie}
 }
 
 // Check returns an error if one occurred for checked requests that are not expecting a reply.
 // This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook RectanglesCookie) Check() error {
+func (cook CombineCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
-// Write request to wire for Rectangles
-// rectanglesRequest writes a Rectangles request to a byte slice.
-func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) []byte {
-	size := xgb.Pad((16 + xgb.Pad((len(Rectangles) * 8))))
+// Write request to wire for Combine
+// combineRequest writes a Combine request to a byte slice.
+func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) []byte {
+	size := 20
 	b := 0
 	buf := make([]byte, size)
 
 	buf[b] = c.Extensions["SHAPE"]
 	b += 1
 
-	buf[b] = 1 // request opcode
+	buf[b] = 3 // request opcode
 	b += 1
 
 	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -353,7 +264,7 @@ func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering
 	buf[b] = byte(DestinationKind)
 	b += 1
 
-	buf[b] = Ordering
+	buf[b] = byte(SourceKind)
 	b += 1
 
 	b += 1 // padding
@@ -367,119 +278,238 @@ func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering
 	xgb.Put16(buf[b:], uint16(YOffset))
 	b += 2
 
-	b += xproto.RectangleListBytes(buf[b:], Rectangles)
+	xgb.Put32(buf[b:], uint32(SourceWindow))
+	b += 4
 
 	return buf
 }
 
-// MaskCookie is a cookie used only for Mask requests.
-type MaskCookie struct {
+// GetRectanglesCookie is a cookie used only for GetRectangles requests.
+type GetRectanglesCookie struct {
 	*xgb.Cookie
 }
 
-// Mask sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+// GetRectangles sends a checked request.
+// If an error occurs, it will be returned with the reply by calling GetRectanglesCookie.Reply()
+func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
-	cookie := c.NewCookie(false, false)
-	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
-	return MaskCookie{cookie}
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
+	return GetRectanglesCookie{cookie}
 }
 
-// MaskChecked sends a checked request.
-// If an error occurs, it can be retrieved using MaskCookie.Check()
-func MaskChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+// GetRectanglesUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func GetRectanglesUnchecked(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
-	cookie := c.NewCookie(true, false)
-	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
-	return MaskCookie{cookie}
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
+	return GetRectanglesCookie{cookie}
 }
 
-// Check returns an error if one occurred for checked requests that are not expecting a reply.
-// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook MaskCookie) Check() error {
-	return cook.Cookie.Check()
+// GetRectanglesReply represents the data returned from a GetRectangles request.
+type GetRectanglesReply struct {
+	Sequence      uint16 // sequence number of the request for this reply
+	Length        uint32 // number of bytes in this reply
+	Ordering      byte
+	RectanglesLen uint32
+	// padding: 20 bytes
+	Rectangles []xproto.Rectangle // size: xgb.Pad((int(RectanglesLen) * 8))
 }
 
-// Write request to wire for Mask
-// maskRequest writes a Mask request to a byte slice.
-func maskRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) []byte {
-	size := 20
-	b := 0
-	buf := make([]byte, size)
+// Reply blocks and returns the reply data for a GetRectangles request.
+func (cook GetRectanglesCookie) Reply() (*GetRectanglesReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return getRectanglesReply(buf), nil
+}
 
-	buf[b] = c.Extensions["SHAPE"]
-	b += 1
+// getRectanglesReply reads a byte slice into a GetRectanglesReply value.
+func getRectanglesReply(buf []byte) *GetRectanglesReply {
+	v := new(GetRectanglesReply)
+	b := 1 // skip reply determinant
 
-	buf[b] = 2 // request opcode
+	v.Ordering = buf[b]
 	b += 1
 
-	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	v.Sequence = xgb.Get16(buf[b:])
 	b += 2
 
-	buf[b] = byte(Operation)
-	b += 1
-
-	buf[b] = byte(DestinationKind)
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	v.RectanglesLen = xgb.Get32(buf[b:])
+	b += 4
+
+	b += 20 // padding
+
+	v.Rectangles = make([]xproto.Rectangle, v.RectanglesLen)
+	b += xproto.RectangleReadList(buf[b:], v.Rectangles)
+
+	return v
+}
+
+// Write request to wire for GetRectangles
+// getRectanglesRequest writes a GetRectangles request to a byte slice.
+func getRectanglesRequest(c *xgb.Conn, Window xproto.Window, SourceKind Kind) []byte {
+	size := 12
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
 	b += 1
 
-	b += 2 // padding
+	buf[b] = 8 // request opcode
+	b += 1
 
-	xgb.Put32(buf[b:], uint32(DestinationWindow))
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
+	b += 2
+
+	xgb.Put32(buf[b:], uint32(Window))
 	b += 4
 
-	xgb.Put16(buf[b:], uint16(XOffset))
+	buf[b] = byte(SourceKind)
+	b += 1
+
+	b += 3 // padding
+
+	return buf
+}
+
+// InputSelectedCookie is a cookie used only for InputSelected requests.
+type InputSelectedCookie struct {
+	*xgb.Cookie
+}
+
+// InputSelected sends a checked request.
+// If an error occurs, it will be returned with the reply by calling InputSelectedCookie.Reply()
+func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
+	cookie := c.NewCookie(true, true)
+	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
+	return InputSelectedCookie{cookie}
+}
+
+// InputSelectedUnchecked sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func InputSelectedUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
+	cookie := c.NewCookie(false, true)
+	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
+	return InputSelectedCookie{cookie}
+}
+
+// InputSelectedReply represents the data returned from a InputSelected request.
+type InputSelectedReply struct {
+	Sequence uint16 // sequence number of the request for this reply
+	Length   uint32 // number of bytes in this reply
+	Enabled  bool
+}
+
+// Reply blocks and returns the reply data for a InputSelected request.
+func (cook InputSelectedCookie) Reply() (*InputSelectedReply, error) {
+	buf, err := cook.Cookie.Reply()
+	if err != nil {
+		return nil, err
+	}
+	if buf == nil {
+		return nil, nil
+	}
+	return inputSelectedReply(buf), nil
+}
+
+// inputSelectedReply reads a byte slice into a InputSelectedReply value.
+func inputSelectedReply(buf []byte) *InputSelectedReply {
+	v := new(InputSelectedReply)
+	b := 1 // skip reply determinant
+
+	if buf[b] == 1 {
+		v.Enabled = true
+	} else {
+		v.Enabled = false
+	}
+	b += 1
+
+	v.Sequence = xgb.Get16(buf[b:])
 	b += 2
 
-	xgb.Put16(buf[b:], uint16(YOffset))
+	v.Length = xgb.Get32(buf[b:]) // 4-byte units
+	b += 4
+
+	return v
+}
+
+// Write request to wire for InputSelected
+// inputSelectedRequest writes a InputSelected request to a byte slice.
+func inputSelectedRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
+	size := 8
+	b := 0
+	buf := make([]byte, size)
+
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
+
+	buf[b] = 7 // request opcode
+	b += 1
+
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
 	b += 2
 
-	xgb.Put32(buf[b:], uint32(SourceBitmap))
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
 	b += 4
 
 	return buf
 }
 
-// CombineCookie is a cookie used only for Combine requests.
-type CombineCookie struct {
+// MaskCookie is a cookie used only for Mask requests.
+type MaskCookie struct {
 	*xgb.Cookie
 }
 
-// Combine sends an unchecked request.
+// Mask sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
 	cookie := c.NewCookie(false, false)
-	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
-	return CombineCookie{cookie}
+	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
+	return MaskCookie{cookie}
 }
 
-// CombineChecked sends a checked request.
-// If an error occurs, it can be retrieved using CombineCookie.Check()
-func CombineChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+// MaskChecked sends a checked request.
+// If an error occurs, it can be retrieved using MaskCookie.Check()
+func MaskChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
 	cookie := c.NewCookie(true, false)
-	c.NewRequest(combineRequest(c, Operation, DestinationKind, SourceKind, DestinationWindow, XOffset, YOffset, SourceWindow), cookie)
-	return CombineCookie{cookie}
+	c.NewRequest(maskRequest(c, Operation, DestinationKind, DestinationWindow, XOffset, YOffset, SourceBitmap), cookie)
+	return MaskCookie{cookie}
 }
 
 // Check returns an error if one occurred for checked requests that are not expecting a reply.
 // This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook CombineCookie) Check() error {
+func (cook MaskCookie) Check() error {
 	return cook.Cookie.Check()
 }
 
-// Write request to wire for Combine
-// combineRequest writes a Combine request to a byte slice.
-func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) []byte {
+// Write request to wire for Mask
+// maskRequest writes a Mask request to a byte slice.
+func maskRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) []byte {
 	size := 20
 	b := 0
 	buf := make([]byte, size)
@@ -487,7 +517,7 @@ func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind
 	buf[b] = c.Extensions["SHAPE"]
 	b += 1
 
-	buf[b] = 3 // request opcode
+	buf[b] = 2 // request opcode
 	b += 1
 
 	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
@@ -499,10 +529,7 @@ func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind
 	buf[b] = byte(DestinationKind)
 	b += 1
 
-	buf[b] = byte(SourceKind)
-	b += 1
-
-	b += 1 // padding
+	b += 2 // padding
 
 	xgb.Put32(buf[b:], uint32(DestinationWindow))
 	b += 4
@@ -513,7 +540,7 @@ func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind
 	xgb.Put16(buf[b:], uint16(YOffset))
 	b += 2
 
-	xgb.Put32(buf[b:], uint32(SourceWindow))
+	xgb.Put32(buf[b:], uint32(SourceBitmap))
 	b += 4
 
 	return buf
@@ -720,106 +747,44 @@ func queryExtentsRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	return buf
 }
 
-// SelectInputCookie is a cookie used only for SelectInput requests.
-type SelectInputCookie struct {
-	*xgb.Cookie
-}
-
-// SelectInput sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
-	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
-	}
-	cookie := c.NewCookie(false, false)
-	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
-	return SelectInputCookie{cookie}
-}
-
-// SelectInputChecked sends a checked request.
-// If an error occurs, it can be retrieved using SelectInputCookie.Check()
-func SelectInputChecked(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
-	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
-	}
-	cookie := c.NewCookie(true, false)
-	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
-	return SelectInputCookie{cookie}
-}
-
-// Check returns an error if one occurred for checked requests that are not expecting a reply.
-// This cannot be called for requests expecting a reply, nor for unchecked requests.
-func (cook SelectInputCookie) Check() error {
-	return cook.Cookie.Check()
-}
-
-// Write request to wire for SelectInput
-// selectInputRequest writes a SelectInput request to a byte slice.
-func selectInputRequest(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) []byte {
-	size := 12
-	b := 0
-	buf := make([]byte, size)
-
-	buf[b] = c.Extensions["SHAPE"]
-	b += 1
-
-	buf[b] = 6 // request opcode
-	b += 1
-
-	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
-	b += 2
-
-	xgb.Put32(buf[b:], uint32(DestinationWindow))
-	b += 4
-
-	if Enable {
-		buf[b] = 1
-	} else {
-		buf[b] = 0
-	}
-	b += 1
-
-	b += 3 // padding
-
-	return buf
-}
-
-// InputSelectedCookie is a cookie used only for InputSelected requests.
-type InputSelectedCookie struct {
+// QueryVersionCookie is a cookie used only for QueryVersion requests.
+type QueryVersionCookie struct {
 	*xgb.Cookie
 }
 
-// InputSelected sends a checked request.
-// If an error occurs, it will be returned with the reply by calling InputSelectedCookie.Reply()
-func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+// QueryVersion sends a checked request.
+// If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
+func QueryVersion(c *xgb.Conn) QueryVersionCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
 	cookie := c.NewCookie(true, true)
-	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
-	return InputSelectedCookie{cookie}
+	c.NewRequest(queryVersionRequest(c), cookie)
+	return QueryVersionCookie{cookie}
 }
 
-// InputSelectedUnchecked sends an unchecked request.
+// QueryVersionUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func InputSelectedUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+func QueryVersionUnchecked(c *xgb.Conn) QueryVersionCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
 	cookie := c.NewCookie(false, true)
-	c.NewRequest(inputSelectedRequest(c, DestinationWindow), cookie)
-	return InputSelectedCookie{cookie}
+	c.NewRequest(queryVersionRequest(c), cookie)
+	return QueryVersionCookie{cookie}
 }
 
-// InputSelectedReply represents the data returned from a InputSelected request.
-type InputSelectedReply struct {
+// QueryVersionReply represents the data returned from a QueryVersion request.
+type QueryVersionReply struct {
 	Sequence uint16 // sequence number of the request for this reply
 	Length   uint32 // number of bytes in this reply
-	Enabled  bool
+	// padding: 1 bytes
+	MajorVersion uint16
+	MinorVersion uint16
 }
 
-// Reply blocks and returns the reply data for a InputSelected request.
-func (cook InputSelectedCookie) Reply() (*InputSelectedReply, error) {
+// Reply blocks and returns the reply data for a QueryVersion request.
+func (cook QueryVersionCookie) Reply() (*QueryVersionReply, error) {
 	buf, err := cook.Cookie.Reply()
 	if err != nil {
 		return nil, err
@@ -827,20 +792,15 @@ func (cook InputSelectedCookie) Reply() (*InputSelectedReply, error) {
 	if buf == nil {
 		return nil, nil
 	}
-	return inputSelectedReply(buf), nil
+	return queryVersionReply(buf), nil
 }
 
-// inputSelectedReply reads a byte slice into a InputSelectedReply value.
-func inputSelectedReply(buf []byte) *InputSelectedReply {
-	v := new(InputSelectedReply)
+// queryVersionReply reads a byte slice into a QueryVersionReply value.
+func queryVersionReply(buf []byte) *QueryVersionReply {
+	v := new(QueryVersionReply)
 	b := 1 // skip reply determinant
 
-	if buf[b] == 1 {
-		v.Enabled = true
-	} else {
-		v.Enabled = false
-	}
-	b += 1
+	b += 1 // padding
 
 	v.Sequence = xgb.Get16(buf[b:])
 	b += 2
@@ -848,108 +808,144 @@ func inputSelectedReply(buf []byte) *InputSelectedReply {
 	v.Length = xgb.Get32(buf[b:]) // 4-byte units
 	b += 4
 
+	v.MajorVersion = xgb.Get16(buf[b:])
+	b += 2
+
+	v.MinorVersion = xgb.Get16(buf[b:])
+	b += 2
+
 	return v
 }
 
-// Write request to wire for InputSelected
-// inputSelectedRequest writes a InputSelected request to a byte slice.
-func inputSelectedRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
-	size := 8
+// Write request to wire for QueryVersion
+// queryVersionRequest writes a QueryVersion request to a byte slice.
+func queryVersionRequest(c *xgb.Conn) []byte {
+	size := 4
 	b := 0
 	buf := make([]byte, size)
 
 	buf[b] = c.Extensions["SHAPE"]
 	b += 1
 
-	buf[b] = 7 // request opcode
+	buf[b] = 0 // request opcode
 	b += 1
 
 	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
 	b += 2
 
-	xgb.Put32(buf[b:], uint32(DestinationWindow))
-	b += 4
-
 	return buf
 }
 
-// GetRectanglesCookie is a cookie used only for GetRectangles requests.
-type GetRectanglesCookie struct {
+// RectanglesCookie is a cookie used only for Rectangles requests.
+type RectanglesCookie struct {
 	*xgb.Cookie
 }
 
-// GetRectangles sends a checked request.
-// If an error occurs, it will be returned with the reply by calling GetRectanglesCookie.Reply()
-func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+// Rectangles sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
-	cookie := c.NewCookie(true, true)
-	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
-	return GetRectanglesCookie{cookie}
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
+	return RectanglesCookie{cookie}
 }
 
-// GetRectanglesUnchecked sends an unchecked request.
-// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
-func GetRectanglesUnchecked(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+// RectanglesChecked sends a checked request.
+// If an error occurs, it can be retrieved using RectanglesCookie.Check()
+func RectanglesChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
 	if _, ok := c.Extensions["SHAPE"]; !ok {
-		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
-	cookie := c.NewCookie(false, true)
-	c.NewRequest(getRectanglesRequest(c, Window, SourceKind), cookie)
-	return GetRectanglesCookie{cookie}
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(rectanglesRequest(c, Operation, DestinationKind, Ordering, DestinationWindow, XOffset, YOffset, Rectangles), cookie)
+	return RectanglesCookie{cookie}
 }
 
-// GetRectanglesReply represents the data returned from a GetRectangles request.
-type GetRectanglesReply struct {
-	Sequence      uint16 // sequence number of the request for this reply
-	Length        uint32 // number of bytes in this reply
-	Ordering      byte
-	RectanglesLen uint32
-	// padding: 20 bytes
-	Rectangles []xproto.Rectangle // size: xgb.Pad((int(RectanglesLen) * 8))
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
+func (cook RectanglesCookie) Check() error {
+	return cook.Cookie.Check()
 }
 
-// Reply blocks and returns the reply data for a GetRectangles request.
-func (cook GetRectanglesCookie) Reply() (*GetRectanglesReply, error) {
-	buf, err := cook.Cookie.Reply()
-	if err != nil {
-		return nil, err
-	}
-	if buf == nil {
-		return nil, nil
-	}
-	return getRectanglesReply(buf), nil
-}
+// Write request to wire for Rectangles
+// rectanglesRequest writes a Rectangles request to a byte slice.
+func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) []byte {
+	size := xgb.Pad((16 + xgb.Pad((len(Rectangles) * 8))))
+	b := 0
+	buf := make([]byte, size)
 
-// getRectanglesReply reads a byte slice into a GetRectanglesReply value.
-func getRectanglesReply(buf []byte) *GetRectanglesReply {
-	v := new(GetRectanglesReply)
-	b := 1 // skip reply determinant
+	buf[b] = c.Extensions["SHAPE"]
+	b += 1
 
-	v.Ordering = buf[b]
+	buf[b] = 1 // request opcode
 	b += 1
 
-	v.Sequence = xgb.Get16(buf[b:])
+	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
 	b += 2
 
-	v.Length = xgb.Get32(buf[b:]) // 4-byte units
-	b += 4
+	buf[b] = byte(Operation)
+	b += 1
 
-	v.RectanglesLen = xgb.Get32(buf[b:])
+	buf[b] = byte(DestinationKind)
+	b += 1
+
+	buf[b] = Ordering
+	b += 1
+
+	b += 1 // padding
+
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
 	b += 4
 
-	b += 20 // padding
+	xgb.Put16(buf[b:], uint16(XOffset))
+	b += 2
 
-	v.Rectangles = make([]xproto.Rectangle, v.RectanglesLen)
-	b += xproto.RectangleReadList(buf[b:], v.Rectangles)
+	xgb.Put16(buf[b:], uint16(YOffset))
+	b += 2
 
-	return v
+	b += xproto.RectangleListBytes(buf[b:], Rectangles)
+
+	return buf
 }
 
-// Write request to wire for GetRectangles
-// getRectanglesRequest writes a GetRectangles request to a byte slice.
-func getRectanglesRequest(c *xgb.Conn, Window xproto.Window, SourceKind Kind) []byte {
+// SelectInputCookie is a cookie used only for SelectInput requests.
+type SelectInputCookie struct {
+	*xgb.Cookie
+}
+
+// SelectInput sends an unchecked request.
+// If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
+func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
+	cookie := c.NewCookie(false, false)
+	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
+	return SelectInputCookie{cookie}
+}
+
+// SelectInputChecked sends a checked request.
+// If an error occurs, it can be retrieved using SelectInputCookie.Check()
+func SelectInputChecked(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	if _, ok := c.Extensions["SHAPE"]; !ok {
+		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
+	}
+	cookie := c.NewCookie(true, false)
+	c.NewRequest(selectInputRequest(c, DestinationWindow, Enable), cookie)
+	return SelectInputCookie{cookie}
+}
+
+// Check returns an error if one occurred for checked requests that are not expecting a reply.
+// This cannot be called for requests expecting a reply, nor for unchecked requests.
+func (cook SelectInputCookie) Check() error {
+	return cook.Cookie.Check()
+}
+
+// Write request to wire for SelectInput
+// selectInputRequest writes a SelectInput request to a byte slice.
+func selectInputRequest(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -957,16 +953,20 @@ func getRectanglesRequest(c *xgb.Conn, Window xproto.Window, SourceKind Kind) []
 	buf[b] = c.Extensions["SHAPE"]
 	b += 1
 
-	buf[b] = 8 // request opcode
+	buf[b] = 6 // request opcode
 	b += 1
 
 	xgb.Put16(buf[b:], uint16(size/4)) // write request size in 4-byte units
 	b += 2
 
-	xgb.Put32(buf[b:], uint32(Window))
+	xgb.Put32(buf[b:], uint32(DestinationWindow))
 	b += 4
 
-	buf[b] = byte(SourceKind)
+	if Enable {
+		buf[b] = 1
+	} else {
+		buf[b] = 0
+	}
 	b += 1
 
 	b += 3 // padding
-- 
cgit v1.2.3


From b06a8ca97625c1134449c3af65d9ac3fb251a613 Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Sun, 11 Aug 2013 20:45:36 -0400
Subject: Don't needlessly change source files every time.

---
 nexgb/shape/shape.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index d0d5b8c..93ff9d0 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -1,10 +1,7 @@
 // Package shape is the X client API for the SHAPE extension.
 package shape
 
-/*
-	This file was generated by shape.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from shape.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
-- 
cgit v1.2.3


From becaf43dcb3e9832c3eb951ff9908ed697868152 Mon Sep 17 00:00:00 2001
From: aarzilli <alessandro.arzilli@gmail.com>
Date: Tue, 1 Mar 2016 15:41:38 +0100
Subject: Read/Write mutex for Extensions map

---
 nexgb/shape/shape.go | 59 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

(limited to 'nexgb/shape/shape.go')

diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 93ff9d0..7069f7e 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -19,16 +19,15 @@ func Init(c *xgb.Conn) error {
 		return xgb.Errorf("No extension named SHAPE could be found on on the server.")
 	}
 
-	xgb.ExtLock.Lock()
+	c.ExtLock.Lock()
 	c.Extensions["SHAPE"] = reply.MajorOpcode
+	c.ExtLock.Unlock()
 	for evNum, fun := range xgb.NewExtEventFuncs["SHAPE"] {
 		xgb.NewEventFuncs[int(reply.FirstEvent)+evNum] = fun
 	}
 	for errNum, fun := range xgb.NewExtErrorFuncs["SHAPE"] {
 		xgb.NewErrorFuncs[int(reply.FirstError)+errNum] = fun
 	}
-	xgb.ExtLock.Unlock()
-
 	return nil
 }
 
@@ -214,6 +213,8 @@ type CombineCookie struct {
 // Combine sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -225,6 +226,8 @@ func Combine(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, D
 // CombineChecked sends a checked request.
 // If an error occurs, it can be retrieved using CombineCookie.Check()
 func CombineChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceWindow xproto.Window) CombineCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Combine' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -246,7 +249,9 @@ func combineRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, SourceKind
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 3 // request opcode
@@ -289,6 +294,8 @@ type GetRectanglesCookie struct {
 // GetRectangles sends a checked request.
 // If an error occurs, it will be returned with the reply by calling GetRectanglesCookie.Reply()
 func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -300,6 +307,8 @@ func GetRectangles(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectan
 // GetRectanglesUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func GetRectanglesUnchecked(c *xgb.Conn, Window xproto.Window, SourceKind Kind) GetRectanglesCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'GetRectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -362,7 +371,9 @@ func getRectanglesRequest(c *xgb.Conn, Window xproto.Window, SourceKind Kind) []
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 8 // request opcode
@@ -390,6 +401,8 @@ type InputSelectedCookie struct {
 // InputSelected sends a checked request.
 // If an error occurs, it will be returned with the reply by calling InputSelectedCookie.Reply()
 func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -401,6 +414,8 @@ func InputSelected(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCo
 // InputSelectedUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func InputSelectedUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) InputSelectedCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'InputSelected' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -456,7 +471,9 @@ func inputSelectedRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 7 // request opcode
@@ -479,6 +496,8 @@ type MaskCookie struct {
 // Mask sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -490,6 +509,8 @@ func Mask(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xpr
 // MaskChecked sends a checked request.
 // If an error occurs, it can be retrieved using MaskCookie.Check()
 func MaskChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16, SourceBitmap xproto.Pixmap) MaskCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Mask' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -511,7 +532,9 @@ func maskRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, DestinationWin
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 2 // request opcode
@@ -551,6 +574,8 @@ type OffsetCookie struct {
 // Offset sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Offset(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Offset' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -562,6 +587,8 @@ func Offset(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window,
 // OffsetChecked sends a checked request.
 // If an error occurs, it can be retrieved using OffsetCookie.Check()
 func OffsetChecked(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.Window, XOffset int16, YOffset int16) OffsetCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Offset' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -583,7 +610,9 @@ func offsetRequest(c *xgb.Conn, DestinationKind Kind, DestinationWindow xproto.W
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 4 // request opcode
@@ -617,6 +646,8 @@ type QueryExtentsCookie struct {
 // QueryExtents sends a checked request.
 // If an error occurs, it will be returned with the reply by calling QueryExtentsCookie.Reply()
 func QueryExtents(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'QueryExtents' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -628,6 +659,8 @@ func QueryExtents(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCook
 // QueryExtentsUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func QueryExtentsUnchecked(c *xgb.Conn, DestinationWindow xproto.Window) QueryExtentsCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'QueryExtents' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -729,7 +762,9 @@ func queryExtentsRequest(c *xgb.Conn, DestinationWindow xproto.Window) []byte {
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 5 // request opcode
@@ -752,6 +787,8 @@ type QueryVersionCookie struct {
 // QueryVersion sends a checked request.
 // If an error occurs, it will be returned with the reply by calling QueryVersionCookie.Reply()
 func QueryVersion(c *xgb.Conn) QueryVersionCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -763,6 +800,8 @@ func QueryVersion(c *xgb.Conn) QueryVersionCookie {
 // QueryVersionUnchecked sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func QueryVersionUnchecked(c *xgb.Conn) QueryVersionCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'QueryVersion' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -821,7 +860,9 @@ func queryVersionRequest(c *xgb.Conn) []byte {
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 0 // request opcode
@@ -841,6 +882,8 @@ type RectanglesCookie struct {
 // Rectangles sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -852,6 +895,8 @@ func Rectangles(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte,
 // RectanglesChecked sends a checked request.
 // If an error occurs, it can be retrieved using RectanglesCookie.Check()
 func RectanglesChecked(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering byte, DestinationWindow xproto.Window, XOffset int16, YOffset int16, Rectangles []xproto.Rectangle) RectanglesCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'Rectangles' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -873,7 +918,9 @@ func rectanglesRequest(c *xgb.Conn, Operation Op, DestinationKind Kind, Ordering
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 1 // request opcode
@@ -915,6 +962,8 @@ type SelectInputCookie struct {
 // SelectInput sends an unchecked request.
 // If an error occurs, it can only be retrieved using xgb.WaitForEvent or xgb.PollForEvent.
 func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -926,6 +975,8 @@ func SelectInput(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) Sele
 // SelectInputChecked sends a checked request.
 // If an error occurs, it can be retrieved using SelectInputCookie.Check()
 func SelectInputChecked(c *xgb.Conn, DestinationWindow xproto.Window, Enable bool) SelectInputCookie {
+	c.ExtLock.RLock()
+	defer c.ExtLock.RUnlock()
 	if _, ok := c.Extensions["SHAPE"]; !ok {
 		panic("Cannot issue request 'SelectInput' using the uninitialized extension 'SHAPE'. shape.Init(connObj) must be called first.")
 	}
@@ -947,7 +998,9 @@ func selectInputRequest(c *xgb.Conn, DestinationWindow xproto.Window, Enable boo
 	b := 0
 	buf := make([]byte, size)
 
+	c.ExtLock.RLock()
 	buf[b] = c.Extensions["SHAPE"]
+	c.ExtLock.RUnlock()
 	b += 1
 
 	buf[b] = 6 // request opcode
-- 
cgit v1.2.3