diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-09-23 16:55:04 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-09-26 13:32:11 +0930 |
| commit | fbd09486c6e6c64db28d81caa5ef04821e49f2eb (patch) | |
| tree | cf0082f1242c9c8af2589d3ed7397a23b2551210 | |
| parent | a2d83b9dc8387ec7e70689db1371cf6500b2f68e (diff) | |
Push server-known properties into xserver-properties.h.
| -rw-r--r-- | Xi/xiproperty.c | 1 | ||||
| -rw-r--r-- | dix/devices.c | 1 | ||||
| -rw-r--r-- | include/Makefile.am | 3 | ||||
| -rw-r--r-- | include/xserver-properties.h | 32 |
4 files changed, 36 insertions, 1 deletions
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 72efb67b1..1e4ed466b 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 e6f21c924..f8ae6da24 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 76c265e79..f63904842 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 000000000..4d602b5ab --- /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 |