From 13d598e5e7f26bc6177ae3f7d52f4f19729ab2f3 Mon Sep 17 00:00:00 2001 From: "Andrew Gallant (Ocelot)" Date: Mon, 7 May 2012 21:58:33 -0400 Subject: more clean up. use log instead of fmt.Print to stderr. bug fix for event blocking (a hack fix for now). --- nexgb/auto_xf86vidmode.go | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'nexgb/auto_xf86vidmode.go') diff --git a/nexgb/auto_xf86vidmode.go b/nexgb/auto_xf86vidmode.go index 649244d..d44105d 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 6 2012 5:48:47pm EDT. + This file was generated by xf86vidmode.xml on May 7 2012 9:17:57pm EDT. This file is automatically generated. Edit at your peril! */ @@ -12,7 +12,7 @@ func (c *Conn) Xf86vidmodeInit() error { case err != nil: return err case !reply.Present: - return newError("No extension named XFree86-VidModeExtension could be found on on the server.") + return errorf("No extension named XFree86-VidModeExtension could be found on on the server.") } c.extLock.Lock() @@ -20,6 +20,9 @@ func (c *Conn) Xf86vidmodeInit() error { for evNum, fun := range newExtEventFuncs["XFree86-VidModeExtension"] { newEventFuncs[int(reply.FirstEvent)+evNum] = fun } + for errNum, fun := range newExtErrorFuncs["XFree86-VidModeExtension"] { + newErrorFuncs[int(reply.FirstError)+errNum] = fun + } c.extLock.Unlock() return nil @@ -27,18 +30,9 @@ func (c *Conn) Xf86vidmodeInit() error { func init() { newExtEventFuncs["XFree86-VidModeExtension"] = make(map[int]newEventFun) + newExtErrorFuncs["XFree86-VidModeExtension"] = 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' // Skipping definition for base type 'Card8' @@ -55,6 +49,16 @@ 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' + +// Skipping definition for base type 'Float' + const ( Xf86vidmodeModeFlagPositiveHsync = 1 Xf86vidmodeModeFlagNegativeHsync = 2 @@ -262,7 +266,7 @@ func (err Xf86vidmodeBadClockError) Error() string { } func init() { - newErrorFuncs[0] = NewXf86vidmodeBadClockError + newExtErrorFuncs["XFree86-VidModeExtension"][0] = NewXf86vidmodeBadClockError } // Error definition Xf86vidmodeBadHTimings (1) @@ -307,7 +311,7 @@ func (err Xf86vidmodeBadHTimingsError) Error() string { } func init() { - newErrorFuncs[1] = NewXf86vidmodeBadHTimingsError + newExtErrorFuncs["XFree86-VidModeExtension"][1] = NewXf86vidmodeBadHTimingsError } // Error definition Xf86vidmodeBadVTimings (2) @@ -352,7 +356,7 @@ func (err Xf86vidmodeBadVTimingsError) Error() string { } func init() { - newErrorFuncs[2] = NewXf86vidmodeBadVTimingsError + newExtErrorFuncs["XFree86-VidModeExtension"][2] = NewXf86vidmodeBadVTimingsError } // Error definition Xf86vidmodeModeUnsuitable (3) @@ -397,7 +401,7 @@ func (err Xf86vidmodeModeUnsuitableError) Error() string { } func init() { - newErrorFuncs[3] = NewXf86vidmodeModeUnsuitableError + newExtErrorFuncs["XFree86-VidModeExtension"][3] = NewXf86vidmodeModeUnsuitableError } // Error definition Xf86vidmodeExtensionDisabled (4) @@ -442,7 +446,7 @@ func (err Xf86vidmodeExtensionDisabledError) Error() string { } func init() { - newErrorFuncs[4] = NewXf86vidmodeExtensionDisabledError + newExtErrorFuncs["XFree86-VidModeExtension"][4] = NewXf86vidmodeExtensionDisabledError } // Error definition Xf86vidmodeClientNotLocal (5) @@ -487,7 +491,7 @@ func (err Xf86vidmodeClientNotLocalError) Error() string { } func init() { - newErrorFuncs[5] = NewXf86vidmodeClientNotLocalError + newExtErrorFuncs["XFree86-VidModeExtension"][5] = NewXf86vidmodeClientNotLocalError } // Error definition Xf86vidmodeZoomLocked (6) @@ -532,7 +536,7 @@ func (err Xf86vidmodeZoomLockedError) Error() string { } func init() { - newErrorFuncs[6] = NewXf86vidmodeZoomLockedError + newExtErrorFuncs["XFree86-VidModeExtension"][6] = NewXf86vidmodeZoomLockedError } // Request Xf86vidmodeQueryVersion -- cgit v1.2.3-54-g00ecf