diff options
Diffstat (limited to 'xserver/doc/Xinput.xml')
| -rw-r--r-- | xserver/doc/Xinput.xml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/xserver/doc/Xinput.xml b/xserver/doc/Xinput.xml index 7f576a135..083b10908 100644 --- a/xserver/doc/Xinput.xml +++ b/xserver/doc/Xinput.xml @@ -61,7 +61,7 @@ The functionality is implemented by routines that typically reside in the server source tree directory extensions/server/xinput. This extension includes functions to enable and disable input extension devices, -select input, grab and focus those device, query and change key +select input, grab and focus those devices, query and change key and button mappings, and others. The only input extension requirements for the device-dependent part of X are that the input devices be correctly initialized and input events from those devices be correctly @@ -362,7 +362,7 @@ server to begin checking for available input from this device. </para> <para> <!-- .LP --> ->From InitAndStartDevices, EnableDevice is called for all devices that have +From InitAndStartDevices, EnableDevice is called for all devices that have the "inited" and "startup" fields in the DeviceIntRec set to TRUE. The "inited" field is set by InitAndStartDevices to the value returned by the deviceproc when called with a mode value of DEVICE_INIT. The "startup" @@ -420,7 +420,7 @@ FocusClass - the device can be focused. </listitem> <listitem> <para> -FeedbackClass - the device supports some kind of feedback +FeedbackClass - the device supports some kind of feedback. <!-- .in -5n --> <!-- .RE --> </para> @@ -446,7 +446,7 @@ This function is provided to allocate and initialize a KeyClassRec, and should be called for extension devices that have keys. It is passed a pointer to the device, and pointers to arrays of keysyms and modifiers reported by the device. It returns FALSE if the KeyClassRec could not be allocated, -or if the maps for the keysyms and and modifiers could not be allocated. +or if the maps for the keysyms and modifiers could not be allocated. Its parameters are: </para> <para> @@ -702,7 +702,7 @@ InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols, num_symbols_supported, symbols) DeviceIntPtr dev; void (*controlProc)(); - int max_symbols: + int max_symbols; int num_symbols_supported; KeySym *symbols; </literallayout> @@ -905,7 +905,7 @@ such a device. <para> <!-- .LP --> The default implementation is to always return a BadMatch error. If the -implementation does not support any input devices that are allow their +implementation does not support any input devices that allow their valuators to be set, the default implementation may be left unchanged. </para> </sect2> @@ -1003,7 +1003,7 @@ initialized. </para> <para> <!-- .LP --> -The data structures that define these +The data structures that describe these events are defined in the file <function>extensions/include/XIproto.h</function>. Other input extension constants needed by DDX are defined in the file <function>extensions/include/XI.h</function>. @@ -1035,7 +1035,7 @@ deviceid - the identifier of the device that generated the event. </listitem> <listitem> <para> -device_state - the state of any modifiers on the device that generated the event +device_state - the state of any modifiers on the device that generated the event. </para> </listitem> <listitem> @@ -1060,7 +1060,7 @@ valuator0 through valuator5 - the values of the valuators. <!-- .LP --> In order to pass this information to the input extension library, two 32-byte wire events must be generated by DDX. The first has an event type of -<function>DeviceKeyPress</function>, and the second has an event type of \fPDeviceValuator\fP. +<function>DeviceKeyPress</function>, and the second has an event type of <function>DeviceValuator</function>. </para> <para> <!-- .LP --> @@ -1078,7 +1078,7 @@ The following code fragment shows how the two wire events could be initialized: deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE; deviceValuator *xv; - xev->type = DeviceKeyPress; /* defined by input extension */ + xev->type = DeviceKeyPress; /* defined by input extension */ xev->detail = keycode; /* key pressed on this device */ xev->time = timestamp; /* same as for core events */ xev->rootX = pointerx; /* x location of core pointer */ @@ -1093,7 +1093,7 @@ The following code fragment shows how the two wire events could be initialized: /* */ /******************************************************************/ - xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1*/ + xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1 */ /******************************************************************/ /* Fields in the second 32-byte wire event: */ @@ -1152,7 +1152,7 @@ The following code fragment shows how the two wire events could be initialized: /* */ /******************************************************************/ - xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1*/ + xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1 */ /******************************************************************/ /* Fields in the second 32-byte wire event: */ |