From e239bb3c68a4981a3916534203c2fbd6b96f593c Mon Sep 17 00:00:00 2001 From: "Andrew Gallant (Ocelot)" Date: Thu, 10 May 2012 12:47:19 -0400 Subject: make resource ids their own individual types. last commit before overhaul to sub-packages --- nexgb/auto_xinput.go | 112 +++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 57 deletions(-) (limited to 'nexgb/auto_xinput.go') diff --git a/nexgb/auto_xinput.go b/nexgb/auto_xinput.go index a15c426..78142b6 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 8 2012 11:03:24pm EDT. + This file was generated by xinput.xml on May 10 2012 12:39:34pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,10 @@ func init() { newExtErrorFuncs["XInputExtension"] = 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' @@ -55,14 +59,8 @@ 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 ( XinputValuatorModeRelative = 0 XinputValuatorModeAbsolute = 1 @@ -116,7 +114,7 @@ type XinputEventClass uint32 // 'XinputDeviceInfo' struct definition // Size: 8 type XinputDeviceInfo struct { - DeviceType Id + DeviceType Atom DeviceId byte NumClassInfo byte DeviceUse byte @@ -127,7 +125,7 @@ type XinputDeviceInfo struct { func ReadXinputDeviceInfo(buf []byte, v *XinputDeviceInfo) int { b := 0 - v.DeviceType = Id(Get32(buf[b:])) + v.DeviceType = Atom(Get32(buf[b:])) b += 4 v.DeviceId = buf[b] @@ -3347,9 +3345,9 @@ type XinputDeviceKeyPressEvent struct { Sequence uint16 Detail byte Time Timestamp - Root Id - Event Id - Child Id + Root Window + Event Window + Child Window RootX int16 RootY int16 EventX int16 @@ -3373,13 +3371,13 @@ func NewXinputDeviceKeyPressEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Root = Id(Get32(buf[b:])) + v.Root = Window(Get32(buf[b:])) b += 4 - v.Event = Id(Get32(buf[b:])) + v.Event = Window(Get32(buf[b:])) b += 4 - v.Child = Id(Get32(buf[b:])) + v.Child = Window(Get32(buf[b:])) b += 4 v.RootX = int16(Get16(buf[b:])) @@ -3501,7 +3499,7 @@ type XinputFocusInEvent struct { Sequence uint16 Detail byte Time Timestamp - Window Id + Window Window Mode byte DeviceId byte // padding: 18 bytes @@ -3521,7 +3519,7 @@ func NewXinputFocusInEvent(buf []byte) Event { v.Time = Timestamp(Get32(buf[b:])) b += 4 - v.Window = Id(Get32(buf[b:])) + v.Window = Window(Get32(buf[b:])) b += 4 v.Mode = buf[b] @@ -4435,7 +4433,7 @@ func (err XinputDeviceError) SequenceId() uint16 { return err.Sequence } -func (err XinputDeviceError) BadId() Id { +func (err XinputDeviceError) BadId() uint32 { return 0 } @@ -4480,7 +4478,7 @@ func (err XinputEventError) SequenceId() uint16 { return err.Sequence } -func (err XinputEventError) BadId() Id { +func (err XinputEventError) BadId() uint32 { return 0 } @@ -4525,7 +4523,7 @@ func (err XinputModeError) SequenceId() uint16 { return err.Sequence } -func (err XinputModeError) BadId() Id { +func (err XinputModeError) BadId() uint32 { return 0 } @@ -4570,7 +4568,7 @@ func (err XinputDeviceBusyError) SequenceId() uint16 { return err.Sequence } -func (err XinputDeviceBusyError) BadId() Id { +func (err XinputDeviceBusyError) BadId() uint32 { return 0 } @@ -4615,7 +4613,7 @@ func (err XinputClassError) SequenceId() uint16 { return err.Sequence } -func (err XinputClassError) BadId() Id { +func (err XinputClassError) BadId() uint32 { return 0 } @@ -5056,13 +5054,13 @@ type XinputSelectExtensionEventCookie struct { } // Write request to wire for XinputSelectExtensionEvent -func (c *Conn) XinputSelectExtensionEvent(Window Id, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { +func (c *Conn) XinputSelectExtensionEvent(Window Window, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputSelectExtensionEventRequest(Window, NumClasses, Classes), cookie) return XinputSelectExtensionEventCookie{cookie} } -func (c *Conn) XinputSelectExtensionEventChecked(Window Id, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { +func (c *Conn) XinputSelectExtensionEventChecked(Window Window, NumClasses uint16, Classes []XinputEventClass) XinputSelectExtensionEventCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputSelectExtensionEventRequest(Window, NumClasses, Classes), cookie) return XinputSelectExtensionEventCookie{cookie} @@ -5073,7 +5071,7 @@ func (cook XinputSelectExtensionEventCookie) Check() error { } // Write request to wire for XinputSelectExtensionEvent -func (c *Conn) xinputSelectExtensionEventRequest(Window Id, NumClasses uint16, Classes []XinputEventClass) []byte { +func (c *Conn) xinputSelectExtensionEventRequest(Window Window, NumClasses uint16, Classes []XinputEventClass) []byte { size := pad((12 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5110,13 +5108,13 @@ type XinputGetSelectedExtensionEventsCookie struct { *cookie } -func (c *Conn) XinputGetSelectedExtensionEvents(Window Id) XinputGetSelectedExtensionEventsCookie { +func (c *Conn) XinputGetSelectedExtensionEvents(Window Window) XinputGetSelectedExtensionEventsCookie { cookie := c.newCookie(true, true) c.newRequest(c.xinputGetSelectedExtensionEventsRequest(Window), cookie) return XinputGetSelectedExtensionEventsCookie{cookie} } -func (c *Conn) XinputGetSelectedExtensionEventsUnchecked(Window Id) XinputGetSelectedExtensionEventsCookie { +func (c *Conn) XinputGetSelectedExtensionEventsUnchecked(Window Window) XinputGetSelectedExtensionEventsCookie { cookie := c.newCookie(false, true) c.newRequest(c.xinputGetSelectedExtensionEventsRequest(Window), cookie) return XinputGetSelectedExtensionEventsCookie{cookie} @@ -5190,7 +5188,7 @@ func (cook XinputGetSelectedExtensionEventsCookie) Check() error { } // Write request to wire for XinputGetSelectedExtensionEvents -func (c *Conn) xinputGetSelectedExtensionEventsRequest(Window Id) []byte { +func (c *Conn) xinputGetSelectedExtensionEventsRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -5217,13 +5215,13 @@ type XinputChangeDeviceDontPropagateListCookie struct { } // Write request to wire for XinputChangeDeviceDontPropagateList -func (c *Conn) XinputChangeDeviceDontPropagateList(Window Id, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { +func (c *Conn) XinputChangeDeviceDontPropagateList(Window Window, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputChangeDeviceDontPropagateListRequest(Window, NumClasses, Mode, Classes), cookie) return XinputChangeDeviceDontPropagateListCookie{cookie} } -func (c *Conn) XinputChangeDeviceDontPropagateListChecked(Window Id, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { +func (c *Conn) XinputChangeDeviceDontPropagateListChecked(Window Window, NumClasses uint16, Mode byte, Classes []XinputEventClass) XinputChangeDeviceDontPropagateListCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputChangeDeviceDontPropagateListRequest(Window, NumClasses, Mode, Classes), cookie) return XinputChangeDeviceDontPropagateListCookie{cookie} @@ -5234,7 +5232,7 @@ func (cook XinputChangeDeviceDontPropagateListCookie) Check() error { } // Write request to wire for XinputChangeDeviceDontPropagateList -func (c *Conn) xinputChangeDeviceDontPropagateListRequest(Window Id, NumClasses uint16, Mode byte, Classes []XinputEventClass) []byte { +func (c *Conn) xinputChangeDeviceDontPropagateListRequest(Window Window, NumClasses uint16, Mode byte, Classes []XinputEventClass) []byte { size := pad((12 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5274,13 +5272,13 @@ type XinputGetDeviceDontPropagateListCookie struct { *cookie } -func (c *Conn) XinputGetDeviceDontPropagateList(Window Id) XinputGetDeviceDontPropagateListCookie { +func (c *Conn) XinputGetDeviceDontPropagateList(Window Window) XinputGetDeviceDontPropagateListCookie { cookie := c.newCookie(true, true) c.newRequest(c.xinputGetDeviceDontPropagateListRequest(Window), cookie) return XinputGetDeviceDontPropagateListCookie{cookie} } -func (c *Conn) XinputGetDeviceDontPropagateListUnchecked(Window Id) XinputGetDeviceDontPropagateListCookie { +func (c *Conn) XinputGetDeviceDontPropagateListUnchecked(Window Window) XinputGetDeviceDontPropagateListCookie { cookie := c.newCookie(false, true) c.newRequest(c.xinputGetDeviceDontPropagateListRequest(Window), cookie) return XinputGetDeviceDontPropagateListCookie{cookie} @@ -5342,7 +5340,7 @@ func (cook XinputGetDeviceDontPropagateListCookie) Check() error { } // Write request to wire for XinputGetDeviceDontPropagateList -func (c *Conn) xinputGetDeviceDontPropagateListRequest(Window Id) []byte { +func (c *Conn) xinputGetDeviceDontPropagateListRequest(Window Window) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -5650,13 +5648,13 @@ type XinputGrabDeviceCookie struct { *cookie } -func (c *Conn) XinputGrabDevice(GrabWindow Id, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { +func (c *Conn) XinputGrabDevice(GrabWindow Window, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { cookie := c.newCookie(true, true) c.newRequest(c.xinputGrabDeviceRequest(GrabWindow, Time, NumClasses, ThisDeviceMode, OtherDeviceMode, OwnerEvents, DeviceId, Classes), cookie) return XinputGrabDeviceCookie{cookie} } -func (c *Conn) XinputGrabDeviceUnchecked(GrabWindow Id, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { +func (c *Conn) XinputGrabDeviceUnchecked(GrabWindow Window, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) XinputGrabDeviceCookie { cookie := c.newCookie(false, true) c.newRequest(c.xinputGrabDeviceRequest(GrabWindow, Time, NumClasses, ThisDeviceMode, OtherDeviceMode, OwnerEvents, DeviceId, Classes), cookie) return XinputGrabDeviceCookie{cookie} @@ -5710,7 +5708,7 @@ func (cook XinputGrabDeviceCookie) Check() error { } // Write request to wire for XinputGrabDevice -func (c *Conn) xinputGrabDeviceRequest(GrabWindow Id, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) []byte { +func (c *Conn) xinputGrabDeviceRequest(GrabWindow Window, Time Timestamp, NumClasses uint16, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, DeviceId byte, Classes []XinputEventClass) []byte { size := pad((20 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5814,13 +5812,13 @@ type XinputGrabDeviceKeyCookie struct { } // Write request to wire for XinputGrabDeviceKey -func (c *Conn) XinputGrabDeviceKey(GrabWindow Id, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { +func (c *Conn) XinputGrabDeviceKey(GrabWindow Window, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputGrabDeviceKeyRequest(GrabWindow, NumClasses, Modifiers, ModifierDevice, GrabbedDevice, Key, ThisDeviceMode, OtherDeviceMode, OwnerEvents, Classes), cookie) return XinputGrabDeviceKeyCookie{cookie} } -func (c *Conn) XinputGrabDeviceKeyChecked(GrabWindow Id, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { +func (c *Conn) XinputGrabDeviceKeyChecked(GrabWindow Window, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) XinputGrabDeviceKeyCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputGrabDeviceKeyRequest(GrabWindow, NumClasses, Modifiers, ModifierDevice, GrabbedDevice, Key, ThisDeviceMode, OtherDeviceMode, OwnerEvents, Classes), cookie) return XinputGrabDeviceKeyCookie{cookie} @@ -5831,7 +5829,7 @@ func (cook XinputGrabDeviceKeyCookie) Check() error { } // Write request to wire for XinputGrabDeviceKey -func (c *Conn) xinputGrabDeviceKeyRequest(GrabWindow Id, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) []byte { +func (c *Conn) xinputGrabDeviceKeyRequest(GrabWindow Window, NumClasses uint16, Modifiers uint16, ModifierDevice byte, GrabbedDevice byte, Key byte, ThisDeviceMode byte, OtherDeviceMode byte, OwnerEvents bool, Classes []XinputEventClass) []byte { size := pad((20 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -5894,13 +5892,13 @@ type XinputUngrabDeviceKeyCookie struct { } // Write request to wire for XinputUngrabDeviceKey -func (c *Conn) XinputUngrabDeviceKey(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { +func (c *Conn) XinputUngrabDeviceKey(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputUngrabDeviceKeyRequest(GrabWindow, Modifiers, ModifierDevice, Key, GrabbedDevice), cookie) return XinputUngrabDeviceKeyCookie{cookie} } -func (c *Conn) XinputUngrabDeviceKeyChecked(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { +func (c *Conn) XinputUngrabDeviceKeyChecked(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) XinputUngrabDeviceKeyCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputUngrabDeviceKeyRequest(GrabWindow, Modifiers, ModifierDevice, Key, GrabbedDevice), cookie) return XinputUngrabDeviceKeyCookie{cookie} @@ -5911,7 +5909,7 @@ func (cook XinputUngrabDeviceKeyCookie) Check() error { } // Write request to wire for XinputUngrabDeviceKey -func (c *Conn) xinputUngrabDeviceKeyRequest(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) []byte { +func (c *Conn) xinputUngrabDeviceKeyRequest(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Key byte, GrabbedDevice byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -5950,13 +5948,13 @@ type XinputGrabDeviceButtonCookie struct { } // Write request to wire for XinputGrabDeviceButton -func (c *Conn) XinputGrabDeviceButton(GrabWindow Id, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { +func (c *Conn) XinputGrabDeviceButton(GrabWindow Window, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputGrabDeviceButtonRequest(GrabWindow, GrabbedDevice, ModifierDevice, NumClasses, Modifiers, ThisDeviceMode, OtherDeviceMode, Button, OwnerEvents, Classes), cookie) return XinputGrabDeviceButtonCookie{cookie} } -func (c *Conn) XinputGrabDeviceButtonChecked(GrabWindow Id, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { +func (c *Conn) XinputGrabDeviceButtonChecked(GrabWindow Window, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) XinputGrabDeviceButtonCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputGrabDeviceButtonRequest(GrabWindow, GrabbedDevice, ModifierDevice, NumClasses, Modifiers, ThisDeviceMode, OtherDeviceMode, Button, OwnerEvents, Classes), cookie) return XinputGrabDeviceButtonCookie{cookie} @@ -5967,7 +5965,7 @@ func (cook XinputGrabDeviceButtonCookie) Check() error { } // Write request to wire for XinputGrabDeviceButton -func (c *Conn) xinputGrabDeviceButtonRequest(GrabWindow Id, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) []byte { +func (c *Conn) xinputGrabDeviceButtonRequest(GrabWindow Window, GrabbedDevice byte, ModifierDevice byte, NumClasses uint16, Modifiers uint16, ThisDeviceMode byte, OtherDeviceMode byte, Button byte, OwnerEvents byte, Classes []XinputEventClass) []byte { size := pad((20 + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) @@ -6026,13 +6024,13 @@ type XinputUngrabDeviceButtonCookie struct { } // Write request to wire for XinputUngrabDeviceButton -func (c *Conn) XinputUngrabDeviceButton(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { +func (c *Conn) XinputUngrabDeviceButton(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputUngrabDeviceButtonRequest(GrabWindow, Modifiers, ModifierDevice, Button, GrabbedDevice), cookie) return XinputUngrabDeviceButtonCookie{cookie} } -func (c *Conn) XinputUngrabDeviceButtonChecked(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { +func (c *Conn) XinputUngrabDeviceButtonChecked(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) XinputUngrabDeviceButtonCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputUngrabDeviceButtonRequest(GrabWindow, Modifiers, ModifierDevice, Button, GrabbedDevice), cookie) return XinputUngrabDeviceButtonCookie{cookie} @@ -6043,7 +6041,7 @@ func (cook XinputUngrabDeviceButtonCookie) Check() error { } // Write request to wire for XinputUngrabDeviceButton -func (c *Conn) xinputUngrabDeviceButtonRequest(GrabWindow Id, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) []byte { +func (c *Conn) xinputUngrabDeviceButtonRequest(GrabWindow Window, Modifiers uint16, ModifierDevice byte, Button byte, GrabbedDevice byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -6149,7 +6147,7 @@ type XinputGetDeviceFocusReply struct { Sequence uint16 Length uint32 // padding: 1 bytes - Focus Id + Focus Window Time Timestamp RevertTo byte // padding: 15 bytes @@ -6180,7 +6178,7 @@ func xinputGetDeviceFocusReply(buf []byte) *XinputGetDeviceFocusReply { v.Length = Get32(buf[b:]) // 4-byte units b += 4 - v.Focus = Id(Get32(buf[b:])) + v.Focus = Window(Get32(buf[b:])) b += 4 v.Time = Timestamp(Get32(buf[b:])) @@ -6228,13 +6226,13 @@ type XinputSetDeviceFocusCookie struct { } // Write request to wire for XinputSetDeviceFocus -func (c *Conn) XinputSetDeviceFocus(Focus Id, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { +func (c *Conn) XinputSetDeviceFocus(Focus Window, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputSetDeviceFocusRequest(Focus, Time, RevertTo, DeviceId), cookie) return XinputSetDeviceFocusCookie{cookie} } -func (c *Conn) XinputSetDeviceFocusChecked(Focus Id, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { +func (c *Conn) XinputSetDeviceFocusChecked(Focus Window, Time Timestamp, RevertTo byte, DeviceId byte) XinputSetDeviceFocusCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputSetDeviceFocusRequest(Focus, Time, RevertTo, DeviceId), cookie) return XinputSetDeviceFocusCookie{cookie} @@ -6245,7 +6243,7 @@ func (cook XinputSetDeviceFocusCookie) Check() error { } // Write request to wire for XinputSetDeviceFocus -func (c *Conn) xinputSetDeviceFocusRequest(Focus Id, Time Timestamp, RevertTo byte, DeviceId byte) []byte { +func (c *Conn) xinputSetDeviceFocusRequest(Focus Window, Time Timestamp, RevertTo byte, DeviceId byte) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -6990,13 +6988,13 @@ type XinputSendExtensionEventCookie struct { } // Write request to wire for XinputSendExtensionEvent -func (c *Conn) XinputSendExtensionEvent(Destination Id, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { +func (c *Conn) XinputSendExtensionEvent(Destination Window, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { cookie := c.newCookie(false, false) c.newRequest(c.xinputSendExtensionEventRequest(Destination, DeviceId, Propagate, NumClasses, NumEvents, Events, Classes), cookie) return XinputSendExtensionEventCookie{cookie} } -func (c *Conn) XinputSendExtensionEventChecked(Destination Id, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { +func (c *Conn) XinputSendExtensionEventChecked(Destination Window, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) XinputSendExtensionEventCookie { cookie := c.newCookie(true, false) c.newRequest(c.xinputSendExtensionEventRequest(Destination, DeviceId, Propagate, NumClasses, NumEvents, Events, Classes), cookie) return XinputSendExtensionEventCookie{cookie} @@ -7007,7 +7005,7 @@ func (cook XinputSendExtensionEventCookie) Check() error { } // Write request to wire for XinputSendExtensionEvent -func (c *Conn) xinputSendExtensionEventRequest(Destination Id, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) []byte { +func (c *Conn) xinputSendExtensionEventRequest(Destination Window, DeviceId byte, Propagate bool, NumClasses uint16, NumEvents byte, Events string, Classes []XinputEventClass) []byte { size := pad(((16 + pad(((int(NumEvents) * 32) * 1))) + pad((int(NumClasses) * 4)))) b := 0 buf := make([]byte, size) -- cgit v1.2.3-54-g00ecf