diff options
author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-17 11:50:06 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-17 12:16:11 +1000 |
commit | 305d356e43462834a2fdd2cf59d47b055c2416fd (patch) | |
tree | 4b361614f368805ace0718b2110eebca22a5d3d5 /man | |
parent | 45b73dc157f326785e1022f5476bfc1f9f514d6e (diff) |
Add support for XI 1.5 device properties.libXi-1.2-branch
This is a manual merge from master onto libXi 1.1.4. The branches have
diverged too much to make cherry-picking reasonable and readable.
This patch includes the property support provided by the combination of the
following patches:
- 7d5bb99ffce3200f82420c5a5ebac3b445aac633
- 0211e3e8277c590349903989f1676f6af4baa44b
- bfd2e08f3530091fbcd8c078f684e9aab9057df0
- bec02767629ed795582ba3f645299d7036093511
- f9a5371d43b2c6023745f766d0e8ceff2acdff60
- e179b124aac13387c6f730197b8852c1f69eb9e3
Man pages are copied from the parsed docbook output from master.
Diffstat (limited to 'man')
-rw-r--r-- | man/Makefile.am | 14 | ||||
-rw-r--r-- | man/XGetDeviceProperty.man | 191 | ||||
-rw-r--r-- | man/XListDeviceProperties.man | 95 |
3 files changed, 298 insertions, 2 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 9efc88c..c8c7624 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -51,7 +51,9 @@ libman_PRE = \ XSetDeviceButtonMapping.man \ XSetDeviceFocus.man \ XSetDeviceMode.man \ - XSetDeviceValuators.man + XSetDeviceValuators.man \ + XListDeviceProperties.man \ + XGetDeviceProperty.man BUILT_SOURCES = shadows.DONE @@ -89,7 +91,8 @@ all_shadows = \ $(XOpenDevice_shadows) \ $(XSetDeviceButtonMapping_shadows) \ $(XSetDeviceFocus_shadows) \ - $(XSelectExtensionEvent_shadows) + $(XSelectExtensionEvent_shadows) \ + $(XGetDeviceProperty_shadows) XGetDeviceControl_shadows = \ @@ -134,6 +137,10 @@ XSetDeviceFocus_shadows = \ XSelectExtensionEvent_shadows = \ XGetSelectedExtensionEvents +XGetDeviceProperty_shadows = \ + XDeleteDeviceProperty \ + XChangeDeviceProperty + shadows.DONE: -rm -f $(all_shadows:=.@LIB_MAN_SUFFIX@) (for i in $(XGetDeviceControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \ @@ -178,3 +185,6 @@ shadows.DONE: (for i in $(XSelectExtensionEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX) > $$i; \ done) + (for i in $(XGetDeviceProperty_shadows:=.@LIB_MAN_SUFFIX@) ; do \ + echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceProperty.$(LIB_MAN_SUFFIX) > $$i; \ + done) diff --git a/man/XGetDeviceProperty.man b/man/XGetDeviceProperty.man new file mode 100644 index 0000000..6944457 --- /dev/null +++ b/man/XGetDeviceProperty.man @@ -0,0 +1,191 @@ +.\" Title: XGetDeviceProperty +.\" Author: Peter Hutterer +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: <pubdate>July 9, 2008</pubdate> +.\" Manual: XINPUT FUNCTIONS +.\" Source: __xorgversion__ +.\" +.TH "XGETDEVICEPROPERTY" "__libmansuffix__" "<pubdate>July 9, 2008</pubdate>" "__xorgversion__" "XINPUT FUNCTIONS" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +XGetDeviceProperty, XChangeDeviceProperty, XDeleteDeviceProperty - Get, change or delete a device's property. +.SH "SYNTAX" +.sp +.ft B +.nf +#include <X11/extensions/XInput\.h> +.fi +.ft +.HP 23 +.BI "int XGetDeviceProperty(Display\ *" "display" ", XDevice\ *" "device" ", Atom\ " "property" ", long\ " "offset" ", long\ " "length" ", Bool\ " "delete" ", Bool\ " "pending" ", Atom\ " "req_type" ", Atom\ *" "actual_type_return" ", int\ *" "actual_format_return" ", unsigned\ long\ *" "nitems_return" ", unsigned\ long\ *" "bytes_after_return" ", unsigned\ char\ **" "prop_return" ");" +.HP 27 +.BI "void XChangeDeviceProperty(Display\ *" "display" ", XDevice\ *" "device" ", Atom\ " "property" ", Atom\ " "type" ", int\ " "format" ", int\ " "mode" ", const\ char\ *" "data" ", int\ " "nelements" ");" +.HP 27 +.BI "void XDeleteDeviceProperty(Display\ *" "display" ", XDevice\ *" "device" ", Atom\ " "property" ");" +.SH "ARGUMENTS" +.PP +.PP +\fIactual_type_return\fR +.RS 4 +Returns an atom identifier that defines the actual type of the property\. +.RE +.PP +\fIactual_format_return\fR +.RS 4 +Returns the actual format of the property\. +.RE +.PP +\fIbytes_after_return\fR +.RS 4 +Returns the number of bytes remaining to be read in the property if a partial read was performed\. +.RE +.PP +\fIdata\fR +.RS 4 +Specifies the property data\. +.RE +.PP +\fIdelete\fR +.RS 4 +Specifies a Boolean value that determines wether the property is deleted\. +.RE +.PP +\fIdisplay\fR +.RS 4 +Specifies the connection to the X server\. +.RE +.PP +\fIdevice\fR +.RS 4 +The device to grab\. +.RE +.PP +\fIformat\fR +.RS 4 +Specifies whether the data should be viewed as a list of 8\-bit, 16\-bit, or 32\-bit quantities\. Possible values are 8, 16, and 32\. This information allows the X server to correctly perform byte\-swap operations as necessary\. If the format is 16\-bit or 32\-bit, you must explicitly cast the data pointer to an (unsigned char*) in the call to +\fBXChangeDeviceProperty\fR\. +.RE +.PP +\fIlength\fR +.RS 4 +Specifies the length in 32\-bit multiplies of the data to be retrieved\. +.RE +.PP +\fImode\fR +.RS 4 +Specifies the mode of operation\. You can pass +\fBPropModeReplace\fR, +\fBPropModePrepend\fR, or +\fBPropModeAppend\fR\. +.RE +.PP +\fInelements\fR +.RS 4 +Specifies the number of elements in data\. +.RE +.PP +\fInitems_return\fR +.RS 4 +Returns the actual number of 8\-bit, 16\-bit, or 32\-bit items stored in the prop_return array\. +.RE +.PP +\fInum_values\fR +.RS 4 +Specifies the number of elements in the values list\. +.RE +.PP +\fIoffset\fR +.RS 4 +Specifies the offset in the specified property (in 32\-bit quantities) where the data is to be retrieved\. +.RE +.PP +\fIpending\fR +.RS 4 +Specifies whether to retrieve the pending state of the property or the current state\. +.RE +.PP +\fIproperty\fR +.RS 4 +Specifies the property to modify or query\. +.RE +.PP +\fIprop_return\fR +.RS 4 +Returns the data in the specified format\. If the returned format is 8, the returned data is represented as a char array\. If the returned format is 16, the returned data is represented as an array of short int type and should be cast to that type to obtain the elements\. If the returned format is 32, the property data will be stored as an array of longs (which in a 64\-bit application will be 64\-bit values that are padded in the upper 4 bytes)\. +.RE +.PP +\fIreq_type\fR +.RS 4 +Specifies the atom identifier associated with the property type or +\fBAnyPropertyType\fR\. +.RE +.SH "DESCRIPTION" +.PP +The +\fBXGetDeviceProperty\fR +function returns the actual type of the property; the actual format of the property; the number of 8\-bit, 16\-bit, or 32\-bit items transferred; the number of bytes remaining to be read in the property; and a pointer to the data actually returned\. For a detailed description of this function, see the man page to +\fBXGetWindowProperty\fR\. +.PP +The +\fBXChangeDeviceProperty\fR +function alters the property for the specified device and causes the server to generate a +\fBXPropertyNotifyEvent\fR +event on that device\. For a detailed description of this function, see the man page to +\fBXChangeProperty\fR\. +.PP +The +\fBXDeleteDeviceProperty\fR +function deletes the specified device property\. Note that a client cannot delete a property created by a driver or the server\. Attempting to do so will result in a +BadAtom +error\. +.PP + +\fBXGetDeviceProperty\fR +can generate a +BadAtom, +BadDevice +error\. +.PP + +\fBXChangeDeviceProperty\fR +can generate a +BadDevice, a +BadMatch, a +BadAtom, and a +BadValue +error\. +.PP + +\fBXDeleteDeviceProperty\fR +can generate a +BadDevice, and a +BadAtom +error\. +.SH "DIAGNOSIS" +.PP +.PP +BadAtom +.RS 4 +A value does not describe a valid named identifier or the client attempted to remove a driver\-allocated property\. +.RE +.PP +BadDevice +.RS 4 +An invalid device was specified\. The device does not exist\. +.RE +.SH "SEE ALSO" +.PP + +\fBXListDeviceProperties\fR, +\fBXQueryDeviceProperty\fR, +\fBXConfigureDeviceProperty\fR\. +.SH "AUTHOR" +.PP +\fBPeter Hutterer\fR +.sp -1n +.IP "" 4 +Specification and implementation\. + diff --git a/man/XListDeviceProperties.man b/man/XListDeviceProperties.man new file mode 100644 index 0000000..4f986fc --- /dev/null +++ b/man/XListDeviceProperties.man @@ -0,0 +1,95 @@ +.\" Title: XListDeviceProperties +.\" Author: Peter Hutterer +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: <pubdate>July 9, 2008</pubdate> +.\" Manual: XINPUT FUNCTIONS +.\" Source: __xorgversion__ +.\" +.TH "XLISTDEVICEPROPERTIE" "__libmansuffix__" "<pubdate>July 9, 2008</pubdate>" "__xorgversion__" "XINPUT FUNCTIONS" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +XListDeviceProperties - List a device's properties. +.SH "SYNTAX" +.sp +.ft B +.nf +#include <X11/extensions/XInput\.h> +.fi +.ft +.HP 28 +.BI "Atom* XListDeviceProperties(Display\ *" "display" ", XDevice\ *" "device" ", int\ *" "nprops_return" ");" +.SH "ARGUMENTS" +.PP +.PP +\fIdisplay\fR +.RS 4 +Specifies the connection to the X server\. +.RE +.PP +\fIdevice\fR +.RS 4 +The device to grab\. +.RE +.PP +\fInprops_return\fR +.RS 4 +Specifies the number of Atoms returned\. +.RE +.PP +\fInum_values\fR +.RS 4 +Specifies the number of elements in the values list\. +.RE +.PP +\fIproperty\fR +.RS 4 +Specifies the property to modify or query\. +.RE +.SH "DESCRIPTION" +.PP +The +\fBXListDeviceProperties\fR +function returns a list of the properties associated with the input device specified in +\fIdevice\fR\. Each device may have an arbitrary number of properties attached, some of which were created by the driver and/or server, others created by clients at runtime\. +.PP +The client is expected to free the list of properties using +\fBXFree\fR\. +.PP + +\fBXListDeviceProperties\fR +can generate a +BadDevice +error\. +.SH "DIAGNOSIS" +.PP +.PP +BadAtom +.RS 4 +A value does not describe a valid named identifier\. +.RE +.PP +BadWindow +.RS 4 +A value for a Window argument does not name a defined window\. +.RE +.PP +BadDevice +.RS 4 +An invalid device was specified\. The device does not exist\. +.RE +.SH "SEE ALSO" +.PP + +\fBXChangeDeviceProperty\fR, +\fBXGetDeviceProperty\fR, +\fBXDeleteDeviceProperty\fR\. +.SH "AUTHOR" +.PP +\fBPeter Hutterer\fR +.sp -1n +.IP "" 4 +Specification and implementation\. + |