aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-04 14:21:49 +0200
committermarha <marha@users.sourceforge.net>2011-07-04 14:21:49 +0200
commit5c671fd7f8198bed2fc32b33b81d1081f1486ed9 (patch)
tree96fc6a6d761473737def7c35256fed9bbe52753e /xorg-server/include
parentd9f970a847e1af706f07560ef163b229bb592307 (diff)
downloadvcxsrv-5c671fd7f8198bed2fc32b33b81d1081f1486ed9.tar.gz
vcxsrv-5c671fd7f8198bed2fc32b33b81d1081f1486ed9.tar.bz2
vcxsrv-5c671fd7f8198bed2fc32b33b81d1081f1486ed9.zip
xserver mesa git update 4 July 2011
Diffstat (limited to 'xorg-server/include')
-rw-r--r--xorg-server/include/dixgrabs.h3
-rw-r--r--xorg-server/include/input.h9
-rw-r--r--xorg-server/include/window.h2
3 files changed, 10 insertions, 4 deletions
diff --git a/xorg-server/include/dixgrabs.h b/xorg-server/include/dixgrabs.h
index 3b2a46d72..229c8bb53 100644
--- a/xorg-server/include/dixgrabs.h
+++ b/xorg-server/include/dixgrabs.h
@@ -28,6 +28,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
struct _GrabParameters;
+extern void PrintDeviceGrabInfo(DeviceIntPtr dev);
+extern void UngrabAllDevices(Bool kill_client);
+
extern GrabPtr CreateGrab(
int /* client */,
DeviceIntPtr /* device */,
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 56847ed8d..5377a0c13 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -62,10 +62,11 @@ SOFTWARE.
#define DEVICE_OFF 2
#define DEVICE_CLOSE 3
-#define POINTER_RELATIVE (1 << 1)
-#define POINTER_ABSOLUTE (1 << 2)
-#define POINTER_ACCELERATE (1 << 3)
-#define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */
+#define POINTER_RELATIVE (1 << 1)
+#define POINTER_ABSOLUTE (1 << 2)
+#define POINTER_ACCELERATE (1 << 3)
+#define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */
+#define POINTER_NORAW (1 << 5) /* Don't generate RawEvents */
/*int constants for pointer acceleration schemes*/
#define PtrAccelNoOp 0
diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h
index 1e4e9bfa4..e13598b88 100644
--- a/xorg-server/include/window.h
+++ b/xorg-server/include/window.h
@@ -267,4 +267,6 @@ extern _X_EXPORT void EnableMapUnmapEvents(
WindowPtr /* pWin */ );
extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable);
+extern _X_EXPORT void PrintWindowTree(void);
+
#endif /* WINDOW_H */