One more patch that was missing from the previous patchset.
New file include/xserver-properties.h that includes #defines for the
properties managed by the server.
File is installed as part of the SDK to be included by clients who wish to
manipulate said properties.
This way we don't have to bump inputproto for new properties (e.g. ptr accel
configuration, a "driver" property, etc.)
Cheers,
Peter
>From 826b6441fe27304a37c0452457ff6c7ba952bfff Mon Sep 17 00:00:00 2001
From: Peter Hutterer <[EMAIL PROTECTED]>
Date: Tue, 23 Sep 2008 16:55:04 +0930
Subject: [PATCH] Push server-known properties into xserver-properties.h.
---
Xi/xiproperty.c | 1 +
dix/devices.c | 1 +
include/Makefile.am | 3 ++-
include/xserver-properties.h | 32 ++++++++++++++++++++++++++++++++
4 files changed, 36 insertions(+), 1 deletions(-)
create mode 100644 include/xserver-properties.h
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 50a4caf..94d5499 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -38,6 +38,7 @@
#include "swaprep.h"
#include "xiproperty.h"
+#include "xserver-properties.h"
/**
* Properties used or alloced from inside the server.
diff --git a/dix/devices.c b/dix/devices.c
index c0ff019..a16cd1c 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -86,6 +86,7 @@ SOFTWARE.
#include "exevents.h"
#include "listdev.h" /* for CopySwapXXXClass */
#include "xiproperty.h"
+#include "xserver-properties.h"
/** @file
* This file handles input device-related stuff.
diff --git a/include/Makefile.am b/include/Makefile.am
index 76c265e..f639048 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -53,7 +53,8 @@ sdk_HEADERS = \
windowstr.h \
xkbfile.h \
xkbsrv.h \
- xkbstr.h
+ xkbstr.h \
+ xserver-properties.h
nodist_sdk_HEADERS = xorg-server.h
endif
diff --git a/include/xserver-properties.h b/include/xserver-properties.h
new file mode 100644
index 0000000..4d602b5
--- /dev/null
+++ b/include/xserver-properties.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software")
+ * to deal in the software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * them Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* Properties managed by the server. */
+
+#ifndef _XSERVER_PROPERTIES_H_
+#define _XSERVER_PROPERTIES_H_
+
+/* BOOL. 0 - device disabled, 1 - device enabled */
+#define XI_PROP_ENABLED "Device Enabled"
+
+#endif
--
1.5.4.3
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
