use a custom logger so we don't stomp all over the global log configuration

30 files changed, 218 insertions, 221 deletions

diff --git a/nexgb/auto_bigreq.go b/nexgb/auto_bigreq.go
index c1eb4d0..24fcfdc 100644
--- a/nexgb/auto_bigreq.go
+++ b/nexgb/auto_bigreq.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by bigreq.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by bigreq.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,6 +33,8 @@ func init() {
 	newExtErrorFuncs["BIG-REQUESTS"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int8'
+
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -57,8 +59,6 @@ func init() {
 
 // Skipping definition for base type 'Byte'
 
-// Skipping definition for base type 'Int8'
-
 // Request BigreqEnable
 // size: 4
 type BigreqEnableCookie struct {
diff --git a/nexgb/auto_composite.go b/nexgb/auto_composite.go
index 4262468..85c4ee2 100644
--- a/nexgb/auto_composite.go
+++ b/nexgb/auto_composite.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by composite.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by composite.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -38,12 +38,6 @@ func init() {
 	newExtErrorFuncs["Composite"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -64,6 +58,12 @@ func init() {
 
 // 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 (
 	CompositeRedirectAutomatic = 0
 	CompositeRedirectManual    = 1
diff --git a/nexgb/auto_damage.go b/nexgb/auto_damage.go
index c3d2734..26f5fba 100644
--- a/nexgb/auto_damage.go
+++ b/nexgb/auto_damage.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by damage.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by damage.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -38,6 +38,14 @@ func init() {
 	newExtErrorFuncs["DAMAGE"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -56,14 +64,6 @@ func init() {
 
 // 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'
-
 const (
 	DamageReportLevelRawRectangles   = 0
 	DamageReportLevelDeltaRectangles = 1
diff --git a/nexgb/auto_dpms.go b/nexgb/auto_dpms.go
index 5200bfa..4626410 100644
--- a/nexgb/auto_dpms.go
+++ b/nexgb/auto_dpms.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by dpms.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by dpms.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/auto_dri2.go b/nexgb/auto_dri2.go
index 68d6084..a9527f7 100644
--- a/nexgb/auto_dri2.go
+++ b/nexgb/auto_dri2.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by dri2.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by dri2.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/auto_ge.go b/nexgb/auto_ge.go
index ef80ebf..0c8f12b 100644
--- a/nexgb/auto_ge.go
+++ b/nexgb/auto_ge.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by ge.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by ge.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,8 +33,6 @@ func init() {
 	newExtErrorFuncs["Generic Event Extension"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Int8'
-
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -59,6 +57,8 @@ func init() {
 
 // Skipping definition for base type 'Byte'
 
+// Skipping definition for base type 'Int8'
+
 // Request GeQueryVersion
 // size: 8
 type GeQueryVersionCookie struct {
diff --git a/nexgb/auto_glx.go b/nexgb/auto_glx.go
index 67c79d7..22e5db5 100644
--- a/nexgb/auto_glx.go
+++ b/nexgb/auto_glx.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by glx.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by glx.xml on May 7 2012 11:34:25pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,14 @@ func init() {
 	newExtErrorFuncs["GLX"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -55,14 +63,6 @@ func init() {
 
 // 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'
-
 const (
 	GlxPbcetDamaged = 32791
 	GlxPbcetSaved   = 32792
diff --git a/nexgb/auto_randr.go b/nexgb/auto_randr.go
index 4e707e6..1971c2a 100644
--- a/nexgb/auto_randr.go
+++ b/nexgb/auto_randr.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by randr.xml on May 7 2012 9:17:56pm EDT.
+	This file was generated by randr.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -38,6 +38,14 @@ func init() {
 	newExtErrorFuncs["RANDR"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -56,14 +64,6 @@ func init() {
 
 // 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 (
 	RandrRotationRotate0   = 1
 	RandrRotationRotate90  = 2
diff --git a/nexgb/auto_record.go b/nexgb/auto_record.go
index 32e1715..b19002e 100644
--- a/nexgb/auto_record.go
+++ b/nexgb/auto_record.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by record.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by record.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,6 +33,16 @@ func init() {
 	newExtErrorFuncs["RECORD"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Id'
+
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -49,16 +59,6 @@ func init() {
 
 // Skipping definition for base type 'Char'
 
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Id'
-
 const (
 	RecordHTypeFromServerTime     = 1
 	RecordHTypeFromClientTime     = 2
diff --git a/nexgb/auto_render.go b/nexgb/auto_render.go
index fa0c5f2..1cf98e1 100644
--- a/nexgb/auto_render.go
+++ b/nexgb/auto_render.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by render.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by render.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,8 @@ func init() {
 	newExtErrorFuncs["RENDER"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -61,8 +63,6 @@ func init() {
 
 // Skipping definition for base type 'Void'
 
-// Skipping definition for base type 'Byte'
-
 const (
 	RenderPictTypeIndexed = 0
 	RenderPictTypeDirect  = 1
diff --git a/nexgb/auto_res.go b/nexgb/auto_res.go
index eeaf01f..4e93d7f 100644
--- a/nexgb/auto_res.go
+++ b/nexgb/auto_res.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by res.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by res.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,18 +37,6 @@ func init() {
 	newExtErrorFuncs["X-Resource"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
 // Skipping definition for base type 'Double'
 
 // Skipping definition for base type 'Bool'
@@ -63,6 +51,18 @@ func init() {
 
 // Skipping definition for base type 'Int32'
 
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
 // 'ResClient' struct definition
 // Size: 8
 type ResClient struct {
diff --git a/nexgb/auto_screensaver.go b/nexgb/auto_screensaver.go
index 13aa818..5fa2e27 100644
--- a/nexgb/auto_screensaver.go
+++ b/nexgb/auto_screensaver.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by screensaver.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by screensaver.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,14 @@ func init() {
 	newExtErrorFuncs["MIT-SCREEN-SAVER"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -55,14 +63,6 @@ func init() {
 
 // 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'
-
 const (
 	ScreensaverKindBlanked  = 0
 	ScreensaverKindInternal = 1
diff --git a/nexgb/auto_shape.go b/nexgb/auto_shape.go
index 4b52a5d..3af630c 100644
--- a/nexgb/auto_shape.go
+++ b/nexgb/auto_shape.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by shape.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by shape.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,12 +37,6 @@ func init() {
 	newExtErrorFuncs["SHAPE"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -63,6 +57,12 @@ func init() {
 
 // Skipping definition for base type 'Int32'
 
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
 const (
 	ShapeSoSet       = 0
 	ShapeSoUnion     = 1
diff --git a/nexgb/auto_shm.go b/nexgb/auto_shm.go
index a6d64a2..b5c4307 100644
--- a/nexgb/auto_shm.go
+++ b/nexgb/auto_shm.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by shm.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by shm.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,16 @@ func init() {
 	newExtErrorFuncs["MIT-SHM"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
 // Skipping definition for base type 'Card32'
 
 // Skipping definition for base type 'Double'
@@ -53,16 +63,6 @@ func init() {
 
 // Skipping definition for base type 'Int32'
 
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
 // Skipping resource definition of 'Seg'
 
 // Event definition ShmCompletion (0)
diff --git a/nexgb/auto_sync.go b/nexgb/auto_sync.go
index ef69ebe..c76db74 100644
--- a/nexgb/auto_sync.go
+++ b/nexgb/auto_sync.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by sync.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by sync.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,8 +37,6 @@ func init() {
 	newExtErrorFuncs["SYNC"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Card16'
-
 // Skipping definition for base type 'Char'
 
 // Skipping definition for base type 'Card32'
@@ -63,6 +61,8 @@ func init() {
 
 // Skipping definition for base type 'Int8'
 
+// Skipping definition for base type 'Card16'
+
 const (
 	SyncAlarmstateActive    = 0
 	SyncAlarmstateInactive  = 1
diff --git a/nexgb/auto_xc_misc.go b/nexgb/auto_xc_misc.go
index 4d5c03c..2ad3d34 100644
--- a/nexgb/auto_xc_misc.go
+++ b/nexgb/auto_xc_misc.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xc_misc.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xc_misc.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,16 +33,6 @@ func init() {
 	newExtErrorFuncs["XC-MISC"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
 // Skipping definition for base type 'Float'
 
 // Skipping definition for base type 'Id'
@@ -59,6 +49,16 @@ func init() {
 
 // Skipping definition for base type 'Int8'
 
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
 // Request Xc_miscGetVersion
 // size: 8
 type Xc_miscGetVersionCookie struct {
diff --git a/nexgb/auto_xevie.go b/nexgb/auto_xevie.go
index 1046f1b..3294fad 100644
--- a/nexgb/auto_xevie.go
+++ b/nexgb/auto_xevie.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xevie.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xevie.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,14 +33,6 @@ func init() {
 	newExtErrorFuncs["XEVIE"] = make(map[int]newErrorFun)
 }
 
-// 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'
@@ -59,6 +51,14 @@ 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'
+
 const (
 	XevieDatatypeUnmodified = 0
 	XevieDatatypeModified   = 1
diff --git a/nexgb/auto_xf86dri.go b/nexgb/auto_xf86dri.go
index 362fa40..5930f79 100644
--- a/nexgb/auto_xf86dri.go
+++ b/nexgb/auto_xf86dri.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xf86dri.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xf86dri.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,12 +33,6 @@ func init() {
 	newExtErrorFuncs["XFree86-DRI"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
 // Skipping definition for base type 'Card32'
 
 // Skipping definition for base type 'Double'
@@ -59,6 +53,12 @@ func init() {
 
 // Skipping definition for base type 'Byte'
 
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
 // 'Xf86driDrmClipRect' struct definition
 // Size: 8
 type Xf86driDrmClipRect struct {
diff --git a/nexgb/auto_xf86vidmode.go b/nexgb/auto_xf86vidmode.go
index d44105d..aed3216 100644
--- a/nexgb/auto_xf86vidmode.go
+++ b/nexgb/auto_xf86vidmode.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xf86vidmode.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xf86vidmode.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -33,18 +33,6 @@ func init() {
 	newExtErrorFuncs["XFree86-VidModeExtension"] = make(map[int]newErrorFun)
 }
 
-// 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'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -59,6 +47,18 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Id'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	Xf86vidmodeModeFlagPositiveHsync = 1
 	Xf86vidmodeModeFlagNegativeHsync = 2
diff --git a/nexgb/auto_xfixes.go b/nexgb/auto_xfixes.go
index f188be0..3adad5b 100644
--- a/nexgb/auto_xfixes.go
+++ b/nexgb/auto_xfixes.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xfixes.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xfixes.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +39,12 @@ func init() {
 	newExtErrorFuncs["XFIXES"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -59,12 +65,6 @@ func init() {
 
 // Skipping definition for base type 'Int32'
 
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
 const (
 	XfixesSaveSetModeInsert = 0
 	XfixesSaveSetModeDelete = 1
diff --git a/nexgb/auto_xinerama.go b/nexgb/auto_xinerama.go
index ff7453c..09db3f8 100644
--- a/nexgb/auto_xinerama.go
+++ b/nexgb/auto_xinerama.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xinerama.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xinerama.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,12 @@ func init() {
 	newExtErrorFuncs["XINERAMA"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
 // Skipping definition for base type 'Byte'
 
 // Skipping definition for base type 'Int8'
@@ -57,12 +63,6 @@ func init() {
 
 // Skipping definition for base type 'Card8'
 
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
 // 'XineramaScreenInfo' struct definition
 // Size: 8
 type XineramaScreenInfo struct {
diff --git a/nexgb/auto_xinput.go b/nexgb/auto_xinput.go
index 7305d2d..ddcb170 100644
--- a/nexgb/auto_xinput.go
+++ b/nexgb/auto_xinput.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xinput.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xinput.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,16 +37,6 @@ func init() {
 	newExtErrorFuncs["XInputExtension"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Bool'
-
-// 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'
@@ -63,6 +53,16 @@ func init() {
 
 // Skipping definition for base type 'Double'
 
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Id'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
 const (
 	XinputValuatorModeRelative = 0
 	XinputValuatorModeAbsolute = 1
diff --git a/nexgb/auto_xprint.go b/nexgb/auto_xprint.go
index 9bb8ea7..981ca17 100644
--- a/nexgb/auto_xprint.go
+++ b/nexgb/auto_xprint.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xprint.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xprint.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,16 @@ func init() {
 	newExtErrorFuncs["XpExtension"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
 // Skipping definition for base type 'Float'
 
 // Skipping definition for base type 'Id'
@@ -53,16 +63,6 @@ func init() {
 
 // Skipping definition for base type 'Int8'
 
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
 const (
 	XprintGetDocFinished       = 0
 	XprintGetDocSecondConsumer = 1
diff --git a/nexgb/auto_xproto.go b/nexgb/auto_xproto.go
index 20152c8..e826249 100644
--- a/nexgb/auto_xproto.go
+++ b/nexgb/auto_xproto.go
@@ -1,10 +1,12 @@
 package xgb
 
 /*
-	This file was generated by xproto.xml on May 7 2012 9:17:57pm EDT.
+	This file was generated by xproto.xml on May 7 2012 11:34:26pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
+// Skipping definition for base type 'Int8'
+
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -29,8 +31,6 @@ package xgb
 
 // Skipping definition for base type 'Byte'
 
-// Skipping definition for base type 'Int8'
-
 const (
 	VisualClassStaticGray  = 0
 	VisualClassGrayScale   = 1
diff --git a/nexgb/auto_xselinux.go b/nexgb/auto_xselinux.go
index a51346a..c0944aa 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 7 2012 9:17:58pm EDT.
+	This file was generated by xselinux.xml on May 7 2012 11:34:27pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,8 +37,6 @@ func init() {
 	newExtErrorFuncs["SELinux"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Id'
-
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -63,6 +61,8 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Id'
+
 // 'XselinuxListItem' struct definition
 // Size: ((12 + pad((int(ObjectContextLen) * 1))) + pad((int(DataContextLen) * 1)))
 type XselinuxListItem struct {
diff --git a/nexgb/auto_xtest.go b/nexgb/auto_xtest.go
index 8a43878..616f651 100644
--- a/nexgb/auto_xtest.go
+++ b/nexgb/auto_xtest.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xtest.xml on May 7 2012 9:17:58pm EDT.
+	This file was generated by xtest.xml on May 7 2012 11:34:27pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,6 +37,14 @@ func init() {
 	newExtErrorFuncs["XTEST"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
 // Skipping definition for base type 'Float'
 
 // Skipping definition for base type 'Id'
@@ -55,14 +63,6 @@ func init() {
 
 // Skipping definition for base type 'Card16'
 
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
 const (
 	XtestCursorNone    = 0
 	XtestCursorCurrent = 1
diff --git a/nexgb/auto_xv.go b/nexgb/auto_xv.go
index dc2826b..e67db8d 100644
--- a/nexgb/auto_xv.go
+++ b/nexgb/auto_xv.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xv.xml on May 7 2012 9:17:58pm EDT.
+	This file was generated by xv.xml on May 7 2012 11:34:27pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/auto_xvmc.go b/nexgb/auto_xvmc.go
index 9c53a59..2310f20 100644
--- a/nexgb/auto_xvmc.go
+++ b/nexgb/auto_xvmc.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by xvmc.xml on May 7 2012 9:17:58pm EDT.
+	This file was generated by xvmc.xml on May 7 2012 11:34:27pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,12 +37,6 @@ func init() {
 	newExtErrorFuncs["XVideo-MotionCompensation"] = make(map[int]newErrorFun)
 }
 
-// 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'
@@ -63,6 +57,12 @@ func init() {
 
 // 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 resource definition of 'Context'
 
 // Skipping resource definition of 'Surface'
diff --git a/nexgb/conn.go b/nexgb/conn.go
index 02396d4..af78be9 100644
--- a/nexgb/conn.go
+++ b/nexgb/conn.go
@@ -26,8 +26,8 @@ func (c *Conn) connect(display string) error {
 	authName, authData, err := readAuthority(c.host, c.display)
 	noauth := false
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Could not get authority info: %v\n", err)
-		fmt.Fprintf(os.Stderr, "Trying connection without authority info...\n")
+		logger.Printf("Could not get authority info: %v", err)
+		logger.Println("Trying connection without authority info...")
 		authName = ""
 		authData = []byte{}
 		noauth = true
@@ -63,8 +63,7 @@ func (c *Conn) connect(display string) error {
 	dataLen := Get16(head[6:])
 
 	if major != 11 || minor != 0 {
-		return errors.New(fmt.Sprintf("x protocol version mismatch: %d.%d",
-			major, minor))
+		return fmt.Errorf("x protocol version mismatch: %d.%d", major, minor)
 	}
 
 	buf = make([]byte, int(dataLen)*4+8, int(dataLen)*4+8)
@@ -75,8 +74,8 @@ func (c *Conn) connect(display string) error {
 
 	if code == 0 {
 		reason := buf[8 : 8+reasonLen]
-		return errors.New(fmt.Sprintf("x protocol authentication refused: %s",
-			string(reason)))
+		return fmt.Errorf("x protocol authentication refused: %s",
+			string(reason))
 	}
 
 	ReadSetupInfo(buf, &c.Setup)
diff --git a/nexgb/xgb.go b/nexgb/xgb.go
index e5f4b1f..b2bf84b 100644
--- a/nexgb/xgb.go
+++ b/nexgb/xgb.go
@@ -5,13 +5,11 @@ import (
 	"io"
 	"log"
 	"net"
+	"os"
 	"sync"
 )
 
-func init() {
-	log.SetFlags(0)
-	log.SetPrefix("XGB:")
-}
+var logger = log.New(os.Stderr, "XGB: ", 0)
 
 const (
 	// cookieBuffer represents the queue size of cookies existing at any
@@ -283,8 +281,8 @@ func (c *Conn) sendRequests() {
 // writeBuffer is a convenience function for writing a byte slice to the wire.
 func (c *Conn) writeBuffer(buf []byte) {
 	if _, err := c.conn.Write(buf); err != nil {
-		log.Printf("Write error: %s", err)
-		log.Fatal("A write error is unrecoverable. Exiting...")
+		logger.Printf("Write error: %s", err)
+		logger.Fatal("A write error is unrecoverable. Exiting...")
 	}
 }
 
@@ -310,8 +308,8 @@ func (c *Conn) readResponses() {
 		err, event, seq = nil, nil, 0
 
 		if _, err := io.ReadFull(c.conn, buf); err != nil {
-			log.Printf("Read error: %s", err)
-			log.Fatal("A read error is unrecoverable. Exiting...")
+			logger.Printf("Read error: %s", err)
+			logger.Fatal("A read error is unrecoverable. Exiting...")
 		}
 
 		switch buf[0] {
@@ -320,7 +318,7 @@ func (c *Conn) readResponses() {
 			// generated) by looking it up by the error number.
 			newErrFun, ok := newErrorFuncs[int(buf[1])]
 			if !ok {
-				log.Printf("BUG: Could not find error constructor function "+
+				logger.Printf("BUG: Could not find error constructor function "+
 					"for error with number %d.", buf[1])
 				continue
 			}
@@ -339,8 +337,8 @@ func (c *Conn) readResponses() {
 				biggerBuf := make([]byte, byteCount)
 				copy(biggerBuf[:32], buf)
 				if _, err := io.ReadFull(c.conn, biggerBuf[32:]); err != nil {
-					log.Printf("Read error: %s", err)
-					log.Fatal("A read error is unrecoverable. Exiting...")
+					logger.Printf("Read error: %s", err)
+					logger.Fatal("A read error is unrecoverable. Exiting...")
 				}
 				replyBytes = biggerBuf
 			} else {
@@ -357,7 +355,7 @@ func (c *Conn) readResponses() {
 			evNum := int(buf[0] & 127)
 			newEventFun, ok := newEventFuncs[evNum]
 			if !ok {
-				log.Printf("BUG: Could not find event construct function "+
+				logger.Printf("BUG: Could not find event construct function "+
 					"for event with number %d.", evNum)
 				continue
 			}
@@ -404,8 +402,8 @@ func (c *Conn) readResponses() {
 					}
 				} else { // this is a reply
 					if cookie.replyChan == nil {
-						log.Printf("Reply with sequence id %d does not have a "+
-							"cookie with a valid reply channel.", seq)
+						logger.Printf("Reply with sequence id %d does not "+
+							"have a cookie with a valid reply channel.", seq)
 						continue
 					} else {
 						cookie.replyChan <- replyBytes
@@ -417,12 +415,12 @@ func (c *Conn) readResponses() {
 			switch {
 			// Checked requests with replies
 			case cookie.replyChan != nil && cookie.errorChan != nil:
-				log.Printf("Found cookie with sequence id %d that is "+
+				logger.Printf("Found cookie with sequence id %d that is "+
 					"expecting a reply but will never get it. Currently "+
 					"on sequence number %d", cookie.Sequence, seq)
 			// Unchecked requests with replies
 			case cookie.replyChan != nil && cookie.pingChan != nil:
-				log.Printf("Found cookie with sequence id %d that is "+
+				logger.Printf("Found cookie with sequence id %d that is "+
 					"expecting a reply (and not an error) but will never "+
 					"get it. Currently on sequence number %d",
 					cookie.Sequence, seq)
@@ -445,7 +443,7 @@ func processEventOrError(everr eventOrError) (Event, Error) {
 	case Error:
 		return nil, ee
 	default:
-		log.Printf("Invalid event/error type: %T", everr)
+		logger.Printf("Invalid event/error type: %T", everr)
 		return nil, nil
 	}
 	panic("unreachable")