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_glx.go | 58 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'nexgb/auto_glx.go') diff --git a/nexgb/auto_glx.go b/nexgb/auto_glx.go index 1b88e6c..67c79d7 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 6 2012 5:48:47pm EDT. + This file was generated by glx.xml on May 7 2012 9:17:56pm EDT. This file is automatically generated. Edit at your peril! */ @@ -16,7 +16,7 @@ func (c *Conn) GlxInit() error { case err != nil: return err case !reply.Present: - return newError("No extension named GLX could be found on on the server.") + return errorf("No extension named GLX could be found on on the server.") } c.extLock.Lock() @@ -24,6 +24,9 @@ func (c *Conn) GlxInit() error { for evNum, fun := range newExtEventFuncs["GLX"] { newEventFuncs[int(reply.FirstEvent)+evNum] = fun } + for errNum, fun := range newExtErrorFuncs["GLX"] { + newErrorFuncs[int(reply.FirstError)+errNum] = fun + } c.extLock.Unlock() return nil @@ -31,8 +34,19 @@ func (c *Conn) GlxInit() error { func init() { newExtEventFuncs["GLX"] = make(map[int]newEventFun) + newExtErrorFuncs["GLX"] = 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' @@ -49,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 ( GlxPbcetDamaged = 32791 GlxPbcetSaved = 32792 @@ -319,7 +323,7 @@ func (err GlxGenericError) Error() string { } func init() { - newErrorFuncs[-1] = NewGlxGenericError + newExtErrorFuncs["GLX"][-1] = NewGlxGenericError } // ErrorCopy definition GlxBadContext (0) @@ -355,7 +359,7 @@ func (err GlxBadContextError) Error() string { } func init() { - newErrorFuncs[0] = NewGlxBadContextError + newExtErrorFuncs["GLX"][0] = NewGlxBadContextError } // ErrorCopy definition GlxBadContextState (1) @@ -391,7 +395,7 @@ func (err GlxBadContextStateError) Error() string { } func init() { - newErrorFuncs[1] = NewGlxBadContextStateError + newExtErrorFuncs["GLX"][1] = NewGlxBadContextStateError } // ErrorCopy definition GlxBadDrawable (2) @@ -427,7 +431,7 @@ func (err GlxBadDrawableError) Error() string { } func init() { - newErrorFuncs[2] = NewGlxBadDrawableError + newExtErrorFuncs["GLX"][2] = NewGlxBadDrawableError } // ErrorCopy definition GlxBadPixmap (3) @@ -463,7 +467,7 @@ func (err GlxBadPixmapError) Error() string { } func init() { - newErrorFuncs[3] = NewGlxBadPixmapError + newExtErrorFuncs["GLX"][3] = NewGlxBadPixmapError } // ErrorCopy definition GlxBadContextTag (4) @@ -499,7 +503,7 @@ func (err GlxBadContextTagError) Error() string { } func init() { - newErrorFuncs[4] = NewGlxBadContextTagError + newExtErrorFuncs["GLX"][4] = NewGlxBadContextTagError } // ErrorCopy definition GlxBadCurrentWindow (5) @@ -535,7 +539,7 @@ func (err GlxBadCurrentWindowError) Error() string { } func init() { - newErrorFuncs[5] = NewGlxBadCurrentWindowError + newExtErrorFuncs["GLX"][5] = NewGlxBadCurrentWindowError } // ErrorCopy definition GlxBadRenderRequest (6) @@ -571,7 +575,7 @@ func (err GlxBadRenderRequestError) Error() string { } func init() { - newErrorFuncs[6] = NewGlxBadRenderRequestError + newExtErrorFuncs["GLX"][6] = NewGlxBadRenderRequestError } // ErrorCopy definition GlxBadLargeRequest (7) @@ -607,7 +611,7 @@ func (err GlxBadLargeRequestError) Error() string { } func init() { - newErrorFuncs[7] = NewGlxBadLargeRequestError + newExtErrorFuncs["GLX"][7] = NewGlxBadLargeRequestError } // ErrorCopy definition GlxUnsupportedPrivateRequest (8) @@ -643,7 +647,7 @@ func (err GlxUnsupportedPrivateRequestError) Error() string { } func init() { - newErrorFuncs[8] = NewGlxUnsupportedPrivateRequestError + newExtErrorFuncs["GLX"][8] = NewGlxUnsupportedPrivateRequestError } // ErrorCopy definition GlxBadFBConfig (9) @@ -679,7 +683,7 @@ func (err GlxBadFBConfigError) Error() string { } func init() { - newErrorFuncs[9] = NewGlxBadFBConfigError + newExtErrorFuncs["GLX"][9] = NewGlxBadFBConfigError } // ErrorCopy definition GlxBadPbuffer (10) @@ -715,7 +719,7 @@ func (err GlxBadPbufferError) Error() string { } func init() { - newErrorFuncs[10] = NewGlxBadPbufferError + newExtErrorFuncs["GLX"][10] = NewGlxBadPbufferError } // ErrorCopy definition GlxBadCurrentDrawable (11) @@ -751,7 +755,7 @@ func (err GlxBadCurrentDrawableError) Error() string { } func init() { - newErrorFuncs[11] = NewGlxBadCurrentDrawableError + newExtErrorFuncs["GLX"][11] = NewGlxBadCurrentDrawableError } // ErrorCopy definition GlxBadWindow (12) @@ -787,7 +791,7 @@ func (err GlxBadWindowError) Error() string { } func init() { - newErrorFuncs[12] = NewGlxBadWindowError + newExtErrorFuncs["GLX"][12] = NewGlxBadWindowError } // ErrorCopy definition GlxGLXBadProfileARB (13) @@ -823,7 +827,7 @@ func (err GlxGLXBadProfileARBError) Error() string { } func init() { - newErrorFuncs[13] = NewGlxGLXBadProfileARBError + newExtErrorFuncs["GLX"][13] = NewGlxGLXBadProfileARBError } // Request GlxRender -- cgit v1.2.3-54-g00ecf