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

1 files changed, 536 insertions, 466 deletions

diff --git a/nexgb/auto_xproto.go b/nexgb/auto_xproto.go
index 6e8e9ee..8bd39b3 100644
--- a/nexgb/auto_xproto.go
+++ b/nexgb/auto_xproto.go
@@ -1,20 +1,10 @@
 package xgb
 
 /*
-	This file was generated by xproto.xml on May 8 2012 11:03:25pm EDT.
+	This file was generated by xproto.xml on May 10 2012 12:39:34pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
-// 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'
@@ -29,7 +19,15 @@ package xgb
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Id'
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
 
 const (
 	VisualClassStaticGray  = 0
@@ -617,23 +615,95 @@ const (
 	MapIndex5       = 7
 )
 
-// Skipping resource definition of 'Window'
+type Window uint32
 
-// Skipping resource definition of 'Pixmap'
+func (c *Conn) NewWindowId() (Window, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Window(id), nil
+}
 
-// Skipping resource definition of 'Cursor'
+type Pixmap uint32
 
-// Skipping resource definition of 'Font'
+func (c *Conn) NewPixmapId() (Pixmap, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Pixmap(id), nil
+}
 
-// Skipping resource definition of 'Gcontext'
+type Cursor uint32
 
-// Skipping resource definition of 'Colormap'
+func (c *Conn) NewCursorId() (Cursor, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Cursor(id), nil
+}
 
-// Skipping resource definition of 'Atom'
+type Font uint32
 
-// Skipping resource definition of 'Drawable'
+func (c *Conn) NewFontId() (Font, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Font(id), nil
+}
+
+type Gcontext uint32
+
+func (c *Conn) NewGcontextId() (Gcontext, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Gcontext(id), nil
+}
+
+type Colormap uint32
+
+func (c *Conn) NewColormapId() (Colormap, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Colormap(id), nil
+}
+
+type Atom uint32
 
-// Skipping resource definition of 'Fontable'
+func (c *Conn) NewAtomId() (Atom, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Atom(id), nil
+}
+
+type Drawable uint32
+
+func (c *Conn) NewDrawableId() (Drawable, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Drawable(id), nil
+}
+
+type Fontable uint32
+
+func (c *Conn) NewFontableId() (Fontable, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return Fontable(id), nil
+}
 
 type Visualid uint32
 
@@ -1159,8 +1229,8 @@ func DepthInfoListSize(list []DepthInfo) int {
 // 'ScreenInfo' struct definition
 // Size: (40 + DepthInfoListSize(AllowedDepths))
 type ScreenInfo struct {
-	Root                Id
-	DefaultColormap     Id
+	Root                Window
+	DefaultColormap     Colormap
 	WhitePixel          uint32
 	BlackPixel          uint32
 	CurrentInputMasks   uint32
@@ -1182,10 +1252,10 @@ type ScreenInfo struct {
 func ReadScreenInfo(buf []byte, v *ScreenInfo) int {
 	b := 0
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.DefaultColormap = Id(Get32(buf[b:]))
+	v.DefaultColormap = Colormap(Get32(buf[b:]))
 	b += 4
 
 	v.WhitePixel = Get32(buf[b:])
@@ -1905,7 +1975,7 @@ func TimecoordListBytes(buf []byte, list []Timecoord) int {
 // 'Fontprop' struct definition
 // Size: 8
 type Fontprop struct {
-	Name  Id
+	Name  Atom
 	Value uint32
 }
 
@@ -1913,7 +1983,7 @@ type Fontprop struct {
 func ReadFontprop(buf []byte, v *Fontprop) int {
 	b := 0
 
-	v.Name = Id(Get32(buf[b:]))
+	v.Name = Atom(Get32(buf[b:]))
 	b += 4
 
 	v.Value = Get32(buf[b:])
@@ -2610,9 +2680,9 @@ type KeyPressEvent struct {
 	Sequence   uint16
 	Detail     Keycode
 	Time       Timestamp
-	Root       Id
-	Event      Id
-	Child      Id
+	Root       Window
+	Event      Window
+	Child      Window
 	RootX      int16
 	RootY      int16
 	EventX     int16
@@ -2636,13 +2706,13 @@ func NewKeyPressEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Child = Id(Get32(buf[b:]))
+	v.Child = Window(Get32(buf[b:]))
 	b += 4
 
 	v.RootX = int16(Get16(buf[b:]))
@@ -2761,9 +2831,9 @@ type ButtonPressEvent struct {
 	Sequence   uint16
 	Detail     Button
 	Time       Timestamp
-	Root       Id
-	Event      Id
-	Child      Id
+	Root       Window
+	Event      Window
+	Child      Window
 	RootX      int16
 	RootY      int16
 	EventX     int16
@@ -2787,13 +2857,13 @@ func NewButtonPressEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Child = Id(Get32(buf[b:]))
+	v.Child = Window(Get32(buf[b:]))
 	b += 4
 
 	v.RootX = int16(Get16(buf[b:]))
@@ -2912,9 +2982,9 @@ type MotionNotifyEvent struct {
 	Sequence   uint16
 	Detail     byte
 	Time       Timestamp
-	Root       Id
-	Event      Id
-	Child      Id
+	Root       Window
+	Event      Window
+	Child      Window
 	RootX      int16
 	RootY      int16
 	EventX     int16
@@ -2938,13 +3008,13 @@ func NewMotionNotifyEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Child = Id(Get32(buf[b:]))
+	v.Child = Window(Get32(buf[b:]))
 	b += 4
 
 	v.RootX = int16(Get16(buf[b:]))
@@ -3063,9 +3133,9 @@ type EnterNotifyEvent struct {
 	Sequence        uint16
 	Detail          byte
 	Time            Timestamp
-	Root            Id
-	Event           Id
-	Child           Id
+	Root            Window
+	Event           Window
+	Child           Window
 	RootX           int16
 	RootY           int16
 	EventX          int16
@@ -3089,13 +3159,13 @@ func NewEnterNotifyEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Child = Id(Get32(buf[b:]))
+	v.Child = Window(Get32(buf[b:]))
 	b += 4
 
 	v.RootX = int16(Get16(buf[b:]))
@@ -3208,7 +3278,7 @@ const FocusIn = 9
 type FocusInEvent struct {
 	Sequence uint16
 	Detail   byte
-	Event    Id
+	Event    Window
 	Mode     byte
 	// padding: 3 bytes
 }
@@ -3224,7 +3294,7 @@ func NewFocusInEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
 	v.Mode = buf[b]
@@ -3338,7 +3408,7 @@ const Expose = 12
 type ExposeEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Window Id
+	Window Window
 	X      uint16
 	Y      uint16
 	Width  uint16
@@ -3357,7 +3427,7 @@ func NewExposeEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = Get16(buf[b:])
@@ -3446,7 +3516,7 @@ const GraphicsExposure = 13
 type GraphicsExposureEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Drawable    Id
+	Drawable    Drawable
 	X           uint16
 	Y           uint16
 	Width       uint16
@@ -3467,7 +3537,7 @@ func NewGraphicsExposureEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Drawable = Id(Get32(buf[b:]))
+	v.Drawable = Drawable(Get32(buf[b:]))
 	b += 4
 
 	v.X = Get16(buf[b:])
@@ -3570,7 +3640,7 @@ const NoExposure = 14
 type NoExposureEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Drawable    Id
+	Drawable    Drawable
 	MinorOpcode uint16
 	MajorOpcode byte
 	// padding: 1 bytes
@@ -3586,7 +3656,7 @@ func NewNoExposureEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Drawable = Id(Get32(buf[b:]))
+	v.Drawable = Drawable(Get32(buf[b:]))
 	b += 4
 
 	v.MinorOpcode = Get16(buf[b:])
@@ -3654,7 +3724,7 @@ const VisibilityNotify = 15
 type VisibilityNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Window Id
+	Window Window
 	State  byte
 	// padding: 3 bytes
 }
@@ -3669,7 +3739,7 @@ func NewVisibilityNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	v.State = buf[b]
@@ -3730,8 +3800,8 @@ const CreateNotify = 16
 type CreateNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Parent           Id
-	Window           Id
+	Parent           Window
+	Window           Window
 	X                int16
 	Y                int16
 	Width            uint16
@@ -3751,10 +3821,10 @@ func NewCreateNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Parent = Id(Get32(buf[b:]))
+	v.Parent = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = int16(Get16(buf[b:]))
@@ -3862,8 +3932,8 @@ const DestroyNotify = 17
 type DestroyNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event  Id
-	Window Id
+	Event  Window
+	Window Window
 }
 
 // Event read DestroyNotify
@@ -3876,10 +3946,10 @@ func NewDestroyNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -3933,8 +4003,8 @@ const UnmapNotify = 18
 type UnmapNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event         Id
-	Window        Id
+	Event         Window
+	Window        Window
 	FromConfigure bool
 	// padding: 3 bytes
 }
@@ -3949,10 +4019,10 @@ func NewUnmapNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	if buf[b] == 1 {
@@ -4025,8 +4095,8 @@ const MapNotify = 19
 type MapNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event            Id
-	Window           Id
+	Event            Window
+	Window           Window
 	OverrideRedirect bool
 	// padding: 3 bytes
 }
@@ -4041,10 +4111,10 @@ func NewMapNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	if buf[b] == 1 {
@@ -4117,8 +4187,8 @@ const MapRequest = 20
 type MapRequestEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Parent Id
-	Window Id
+	Parent Window
+	Window Window
 }
 
 // Event read MapRequest
@@ -4131,10 +4201,10 @@ func NewMapRequestEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Parent = Id(Get32(buf[b:]))
+	v.Parent = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -4188,9 +4258,9 @@ const ReparentNotify = 21
 type ReparentNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event            Id
-	Window           Id
-	Parent           Id
+	Event            Window
+	Window           Window
+	Parent           Window
 	X                int16
 	Y                int16
 	OverrideRedirect bool
@@ -4207,13 +4277,13 @@ func NewReparentNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Parent = Id(Get32(buf[b:]))
+	v.Parent = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = int16(Get16(buf[b:]))
@@ -4304,9 +4374,9 @@ const ConfigureNotify = 22
 type ConfigureNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event            Id
-	Window           Id
-	AboveSibling     Id
+	Event            Window
+	Window           Window
+	AboveSibling     Window
 	X                int16
 	Y                int16
 	Width            uint16
@@ -4326,13 +4396,13 @@ func NewConfigureNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
-	v.AboveSibling = Id(Get32(buf[b:]))
+	v.AboveSibling = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = int16(Get16(buf[b:]))
@@ -4444,9 +4514,9 @@ const ConfigureRequest = 23
 type ConfigureRequestEvent struct {
 	Sequence    uint16
 	StackMode   byte
-	Parent      Id
-	Window      Id
-	Sibling     Id
+	Parent      Window
+	Window      Window
+	Sibling     Window
 	X           int16
 	Y           int16
 	Width       uint16
@@ -4466,13 +4536,13 @@ func NewConfigureRequestEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Parent = Id(Get32(buf[b:]))
+	v.Parent = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Sibling = Id(Get32(buf[b:]))
+	v.Sibling = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = int16(Get16(buf[b:]))
@@ -4574,8 +4644,8 @@ const GravityNotify = 24
 type GravityNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event  Id
-	Window Id
+	Event  Window
+	Window Window
 	X      int16
 	Y      int16
 }
@@ -4590,10 +4660,10 @@ func NewGravityNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = int16(Get16(buf[b:]))
@@ -4661,7 +4731,7 @@ const ResizeRequest = 25
 type ResizeRequestEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Window Id
+	Window Window
 	Width  uint16
 	Height uint16
 }
@@ -4676,7 +4746,7 @@ func NewResizeRequestEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	v.Width = Get16(buf[b:])
@@ -4740,8 +4810,8 @@ const CirculateNotify = 26
 type CirculateNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Event  Id
-	Window Id
+	Event  Window
+	Window Window
 	// padding: 4 bytes
 	Place byte
 	// padding: 3 bytes
@@ -4757,10 +4827,10 @@ func NewCirculateNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Event = Id(Get32(buf[b:]))
+	v.Event = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
 	b += 4 // padding
@@ -4829,8 +4899,8 @@ const PropertyNotify = 28
 type PropertyNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Window Id
-	Atom   Id
+	Window Window
+	Atom   Atom
 	Time   Timestamp
 	State  byte
 	// padding: 3 bytes
@@ -4846,10 +4916,10 @@ func NewPropertyNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Atom = Id(Get32(buf[b:]))
+	v.Atom = Atom(Get32(buf[b:]))
 	b += 4
 
 	v.Time = Timestamp(Get32(buf[b:]))
@@ -4922,8 +4992,8 @@ type SelectionClearEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
 	Time      Timestamp
-	Owner     Id
-	Selection Id
+	Owner     Window
+	Selection Atom
 }
 
 // Event read SelectionClear
@@ -4939,10 +5009,10 @@ func NewSelectionClearEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Owner = Id(Get32(buf[b:]))
+	v.Owner = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Selection = Id(Get32(buf[b:]))
+	v.Selection = Atom(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -5001,11 +5071,11 @@ type SelectionRequestEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
 	Time      Timestamp
-	Owner     Id
-	Requestor Id
-	Selection Id
-	Target    Id
-	Property  Id
+	Owner     Window
+	Requestor Window
+	Selection Atom
+	Target    Atom
+	Property  Atom
 }
 
 // Event read SelectionRequest
@@ -5021,19 +5091,19 @@ func NewSelectionRequestEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Owner = Id(Get32(buf[b:]))
+	v.Owner = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Requestor = Id(Get32(buf[b:]))
+	v.Requestor = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Selection = Id(Get32(buf[b:]))
+	v.Selection = Atom(Get32(buf[b:]))
 	b += 4
 
-	v.Target = Id(Get32(buf[b:]))
+	v.Target = Atom(Get32(buf[b:]))
 	b += 4
 
-	v.Property = Id(Get32(buf[b:]))
+	v.Property = Atom(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -5104,10 +5174,10 @@ type SelectionNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
 	Time      Timestamp
-	Requestor Id
-	Selection Id
-	Target    Id
-	Property  Id
+	Requestor Window
+	Selection Atom
+	Target    Atom
+	Property  Atom
 }
 
 // Event read SelectionNotify
@@ -5123,16 +5193,16 @@ func NewSelectionNotifyEvent(buf []byte) Event {
 	v.Time = Timestamp(Get32(buf[b:]))
 	b += 4
 
-	v.Requestor = Id(Get32(buf[b:]))
+	v.Requestor = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Selection = Id(Get32(buf[b:]))
+	v.Selection = Atom(Get32(buf[b:]))
 	b += 4
 
-	v.Target = Id(Get32(buf[b:]))
+	v.Target = Atom(Get32(buf[b:]))
 	b += 4
 
-	v.Property = Id(Get32(buf[b:]))
+	v.Property = Atom(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -5198,8 +5268,8 @@ const ColormapNotify = 32
 type ColormapNotifyEvent struct {
 	Sequence uint16
 	// padding: 1 bytes
-	Window   Id
-	Colormap Id
+	Window   Window
+	Colormap Colormap
 	New      bool
 	State    byte
 	// padding: 2 bytes
@@ -5215,10 +5285,10 @@ func NewColormapNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Colormap = Id(Get32(buf[b:]))
+	v.Colormap = Colormap(Get32(buf[b:]))
 	b += 4
 
 	if buf[b] == 1 {
@@ -5298,8 +5368,8 @@ const ClientMessage = 33
 type ClientMessageEvent struct {
 	Sequence uint16
 	Format   byte
-	Window   Id
-	Type     Id
+	Window   Window
+	Type     Atom
 	Data     ClientMessageDataUnion
 }
 
@@ -5314,10 +5384,10 @@ func NewClientMessageEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Window = Id(Get32(buf[b:]))
+	v.Window = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Type = Id(Get32(buf[b:]))
+	v.Type = Atom(Get32(buf[b:]))
 	b += 4
 
 	v.Data = ClientMessageDataUnion{}
@@ -5693,8 +5763,8 @@ func (err RequestError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err RequestError) BadId() Id {
-	return Id(err.BadValue)
+func (err RequestError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err RequestError) Error() string {
@@ -5756,8 +5826,8 @@ func (err ValueError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err ValueError) BadId() Id {
-	return Id(err.BadValue)
+func (err ValueError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err ValueError) Error() string {
@@ -5792,8 +5862,8 @@ func (err WindowError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err WindowError) BadId() Id {
-	return Id(err.BadValue)
+func (err WindowError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err WindowError) Error() string {
@@ -5828,8 +5898,8 @@ func (err PixmapError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err PixmapError) BadId() Id {
-	return Id(err.BadValue)
+func (err PixmapError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err PixmapError) Error() string {
@@ -5864,8 +5934,8 @@ func (err AtomError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err AtomError) BadId() Id {
-	return Id(err.BadValue)
+func (err AtomError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err AtomError) Error() string {
@@ -5900,8 +5970,8 @@ func (err CursorError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err CursorError) BadId() Id {
-	return Id(err.BadValue)
+func (err CursorError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err CursorError) Error() string {
@@ -5936,8 +6006,8 @@ func (err FontError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err FontError) BadId() Id {
-	return Id(err.BadValue)
+func (err FontError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err FontError) Error() string {
@@ -5972,8 +6042,8 @@ func (err MatchError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err MatchError) BadId() Id {
-	return Id(err.BadValue)
+func (err MatchError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err MatchError) Error() string {
@@ -6008,8 +6078,8 @@ func (err DrawableError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err DrawableError) BadId() Id {
-	return Id(err.BadValue)
+func (err DrawableError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err DrawableError) Error() string {
@@ -6044,8 +6114,8 @@ func (err AccessError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err AccessError) BadId() Id {
-	return Id(err.BadValue)
+func (err AccessError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err AccessError) Error() string {
@@ -6080,8 +6150,8 @@ func (err AllocError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err AllocError) BadId() Id {
-	return Id(err.BadValue)
+func (err AllocError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err AllocError) Error() string {
@@ -6116,8 +6186,8 @@ func (err ColormapError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err ColormapError) BadId() Id {
-	return Id(err.BadValue)
+func (err ColormapError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err ColormapError) Error() string {
@@ -6152,8 +6222,8 @@ func (err GContextError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err GContextError) BadId() Id {
-	return Id(err.BadValue)
+func (err GContextError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err GContextError) Error() string {
@@ -6188,8 +6258,8 @@ func (err IDChoiceError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err IDChoiceError) BadId() Id {
-	return Id(err.BadValue)
+func (err IDChoiceError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err IDChoiceError) Error() string {
@@ -6224,8 +6294,8 @@ func (err NameError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err NameError) BadId() Id {
-	return Id(err.BadValue)
+func (err NameError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err NameError) Error() string {
@@ -6260,8 +6330,8 @@ func (err LengthError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err LengthError) BadId() Id {
-	return Id(err.BadValue)
+func (err LengthError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err LengthError) Error() string {
@@ -6296,8 +6366,8 @@ func (err ImplementationError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err ImplementationError) BadId() Id {
-	return Id(err.BadValue)
+func (err ImplementationError) BadId() uint32 {
+	return err.BadValue
 }
 
 func (err ImplementationError) Error() string {
@@ -6321,13 +6391,13 @@ type CreateWindowCookie struct {
 }
 
 // Write request to wire for CreateWindow
-func (c *Conn) CreateWindow(Depth byte, Wid Id, Parent Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie {
+func (c *Conn) CreateWindow(Depth byte, Wid Window, Parent Window, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.createWindowRequest(Depth, Wid, Parent, X, Y, Width, Height, BorderWidth, Class, Visual, ValueMask, ValueList), cookie)
 	return CreateWindowCookie{cookie}
 }
 
-func (c *Conn) CreateWindowChecked(Depth byte, Wid Id, Parent Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie {
+func (c *Conn) CreateWindowChecked(Depth byte, Wid Window, Parent Window, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) CreateWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.createWindowRequest(Depth, Wid, Parent, X, Y, Width, Height, BorderWidth, Class, Visual, ValueMask, ValueList), cookie)
 	return CreateWindowCookie{cookie}
@@ -6338,7 +6408,7 @@ func (cook CreateWindowCookie) Check() error {
 }
 
 // Write request to wire for CreateWindow
-func (c *Conn) createWindowRequest(Depth byte, Wid Id, Parent Id, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) []byte {
+func (c *Conn) createWindowRequest(Depth byte, Wid Window, Parent Window, X int16, Y int16, Width uint16, Height uint16, BorderWidth uint16, Class uint16, Visual Visualid, ValueMask uint32, ValueList []uint32) []byte {
 	size := pad((28 + (4 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -6397,13 +6467,13 @@ type ChangeWindowAttributesCookie struct {
 }
 
 // Write request to wire for ChangeWindowAttributes
-func (c *Conn) ChangeWindowAttributes(Window Id, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie {
+func (c *Conn) ChangeWindowAttributes(Window Window, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.changeWindowAttributesRequest(Window, ValueMask, ValueList), cookie)
 	return ChangeWindowAttributesCookie{cookie}
 }
 
-func (c *Conn) ChangeWindowAttributesChecked(Window Id, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie {
+func (c *Conn) ChangeWindowAttributesChecked(Window Window, ValueMask uint32, ValueList []uint32) ChangeWindowAttributesCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.changeWindowAttributesRequest(Window, ValueMask, ValueList), cookie)
 	return ChangeWindowAttributesCookie{cookie}
@@ -6414,7 +6484,7 @@ func (cook ChangeWindowAttributesCookie) Check() error {
 }
 
 // Write request to wire for ChangeWindowAttributes
-func (c *Conn) changeWindowAttributesRequest(Window Id, ValueMask uint32, ValueList []uint32) []byte {
+func (c *Conn) changeWindowAttributesRequest(Window Window, ValueMask uint32, ValueList []uint32) []byte {
 	size := pad((8 + (4 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -6447,13 +6517,13 @@ type GetWindowAttributesCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetWindowAttributes(Window Id) GetWindowAttributesCookie {
+func (c *Conn) GetWindowAttributes(Window Window) GetWindowAttributesCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getWindowAttributesRequest(Window), cookie)
 	return GetWindowAttributesCookie{cookie}
 }
 
-func (c *Conn) GetWindowAttributesUnchecked(Window Id) GetWindowAttributesCookie {
+func (c *Conn) GetWindowAttributesUnchecked(Window Window) GetWindowAttributesCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getWindowAttributesRequest(Window), cookie)
 	return GetWindowAttributesCookie{cookie}
@@ -6475,7 +6545,7 @@ type GetWindowAttributesReply struct {
 	MapIsInstalled     bool
 	MapState           byte
 	OverrideRedirect   bool
-	Colormap           Id
+	Colormap           Colormap
 	AllEventMasks      uint32
 	YourEventMask      uint32
 	DoNotPropagateMask uint16
@@ -6550,7 +6620,7 @@ func getWindowAttributesReply(buf []byte) *GetWindowAttributesReply {
 	}
 	b += 1
 
-	v.Colormap = Id(Get32(buf[b:]))
+	v.Colormap = Colormap(Get32(buf[b:]))
 	b += 4
 
 	v.AllEventMasks = Get32(buf[b:])
@@ -6572,7 +6642,7 @@ func (cook GetWindowAttributesCookie) Check() error {
 }
 
 // Write request to wire for GetWindowAttributes
-func (c *Conn) getWindowAttributesRequest(Window Id) []byte {
+func (c *Conn) getWindowAttributesRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6598,13 +6668,13 @@ type DestroyWindowCookie struct {
 }
 
 // Write request to wire for DestroyWindow
-func (c *Conn) DestroyWindow(Window Id) DestroyWindowCookie {
+func (c *Conn) DestroyWindow(Window Window) DestroyWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.destroyWindowRequest(Window), cookie)
 	return DestroyWindowCookie{cookie}
 }
 
-func (c *Conn) DestroyWindowChecked(Window Id) DestroyWindowCookie {
+func (c *Conn) DestroyWindowChecked(Window Window) DestroyWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.destroyWindowRequest(Window), cookie)
 	return DestroyWindowCookie{cookie}
@@ -6615,7 +6685,7 @@ func (cook DestroyWindowCookie) Check() error {
 }
 
 // Write request to wire for DestroyWindow
-func (c *Conn) destroyWindowRequest(Window Id) []byte {
+func (c *Conn) destroyWindowRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6641,13 +6711,13 @@ type DestroySubwindowsCookie struct {
 }
 
 // Write request to wire for DestroySubwindows
-func (c *Conn) DestroySubwindows(Window Id) DestroySubwindowsCookie {
+func (c *Conn) DestroySubwindows(Window Window) DestroySubwindowsCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.destroySubwindowsRequest(Window), cookie)
 	return DestroySubwindowsCookie{cookie}
 }
 
-func (c *Conn) DestroySubwindowsChecked(Window Id) DestroySubwindowsCookie {
+func (c *Conn) DestroySubwindowsChecked(Window Window) DestroySubwindowsCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.destroySubwindowsRequest(Window), cookie)
 	return DestroySubwindowsCookie{cookie}
@@ -6658,7 +6728,7 @@ func (cook DestroySubwindowsCookie) Check() error {
 }
 
 // Write request to wire for DestroySubwindows
-func (c *Conn) destroySubwindowsRequest(Window Id) []byte {
+func (c *Conn) destroySubwindowsRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6684,13 +6754,13 @@ type ChangeSaveSetCookie struct {
 }
 
 // Write request to wire for ChangeSaveSet
-func (c *Conn) ChangeSaveSet(Mode byte, Window Id) ChangeSaveSetCookie {
+func (c *Conn) ChangeSaveSet(Mode byte, Window Window) ChangeSaveSetCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.changeSaveSetRequest(Mode, Window), cookie)
 	return ChangeSaveSetCookie{cookie}
 }
 
-func (c *Conn) ChangeSaveSetChecked(Mode byte, Window Id) ChangeSaveSetCookie {
+func (c *Conn) ChangeSaveSetChecked(Mode byte, Window Window) ChangeSaveSetCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.changeSaveSetRequest(Mode, Window), cookie)
 	return ChangeSaveSetCookie{cookie}
@@ -6701,7 +6771,7 @@ func (cook ChangeSaveSetCookie) Check() error {
 }
 
 // Write request to wire for ChangeSaveSet
-func (c *Conn) changeSaveSetRequest(Mode byte, Window Id) []byte {
+func (c *Conn) changeSaveSetRequest(Mode byte, Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6728,13 +6798,13 @@ type ReparentWindowCookie struct {
 }
 
 // Write request to wire for ReparentWindow
-func (c *Conn) ReparentWindow(Window Id, Parent Id, X int16, Y int16) ReparentWindowCookie {
+func (c *Conn) ReparentWindow(Window Window, Parent Window, X int16, Y int16) ReparentWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.reparentWindowRequest(Window, Parent, X, Y), cookie)
 	return ReparentWindowCookie{cookie}
 }
 
-func (c *Conn) ReparentWindowChecked(Window Id, Parent Id, X int16, Y int16) ReparentWindowCookie {
+func (c *Conn) ReparentWindowChecked(Window Window, Parent Window, X int16, Y int16) ReparentWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.reparentWindowRequest(Window, Parent, X, Y), cookie)
 	return ReparentWindowCookie{cookie}
@@ -6745,7 +6815,7 @@ func (cook ReparentWindowCookie) Check() error {
 }
 
 // Write request to wire for ReparentWindow
-func (c *Conn) reparentWindowRequest(Window Id, Parent Id, X int16, Y int16) []byte {
+func (c *Conn) reparentWindowRequest(Window Window, Parent Window, X int16, Y int16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -6780,13 +6850,13 @@ type MapWindowCookie struct {
 }
 
 // Write request to wire for MapWindow
-func (c *Conn) MapWindow(Window Id) MapWindowCookie {
+func (c *Conn) MapWindow(Window Window) MapWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.mapWindowRequest(Window), cookie)
 	return MapWindowCookie{cookie}
 }
 
-func (c *Conn) MapWindowChecked(Window Id) MapWindowCookie {
+func (c *Conn) MapWindowChecked(Window Window) MapWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.mapWindowRequest(Window), cookie)
 	return MapWindowCookie{cookie}
@@ -6797,7 +6867,7 @@ func (cook MapWindowCookie) Check() error {
 }
 
 // Write request to wire for MapWindow
-func (c *Conn) mapWindowRequest(Window Id) []byte {
+func (c *Conn) mapWindowRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6823,13 +6893,13 @@ type MapSubwindowsCookie struct {
 }
 
 // Write request to wire for MapSubwindows
-func (c *Conn) MapSubwindows(Window Id) MapSubwindowsCookie {
+func (c *Conn) MapSubwindows(Window Window) MapSubwindowsCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.mapSubwindowsRequest(Window), cookie)
 	return MapSubwindowsCookie{cookie}
 }
 
-func (c *Conn) MapSubwindowsChecked(Window Id) MapSubwindowsCookie {
+func (c *Conn) MapSubwindowsChecked(Window Window) MapSubwindowsCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.mapSubwindowsRequest(Window), cookie)
 	return MapSubwindowsCookie{cookie}
@@ -6840,7 +6910,7 @@ func (cook MapSubwindowsCookie) Check() error {
 }
 
 // Write request to wire for MapSubwindows
-func (c *Conn) mapSubwindowsRequest(Window Id) []byte {
+func (c *Conn) mapSubwindowsRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6866,13 +6936,13 @@ type UnmapWindowCookie struct {
 }
 
 // Write request to wire for UnmapWindow
-func (c *Conn) UnmapWindow(Window Id) UnmapWindowCookie {
+func (c *Conn) UnmapWindow(Window Window) UnmapWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.unmapWindowRequest(Window), cookie)
 	return UnmapWindowCookie{cookie}
 }
 
-func (c *Conn) UnmapWindowChecked(Window Id) UnmapWindowCookie {
+func (c *Conn) UnmapWindowChecked(Window Window) UnmapWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.unmapWindowRequest(Window), cookie)
 	return UnmapWindowCookie{cookie}
@@ -6883,7 +6953,7 @@ func (cook UnmapWindowCookie) Check() error {
 }
 
 // Write request to wire for UnmapWindow
-func (c *Conn) unmapWindowRequest(Window Id) []byte {
+func (c *Conn) unmapWindowRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6909,13 +6979,13 @@ type UnmapSubwindowsCookie struct {
 }
 
 // Write request to wire for UnmapSubwindows
-func (c *Conn) UnmapSubwindows(Window Id) UnmapSubwindowsCookie {
+func (c *Conn) UnmapSubwindows(Window Window) UnmapSubwindowsCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.unmapSubwindowsRequest(Window), cookie)
 	return UnmapSubwindowsCookie{cookie}
 }
 
-func (c *Conn) UnmapSubwindowsChecked(Window Id) UnmapSubwindowsCookie {
+func (c *Conn) UnmapSubwindowsChecked(Window Window) UnmapSubwindowsCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.unmapSubwindowsRequest(Window), cookie)
 	return UnmapSubwindowsCookie{cookie}
@@ -6926,7 +6996,7 @@ func (cook UnmapSubwindowsCookie) Check() error {
 }
 
 // Write request to wire for UnmapSubwindows
-func (c *Conn) unmapSubwindowsRequest(Window Id) []byte {
+func (c *Conn) unmapSubwindowsRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -6952,13 +7022,13 @@ type ConfigureWindowCookie struct {
 }
 
 // Write request to wire for ConfigureWindow
-func (c *Conn) ConfigureWindow(Window Id, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie {
+func (c *Conn) ConfigureWindow(Window Window, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.configureWindowRequest(Window, ValueMask, ValueList), cookie)
 	return ConfigureWindowCookie{cookie}
 }
 
-func (c *Conn) ConfigureWindowChecked(Window Id, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie {
+func (c *Conn) ConfigureWindowChecked(Window Window, ValueMask uint16, ValueList []uint32) ConfigureWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.configureWindowRequest(Window, ValueMask, ValueList), cookie)
 	return ConfigureWindowCookie{cookie}
@@ -6969,7 +7039,7 @@ func (cook ConfigureWindowCookie) Check() error {
 }
 
 // Write request to wire for ConfigureWindow
-func (c *Conn) configureWindowRequest(Window Id, ValueMask uint16, ValueList []uint32) []byte {
+func (c *Conn) configureWindowRequest(Window Window, ValueMask uint16, ValueList []uint32) []byte {
 	size := pad((10 + (2 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -7006,13 +7076,13 @@ type CirculateWindowCookie struct {
 }
 
 // Write request to wire for CirculateWindow
-func (c *Conn) CirculateWindow(Direction byte, Window Id) CirculateWindowCookie {
+func (c *Conn) CirculateWindow(Direction byte, Window Window) CirculateWindowCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.circulateWindowRequest(Direction, Window), cookie)
 	return CirculateWindowCookie{cookie}
 }
 
-func (c *Conn) CirculateWindowChecked(Direction byte, Window Id) CirculateWindowCookie {
+func (c *Conn) CirculateWindowChecked(Direction byte, Window Window) CirculateWindowCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.circulateWindowRequest(Direction, Window), cookie)
 	return CirculateWindowCookie{cookie}
@@ -7023,7 +7093,7 @@ func (cook CirculateWindowCookie) Check() error {
 }
 
 // Write request to wire for CirculateWindow
-func (c *Conn) circulateWindowRequest(Direction byte, Window Id) []byte {
+func (c *Conn) circulateWindowRequest(Direction byte, Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -7049,13 +7119,13 @@ type GetGeometryCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetGeometry(Drawable Id) GetGeometryCookie {
+func (c *Conn) GetGeometry(Drawable Drawable) GetGeometryCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getGeometryRequest(Drawable), cookie)
 	return GetGeometryCookie{cookie}
 }
 
-func (c *Conn) GetGeometryUnchecked(Drawable Id) GetGeometryCookie {
+func (c *Conn) GetGeometryUnchecked(Drawable Drawable) GetGeometryCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getGeometryRequest(Drawable), cookie)
 	return GetGeometryCookie{cookie}
@@ -7067,7 +7137,7 @@ type GetGeometryReply struct {
 	Sequence    uint16
 	Length      uint32
 	Depth       byte
-	Root        Id
+	Root        Window
 	X           int16
 	Y           int16
 	Width       uint16
@@ -7102,7 +7172,7 @@ func getGeometryReply(buf []byte) *GetGeometryReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
 	v.X = int16(Get16(buf[b:]))
@@ -7130,7 +7200,7 @@ func (cook GetGeometryCookie) Check() error {
 }
 
 // Write request to wire for GetGeometry
-func (c *Conn) getGeometryRequest(Drawable Id) []byte {
+func (c *Conn) getGeometryRequest(Drawable Drawable) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -7155,13 +7225,13 @@ type QueryTreeCookie struct {
 	*cookie
 }
 
-func (c *Conn) QueryTree(Window Id) QueryTreeCookie {
+func (c *Conn) QueryTree(Window Window) QueryTreeCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.queryTreeRequest(Window), cookie)
 	return QueryTreeCookie{cookie}
 }
 
-func (c *Conn) QueryTreeUnchecked(Window Id) QueryTreeCookie {
+func (c *Conn) QueryTreeUnchecked(Window Window) QueryTreeCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.queryTreeRequest(Window), cookie)
 	return QueryTreeCookie{cookie}
@@ -7173,11 +7243,11 @@ type QueryTreeReply struct {
 	Sequence uint16
 	Length   uint32
 	// padding: 1 bytes
-	Root        Id
-	Parent      Id
+	Root        Window
+	Parent      Window
 	ChildrenLen uint16
 	// padding: 14 bytes
-	Children []Id // size: pad((int(ChildrenLen) * 4))
+	Children []Window // size: pad((int(ChildrenLen) * 4))
 }
 
 // Waits and reads reply data from request QueryTree
@@ -7205,10 +7275,10 @@ func queryTreeReply(buf []byte) *QueryTreeReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Parent = Id(Get32(buf[b:]))
+	v.Parent = Window(Get32(buf[b:]))
 	b += 4
 
 	v.ChildrenLen = Get16(buf[b:])
@@ -7216,9 +7286,9 @@ func queryTreeReply(buf []byte) *QueryTreeReply {
 
 	b += 14 // padding
 
-	v.Children = make([]Id, v.ChildrenLen)
+	v.Children = make([]Window, v.ChildrenLen)
 	for i := 0; i < int(v.ChildrenLen); i++ {
-		v.Children[i] = Id(Get32(buf[b:]))
+		v.Children[i] = Window(Get32(buf[b:]))
 		b += 4
 	}
 	b = pad(b)
@@ -7231,7 +7301,7 @@ func (cook QueryTreeCookie) Check() error {
 }
 
 // Write request to wire for QueryTree
-func (c *Conn) queryTreeRequest(Window Id) []byte {
+func (c *Conn) queryTreeRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -7274,7 +7344,7 @@ type InternAtomReply struct {
 	Sequence uint16
 	Length   uint32
 	// padding: 1 bytes
-	Atom Id
+	Atom Atom
 }
 
 // Waits and reads reply data from request InternAtom
@@ -7302,7 +7372,7 @@ func internAtomReply(buf []byte) *InternAtomReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Atom = Id(Get32(buf[b:]))
+	v.Atom = Atom(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -7348,13 +7418,13 @@ type GetAtomNameCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetAtomName(Atom Id) GetAtomNameCookie {
+func (c *Conn) GetAtomName(Atom Atom) GetAtomNameCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getAtomNameRequest(Atom), cookie)
 	return GetAtomNameCookie{cookie}
 }
 
-func (c *Conn) GetAtomNameUnchecked(Atom Id) GetAtomNameCookie {
+func (c *Conn) GetAtomNameUnchecked(Atom Atom) GetAtomNameCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getAtomNameRequest(Atom), cookie)
 	return GetAtomNameCookie{cookie}
@@ -7416,7 +7486,7 @@ func (cook GetAtomNameCookie) Check() error {
 }
 
 // Write request to wire for GetAtomName
-func (c *Conn) getAtomNameRequest(Atom Id) []byte {
+func (c *Conn) getAtomNameRequest(Atom Atom) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -7442,13 +7512,13 @@ type ChangePropertyCookie struct {
 }
 
 // Write request to wire for ChangeProperty
-func (c *Conn) ChangeProperty(Mode byte, Window Id, Property Id, Type Id, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie {
+func (c *Conn) ChangeProperty(Mode byte, Window Window, Property Atom, Type Atom, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.changePropertyRequest(Mode, Window, Property, Type, Format, DataLen, Data), cookie)
 	return ChangePropertyCookie{cookie}
 }
 
-func (c *Conn) ChangePropertyChecked(Mode byte, Window Id, Property Id, Type Id, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie {
+func (c *Conn) ChangePropertyChecked(Mode byte, Window Window, Property Atom, Type Atom, Format byte, DataLen uint32, Data []byte) ChangePropertyCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.changePropertyRequest(Mode, Window, Property, Type, Format, DataLen, Data), cookie)
 	return ChangePropertyCookie{cookie}
@@ -7459,7 +7529,7 @@ func (cook ChangePropertyCookie) Check() error {
 }
 
 // Write request to wire for ChangeProperty
-func (c *Conn) changePropertyRequest(Mode byte, Window Id, Property Id, Type Id, Format byte, DataLen uint32, Data []byte) []byte {
+func (c *Conn) changePropertyRequest(Mode byte, Window Window, Property Atom, Type Atom, Format byte, DataLen uint32, Data []byte) []byte {
 	size := pad((24 + pad((((int(DataLen) * int(Format)) / 8) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -7503,13 +7573,13 @@ type DeletePropertyCookie struct {
 }
 
 // Write request to wire for DeleteProperty
-func (c *Conn) DeleteProperty(Window Id, Property Id) DeletePropertyCookie {
+func (c *Conn) DeleteProperty(Window Window, Property Atom) DeletePropertyCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.deletePropertyRequest(Window, Property), cookie)
 	return DeletePropertyCookie{cookie}
 }
 
-func (c *Conn) DeletePropertyChecked(Window Id, Property Id) DeletePropertyCookie {
+func (c *Conn) DeletePropertyChecked(Window Window, Property Atom) DeletePropertyCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.deletePropertyRequest(Window, Property), cookie)
 	return DeletePropertyCookie{cookie}
@@ -7520,7 +7590,7 @@ func (cook DeletePropertyCookie) Check() error {
 }
 
 // Write request to wire for DeleteProperty
-func (c *Conn) deletePropertyRequest(Window Id, Property Id) []byte {
+func (c *Conn) deletePropertyRequest(Window Window, Property Atom) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -7548,13 +7618,13 @@ type GetPropertyCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetProperty(Delete bool, Window Id, Property Id, Type Id, LongOffset uint32, LongLength uint32) GetPropertyCookie {
+func (c *Conn) GetProperty(Delete bool, Window Window, Property Atom, Type Atom, LongOffset uint32, LongLength uint32) GetPropertyCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getPropertyRequest(Delete, Window, Property, Type, LongOffset, LongLength), cookie)
 	return GetPropertyCookie{cookie}
 }
 
-func (c *Conn) GetPropertyUnchecked(Delete bool, Window Id, Property Id, Type Id, LongOffset uint32, LongLength uint32) GetPropertyCookie {
+func (c *Conn) GetPropertyUnchecked(Delete bool, Window Window, Property Atom, Type Atom, LongOffset uint32, LongLength uint32) GetPropertyCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getPropertyRequest(Delete, Window, Property, Type, LongOffset, LongLength), cookie)
 	return GetPropertyCookie{cookie}
@@ -7566,7 +7636,7 @@ type GetPropertyReply struct {
 	Sequence   uint16
 	Length     uint32
 	Format     byte
-	Type       Id
+	Type       Atom
 	BytesAfter uint32
 	ValueLen   uint32
 	// padding: 12 bytes
@@ -7599,7 +7669,7 @@ func getPropertyReply(buf []byte) *GetPropertyReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Type = Id(Get32(buf[b:]))
+	v.Type = Atom(Get32(buf[b:]))
 	b += 4
 
 	v.BytesAfter = Get32(buf[b:])
@@ -7622,7 +7692,7 @@ func (cook GetPropertyCookie) Check() error {
 }
 
 // Write request to wire for GetProperty
-func (c *Conn) getPropertyRequest(Delete bool, Window Id, Property Id, Type Id, LongOffset uint32, LongLength uint32) []byte {
+func (c *Conn) getPropertyRequest(Delete bool, Window Window, Property Atom, Type Atom, LongOffset uint32, LongLength uint32) []byte {
 	size := 24
 	b := 0
 	buf := make([]byte, size)
@@ -7664,13 +7734,13 @@ type ListPropertiesCookie struct {
 	*cookie
 }
 
-func (c *Conn) ListProperties(Window Id) ListPropertiesCookie {
+func (c *Conn) ListProperties(Window Window) ListPropertiesCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.listPropertiesRequest(Window), cookie)
 	return ListPropertiesCookie{cookie}
 }
 
-func (c *Conn) ListPropertiesUnchecked(Window Id) ListPropertiesCookie {
+func (c *Conn) ListPropertiesUnchecked(Window Window) ListPropertiesCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.listPropertiesRequest(Window), cookie)
 	return ListPropertiesCookie{cookie}
@@ -7684,7 +7754,7 @@ type ListPropertiesReply struct {
 	// padding: 1 bytes
 	AtomsLen uint16
 	// padding: 22 bytes
-	Atoms []Id // size: pad((int(AtomsLen) * 4))
+	Atoms []Atom // size: pad((int(AtomsLen) * 4))
 }
 
 // Waits and reads reply data from request ListProperties
@@ -7717,9 +7787,9 @@ func listPropertiesReply(buf []byte) *ListPropertiesReply {
 
 	b += 22 // padding
 
-	v.Atoms = make([]Id, v.AtomsLen)
+	v.Atoms = make([]Atom, v.AtomsLen)
 	for i := 0; i < int(v.AtomsLen); i++ {
-		v.Atoms[i] = Id(Get32(buf[b:]))
+		v.Atoms[i] = Atom(Get32(buf[b:]))
 		b += 4
 	}
 	b = pad(b)
@@ -7732,7 +7802,7 @@ func (cook ListPropertiesCookie) Check() error {
 }
 
 // Write request to wire for ListProperties
-func (c *Conn) listPropertiesRequest(Window Id) []byte {
+func (c *Conn) listPropertiesRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -7758,13 +7828,13 @@ type SetSelectionOwnerCookie struct {
 }
 
 // Write request to wire for SetSelectionOwner
-func (c *Conn) SetSelectionOwner(Owner Id, Selection Id, Time Timestamp) SetSelectionOwnerCookie {
+func (c *Conn) SetSelectionOwner(Owner Window, Selection Atom, Time Timestamp) SetSelectionOwnerCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.setSelectionOwnerRequest(Owner, Selection, Time), cookie)
 	return SetSelectionOwnerCookie{cookie}
 }
 
-func (c *Conn) SetSelectionOwnerChecked(Owner Id, Selection Id, Time Timestamp) SetSelectionOwnerCookie {
+func (c *Conn) SetSelectionOwnerChecked(Owner Window, Selection Atom, Time Timestamp) SetSelectionOwnerCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.setSelectionOwnerRequest(Owner, Selection, Time), cookie)
 	return SetSelectionOwnerCookie{cookie}
@@ -7775,7 +7845,7 @@ func (cook SetSelectionOwnerCookie) Check() error {
 }
 
 // Write request to wire for SetSelectionOwner
-func (c *Conn) setSelectionOwnerRequest(Owner Id, Selection Id, Time Timestamp) []byte {
+func (c *Conn) setSelectionOwnerRequest(Owner Window, Selection Atom, Time Timestamp) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -7806,13 +7876,13 @@ type GetSelectionOwnerCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetSelectionOwner(Selection Id) GetSelectionOwnerCookie {
+func (c *Conn) GetSelectionOwner(Selection Atom) GetSelectionOwnerCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getSelectionOwnerRequest(Selection), cookie)
 	return GetSelectionOwnerCookie{cookie}
 }
 
-func (c *Conn) GetSelectionOwnerUnchecked(Selection Id) GetSelectionOwnerCookie {
+func (c *Conn) GetSelectionOwnerUnchecked(Selection Atom) GetSelectionOwnerCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getSelectionOwnerRequest(Selection), cookie)
 	return GetSelectionOwnerCookie{cookie}
@@ -7824,7 +7894,7 @@ type GetSelectionOwnerReply struct {
 	Sequence uint16
 	Length   uint32
 	// padding: 1 bytes
-	Owner Id
+	Owner Window
 }
 
 // Waits and reads reply data from request GetSelectionOwner
@@ -7852,7 +7922,7 @@ func getSelectionOwnerReply(buf []byte) *GetSelectionOwnerReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Owner = Id(Get32(buf[b:]))
+	v.Owner = Window(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -7863,7 +7933,7 @@ func (cook GetSelectionOwnerCookie) Check() error {
 }
 
 // Write request to wire for GetSelectionOwner
-func (c *Conn) getSelectionOwnerRequest(Selection Id) []byte {
+func (c *Conn) getSelectionOwnerRequest(Selection Atom) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -7889,13 +7959,13 @@ type ConvertSelectionCookie struct {
 }
 
 // Write request to wire for ConvertSelection
-func (c *Conn) ConvertSelection(Requestor Id, Selection Id, Target Id, Property Id, Time Timestamp) ConvertSelectionCookie {
+func (c *Conn) ConvertSelection(Requestor Window, Selection Atom, Target Atom, Property Atom, Time Timestamp) ConvertSelectionCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.convertSelectionRequest(Requestor, Selection, Target, Property, Time), cookie)
 	return ConvertSelectionCookie{cookie}
 }
 
-func (c *Conn) ConvertSelectionChecked(Requestor Id, Selection Id, Target Id, Property Id, Time Timestamp) ConvertSelectionCookie {
+func (c *Conn) ConvertSelectionChecked(Requestor Window, Selection Atom, Target Atom, Property Atom, Time Timestamp) ConvertSelectionCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.convertSelectionRequest(Requestor, Selection, Target, Property, Time), cookie)
 	return ConvertSelectionCookie{cookie}
@@ -7906,7 +7976,7 @@ func (cook ConvertSelectionCookie) Check() error {
 }
 
 // Write request to wire for ConvertSelection
-func (c *Conn) convertSelectionRequest(Requestor Id, Selection Id, Target Id, Property Id, Time Timestamp) []byte {
+func (c *Conn) convertSelectionRequest(Requestor Window, Selection Atom, Target Atom, Property Atom, Time Timestamp) []byte {
 	size := 24
 	b := 0
 	buf := make([]byte, size)
@@ -7944,13 +8014,13 @@ type SendEventCookie struct {
 }
 
 // Write request to wire for SendEvent
-func (c *Conn) SendEvent(Propagate bool, Destination Id, EventMask uint32, Event string) SendEventCookie {
+func (c *Conn) SendEvent(Propagate bool, Destination Window, EventMask uint32, Event string) SendEventCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.sendEventRequest(Propagate, Destination, EventMask, Event), cookie)
 	return SendEventCookie{cookie}
 }
 
-func (c *Conn) SendEventChecked(Propagate bool, Destination Id, EventMask uint32, Event string) SendEventCookie {
+func (c *Conn) SendEventChecked(Propagate bool, Destination Window, EventMask uint32, Event string) SendEventCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.sendEventRequest(Propagate, Destination, EventMask, Event), cookie)
 	return SendEventCookie{cookie}
@@ -7961,7 +8031,7 @@ func (cook SendEventCookie) Check() error {
 }
 
 // Write request to wire for SendEvent
-func (c *Conn) sendEventRequest(Propagate bool, Destination Id, EventMask uint32, Event string) []byte {
+func (c *Conn) sendEventRequest(Propagate bool, Destination Window, EventMask uint32, Event string) []byte {
 	size := 44
 	b := 0
 	buf := make([]byte, size)
@@ -7997,13 +8067,13 @@ type GrabPointerCookie struct {
 	*cookie
 }
 
-func (c *Conn) GrabPointer(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Time Timestamp) GrabPointerCookie {
+func (c *Conn) GrabPointer(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Time Timestamp) GrabPointerCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.grabPointerRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Time), cookie)
 	return GrabPointerCookie{cookie}
 }
 
-func (c *Conn) GrabPointerUnchecked(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Time Timestamp) GrabPointerCookie {
+func (c *Conn) GrabPointerUnchecked(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Time Timestamp) GrabPointerCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.grabPointerRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Time), cookie)
 	return GrabPointerCookie{cookie}
@@ -8051,7 +8121,7 @@ func (cook GrabPointerCookie) Check() error {
 }
 
 // Write request to wire for GrabPointer
-func (c *Conn) grabPointerRequest(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Time Timestamp) []byte {
+func (c *Conn) grabPointerRequest(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Time Timestamp) []byte {
 	size := 24
 	b := 0
 	buf := make([]byte, size)
@@ -8143,13 +8213,13 @@ type GrabButtonCookie struct {
 }
 
 // Write request to wire for GrabButton
-func (c *Conn) GrabButton(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Button byte, Modifiers uint16) GrabButtonCookie {
+func (c *Conn) GrabButton(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Button byte, Modifiers uint16) GrabButtonCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.grabButtonRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Button, Modifiers), cookie)
 	return GrabButtonCookie{cookie}
 }
 
-func (c *Conn) GrabButtonChecked(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Button byte, Modifiers uint16) GrabButtonCookie {
+func (c *Conn) GrabButtonChecked(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Button byte, Modifiers uint16) GrabButtonCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.grabButtonRequest(OwnerEvents, GrabWindow, EventMask, PointerMode, KeyboardMode, ConfineTo, Cursor, Button, Modifiers), cookie)
 	return GrabButtonCookie{cookie}
@@ -8160,7 +8230,7 @@ func (cook GrabButtonCookie) Check() error {
 }
 
 // Write request to wire for GrabButton
-func (c *Conn) grabButtonRequest(OwnerEvents bool, GrabWindow Id, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Id, Cursor Id, Button byte, Modifiers uint16) []byte {
+func (c *Conn) grabButtonRequest(OwnerEvents bool, GrabWindow Window, EventMask uint16, PointerMode byte, KeyboardMode byte, ConfineTo Window, Cursor Cursor, Button byte, Modifiers uint16) []byte {
 	size := 24
 	b := 0
 	buf := make([]byte, size)
@@ -8214,13 +8284,13 @@ type UngrabButtonCookie struct {
 }
 
 // Write request to wire for UngrabButton
-func (c *Conn) UngrabButton(Button byte, GrabWindow Id, Modifiers uint16) UngrabButtonCookie {
+func (c *Conn) UngrabButton(Button byte, GrabWindow Window, Modifiers uint16) UngrabButtonCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.ungrabButtonRequest(Button, GrabWindow, Modifiers), cookie)
 	return UngrabButtonCookie{cookie}
 }
 
-func (c *Conn) UngrabButtonChecked(Button byte, GrabWindow Id, Modifiers uint16) UngrabButtonCookie {
+func (c *Conn) UngrabButtonChecked(Button byte, GrabWindow Window, Modifiers uint16) UngrabButtonCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.ungrabButtonRequest(Button, GrabWindow, Modifiers), cookie)
 	return UngrabButtonCookie{cookie}
@@ -8231,7 +8301,7 @@ func (cook UngrabButtonCookie) Check() error {
 }
 
 // Write request to wire for UngrabButton
-func (c *Conn) ungrabButtonRequest(Button byte, GrabWindow Id, Modifiers uint16) []byte {
+func (c *Conn) ungrabButtonRequest(Button byte, GrabWindow Window, Modifiers uint16) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -8263,13 +8333,13 @@ type ChangeActivePointerGrabCookie struct {
 }
 
 // Write request to wire for ChangeActivePointerGrab
-func (c *Conn) ChangeActivePointerGrab(Cursor Id, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie {
+func (c *Conn) ChangeActivePointerGrab(Cursor Cursor, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.changeActivePointerGrabRequest(Cursor, Time, EventMask), cookie)
 	return ChangeActivePointerGrabCookie{cookie}
 }
 
-func (c *Conn) ChangeActivePointerGrabChecked(Cursor Id, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie {
+func (c *Conn) ChangeActivePointerGrabChecked(Cursor Cursor, Time Timestamp, EventMask uint16) ChangeActivePointerGrabCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.changeActivePointerGrabRequest(Cursor, Time, EventMask), cookie)
 	return ChangeActivePointerGrabCookie{cookie}
@@ -8280,7 +8350,7 @@ func (cook ChangeActivePointerGrabCookie) Check() error {
 }
 
 // Write request to wire for ChangeActivePointerGrab
-func (c *Conn) changeActivePointerGrabRequest(Cursor Id, Time Timestamp, EventMask uint16) []byte {
+func (c *Conn) changeActivePointerGrabRequest(Cursor Cursor, Time Timestamp, EventMask uint16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -8313,13 +8383,13 @@ type GrabKeyboardCookie struct {
 	*cookie
 }
 
-func (c *Conn) GrabKeyboard(OwnerEvents bool, GrabWindow Id, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie {
+func (c *Conn) GrabKeyboard(OwnerEvents bool, GrabWindow Window, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.grabKeyboardRequest(OwnerEvents, GrabWindow, Time, PointerMode, KeyboardMode), cookie)
 	return GrabKeyboardCookie{cookie}
 }
 
-func (c *Conn) GrabKeyboardUnchecked(OwnerEvents bool, GrabWindow Id, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie {
+func (c *Conn) GrabKeyboardUnchecked(OwnerEvents bool, GrabWindow Window, Time Timestamp, PointerMode byte, KeyboardMode byte) GrabKeyboardCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.grabKeyboardRequest(OwnerEvents, GrabWindow, Time, PointerMode, KeyboardMode), cookie)
 	return GrabKeyboardCookie{cookie}
@@ -8367,7 +8437,7 @@ func (cook GrabKeyboardCookie) Check() error {
 }
 
 // Write request to wire for GrabKeyboard
-func (c *Conn) grabKeyboardRequest(OwnerEvents bool, GrabWindow Id, Time Timestamp, PointerMode byte, KeyboardMode byte) []byte {
+func (c *Conn) grabKeyboardRequest(OwnerEvents bool, GrabWindow Window, Time Timestamp, PointerMode byte, KeyboardMode byte) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -8452,13 +8522,13 @@ type GrabKeyCookie struct {
 }
 
 // Write request to wire for GrabKey
-func (c *Conn) GrabKey(OwnerEvents bool, GrabWindow Id, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie {
+func (c *Conn) GrabKey(OwnerEvents bool, GrabWindow Window, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.grabKeyRequest(OwnerEvents, GrabWindow, Modifiers, Key, PointerMode, KeyboardMode), cookie)
 	return GrabKeyCookie{cookie}
 }
 
-func (c *Conn) GrabKeyChecked(OwnerEvents bool, GrabWindow Id, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie {
+func (c *Conn) GrabKeyChecked(OwnerEvents bool, GrabWindow Window, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) GrabKeyCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.grabKeyRequest(OwnerEvents, GrabWindow, Modifiers, Key, PointerMode, KeyboardMode), cookie)
 	return GrabKeyCookie{cookie}
@@ -8469,7 +8539,7 @@ func (cook GrabKeyCookie) Check() error {
 }
 
 // Write request to wire for GrabKey
-func (c *Conn) grabKeyRequest(OwnerEvents bool, GrabWindow Id, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) []byte {
+func (c *Conn) grabKeyRequest(OwnerEvents bool, GrabWindow Window, Modifiers uint16, Key Keycode, PointerMode byte, KeyboardMode byte) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -8514,13 +8584,13 @@ type UngrabKeyCookie struct {
 }
 
 // Write request to wire for UngrabKey
-func (c *Conn) UngrabKey(Key Keycode, GrabWindow Id, Modifiers uint16) UngrabKeyCookie {
+func (c *Conn) UngrabKey(Key Keycode, GrabWindow Window, Modifiers uint16) UngrabKeyCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.ungrabKeyRequest(Key, GrabWindow, Modifiers), cookie)
 	return UngrabKeyCookie{cookie}
 }
 
-func (c *Conn) UngrabKeyChecked(Key Keycode, GrabWindow Id, Modifiers uint16) UngrabKeyCookie {
+func (c *Conn) UngrabKeyChecked(Key Keycode, GrabWindow Window, Modifiers uint16) UngrabKeyCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.ungrabKeyRequest(Key, GrabWindow, Modifiers), cookie)
 	return UngrabKeyCookie{cookie}
@@ -8531,7 +8601,7 @@ func (cook UngrabKeyCookie) Check() error {
 }
 
 // Write request to wire for UngrabKey
-func (c *Conn) ungrabKeyRequest(Key Keycode, GrabWindow Id, Modifiers uint16) []byte {
+func (c *Conn) ungrabKeyRequest(Key Keycode, GrabWindow Window, Modifiers uint16) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -8684,13 +8754,13 @@ type QueryPointerCookie struct {
 	*cookie
 }
 
-func (c *Conn) QueryPointer(Window Id) QueryPointerCookie {
+func (c *Conn) QueryPointer(Window Window) QueryPointerCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.queryPointerRequest(Window), cookie)
 	return QueryPointerCookie{cookie}
 }
 
-func (c *Conn) QueryPointerUnchecked(Window Id) QueryPointerCookie {
+func (c *Conn) QueryPointerUnchecked(Window Window) QueryPointerCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.queryPointerRequest(Window), cookie)
 	return QueryPointerCookie{cookie}
@@ -8702,8 +8772,8 @@ type QueryPointerReply struct {
 	Sequence   uint16
 	Length     uint32
 	SameScreen bool
-	Root       Id
-	Child      Id
+	Root       Window
+	Child      Window
 	RootX      int16
 	RootY      int16
 	WinX       int16
@@ -8742,10 +8812,10 @@ func queryPointerReply(buf []byte) *QueryPointerReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Root = Id(Get32(buf[b:]))
+	v.Root = Window(Get32(buf[b:]))
 	b += 4
 
-	v.Child = Id(Get32(buf[b:]))
+	v.Child = Window(Get32(buf[b:]))
 	b += 4
 
 	v.RootX = int16(Get16(buf[b:]))
@@ -8773,7 +8843,7 @@ func (cook QueryPointerCookie) Check() error {
 }
 
 // Write request to wire for QueryPointer
-func (c *Conn) queryPointerRequest(Window Id) []byte {
+func (c *Conn) queryPointerRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -8798,13 +8868,13 @@ type GetMotionEventsCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetMotionEvents(Window Id, Start Timestamp, Stop Timestamp) GetMotionEventsCookie {
+func (c *Conn) GetMotionEvents(Window Window, Start Timestamp, Stop Timestamp) GetMotionEventsCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getMotionEventsRequest(Window, Start, Stop), cookie)
 	return GetMotionEventsCookie{cookie}
 }
 
-func (c *Conn) GetMotionEventsUnchecked(Window Id, Start Timestamp, Stop Timestamp) GetMotionEventsCookie {
+func (c *Conn) GetMotionEventsUnchecked(Window Window, Start Timestamp, Stop Timestamp) GetMotionEventsCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getMotionEventsRequest(Window, Start, Stop), cookie)
 	return GetMotionEventsCookie{cookie}
@@ -8862,7 +8932,7 @@ func (cook GetMotionEventsCookie) Check() error {
 }
 
 // Write request to wire for GetMotionEvents
-func (c *Conn) getMotionEventsRequest(Window Id, Start Timestamp, Stop Timestamp) []byte {
+func (c *Conn) getMotionEventsRequest(Window Window, Start Timestamp, Stop Timestamp) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -8893,13 +8963,13 @@ type TranslateCoordinatesCookie struct {
 	*cookie
 }
 
-func (c *Conn) TranslateCoordinates(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16) TranslateCoordinatesCookie {
+func (c *Conn) TranslateCoordinates(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16) TranslateCoordinatesCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.translateCoordinatesRequest(SrcWindow, DstWindow, SrcX, SrcY), cookie)
 	return TranslateCoordinatesCookie{cookie}
 }
 
-func (c *Conn) TranslateCoordinatesUnchecked(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16) TranslateCoordinatesCookie {
+func (c *Conn) TranslateCoordinatesUnchecked(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16) TranslateCoordinatesCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.translateCoordinatesRequest(SrcWindow, DstWindow, SrcX, SrcY), cookie)
 	return TranslateCoordinatesCookie{cookie}
@@ -8911,7 +8981,7 @@ type TranslateCoordinatesReply struct {
 	Sequence   uint16
 	Length     uint32
 	SameScreen bool
-	Child      Id
+	Child      Window
 	DstX       int16
 	DstY       int16
 }
@@ -8946,7 +9016,7 @@ func translateCoordinatesReply(buf []byte) *TranslateCoordinatesReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Child = Id(Get32(buf[b:]))
+	v.Child = Window(Get32(buf[b:]))
 	b += 4
 
 	v.DstX = int16(Get16(buf[b:]))
@@ -8963,7 +9033,7 @@ func (cook TranslateCoordinatesCookie) Check() error {
 }
 
 // Write request to wire for TranslateCoordinates
-func (c *Conn) translateCoordinatesRequest(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16) []byte {
+func (c *Conn) translateCoordinatesRequest(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -8998,13 +9068,13 @@ type WarpPointerCookie struct {
 }
 
 // Write request to wire for WarpPointer
-func (c *Conn) WarpPointer(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie {
+func (c *Conn) WarpPointer(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.warpPointerRequest(SrcWindow, DstWindow, SrcX, SrcY, SrcWidth, SrcHeight, DstX, DstY), cookie)
 	return WarpPointerCookie{cookie}
 }
 
-func (c *Conn) WarpPointerChecked(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie {
+func (c *Conn) WarpPointerChecked(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) WarpPointerCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.warpPointerRequest(SrcWindow, DstWindow, SrcX, SrcY, SrcWidth, SrcHeight, DstX, DstY), cookie)
 	return WarpPointerCookie{cookie}
@@ -9015,7 +9085,7 @@ func (cook WarpPointerCookie) Check() error {
 }
 
 // Write request to wire for WarpPointer
-func (c *Conn) warpPointerRequest(SrcWindow Id, DstWindow Id, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) []byte {
+func (c *Conn) warpPointerRequest(SrcWindow Window, DstWindow Window, SrcX int16, SrcY int16, SrcWidth uint16, SrcHeight uint16, DstX int16, DstY int16) []byte {
 	size := 24
 	b := 0
 	buf := make([]byte, size)
@@ -9062,13 +9132,13 @@ type SetInputFocusCookie struct {
 }
 
 // Write request to wire for SetInputFocus
-func (c *Conn) SetInputFocus(RevertTo byte, Focus Id, Time Timestamp) SetInputFocusCookie {
+func (c *Conn) SetInputFocus(RevertTo byte, Focus Window, Time Timestamp) SetInputFocusCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.setInputFocusRequest(RevertTo, Focus, Time), cookie)
 	return SetInputFocusCookie{cookie}
 }
 
-func (c *Conn) SetInputFocusChecked(RevertTo byte, Focus Id, Time Timestamp) SetInputFocusCookie {
+func (c *Conn) SetInputFocusChecked(RevertTo byte, Focus Window, Time Timestamp) SetInputFocusCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.setInputFocusRequest(RevertTo, Focus, Time), cookie)
 	return SetInputFocusCookie{cookie}
@@ -9079,7 +9149,7 @@ func (cook SetInputFocusCookie) Check() error {
 }
 
 // Write request to wire for SetInputFocus
-func (c *Conn) setInputFocusRequest(RevertTo byte, Focus Id, Time Timestamp) []byte {
+func (c *Conn) setInputFocusRequest(RevertTo byte, Focus Window, Time Timestamp) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -9126,7 +9196,7 @@ type GetInputFocusReply struct {
 	Sequence uint16
 	Length   uint32
 	RevertTo byte
-	Focus    Id
+	Focus    Window
 }
 
 // Waits and reads reply data from request GetInputFocus
@@ -9155,7 +9225,7 @@ func getInputFocusReply(buf []byte) *GetInputFocusReply {
 	v.Length = Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Focus = Id(Get32(buf[b:]))
+	v.Focus = Window(Get32(buf[b:]))
 	b += 4
 
 	return v
@@ -9267,13 +9337,13 @@ type OpenFontCookie struct {
 }
 
 // Write request to wire for OpenFont
-func (c *Conn) OpenFont(Fid Id, NameLen uint16, Name string) OpenFontCookie {
+func (c *Conn) OpenFont(Fid Font, NameLen uint16, Name string) OpenFontCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.openFontRequest(Fid, NameLen, Name), cookie)
 	return OpenFontCookie{cookie}
 }
 
-func (c *Conn) OpenFontChecked(Fid Id, NameLen uint16, Name string) OpenFontCookie {
+func (c *Conn) OpenFontChecked(Fid Font, NameLen uint16, Name string) OpenFontCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.openFontRequest(Fid, NameLen, Name), cookie)
 	return OpenFontCookie{cookie}
@@ -9284,7 +9354,7 @@ func (cook OpenFontCookie) Check() error {
 }
 
 // Write request to wire for OpenFont
-func (c *Conn) openFontRequest(Fid Id, NameLen uint16, Name string) []byte {
+func (c *Conn) openFontRequest(Fid Font, NameLen uint16, Name string) []byte {
 	size := pad((12 + pad((int(NameLen) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -9318,13 +9388,13 @@ type CloseFontCookie struct {
 }
 
 // Write request to wire for CloseFont
-func (c *Conn) CloseFont(Font Id) CloseFontCookie {
+func (c *Conn) CloseFont(Font Font) CloseFontCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.closeFontRequest(Font), cookie)
 	return CloseFontCookie{cookie}
 }
 
-func (c *Conn) CloseFontChecked(Font Id) CloseFontCookie {
+func (c *Conn) CloseFontChecked(Font Font) CloseFontCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.closeFontRequest(Font), cookie)
 	return CloseFontCookie{cookie}
@@ -9335,7 +9405,7 @@ func (cook CloseFontCookie) Check() error {
 }
 
 // Write request to wire for CloseFont
-func (c *Conn) closeFontRequest(Font Id) []byte {
+func (c *Conn) closeFontRequest(Font Font) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -9360,13 +9430,13 @@ type QueryFontCookie struct {
 	*cookie
 }
 
-func (c *Conn) QueryFont(Font Id) QueryFontCookie {
+func (c *Conn) QueryFont(Font Fontable) QueryFontCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.queryFontRequest(Font), cookie)
 	return QueryFontCookie{cookie}
 }
 
-func (c *Conn) QueryFontUnchecked(Font Id) QueryFontCookie {
+func (c *Conn) QueryFontUnchecked(Font Fontable) QueryFontCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.queryFontRequest(Font), cookie)
 	return QueryFontCookie{cookie}
@@ -9483,7 +9553,7 @@ func (cook QueryFontCookie) Check() error {
 }
 
 // Write request to wire for QueryFont
-func (c *Conn) queryFontRequest(Font Id) []byte {
+func (c *Conn) queryFontRequest(Font Fontable) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -9508,13 +9578,13 @@ type QueryTextExtentsCookie struct {
 	*cookie
 }
 
-func (c *Conn) QueryTextExtents(Font Id, String []Char2b, StringLen uint16) QueryTextExtentsCookie {
+func (c *Conn) QueryTextExtents(Font Fontable, String []Char2b, StringLen uint16) QueryTextExtentsCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.queryTextExtentsRequest(Font, String, StringLen), cookie)
 	return QueryTextExtentsCookie{cookie}
 }
 
-func (c *Conn) QueryTextExtentsUnchecked(Font Id, String []Char2b, StringLen uint16) QueryTextExtentsCookie {
+func (c *Conn) QueryTextExtentsUnchecked(Font Fontable, String []Char2b, StringLen uint16) QueryTextExtentsCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.queryTextExtentsRequest(Font, String, StringLen), cookie)
 	return QueryTextExtentsCookie{cookie}
@@ -9590,7 +9660,7 @@ func (cook QueryTextExtentsCookie) Check() error {
 }
 
 // Write request to wire for QueryTextExtents
-func (c *Conn) queryTextExtentsRequest(Font Id, String []Char2b, StringLen uint16) []byte {
+func (c *Conn) queryTextExtentsRequest(Font Fontable, String []Char2b, StringLen uint16) []byte {
 	size := pad((8 + pad((len(String) * 2))))
 	b := 0
 	buf := make([]byte, size)
@@ -10007,13 +10077,13 @@ type CreatePixmapCookie struct {
 }
 
 // Write request to wire for CreatePixmap
-func (c *Conn) CreatePixmap(Depth byte, Pid Id, Drawable Id, Width uint16, Height uint16) CreatePixmapCookie {
+func (c *Conn) CreatePixmap(Depth byte, Pid Pixmap, Drawable Drawable, Width uint16, Height uint16) CreatePixmapCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.createPixmapRequest(Depth, Pid, Drawable, Width, Height), cookie)
 	return CreatePixmapCookie{cookie}
 }
 
-func (c *Conn) CreatePixmapChecked(Depth byte, Pid Id, Drawable Id, Width uint16, Height uint16) CreatePixmapCookie {
+func (c *Conn) CreatePixmapChecked(Depth byte, Pid Pixmap, Drawable Drawable, Width uint16, Height uint16) CreatePixmapCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.createPixmapRequest(Depth, Pid, Drawable, Width, Height), cookie)
 	return CreatePixmapCookie{cookie}
@@ -10024,7 +10094,7 @@ func (cook CreatePixmapCookie) Check() error {
 }
 
 // Write request to wire for CreatePixmap
-func (c *Conn) createPixmapRequest(Depth byte, Pid Id, Drawable Id, Width uint16, Height uint16) []byte {
+func (c *Conn) createPixmapRequest(Depth byte, Pid Pixmap, Drawable Drawable, Width uint16, Height uint16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -10060,13 +10130,13 @@ type FreePixmapCookie struct {
 }
 
 // Write request to wire for FreePixmap
-func (c *Conn) FreePixmap(Pixmap Id) FreePixmapCookie {
+func (c *Conn) FreePixmap(Pixmap Pixmap) FreePixmapCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.freePixmapRequest(Pixmap), cookie)
 	return FreePixmapCookie{cookie}
 }
 
-func (c *Conn) FreePixmapChecked(Pixmap Id) FreePixmapCookie {
+func (c *Conn) FreePixmapChecked(Pixmap Pixmap) FreePixmapCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.freePixmapRequest(Pixmap), cookie)
 	return FreePixmapCookie{cookie}
@@ -10077,7 +10147,7 @@ func (cook FreePixmapCookie) Check() error {
 }
 
 // Write request to wire for FreePixmap
-func (c *Conn) freePixmapRequest(Pixmap Id) []byte {
+func (c *Conn) freePixmapRequest(Pixmap Pixmap) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -10103,13 +10173,13 @@ type CreateGCCookie struct {
 }
 
 // Write request to wire for CreateGC
-func (c *Conn) CreateGC(Cid Id, Drawable Id, ValueMask uint32, ValueList []uint32) CreateGCCookie {
+func (c *Conn) CreateGC(Cid Gcontext, Drawable Drawable, ValueMask uint32, ValueList []uint32) CreateGCCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.createGCRequest(Cid, Drawable, ValueMask, ValueList), cookie)
 	return CreateGCCookie{cookie}
 }
 
-func (c *Conn) CreateGCChecked(Cid Id, Drawable Id, ValueMask uint32, ValueList []uint32) CreateGCCookie {
+func (c *Conn) CreateGCChecked(Cid Gcontext, Drawable Drawable, ValueMask uint32, ValueList []uint32) CreateGCCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.createGCRequest(Cid, Drawable, ValueMask, ValueList), cookie)
 	return CreateGCCookie{cookie}
@@ -10120,7 +10190,7 @@ func (cook CreateGCCookie) Check() error {
 }
 
 // Write request to wire for CreateGC
-func (c *Conn) createGCRequest(Cid Id, Drawable Id, ValueMask uint32, ValueList []uint32) []byte {
+func (c *Conn) createGCRequest(Cid Gcontext, Drawable Drawable, ValueMask uint32, ValueList []uint32) []byte {
 	size := pad((12 + (4 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -10157,13 +10227,13 @@ type ChangeGCCookie struct {
 }
 
 // Write request to wire for ChangeGC
-func (c *Conn) ChangeGC(Gc Id, ValueMask uint32, ValueList []uint32) ChangeGCCookie {
+func (c *Conn) ChangeGC(Gc Gcontext, ValueMask uint32, ValueList []uint32) ChangeGCCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.changeGCRequest(Gc, ValueMask, ValueList), cookie)
 	return ChangeGCCookie{cookie}
 }
 
-func (c *Conn) ChangeGCChecked(Gc Id, ValueMask uint32, ValueList []uint32) ChangeGCCookie {
+func (c *Conn) ChangeGCChecked(Gc Gcontext, ValueMask uint32, ValueList []uint32) ChangeGCCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.changeGCRequest(Gc, ValueMask, ValueList), cookie)
 	return ChangeGCCookie{cookie}
@@ -10174,7 +10244,7 @@ func (cook ChangeGCCookie) Check() error {
 }
 
 // Write request to wire for ChangeGC
-func (c *Conn) changeGCRequest(Gc Id, ValueMask uint32, ValueList []uint32) []byte {
+func (c *Conn) changeGCRequest(Gc Gcontext, ValueMask uint32, ValueList []uint32) []byte {
 	size := pad((8 + (4 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -10208,13 +10278,13 @@ type CopyGCCookie struct {
 }
 
 // Write request to wire for CopyGC
-func (c *Conn) CopyGC(SrcGc Id, DstGc Id, ValueMask uint32) CopyGCCookie {
+func (c *Conn) CopyGC(SrcGc Gcontext, DstGc Gcontext, ValueMask uint32) CopyGCCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.copyGCRequest(SrcGc, DstGc, ValueMask), cookie)
 	return CopyGCCookie{cookie}
 }
 
-func (c *Conn) CopyGCChecked(SrcGc Id, DstGc Id, ValueMask uint32) CopyGCCookie {
+func (c *Conn) CopyGCChecked(SrcGc Gcontext, DstGc Gcontext, ValueMask uint32) CopyGCCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.copyGCRequest(SrcGc, DstGc, ValueMask), cookie)
 	return CopyGCCookie{cookie}
@@ -10225,7 +10295,7 @@ func (cook CopyGCCookie) Check() error {
 }
 
 // Write request to wire for CopyGC
-func (c *Conn) copyGCRequest(SrcGc Id, DstGc Id, ValueMask uint32) []byte {
+func (c *Conn) copyGCRequest(SrcGc Gcontext, DstGc Gcontext, ValueMask uint32) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -10257,13 +10327,13 @@ type SetDashesCookie struct {
 }
 
 // Write request to wire for SetDashes
-func (c *Conn) SetDashes(Gc Id, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie {
+func (c *Conn) SetDashes(Gc Gcontext, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.setDashesRequest(Gc, DashOffset, DashesLen, Dashes), cookie)
 	return SetDashesCookie{cookie}
 }
 
-func (c *Conn) SetDashesChecked(Gc Id, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie {
+func (c *Conn) SetDashesChecked(Gc Gcontext, DashOffset uint16, DashesLen uint16, Dashes []byte) SetDashesCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.setDashesRequest(Gc, DashOffset, DashesLen, Dashes), cookie)
 	return SetDashesCookie{cookie}
@@ -10274,7 +10344,7 @@ func (cook SetDashesCookie) Check() error {
 }
 
 // Write request to wire for SetDashes
-func (c *Conn) setDashesRequest(Gc Id, DashOffset uint16, DashesLen uint16, Dashes []byte) []byte {
+func (c *Conn) setDashesRequest(Gc Gcontext, DashOffset uint16, DashesLen uint16, Dashes []byte) []byte {
 	size := pad((12 + pad((int(DashesLen) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -10309,13 +10379,13 @@ type SetClipRectanglesCookie struct {
 }
 
 // Write request to wire for SetClipRectangles
-func (c *Conn) SetClipRectangles(Ordering byte, Gc Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie {
+func (c *Conn) SetClipRectangles(Ordering byte, Gc Gcontext, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.setClipRectanglesRequest(Ordering, Gc, ClipXOrigin, ClipYOrigin, Rectangles), cookie)
 	return SetClipRectanglesCookie{cookie}
 }
 
-func (c *Conn) SetClipRectanglesChecked(Ordering byte, Gc Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie {
+func (c *Conn) SetClipRectanglesChecked(Ordering byte, Gc Gcontext, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) SetClipRectanglesCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.setClipRectanglesRequest(Ordering, Gc, ClipXOrigin, ClipYOrigin, Rectangles), cookie)
 	return SetClipRectanglesCookie{cookie}
@@ -10326,7 +10396,7 @@ func (cook SetClipRectanglesCookie) Check() error {
 }
 
 // Write request to wire for SetClipRectangles
-func (c *Conn) setClipRectanglesRequest(Ordering byte, Gc Id, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) []byte {
+func (c *Conn) setClipRectanglesRequest(Ordering byte, Gc Gcontext, ClipXOrigin int16, ClipYOrigin int16, Rectangles []Rectangle) []byte {
 	size := pad((12 + pad((len(Rectangles) * 8))))
 	b := 0
 	buf := make([]byte, size)
@@ -10361,13 +10431,13 @@ type FreeGCCookie struct {
 }
 
 // Write request to wire for FreeGC
-func (c *Conn) FreeGC(Gc Id) FreeGCCookie {
+func (c *Conn) FreeGC(Gc Gcontext) FreeGCCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.freeGCRequest(Gc), cookie)
 	return FreeGCCookie{cookie}
 }
 
-func (c *Conn) FreeGCChecked(Gc Id) FreeGCCookie {
+func (c *Conn) FreeGCChecked(Gc Gcontext) FreeGCCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.freeGCRequest(Gc), cookie)
 	return FreeGCCookie{cookie}
@@ -10378,7 +10448,7 @@ func (cook FreeGCCookie) Check() error {
 }
 
 // Write request to wire for FreeGC
-func (c *Conn) freeGCRequest(Gc Id) []byte {
+func (c *Conn) freeGCRequest(Gc Gcontext) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -10404,13 +10474,13 @@ type ClearAreaCookie struct {
 }
 
 // Write request to wire for ClearArea
-func (c *Conn) ClearArea(Exposures bool, Window Id, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie {
+func (c *Conn) ClearArea(Exposures bool, Window Window, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.clearAreaRequest(Exposures, Window, X, Y, Width, Height), cookie)
 	return ClearAreaCookie{cookie}
 }
 
-func (c *Conn) ClearAreaChecked(Exposures bool, Window Id, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie {
+func (c *Conn) ClearAreaChecked(Exposures bool, Window Window, X int16, Y int16, Width uint16, Height uint16) ClearAreaCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.clearAreaRequest(Exposures, Window, X, Y, Width, Height), cookie)
 	return ClearAreaCookie{cookie}
@@ -10421,7 +10491,7 @@ func (cook ClearAreaCookie) Check() error {
 }
 
 // Write request to wire for ClearArea
-func (c *Conn) clearAreaRequest(Exposures bool, Window Id, X int16, Y int16, Width uint16, Height uint16) []byte {
+func (c *Conn) clearAreaRequest(Exposures bool, Window Window, X int16, Y int16, Width uint16, Height uint16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -10464,13 +10534,13 @@ type CopyAreaCookie struct {
 }
 
 // Write request to wire for CopyArea
-func (c *Conn) CopyArea(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie {
+func (c *Conn) CopyArea(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.copyAreaRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height), cookie)
 	return CopyAreaCookie{cookie}
 }
 
-func (c *Conn) CopyAreaChecked(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie {
+func (c *Conn) CopyAreaChecked(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) CopyAreaCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.copyAreaRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height), cookie)
 	return CopyAreaCookie{cookie}
@@ -10481,7 +10551,7 @@ func (cook CopyAreaCookie) Check() error {
 }
 
 // Write request to wire for CopyArea
-func (c *Conn) copyAreaRequest(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) []byte {
+func (c *Conn) copyAreaRequest(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16) []byte {
 	size := 28
 	b := 0
 	buf := make([]byte, size)
@@ -10531,13 +10601,13 @@ type CopyPlaneCookie struct {
 }
 
 // Write request to wire for CopyPlane
-func (c *Conn) CopyPlane(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie {
+func (c *Conn) CopyPlane(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.copyPlaneRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height, BitPlane), cookie)
 	return CopyPlaneCookie{cookie}
 }
 
-func (c *Conn) CopyPlaneChecked(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie {
+func (c *Conn) CopyPlaneChecked(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) CopyPlaneCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.copyPlaneRequest(SrcDrawable, DstDrawable, Gc, SrcX, SrcY, DstX, DstY, Width, Height, BitPlane), cookie)
 	return CopyPlaneCookie{cookie}
@@ -10548,7 +10618,7 @@ func (cook CopyPlaneCookie) Check() error {
 }
 
 // Write request to wire for CopyPlane
-func (c *Conn) copyPlaneRequest(SrcDrawable Id, DstDrawable Id, Gc Id, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) []byte {
+func (c *Conn) copyPlaneRequest(SrcDrawable Drawable, DstDrawable Drawable, Gc Gcontext, SrcX int16, SrcY int16, DstX int16, DstY int16, Width uint16, Height uint16, BitPlane uint32) []byte {
 	size := 32
 	b := 0
 	buf := make([]byte, size)
@@ -10601,13 +10671,13 @@ type PolyPointCookie struct {
 }
 
 // Write request to wire for PolyPoint
-func (c *Conn) PolyPoint(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyPointCookie {
+func (c *Conn) PolyPoint(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyPointCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyPointRequest(CoordinateMode, Drawable, Gc, Points), cookie)
 	return PolyPointCookie{cookie}
 }
 
-func (c *Conn) PolyPointChecked(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyPointCookie {
+func (c *Conn) PolyPointChecked(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyPointCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyPointRequest(CoordinateMode, Drawable, Gc, Points), cookie)
 	return PolyPointCookie{cookie}
@@ -10618,7 +10688,7 @@ func (cook PolyPointCookie) Check() error {
 }
 
 // Write request to wire for PolyPoint
-func (c *Conn) polyPointRequest(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) []byte {
+func (c *Conn) polyPointRequest(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) []byte {
 	size := pad((12 + pad((len(Points) * 4))))
 	b := 0
 	buf := make([]byte, size)
@@ -10650,13 +10720,13 @@ type PolyLineCookie struct {
 }
 
 // Write request to wire for PolyLine
-func (c *Conn) PolyLine(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyLineCookie {
+func (c *Conn) PolyLine(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyLineCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyLineRequest(CoordinateMode, Drawable, Gc, Points), cookie)
 	return PolyLineCookie{cookie}
 }
 
-func (c *Conn) PolyLineChecked(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) PolyLineCookie {
+func (c *Conn) PolyLineChecked(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) PolyLineCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyLineRequest(CoordinateMode, Drawable, Gc, Points), cookie)
 	return PolyLineCookie{cookie}
@@ -10667,7 +10737,7 @@ func (cook PolyLineCookie) Check() error {
 }
 
 // Write request to wire for PolyLine
-func (c *Conn) polyLineRequest(CoordinateMode byte, Drawable Id, Gc Id, Points []Point) []byte {
+func (c *Conn) polyLineRequest(CoordinateMode byte, Drawable Drawable, Gc Gcontext, Points []Point) []byte {
 	size := pad((12 + pad((len(Points) * 4))))
 	b := 0
 	buf := make([]byte, size)
@@ -10699,13 +10769,13 @@ type PolySegmentCookie struct {
 }
 
 // Write request to wire for PolySegment
-func (c *Conn) PolySegment(Drawable Id, Gc Id, Segments []Segment) PolySegmentCookie {
+func (c *Conn) PolySegment(Drawable Drawable, Gc Gcontext, Segments []Segment) PolySegmentCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polySegmentRequest(Drawable, Gc, Segments), cookie)
 	return PolySegmentCookie{cookie}
 }
 
-func (c *Conn) PolySegmentChecked(Drawable Id, Gc Id, Segments []Segment) PolySegmentCookie {
+func (c *Conn) PolySegmentChecked(Drawable Drawable, Gc Gcontext, Segments []Segment) PolySegmentCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polySegmentRequest(Drawable, Gc, Segments), cookie)
 	return PolySegmentCookie{cookie}
@@ -10716,7 +10786,7 @@ func (cook PolySegmentCookie) Check() error {
 }
 
 // Write request to wire for PolySegment
-func (c *Conn) polySegmentRequest(Drawable Id, Gc Id, Segments []Segment) []byte {
+func (c *Conn) polySegmentRequest(Drawable Drawable, Gc Gcontext, Segments []Segment) []byte {
 	size := pad((12 + pad((len(Segments) * 8))))
 	b := 0
 	buf := make([]byte, size)
@@ -10747,13 +10817,13 @@ type PolyRectangleCookie struct {
 }
 
 // Write request to wire for PolyRectangle
-func (c *Conn) PolyRectangle(Drawable Id, Gc Id, Rectangles []Rectangle) PolyRectangleCookie {
+func (c *Conn) PolyRectangle(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyRectangleCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyRectangleRequest(Drawable, Gc, Rectangles), cookie)
 	return PolyRectangleCookie{cookie}
 }
 
-func (c *Conn) PolyRectangleChecked(Drawable Id, Gc Id, Rectangles []Rectangle) PolyRectangleCookie {
+func (c *Conn) PolyRectangleChecked(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyRectangleCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyRectangleRequest(Drawable, Gc, Rectangles), cookie)
 	return PolyRectangleCookie{cookie}
@@ -10764,7 +10834,7 @@ func (cook PolyRectangleCookie) Check() error {
 }
 
 // Write request to wire for PolyRectangle
-func (c *Conn) polyRectangleRequest(Drawable Id, Gc Id, Rectangles []Rectangle) []byte {
+func (c *Conn) polyRectangleRequest(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) []byte {
 	size := pad((12 + pad((len(Rectangles) * 8))))
 	b := 0
 	buf := make([]byte, size)
@@ -10795,13 +10865,13 @@ type PolyArcCookie struct {
 }
 
 // Write request to wire for PolyArc
-func (c *Conn) PolyArc(Drawable Id, Gc Id, Arcs []Arc) PolyArcCookie {
+func (c *Conn) PolyArc(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyArcCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyArcRequest(Drawable, Gc, Arcs), cookie)
 	return PolyArcCookie{cookie}
 }
 
-func (c *Conn) PolyArcChecked(Drawable Id, Gc Id, Arcs []Arc) PolyArcCookie {
+func (c *Conn) PolyArcChecked(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyArcCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyArcRequest(Drawable, Gc, Arcs), cookie)
 	return PolyArcCookie{cookie}
@@ -10812,7 +10882,7 @@ func (cook PolyArcCookie) Check() error {
 }
 
 // Write request to wire for PolyArc
-func (c *Conn) polyArcRequest(Drawable Id, Gc Id, Arcs []Arc) []byte {
+func (c *Conn) polyArcRequest(Drawable Drawable, Gc Gcontext, Arcs []Arc) []byte {
 	size := pad((12 + pad((len(Arcs) * 12))))
 	b := 0
 	buf := make([]byte, size)
@@ -10843,13 +10913,13 @@ type FillPolyCookie struct {
 }
 
 // Write request to wire for FillPoly
-func (c *Conn) FillPoly(Drawable Id, Gc Id, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie {
+func (c *Conn) FillPoly(Drawable Drawable, Gc Gcontext, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.fillPolyRequest(Drawable, Gc, Shape, CoordinateMode, Points), cookie)
 	return FillPolyCookie{cookie}
 }
 
-func (c *Conn) FillPolyChecked(Drawable Id, Gc Id, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie {
+func (c *Conn) FillPolyChecked(Drawable Drawable, Gc Gcontext, Shape byte, CoordinateMode byte, Points []Point) FillPolyCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.fillPolyRequest(Drawable, Gc, Shape, CoordinateMode, Points), cookie)
 	return FillPolyCookie{cookie}
@@ -10860,7 +10930,7 @@ func (cook FillPolyCookie) Check() error {
 }
 
 // Write request to wire for FillPoly
-func (c *Conn) fillPolyRequest(Drawable Id, Gc Id, Shape byte, CoordinateMode byte, Points []Point) []byte {
+func (c *Conn) fillPolyRequest(Drawable Drawable, Gc Gcontext, Shape byte, CoordinateMode byte, Points []Point) []byte {
 	size := pad((16 + pad((len(Points) * 4))))
 	b := 0
 	buf := make([]byte, size)
@@ -10899,13 +10969,13 @@ type PolyFillRectangleCookie struct {
 }
 
 // Write request to wire for PolyFillRectangle
-func (c *Conn) PolyFillRectangle(Drawable Id, Gc Id, Rectangles []Rectangle) PolyFillRectangleCookie {
+func (c *Conn) PolyFillRectangle(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyFillRectangleCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyFillRectangleRequest(Drawable, Gc, Rectangles), cookie)
 	return PolyFillRectangleCookie{cookie}
 }
 
-func (c *Conn) PolyFillRectangleChecked(Drawable Id, Gc Id, Rectangles []Rectangle) PolyFillRectangleCookie {
+func (c *Conn) PolyFillRectangleChecked(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) PolyFillRectangleCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyFillRectangleRequest(Drawable, Gc, Rectangles), cookie)
 	return PolyFillRectangleCookie{cookie}
@@ -10916,7 +10986,7 @@ func (cook PolyFillRectangleCookie) Check() error {
 }
 
 // Write request to wire for PolyFillRectangle
-func (c *Conn) polyFillRectangleRequest(Drawable Id, Gc Id, Rectangles []Rectangle) []byte {
+func (c *Conn) polyFillRectangleRequest(Drawable Drawable, Gc Gcontext, Rectangles []Rectangle) []byte {
 	size := pad((12 + pad((len(Rectangles) * 8))))
 	b := 0
 	buf := make([]byte, size)
@@ -10947,13 +11017,13 @@ type PolyFillArcCookie struct {
 }
 
 // Write request to wire for PolyFillArc
-func (c *Conn) PolyFillArc(Drawable Id, Gc Id, Arcs []Arc) PolyFillArcCookie {
+func (c *Conn) PolyFillArc(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyFillArcCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyFillArcRequest(Drawable, Gc, Arcs), cookie)
 	return PolyFillArcCookie{cookie}
 }
 
-func (c *Conn) PolyFillArcChecked(Drawable Id, Gc Id, Arcs []Arc) PolyFillArcCookie {
+func (c *Conn) PolyFillArcChecked(Drawable Drawable, Gc Gcontext, Arcs []Arc) PolyFillArcCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyFillArcRequest(Drawable, Gc, Arcs), cookie)
 	return PolyFillArcCookie{cookie}
@@ -10964,7 +11034,7 @@ func (cook PolyFillArcCookie) Check() error {
 }
 
 // Write request to wire for PolyFillArc
-func (c *Conn) polyFillArcRequest(Drawable Id, Gc Id, Arcs []Arc) []byte {
+func (c *Conn) polyFillArcRequest(Drawable Drawable, Gc Gcontext, Arcs []Arc) []byte {
 	size := pad((12 + pad((len(Arcs) * 12))))
 	b := 0
 	buf := make([]byte, size)
@@ -10995,13 +11065,13 @@ type PutImageCookie struct {
 }
 
 // Write request to wire for PutImage
-func (c *Conn) PutImage(Format byte, Drawable Id, Gc Id, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie {
+func (c *Conn) PutImage(Format byte, Drawable Drawable, Gc Gcontext, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.putImageRequest(Format, Drawable, Gc, Width, Height, DstX, DstY, LeftPad, Depth, Data), cookie)
 	return PutImageCookie{cookie}
 }
 
-func (c *Conn) PutImageChecked(Format byte, Drawable Id, Gc Id, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie {
+func (c *Conn) PutImageChecked(Format byte, Drawable Drawable, Gc Gcontext, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) PutImageCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.putImageRequest(Format, Drawable, Gc, Width, Height, DstX, DstY, LeftPad, Depth, Data), cookie)
 	return PutImageCookie{cookie}
@@ -11012,7 +11082,7 @@ func (cook PutImageCookie) Check() error {
 }
 
 // Write request to wire for PutImage
-func (c *Conn) putImageRequest(Format byte, Drawable Id, Gc Id, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) []byte {
+func (c *Conn) putImageRequest(Format byte, Drawable Drawable, Gc Gcontext, Width uint16, Height uint16, DstX int16, DstY int16, LeftPad byte, Depth byte, Data []byte) []byte {
 	size := pad((24 + pad((len(Data) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -11064,13 +11134,13 @@ type GetImageCookie struct {
 	*cookie
 }
 
-func (c *Conn) GetImage(Format byte, Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie {
+func (c *Conn) GetImage(Format byte, Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.getImageRequest(Format, Drawable, X, Y, Width, Height, PlaneMask), cookie)
 	return GetImageCookie{cookie}
 }
 
-func (c *Conn) GetImageUnchecked(Format byte, Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie {
+func (c *Conn) GetImageUnchecked(Format byte, Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) GetImageCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.getImageRequest(Format, Drawable, X, Y, Width, Height, PlaneMask), cookie)
 	return GetImageCookie{cookie}
@@ -11130,7 +11200,7 @@ func (cook GetImageCookie) Check() error {
 }
 
 // Write request to wire for GetImage
-func (c *Conn) getImageRequest(Format byte, Drawable Id, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) []byte {
+func (c *Conn) getImageRequest(Format byte, Drawable Drawable, X int16, Y int16, Width uint16, Height uint16, PlaneMask uint32) []byte {
 	size := 20
 	b := 0
 	buf := make([]byte, size)
@@ -11172,13 +11242,13 @@ type PolyText8Cookie struct {
 }
 
 // Write request to wire for PolyText8
-func (c *Conn) PolyText8(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText8Cookie {
+func (c *Conn) PolyText8(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText8Cookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyText8Request(Drawable, Gc, X, Y, Items), cookie)
 	return PolyText8Cookie{cookie}
 }
 
-func (c *Conn) PolyText8Checked(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText8Cookie {
+func (c *Conn) PolyText8Checked(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText8Cookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyText8Request(Drawable, Gc, X, Y, Items), cookie)
 	return PolyText8Cookie{cookie}
@@ -11189,7 +11259,7 @@ func (cook PolyText8Cookie) Check() error {
 }
 
 // Write request to wire for PolyText8
-func (c *Conn) polyText8Request(Drawable Id, Gc Id, X int16, Y int16, Items []byte) []byte {
+func (c *Conn) polyText8Request(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) []byte {
 	size := pad((16 + pad((len(Items) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -11227,13 +11297,13 @@ type PolyText16Cookie struct {
 }
 
 // Write request to wire for PolyText16
-func (c *Conn) PolyText16(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText16Cookie {
+func (c *Conn) PolyText16(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText16Cookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.polyText16Request(Drawable, Gc, X, Y, Items), cookie)
 	return PolyText16Cookie{cookie}
 }
 
-func (c *Conn) PolyText16Checked(Drawable Id, Gc Id, X int16, Y int16, Items []byte) PolyText16Cookie {
+func (c *Conn) PolyText16Checked(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) PolyText16Cookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.polyText16Request(Drawable, Gc, X, Y, Items), cookie)
 	return PolyText16Cookie{cookie}
@@ -11244,7 +11314,7 @@ func (cook PolyText16Cookie) Check() error {
 }
 
 // Write request to wire for PolyText16
-func (c *Conn) polyText16Request(Drawable Id, Gc Id, X int16, Y int16, Items []byte) []byte {
+func (c *Conn) polyText16Request(Drawable Drawable, Gc Gcontext, X int16, Y int16, Items []byte) []byte {
 	size := pad((16 + pad((len(Items) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -11282,13 +11352,13 @@ type ImageText8Cookie struct {
 }
 
 // Write request to wire for ImageText8
-func (c *Conn) ImageText8(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String string) ImageText8Cookie {
+func (c *Conn) ImageText8(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String string) ImageText8Cookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.imageText8Request(StringLen, Drawable, Gc, X, Y, String), cookie)
 	return ImageText8Cookie{cookie}
 }
 
-func (c *Conn) ImageText8Checked(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String string) ImageText8Cookie {
+func (c *Conn) ImageText8Checked(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String string) ImageText8Cookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.imageText8Request(StringLen, Drawable, Gc, X, Y, String), cookie)
 	return ImageText8Cookie{cookie}
@@ -11299,7 +11369,7 @@ func (cook ImageText8Cookie) Check() error {
 }
 
 // Write request to wire for ImageText8
-func (c *Conn) imageText8Request(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String string) []byte {
+func (c *Conn) imageText8Request(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String string) []byte {
 	size := pad((16 + pad((int(StringLen) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -11338,13 +11408,13 @@ type ImageText16Cookie struct {
 }
 
 // Write request to wire for ImageText16
-func (c *Conn) ImageText16(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String []Char2b) ImageText16Cookie {
+func (c *Conn) ImageText16(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String []Char2b) ImageText16Cookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.imageText16Request(StringLen, Drawable, Gc, X, Y, String), cookie)
 	return ImageText16Cookie{cookie}
 }
 
-func (c *Conn) ImageText16Checked(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String []Char2b) ImageText16Cookie {
+func (c *Conn) ImageText16Checked(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String []Char2b) ImageText16Cookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.imageText16Request(StringLen, Drawable, Gc, X, Y, String), cookie)
 	return ImageText16Cookie{cookie}
@@ -11355,7 +11425,7 @@ func (cook ImageText16Cookie) Check() error {
 }
 
 // Write request to wire for ImageText16
-func (c *Conn) imageText16Request(StringLen byte, Drawable Id, Gc Id, X int16, Y int16, String []Char2b) []byte {
+func (c *Conn) imageText16Request(StringLen byte, Drawable Drawable, Gc Gcontext, X int16, Y int16, String []Char2b) []byte {
 	size := pad((16 + pad((int(StringLen) * 2))))
 	b := 0
 	buf := make([]byte, size)
@@ -11393,13 +11463,13 @@ type CreateColormapCookie struct {
 }
 
 // Write request to wire for CreateColormap
-func (c *Conn) CreateColormap(Alloc byte, Mid Id, Window Id, Visual Visualid) CreateColormapCookie {
+func (c *Conn) CreateColormap(Alloc byte, Mid Colormap, Window Window, Visual Visualid) CreateColormapCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.createColormapRequest(Alloc, Mid, Window, Visual), cookie)
 	return CreateColormapCookie{cookie}
 }
 
-func (c *Conn) CreateColormapChecked(Alloc byte, Mid Id, Window Id, Visual Visualid) CreateColormapCookie {
+func (c *Conn) CreateColormapChecked(Alloc byte, Mid Colormap, Window Window, Visual Visualid) CreateColormapCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.createColormapRequest(Alloc, Mid, Window, Visual), cookie)
 	return CreateColormapCookie{cookie}
@@ -11410,7 +11480,7 @@ func (cook CreateColormapCookie) Check() error {
 }
 
 // Write request to wire for CreateColormap
-func (c *Conn) createColormapRequest(Alloc byte, Mid Id, Window Id, Visual Visualid) []byte {
+func (c *Conn) createColormapRequest(Alloc byte, Mid Colormap, Window Window, Visual Visualid) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -11443,13 +11513,13 @@ type FreeColormapCookie struct {
 }
 
 // Write request to wire for FreeColormap
-func (c *Conn) FreeColormap(Cmap Id) FreeColormapCookie {
+func (c *Conn) FreeColormap(Cmap Colormap) FreeColormapCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.freeColormapRequest(Cmap), cookie)
 	return FreeColormapCookie{cookie}
 }
 
-func (c *Conn) FreeColormapChecked(Cmap Id) FreeColormapCookie {
+func (c *Conn) FreeColormapChecked(Cmap Colormap) FreeColormapCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.freeColormapRequest(Cmap), cookie)
 	return FreeColormapCookie{cookie}
@@ -11460,7 +11530,7 @@ func (cook FreeColormapCookie) Check() error {
 }
 
 // Write request to wire for FreeColormap
-func (c *Conn) freeColormapRequest(Cmap Id) []byte {
+func (c *Conn) freeColormapRequest(Cmap Colormap) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -11486,13 +11556,13 @@ type CopyColormapAndFreeCookie struct {
 }
 
 // Write request to wire for CopyColormapAndFree
-func (c *Conn) CopyColormapAndFree(Mid Id, SrcCmap Id) CopyColormapAndFreeCookie {
+func (c *Conn) CopyColormapAndFree(Mid Colormap, SrcCmap Colormap) CopyColormapAndFreeCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.copyColormapAndFreeRequest(Mid, SrcCmap), cookie)
 	return CopyColormapAndFreeCookie{cookie}
 }
 
-func (c *Conn) CopyColormapAndFreeChecked(Mid Id, SrcCmap Id) CopyColormapAndFreeCookie {
+func (c *Conn) CopyColormapAndFreeChecked(Mid Colormap, SrcCmap Colormap) CopyColormapAndFreeCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.copyColormapAndFreeRequest(Mid, SrcCmap), cookie)
 	return CopyColormapAndFreeCookie{cookie}
@@ -11503,7 +11573,7 @@ func (cook CopyColormapAndFreeCookie) Check() error {
 }
 
 // Write request to wire for CopyColormapAndFree
-func (c *Conn) copyColormapAndFreeRequest(Mid Id, SrcCmap Id) []byte {
+func (c *Conn) copyColormapAndFreeRequest(Mid Colormap, SrcCmap Colormap) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -11532,13 +11602,13 @@ type InstallColormapCookie struct {
 }
 
 // Write request to wire for InstallColormap
-func (c *Conn) InstallColormap(Cmap Id) InstallColormapCookie {
+func (c *Conn) InstallColormap(Cmap Colormap) InstallColormapCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.installColormapRequest(Cmap), cookie)
 	return InstallColormapCookie{cookie}
 }
 
-func (c *Conn) InstallColormapChecked(Cmap Id) InstallColormapCookie {
+func (c *Conn) InstallColormapChecked(Cmap Colormap) InstallColormapCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.installColormapRequest(Cmap), cookie)
 	return InstallColormapCookie{cookie}
@@ -11549,7 +11619,7 @@ func (cook InstallColormapCookie) Check() error {
 }
 
 // Write request to wire for InstallColormap
-func (c *Conn) installColormapRequest(Cmap Id) []byte {
+func (c *Conn) installColormapRequest(Cmap Colormap) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -11575,13 +11645,13 @@ type UninstallColormapCookie struct {
 }
 
 // Write request to wire for UninstallColormap
-func (c *Conn) UninstallColormap(Cmap Id) UninstallColormapCookie {
+func (c *Conn) UninstallColormap(Cmap Colormap) UninstallColormapCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.uninstallColormapRequest(Cmap), cookie)
 	return UninstallColormapCookie{cookie}
 }
 
-func (c *Conn) UninstallColormapChecked(Cmap Id) UninstallColormapCookie {
+func (c *Conn) UninstallColormapChecked(Cmap Colormap) UninstallColormapCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.uninstallColormapRequest(Cmap), cookie)
 	return UninstallColormapCookie{cookie}
@@ -11592,7 +11662,7 @@ func (cook UninstallColormapCookie) Check() error {
 }
 
 // Write request to wire for UninstallColormap
-func (c *Conn) uninstallColormapRequest(Cmap Id) []byte {
+func (c *Conn) uninstallColormapRequest(Cmap Colormap) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -11617,13 +11687,13 @@ type ListInstalledColormapsCookie struct {
 	*cookie
 }
 
-func (c *Conn) ListInstalledColormaps(Window Id) ListInstalledColormapsCookie {
+func (c *Conn) ListInstalledColormaps(Window Window) ListInstalledColormapsCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.listInstalledColormapsRequest(Window), cookie)
 	return ListInstalledColormapsCookie{cookie}
 }
 
-func (c *Conn) ListInstalledColormapsUnchecked(Window Id) ListInstalledColormapsCookie {
+func (c *Conn) ListInstalledColormapsUnchecked(Window Window) ListInstalledColormapsCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.listInstalledColormapsRequest(Window), cookie)
 	return ListInstalledColormapsCookie{cookie}
@@ -11637,7 +11707,7 @@ type ListInstalledColormapsReply struct {
 	// padding: 1 bytes
 	CmapsLen uint16
 	// padding: 22 bytes
-	Cmaps []Id // size: pad((int(CmapsLen) * 4))
+	Cmaps []Colormap // size: pad((int(CmapsLen) * 4))
 }
 
 // Waits and reads reply data from request ListInstalledColormaps
@@ -11670,9 +11740,9 @@ func listInstalledColormapsReply(buf []byte) *ListInstalledColormapsReply {
 
 	b += 22 // padding
 
-	v.Cmaps = make([]Id, v.CmapsLen)
+	v.Cmaps = make([]Colormap, v.CmapsLen)
 	for i := 0; i < int(v.CmapsLen); i++ {
-		v.Cmaps[i] = Id(Get32(buf[b:]))
+		v.Cmaps[i] = Colormap(Get32(buf[b:]))
 		b += 4
 	}
 	b = pad(b)
@@ -11685,7 +11755,7 @@ func (cook ListInstalledColormapsCookie) Check() error {
 }
 
 // Write request to wire for ListInstalledColormaps
-func (c *Conn) listInstalledColormapsRequest(Window Id) []byte {
+func (c *Conn) listInstalledColormapsRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -11710,13 +11780,13 @@ type AllocColorCookie struct {
 	*cookie
 }
 
-func (c *Conn) AllocColor(Cmap Id, Red uint16, Green uint16, Blue uint16) AllocColorCookie {
+func (c *Conn) AllocColor(Cmap Colormap, Red uint16, Green uint16, Blue uint16) AllocColorCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.allocColorRequest(Cmap, Red, Green, Blue), cookie)
 	return AllocColorCookie{cookie}
 }
 
-func (c *Conn) AllocColorUnchecked(Cmap Id, Red uint16, Green uint16, Blue uint16) AllocColorCookie {
+func (c *Conn) AllocColorUnchecked(Cmap Colormap, Red uint16, Green uint16, Blue uint16) AllocColorCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.allocColorRequest(Cmap, Red, Green, Blue), cookie)
 	return AllocColorCookie{cookie}
@@ -11782,7 +11852,7 @@ func (cook AllocColorCookie) Check() error {
 }
 
 // Write request to wire for AllocColor
-func (c *Conn) allocColorRequest(Cmap Id, Red uint16, Green uint16, Blue uint16) []byte {
+func (c *Conn) allocColorRequest(Cmap Colormap, Red uint16, Green uint16, Blue uint16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -11818,13 +11888,13 @@ type AllocNamedColorCookie struct {
 	*cookie
 }
 
-func (c *Conn) AllocNamedColor(Cmap Id, NameLen uint16, Name string) AllocNamedColorCookie {
+func (c *Conn) AllocNamedColor(Cmap Colormap, NameLen uint16, Name string) AllocNamedColorCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.allocNamedColorRequest(Cmap, NameLen, Name), cookie)
 	return AllocNamedColorCookie{cookie}
 }
 
-func (c *Conn) AllocNamedColorUnchecked(Cmap Id, NameLen uint16, Name string) AllocNamedColorCookie {
+func (c *Conn) AllocNamedColorUnchecked(Cmap Colormap, NameLen uint16, Name string) AllocNamedColorCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.allocNamedColorRequest(Cmap, NameLen, Name), cookie)
 	return AllocNamedColorCookie{cookie}
@@ -11899,7 +11969,7 @@ func (cook AllocNamedColorCookie) Check() error {
 }
 
 // Write request to wire for AllocNamedColor
-func (c *Conn) allocNamedColorRequest(Cmap Id, NameLen uint16, Name string) []byte {
+func (c *Conn) allocNamedColorRequest(Cmap Colormap, NameLen uint16, Name string) []byte {
 	size := pad((12 + pad((int(NameLen) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -11932,13 +12002,13 @@ type AllocColorCellsCookie struct {
 	*cookie
 }
 
-func (c *Conn) AllocColorCells(Contiguous bool, Cmap Id, Colors uint16, Planes uint16) AllocColorCellsCookie {
+func (c *Conn) AllocColorCells(Contiguous bool, Cmap Colormap, Colors uint16, Planes uint16) AllocColorCellsCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.allocColorCellsRequest(Contiguous, Cmap, Colors, Planes), cookie)
 	return AllocColorCellsCookie{cookie}
 }
 
-func (c *Conn) AllocColorCellsUnchecked(Contiguous bool, Cmap Id, Colors uint16, Planes uint16) AllocColorCellsCookie {
+func (c *Conn) AllocColorCellsUnchecked(Contiguous bool, Cmap Colormap, Colors uint16, Planes uint16) AllocColorCellsCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.allocColorCellsRequest(Contiguous, Cmap, Colors, Planes), cookie)
 	return AllocColorCellsCookie{cookie}
@@ -12012,7 +12082,7 @@ func (cook AllocColorCellsCookie) Check() error {
 }
 
 // Write request to wire for AllocColorCells
-func (c *Conn) allocColorCellsRequest(Contiguous bool, Cmap Id, Colors uint16, Planes uint16) []byte {
+func (c *Conn) allocColorCellsRequest(Contiguous bool, Cmap Colormap, Colors uint16, Planes uint16) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -12048,13 +12118,13 @@ type AllocColorPlanesCookie struct {
 	*cookie
 }
 
-func (c *Conn) AllocColorPlanes(Contiguous bool, Cmap Id, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie {
+func (c *Conn) AllocColorPlanes(Contiguous bool, Cmap Colormap, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.allocColorPlanesRequest(Contiguous, Cmap, Colors, Reds, Greens, Blues), cookie)
 	return AllocColorPlanesCookie{cookie}
 }
 
-func (c *Conn) AllocColorPlanesUnchecked(Contiguous bool, Cmap Id, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie {
+func (c *Conn) AllocColorPlanesUnchecked(Contiguous bool, Cmap Colormap, Colors uint16, Reds uint16, Greens uint16, Blues uint16) AllocColorPlanesCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.allocColorPlanesRequest(Contiguous, Cmap, Colors, Reds, Greens, Blues), cookie)
 	return AllocColorPlanesCookie{cookie}
@@ -12131,7 +12201,7 @@ func (cook AllocColorPlanesCookie) Check() error {
 }
 
 // Write request to wire for AllocColorPlanes
-func (c *Conn) allocColorPlanesRequest(Contiguous bool, Cmap Id, Colors uint16, Reds uint16, Greens uint16, Blues uint16) []byte {
+func (c *Conn) allocColorPlanesRequest(Contiguous bool, Cmap Colormap, Colors uint16, Reds uint16, Greens uint16, Blues uint16) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -12174,13 +12244,13 @@ type FreeColorsCookie struct {
 }
 
 // Write request to wire for FreeColors
-func (c *Conn) FreeColors(Cmap Id, PlaneMask uint32, Pixels []uint32) FreeColorsCookie {
+func (c *Conn) FreeColors(Cmap Colormap, PlaneMask uint32, Pixels []uint32) FreeColorsCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.freeColorsRequest(Cmap, PlaneMask, Pixels), cookie)
 	return FreeColorsCookie{cookie}
 }
 
-func (c *Conn) FreeColorsChecked(Cmap Id, PlaneMask uint32, Pixels []uint32) FreeColorsCookie {
+func (c *Conn) FreeColorsChecked(Cmap Colormap, PlaneMask uint32, Pixels []uint32) FreeColorsCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.freeColorsRequest(Cmap, PlaneMask, Pixels), cookie)
 	return FreeColorsCookie{cookie}
@@ -12191,7 +12261,7 @@ func (cook FreeColorsCookie) Check() error {
 }
 
 // Write request to wire for FreeColors
-func (c *Conn) freeColorsRequest(Cmap Id, PlaneMask uint32, Pixels []uint32) []byte {
+func (c *Conn) freeColorsRequest(Cmap Colormap, PlaneMask uint32, Pixels []uint32) []byte {
 	size := pad((12 + pad((len(Pixels) * 4))))
 	b := 0
 	buf := make([]byte, size)
@@ -12226,13 +12296,13 @@ type StoreColorsCookie struct {
 }
 
 // Write request to wire for StoreColors
-func (c *Conn) StoreColors(Cmap Id, Items []Coloritem) StoreColorsCookie {
+func (c *Conn) StoreColors(Cmap Colormap, Items []Coloritem) StoreColorsCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.storeColorsRequest(Cmap, Items), cookie)
 	return StoreColorsCookie{cookie}
 }
 
-func (c *Conn) StoreColorsChecked(Cmap Id, Items []Coloritem) StoreColorsCookie {
+func (c *Conn) StoreColorsChecked(Cmap Colormap, Items []Coloritem) StoreColorsCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.storeColorsRequest(Cmap, Items), cookie)
 	return StoreColorsCookie{cookie}
@@ -12243,7 +12313,7 @@ func (cook StoreColorsCookie) Check() error {
 }
 
 // Write request to wire for StoreColors
-func (c *Conn) storeColorsRequest(Cmap Id, Items []Coloritem) []byte {
+func (c *Conn) storeColorsRequest(Cmap Colormap, Items []Coloritem) []byte {
 	size := pad((8 + pad((len(Items) * 12))))
 	b := 0
 	buf := make([]byte, size)
@@ -12271,13 +12341,13 @@ type StoreNamedColorCookie struct {
 }
 
 // Write request to wire for StoreNamedColor
-func (c *Conn) StoreNamedColor(Flags byte, Cmap Id, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie {
+func (c *Conn) StoreNamedColor(Flags byte, Cmap Colormap, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.storeNamedColorRequest(Flags, Cmap, Pixel, NameLen, Name), cookie)
 	return StoreNamedColorCookie{cookie}
 }
 
-func (c *Conn) StoreNamedColorChecked(Flags byte, Cmap Id, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie {
+func (c *Conn) StoreNamedColorChecked(Flags byte, Cmap Colormap, Pixel uint32, NameLen uint16, Name string) StoreNamedColorCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.storeNamedColorRequest(Flags, Cmap, Pixel, NameLen, Name), cookie)
 	return StoreNamedColorCookie{cookie}
@@ -12288,7 +12358,7 @@ func (cook StoreNamedColorCookie) Check() error {
 }
 
 // Write request to wire for StoreNamedColor
-func (c *Conn) storeNamedColorRequest(Flags byte, Cmap Id, Pixel uint32, NameLen uint16, Name string) []byte {
+func (c *Conn) storeNamedColorRequest(Flags byte, Cmap Colormap, Pixel uint32, NameLen uint16, Name string) []byte {
 	size := pad((16 + pad((int(NameLen) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -12325,13 +12395,13 @@ type QueryColorsCookie struct {
 	*cookie
 }
 
-func (c *Conn) QueryColors(Cmap Id, Pixels []uint32) QueryColorsCookie {
+func (c *Conn) QueryColors(Cmap Colormap, Pixels []uint32) QueryColorsCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.queryColorsRequest(Cmap, Pixels), cookie)
 	return QueryColorsCookie{cookie}
 }
 
-func (c *Conn) QueryColorsUnchecked(Cmap Id, Pixels []uint32) QueryColorsCookie {
+func (c *Conn) QueryColorsUnchecked(Cmap Colormap, Pixels []uint32) QueryColorsCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.queryColorsRequest(Cmap, Pixels), cookie)
 	return QueryColorsCookie{cookie}
@@ -12389,7 +12459,7 @@ func (cook QueryColorsCookie) Check() error {
 }
 
 // Write request to wire for QueryColors
-func (c *Conn) queryColorsRequest(Cmap Id, Pixels []uint32) []byte {
+func (c *Conn) queryColorsRequest(Cmap Colormap, Pixels []uint32) []byte {
 	size := pad((8 + pad((len(Pixels) * 4))))
 	b := 0
 	buf := make([]byte, size)
@@ -12420,13 +12490,13 @@ type LookupColorCookie struct {
 	*cookie
 }
 
-func (c *Conn) LookupColor(Cmap Id, NameLen uint16, Name string) LookupColorCookie {
+func (c *Conn) LookupColor(Cmap Colormap, NameLen uint16, Name string) LookupColorCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.lookupColorRequest(Cmap, NameLen, Name), cookie)
 	return LookupColorCookie{cookie}
 }
 
-func (c *Conn) LookupColorUnchecked(Cmap Id, NameLen uint16, Name string) LookupColorCookie {
+func (c *Conn) LookupColorUnchecked(Cmap Colormap, NameLen uint16, Name string) LookupColorCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.lookupColorRequest(Cmap, NameLen, Name), cookie)
 	return LookupColorCookie{cookie}
@@ -12497,7 +12567,7 @@ func (cook LookupColorCookie) Check() error {
 }
 
 // Write request to wire for LookupColor
-func (c *Conn) lookupColorRequest(Cmap Id, NameLen uint16, Name string) []byte {
+func (c *Conn) lookupColorRequest(Cmap Colormap, NameLen uint16, Name string) []byte {
 	size := pad((12 + pad((int(NameLen) * 1))))
 	b := 0
 	buf := make([]byte, size)
@@ -12531,13 +12601,13 @@ type CreateCursorCookie struct {
 }
 
 // Write request to wire for CreateCursor
-func (c *Conn) CreateCursor(Cid Id, Source Id, Mask Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie {
+func (c *Conn) CreateCursor(Cid Cursor, Source Pixmap, Mask Pixmap, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.createCursorRequest(Cid, Source, Mask, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue, X, Y), cookie)
 	return CreateCursorCookie{cookie}
 }
 
-func (c *Conn) CreateCursorChecked(Cid Id, Source Id, Mask Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie {
+func (c *Conn) CreateCursorChecked(Cid Cursor, Source Pixmap, Mask Pixmap, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) CreateCursorCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.createCursorRequest(Cid, Source, Mask, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue, X, Y), cookie)
 	return CreateCursorCookie{cookie}
@@ -12548,7 +12618,7 @@ func (cook CreateCursorCookie) Check() error {
 }
 
 // Write request to wire for CreateCursor
-func (c *Conn) createCursorRequest(Cid Id, Source Id, Mask Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) []byte {
+func (c *Conn) createCursorRequest(Cid Cursor, Source Pixmap, Mask Pixmap, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16, X uint16, Y uint16) []byte {
 	size := 32
 	b := 0
 	buf := make([]byte, size)
@@ -12604,13 +12674,13 @@ type CreateGlyphCursorCookie struct {
 }
 
 // Write request to wire for CreateGlyphCursor
-func (c *Conn) CreateGlyphCursor(Cid Id, SourceFont Id, MaskFont Id, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie {
+func (c *Conn) CreateGlyphCursor(Cid Cursor, SourceFont Font, MaskFont Font, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.createGlyphCursorRequest(Cid, SourceFont, MaskFont, SourceChar, MaskChar, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie)
 	return CreateGlyphCursorCookie{cookie}
 }
 
-func (c *Conn) CreateGlyphCursorChecked(Cid Id, SourceFont Id, MaskFont Id, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie {
+func (c *Conn) CreateGlyphCursorChecked(Cid Cursor, SourceFont Font, MaskFont Font, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) CreateGlyphCursorCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.createGlyphCursorRequest(Cid, SourceFont, MaskFont, SourceChar, MaskChar, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie)
 	return CreateGlyphCursorCookie{cookie}
@@ -12621,7 +12691,7 @@ func (cook CreateGlyphCursorCookie) Check() error {
 }
 
 // Write request to wire for CreateGlyphCursor
-func (c *Conn) createGlyphCursorRequest(Cid Id, SourceFont Id, MaskFont Id, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte {
+func (c *Conn) createGlyphCursorRequest(Cid Cursor, SourceFont Font, MaskFont Font, SourceChar uint16, MaskChar uint16, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte {
 	size := 32
 	b := 0
 	buf := make([]byte, size)
@@ -12677,13 +12747,13 @@ type FreeCursorCookie struct {
 }
 
 // Write request to wire for FreeCursor
-func (c *Conn) FreeCursor(Cursor Id) FreeCursorCookie {
+func (c *Conn) FreeCursor(Cursor Cursor) FreeCursorCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.freeCursorRequest(Cursor), cookie)
 	return FreeCursorCookie{cookie}
 }
 
-func (c *Conn) FreeCursorChecked(Cursor Id) FreeCursorCookie {
+func (c *Conn) FreeCursorChecked(Cursor Cursor) FreeCursorCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.freeCursorRequest(Cursor), cookie)
 	return FreeCursorCookie{cookie}
@@ -12694,7 +12764,7 @@ func (cook FreeCursorCookie) Check() error {
 }
 
 // Write request to wire for FreeCursor
-func (c *Conn) freeCursorRequest(Cursor Id) []byte {
+func (c *Conn) freeCursorRequest(Cursor Cursor) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -12720,13 +12790,13 @@ type RecolorCursorCookie struct {
 }
 
 // Write request to wire for RecolorCursor
-func (c *Conn) RecolorCursor(Cursor Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie {
+func (c *Conn) RecolorCursor(Cursor Cursor, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.recolorCursorRequest(Cursor, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie)
 	return RecolorCursorCookie{cookie}
 }
 
-func (c *Conn) RecolorCursorChecked(Cursor Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie {
+func (c *Conn) RecolorCursorChecked(Cursor Cursor, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) RecolorCursorCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.recolorCursorRequest(Cursor, ForeRed, ForeGreen, ForeBlue, BackRed, BackGreen, BackBlue), cookie)
 	return RecolorCursorCookie{cookie}
@@ -12737,7 +12807,7 @@ func (cook RecolorCursorCookie) Check() error {
 }
 
 // Write request to wire for RecolorCursor
-func (c *Conn) recolorCursorRequest(Cursor Id, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte {
+func (c *Conn) recolorCursorRequest(Cursor Cursor, ForeRed uint16, ForeGreen uint16, ForeBlue uint16, BackRed uint16, BackGreen uint16, BackBlue uint16) []byte {
 	size := 20
 	b := 0
 	buf := make([]byte, size)
@@ -12780,13 +12850,13 @@ type QueryBestSizeCookie struct {
 	*cookie
 }
 
-func (c *Conn) QueryBestSize(Class byte, Drawable Id, Width uint16, Height uint16) QueryBestSizeCookie {
+func (c *Conn) QueryBestSize(Class byte, Drawable Drawable, Width uint16, Height uint16) QueryBestSizeCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.queryBestSizeRequest(Class, Drawable, Width, Height), cookie)
 	return QueryBestSizeCookie{cookie}
 }
 
-func (c *Conn) QueryBestSizeUnchecked(Class byte, Drawable Id, Width uint16, Height uint16) QueryBestSizeCookie {
+func (c *Conn) QueryBestSizeUnchecked(Class byte, Drawable Drawable, Width uint16, Height uint16) QueryBestSizeCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.queryBestSizeRequest(Class, Drawable, Width, Height), cookie)
 	return QueryBestSizeCookie{cookie}
@@ -12841,7 +12911,7 @@ func (cook QueryBestSizeCookie) Check() error {
 }
 
 // Write request to wire for QueryBestSize
-func (c *Conn) queryBestSizeRequest(Class byte, Drawable Id, Width uint16, Height uint16) []byte {
+func (c *Conn) queryBestSizeRequest(Class byte, Drawable Drawable, Width uint16, Height uint16) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -13959,13 +14029,13 @@ type RotatePropertiesCookie struct {
 }
 
 // Write request to wire for RotateProperties
-func (c *Conn) RotateProperties(Window Id, AtomsLen uint16, Delta int16, Atoms []Id) RotatePropertiesCookie {
+func (c *Conn) RotateProperties(Window Window, AtomsLen uint16, Delta int16, Atoms []Atom) RotatePropertiesCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.rotatePropertiesRequest(Window, AtomsLen, Delta, Atoms), cookie)
 	return RotatePropertiesCookie{cookie}
 }
 
-func (c *Conn) RotatePropertiesChecked(Window Id, AtomsLen uint16, Delta int16, Atoms []Id) RotatePropertiesCookie {
+func (c *Conn) RotatePropertiesChecked(Window Window, AtomsLen uint16, Delta int16, Atoms []Atom) RotatePropertiesCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.rotatePropertiesRequest(Window, AtomsLen, Delta, Atoms), cookie)
 	return RotatePropertiesCookie{cookie}
@@ -13976,7 +14046,7 @@ func (cook RotatePropertiesCookie) Check() error {
 }
 
 // Write request to wire for RotateProperties
-func (c *Conn) rotatePropertiesRequest(Window Id, AtomsLen uint16, Delta int16, Atoms []Id) []byte {
+func (c *Conn) rotatePropertiesRequest(Window Window, AtomsLen uint16, Delta int16, Atoms []Atom) []byte {
 	size := pad((12 + pad((int(AtomsLen) * 4))))
 	b := 0
 	buf := make([]byte, size)