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_xinput.go | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'nexgb/auto_xinput.go') diff --git a/nexgb/auto_xinput.go b/nexgb/auto_xinput.go index ae122b8..7305d2d 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 6 2012 5:48:48pm EDT. + This file was generated by xinput.xml on May 7 2012 9:17:57pm EDT. This file is automatically generated. Edit at your peril! */ @@ -16,7 +16,7 @@ func (c *Conn) XinputInit() error { case err != nil: return err case !reply.Present: - return newError("No extension named XInputExtension could be found on on the server.") + return errorf("No extension named XInputExtension could be found on on the server.") } c.extLock.Lock() @@ -24,6 +24,9 @@ func (c *Conn) XinputInit() error { for evNum, fun := range newExtEventFuncs["XInputExtension"] { newEventFuncs[int(reply.FirstEvent)+evNum] = fun } + for errNum, fun := range newExtErrorFuncs["XInputExtension"] { + newErrorFuncs[int(reply.FirstError)+errNum] = fun + } c.extLock.Unlock() return nil @@ -31,18 +34,9 @@ func (c *Conn) XinputInit() error { func init() { newExtEventFuncs["XInputExtension"] = make(map[int]newEventFun) + newExtErrorFuncs["XInputExtension"] = 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' - // Skipping definition for base type 'Bool' // Skipping definition for base type 'Float' @@ -59,6 +53,16 @@ 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' + +// Skipping definition for base type 'Card32' + +// Skipping definition for base type 'Double' + const ( XinputValuatorModeRelative = 0 XinputValuatorModeAbsolute = 1 @@ -4443,7 +4447,7 @@ func (err XinputDeviceError) Error() string { } func init() { - newErrorFuncs[0] = NewXinputDeviceError + newExtErrorFuncs["XInputExtension"][0] = NewXinputDeviceError } // Error definition XinputEvent (1) @@ -4488,7 +4492,7 @@ func (err XinputEventError) Error() string { } func init() { - newErrorFuncs[1] = NewXinputEventError + newExtErrorFuncs["XInputExtension"][1] = NewXinputEventError } // Error definition XinputMode (2) @@ -4533,7 +4537,7 @@ func (err XinputModeError) Error() string { } func init() { - newErrorFuncs[2] = NewXinputModeError + newExtErrorFuncs["XInputExtension"][2] = NewXinputModeError } // Error definition XinputDeviceBusy (3) @@ -4578,7 +4582,7 @@ func (err XinputDeviceBusyError) Error() string { } func init() { - newErrorFuncs[3] = NewXinputDeviceBusyError + newExtErrorFuncs["XInputExtension"][3] = NewXinputDeviceBusyError } // Error definition XinputClass (4) @@ -4623,7 +4627,7 @@ func (err XinputClassError) Error() string { } func init() { - newErrorFuncs[4] = NewXinputClassError + newExtErrorFuncs["XInputExtension"][4] = NewXinputClassError } // Request XinputGetExtensionVersion -- cgit v1.2.3-54-g00ecf