summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-09-18 15:58:46 +0930
committerPeter Hutterer <peter.hutterer@redhat.com>2008-09-26 13:32:05 +0930
commit1e24e7b9df3d02350c7ea18e9379e87fe4d00026 (patch)
tree578a86f4eb88598fe246e909a6bb43ebc4667df2 /include
parentfeaa5fa6712c8c6f4ca97766e2ac0338253cf3b8 (diff)
Xi: remove configure/query device property calls.
This removes all the meta-information about device properties (pending, fromClient, range, valid_values, immutable).
Diffstat (limited to 'include')
-rw-r--r--include/exevents.h21
-rw-r--r--include/inputstr.h12
2 files changed, 3 insertions, 30 deletions
diff --git a/include/exevents.h b/include/exevents.h
index b42a90420..e137fef03 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -213,31 +213,14 @@ extern int XIChangeDeviceProperty(
int /* mode*/,
unsigned long /* len*/,
pointer /* value*/,
- Bool /* sendevent*/,
- Bool /* pending*/,
- Bool /* fromClient */
+ Bool /* sendevent*/
);
-extern XIPropertyPtr XIQueryDeviceProperty(
- DeviceIntPtr /* dev */,
- Atom /* property */
-);
-
extern XIPropertyValuePtr XIGetDeviceProperty(
DeviceIntPtr /* dev */,
- Atom /* property */,
- Bool /* pending */
+ Atom /* property */
);
-extern int XIConfigureDeviceProperty(
- DeviceIntPtr /* dev */,
- Atom /* property */,
- Bool /* pending */,
- Bool /* range */,
- Bool /* immutable */,
- int /* num_values */,
- INT32* /* values */
-);
extern long XIRegisterPropertyHandler(
DeviceIntPtr dev,
diff --git a/include/inputstr.h b/include/inputstr.h
index 6bba47cf8..64b698594 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -353,18 +353,9 @@ typedef struct _XIProperty
{
struct _XIProperty *next;
Atom propertyName;
- Bool is_pending;
- Bool range;
- Bool immutable;
- Bool fromClient; /* created by client or driver/server */
- int num_valid;
- INT32 *valid_values;
- XIPropertyValueRec current,
- pending;
+ XIPropertyValueRec value;
} XIPropertyRec;
-
-
typedef XIPropertyRec *XIPropertyPtr;
typedef XIPropertyValueRec *XIPropertyValuePtr;
@@ -484,7 +475,6 @@ typedef struct _DeviceIntRec {
/* Input device property handling. */
struct {
XIPropertyPtr properties;
- Bool pendingProperties;
XIPropertyHandlerPtr handlers; /* NULL-terminated */
} properties;
} DeviceIntRec;