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

1 files changed, 31 insertions, 33 deletions

diff --git a/nexgb/auto_xselinux.go b/nexgb/auto_xselinux.go
index 34d40fd..4e7ee81 100644
--- a/nexgb/auto_xselinux.go
+++ b/nexgb/auto_xselinux.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xselinux.xml on May 8 2012 11:03:25pm EDT.
+	This file was generated by xselinux.xml on May 10 2012 12:39:34pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,16 @@ func init() {
 	newExtErrorFuncs["SELinux"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -51,22 +61,10 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Id'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // 'XselinuxListItem' struct definition
 // Size: ((12 + pad((int(ObjectContextLen) * 1))) + pad((int(DataContextLen) * 1)))
 type XselinuxListItem struct {
-	Name             Id
+	Name             Atom
 	ObjectContextLen uint32
 	DataContextLen   uint32
 	ObjectContext    string // size: pad((int(ObjectContextLen) * 1))
@@ -77,7 +75,7 @@ type XselinuxListItem struct {
 func ReadXselinuxListItem(buf []byte, v *XselinuxListItem) int {
 	b := 0
 
-	v.Name = Id(Get32(buf[b:]))
+	v.Name = Atom(Get32(buf[b:]))
 	b += 4
 
 	v.ObjectContextLen = Get32(buf[b:])
@@ -673,13 +671,13 @@ type XselinuxGetWindowContextCookie struct {
 	*cookie
 }
 
-func (c *Conn) XselinuxGetWindowContext(Window Id) XselinuxGetWindowContextCookie {
+func (c *Conn) XselinuxGetWindowContext(Window Window) XselinuxGetWindowContextCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xselinuxGetWindowContextRequest(Window), cookie)
 	return XselinuxGetWindowContextCookie{cookie}
 }
 
-func (c *Conn) XselinuxGetWindowContextUnchecked(Window Id) XselinuxGetWindowContextCookie {
+func (c *Conn) XselinuxGetWindowContextUnchecked(Window Window) XselinuxGetWindowContextCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xselinuxGetWindowContextRequest(Window), cookie)
 	return XselinuxGetWindowContextCookie{cookie}
@@ -741,7 +739,7 @@ func (cook XselinuxGetWindowContextCookie) Check() error {
 }
 
 // Write request to wire for XselinuxGetWindowContext
-func (c *Conn) xselinuxGetWindowContextRequest(Window Id) []byte {
+func (c *Conn) xselinuxGetWindowContextRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1043,13 +1041,13 @@ type XselinuxGetPropertyContextCookie struct {
 	*cookie
 }
 
-func (c *Conn) XselinuxGetPropertyContext(Window Id, Property Id) XselinuxGetPropertyContextCookie {
+func (c *Conn) XselinuxGetPropertyContext(Window Window, Property Atom) XselinuxGetPropertyContextCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xselinuxGetPropertyContextRequest(Window, Property), cookie)
 	return XselinuxGetPropertyContextCookie{cookie}
 }
 
-func (c *Conn) XselinuxGetPropertyContextUnchecked(Window Id, Property Id) XselinuxGetPropertyContextCookie {
+func (c *Conn) XselinuxGetPropertyContextUnchecked(Window Window, Property Atom) XselinuxGetPropertyContextCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xselinuxGetPropertyContextRequest(Window, Property), cookie)
 	return XselinuxGetPropertyContextCookie{cookie}
@@ -1111,7 +1109,7 @@ func (cook XselinuxGetPropertyContextCookie) Check() error {
 }
 
 // Write request to wire for XselinuxGetPropertyContext
-func (c *Conn) xselinuxGetPropertyContextRequest(Window Id, Property Id) []byte {
+func (c *Conn) xselinuxGetPropertyContextRequest(Window Window, Property Atom) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -1140,13 +1138,13 @@ type XselinuxGetPropertyDataContextCookie struct {
 	*cookie
 }
 
-func (c *Conn) XselinuxGetPropertyDataContext(Window Id, Property Id) XselinuxGetPropertyDataContextCookie {
+func (c *Conn) XselinuxGetPropertyDataContext(Window Window, Property Atom) XselinuxGetPropertyDataContextCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xselinuxGetPropertyDataContextRequest(Window, Property), cookie)
 	return XselinuxGetPropertyDataContextCookie{cookie}
 }
 
-func (c *Conn) XselinuxGetPropertyDataContextUnchecked(Window Id, Property Id) XselinuxGetPropertyDataContextCookie {
+func (c *Conn) XselinuxGetPropertyDataContextUnchecked(Window Window, Property Atom) XselinuxGetPropertyDataContextCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xselinuxGetPropertyDataContextRequest(Window, Property), cookie)
 	return XselinuxGetPropertyDataContextCookie{cookie}
@@ -1208,7 +1206,7 @@ func (cook XselinuxGetPropertyDataContextCookie) Check() error {
 }
 
 // Write request to wire for XselinuxGetPropertyDataContext
-func (c *Conn) xselinuxGetPropertyDataContextRequest(Window Id, Property Id) []byte {
+func (c *Conn) xselinuxGetPropertyDataContextRequest(Window Window, Property Atom) []byte {
 	size := 12
 	b := 0
 	buf := make([]byte, size)
@@ -1237,13 +1235,13 @@ type XselinuxListPropertiesCookie struct {
 	*cookie
 }
 
-func (c *Conn) XselinuxListProperties(Window Id) XselinuxListPropertiesCookie {
+func (c *Conn) XselinuxListProperties(Window Window) XselinuxListPropertiesCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xselinuxListPropertiesRequest(Window), cookie)
 	return XselinuxListPropertiesCookie{cookie}
 }
 
-func (c *Conn) XselinuxListPropertiesUnchecked(Window Id) XselinuxListPropertiesCookie {
+func (c *Conn) XselinuxListPropertiesUnchecked(Window Window) XselinuxListPropertiesCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xselinuxListPropertiesRequest(Window), cookie)
 	return XselinuxListPropertiesCookie{cookie}
@@ -1301,7 +1299,7 @@ func (cook XselinuxListPropertiesCookie) Check() error {
 }
 
 // Write request to wire for XselinuxListProperties
-func (c *Conn) xselinuxListPropertiesRequest(Window Id) []byte {
+func (c *Conn) xselinuxListPropertiesRequest(Window Window) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1603,13 +1601,13 @@ type XselinuxGetSelectionContextCookie struct {
 	*cookie
 }
 
-func (c *Conn) XselinuxGetSelectionContext(Selection Id) XselinuxGetSelectionContextCookie {
+func (c *Conn) XselinuxGetSelectionContext(Selection Atom) XselinuxGetSelectionContextCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xselinuxGetSelectionContextRequest(Selection), cookie)
 	return XselinuxGetSelectionContextCookie{cookie}
 }
 
-func (c *Conn) XselinuxGetSelectionContextUnchecked(Selection Id) XselinuxGetSelectionContextCookie {
+func (c *Conn) XselinuxGetSelectionContextUnchecked(Selection Atom) XselinuxGetSelectionContextCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xselinuxGetSelectionContextRequest(Selection), cookie)
 	return XselinuxGetSelectionContextCookie{cookie}
@@ -1671,7 +1669,7 @@ func (cook XselinuxGetSelectionContextCookie) Check() error {
 }
 
 // Write request to wire for XselinuxGetSelectionContext
-func (c *Conn) xselinuxGetSelectionContextRequest(Selection Id) []byte {
+func (c *Conn) xselinuxGetSelectionContextRequest(Selection Atom) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1697,13 +1695,13 @@ type XselinuxGetSelectionDataContextCookie struct {
 	*cookie
 }
 
-func (c *Conn) XselinuxGetSelectionDataContext(Selection Id) XselinuxGetSelectionDataContextCookie {
+func (c *Conn) XselinuxGetSelectionDataContext(Selection Atom) XselinuxGetSelectionDataContextCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.xselinuxGetSelectionDataContextRequest(Selection), cookie)
 	return XselinuxGetSelectionDataContextCookie{cookie}
 }
 
-func (c *Conn) XselinuxGetSelectionDataContextUnchecked(Selection Id) XselinuxGetSelectionDataContextCookie {
+func (c *Conn) XselinuxGetSelectionDataContextUnchecked(Selection Atom) XselinuxGetSelectionDataContextCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.xselinuxGetSelectionDataContextRequest(Selection), cookie)
 	return XselinuxGetSelectionDataContextCookie{cookie}
@@ -1765,7 +1763,7 @@ func (cook XselinuxGetSelectionDataContextCookie) Check() error {
 }
 
 // Write request to wire for XselinuxGetSelectionDataContext
-func (c *Conn) xselinuxGetSelectionDataContextRequest(Selection Id) []byte {
+func (c *Conn) xselinuxGetSelectionDataContextRequest(Selection Atom) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)