p/haven
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Gallant (Ocelot) 2012-05-08 00:27:00 -04:00
parent e256da00b1
commit 62b293c937
30 changed files with 218 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nexgb/auto_bigreq.go
View File

@ -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 {

14
nexgb/auto_composite.go
View File

@ -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

18
nexgb/auto_damage.go
View File

@ -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

2
nexgb/auto_dpms.go
View File

@ -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!
*/

2
nexgb/auto_dri2.go
View File

@ -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!
*/

6
nexgb/auto_ge.go
View File

@ -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 {

18
nexgb/auto_glx.go
View File

@ -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

18
nexgb/auto_randr.go
View File

@ -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

22
nexgb/auto_record.go
View File

@ -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

6
nexgb/auto_render.go
View File

@ -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

26
nexgb/auto_res.go
View File

@ -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 {

18
nexgb/auto_screensaver.go
View File

@ -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

14
nexgb/auto_shape.go
View File

@ -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

22
nexgb/auto_shm.go
View File

@ -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)

6
nexgb/auto_sync.go
View File

@ -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

22
nexgb/auto_xc_misc.go
View File

@ -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 {

18
nexgb/auto_xevie.go
View File

@ -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

14
nexgb/auto_xf86dri.go
View File

@ -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 {

26
nexgb/auto_xf86vidmode.go
View File

@ -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

14
nexgb/auto_xfixes.go
View File

@ -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

14
nexgb/auto_xinerama.go
View File

@ -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 {

22
nexgb/auto_xinput.go
View File

@ -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

22
nexgb/auto_xprint.go
View File

@ -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

6
nexgb/auto_xproto.go
View File

@ -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

6
nexgb/auto_xselinux.go
View File

@ -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 {

18
nexgb/auto_xtest.go
View File

@ -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

2
nexgb/auto_xv.go
View File

@ -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!
*/

14
nexgb/auto_xvmc.go
View File

@ -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'

11
nexgb/conn.go
View File

@ -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)

32
nexgb/xgb.go
View File

@ -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")