Merged mouse dll into USER.
diff --git a/include/mouse.h b/include/mouse.h
index 4fe6fb8..302c4ee 100644
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -8,29 +8,7 @@
#define __WINE_MOUSE_H
#include "windef.h"
-
-struct tagCURSORICONINFO;
-
-#include "pshpack1.h"
-typedef struct _MOUSEINFO
-{
- BYTE msExist;
- BYTE msRelative;
- WORD msNumButtons;
- WORD msRate;
- WORD msXThreshold;
- WORD msYThreshold;
- WORD msXRes;
- WORD msYRes;
- WORD msMouseCommPort;
-} MOUSEINFO, *LPMOUSEINFO;
-#include "poppack.h"
-
-typedef VOID (CALLBACK *LPMOUSE_EVENT_PROC)(DWORD,DWORD,DWORD,DWORD,DWORD);
-
-WORD WINAPI MOUSE_Inquire(LPMOUSEINFO lpMouseInfo);
-VOID WINAPI MOUSE_Enable(LPMOUSE_EVENT_PROC lpMouseEventProc);
-VOID WINAPI MOUSE_Disable(VOID);
+#include "user.h"
/* Wine internals */
@@ -44,9 +22,6 @@
} WINE_MOUSEEVENT;
-extern void MOUSE_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY,
- DWORD keyState, DWORD time, HWND hWnd );
-
/***********************************
* MouseWheel support (defines)
*/
diff --git a/include/ttydrv.h b/include/ttydrv.h
index ba86666..142f89a 100644
--- a/include/ttydrv.h
+++ b/include/ttydrv.h
@@ -18,6 +18,7 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/wingdi16.h"
+#include "user.h"
struct tagBITMAPOBJ;
struct tagCLASS;
@@ -170,10 +171,9 @@
/* TTY mouse driver */
-extern void TTYDRV_MOUSE_Init();
+extern void TTYDRV_MOUSE_Init(LPMOUSE_EVENT_PROC);
extern void TTYDRV_MOUSE_SetCursor(struct tagCURSORICONINFO *lpCursor);
extern void TTYDRV_MOUSE_MoveCursor(WORD wAbsX, WORD wAbsY);
-extern LONG TTYDRV_MOUSE_EnableWarpPointer(BOOL bEnable);
/* TTY windows driver */
diff --git a/include/user.h b/include/user.h
index 741428a..ec5775b 100644
--- a/include/user.h
+++ b/include/user.h
@@ -37,6 +37,8 @@
BOOL auto_repeat;
} KEYBOARD_CONFIG;
+typedef VOID (CALLBACK *LPMOUSE_EVENT_PROC)(DWORD,DWORD,DWORD,DWORD,DWORD);
+
typedef struct tagUSER_DRIVER {
/* event functions */
void (*pSynchronize)(void);
@@ -56,10 +58,9 @@
void (*pGetKeyboardConfig)(KEYBOARD_CONFIG *);
void (*pSetKeyboardConfig)(KEYBOARD_CONFIG *, DWORD);
/* mouse functions */
- void (*pInitMouse)(void);
+ void (*pInitMouse)(LPMOUSE_EVENT_PROC);
void (*pSetCursor)(struct tagCURSORICONINFO *);
void (*pMoveCursor)(WORD, WORD);
- LONG (*pEnableWarpPointer)(BOOL);
/* screen saver functions */
BOOL (*pGetScreenSaveActive)(void);
void (*pSetScreenSaveActive)(BOOL);
@@ -74,4 +75,7 @@
WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
DWORD dwFlags, HMODULE16 hModule );
+VOID WINAPI MOUSE_Enable(LPMOUSE_EVENT_PROC lpMouseEventProc);
+VOID WINAPI MOUSE_Disable(VOID);
+
#endif /* __WINE_USER_H */
diff --git a/include/x11drv.h b/include/x11drv.h
index ca1deb4..ccbd4ec 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -15,9 +15,10 @@
# include <X11/extensions/XShm.h>
#endif /* defined(HAVE_LIBXXSHM) */
-#include "gdi.h"
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
+#include "gdi.h"
+#include "user.h"
#define MAX_PIXELFORMATS 8
@@ -393,10 +394,11 @@
/* X11 mouse driver */
-extern void X11DRV_MOUSE_Init();
+extern void X11DRV_MOUSE_Init(LPMOUSE_EVENT_PROC);
extern void X11DRV_MOUSE_SetCursor(struct tagCURSORICONINFO *lpCursor);
extern void X11DRV_MOUSE_MoveCursor(WORD wAbsX, WORD wAbsY);
-extern LONG X11DRV_MOUSE_EnableWarpPointer(BOOL bEnable);
+extern void X11DRV_MOUSE_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY,
+ DWORD keyState, DWORD time, HWND hWnd );
/* X11 windows driver */
