summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/darwin/xfIOKit.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/darwin/xfIOKit.h')
-rw-r--r--xc/programs/Xserver/hw/darwin/xfIOKit.h20
1 files changed, 17 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/darwin/xfIOKit.h b/xc/programs/Xserver/hw/darwin/xfIOKit.h
index a3fcddcc2..4e4046a31 100644
--- a/xc/programs/Xserver/hw/darwin/xfIOKit.h
+++ b/xc/programs/Xserver/hw/darwin/xfIOKit.h
@@ -4,7 +4,7 @@
IOKit specific functions and definitions
*/
/*
- * Copyright (c) 2001 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2001-2002 Torrey T. Lyons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -28,20 +28,34 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.7 2002/03/28 02:21:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.9 2002/12/15 06:10:15 torrey Exp $ */
#ifndef _XFIOKIT_H
#define _XFIOKIT_H
+#include <pthread.h>
+#include <IOKit/graphics/IOFramebufferShared.h>
#include "X11/Xproto.h"
#include "screenint.h"
#include "darwin.h"
+typedef struct {
+ io_connect_t fbService;
+ StdFBShmem_t *cursorShmem;
+} XFIOKitScreenRec, *XFIOKitScreenPtr;
+
+#define XFIOKIT_SCREEN_PRIV(pScreen) \
+ ((XFIOKitScreenPtr)pScreen->devPrivates[xfIOKitScreenIndex].ptr)
+
+extern int xfIOKitScreenIndex; // index into pScreen.devPrivates
+extern io_connect_t xfIOKitInputConnect;
+
Bool XFIOKitAddScreen(int index, ScreenPtr pScreen);
Bool XFIOKitSetupScreen(int index, ScreenPtr pScreen);
Bool XFIOKitInitCursor(ScreenPtr pScreen);
void XFIOKitInitOutput(int argc, char **argv);
+void XFIOKitInitInput(int argc, char **argv);
void XFIOKitGiveUp(void);
void XFIOKitBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
-#endif
+#endif /* _XFIOKIT_H */