commit 28c3a1baf39696136bfff5b61c065d34e86874c1
author Alexandre Julliard <julliard@winehq.org> Mon Mar 20 18:21:19 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 20 18:21:19 2000 +0000
tree 9f7fab3562dc249f61893dbf176f059e63d5296b
parent c03da6680d9407c24e273eb8d33fd18442e0523b

Moved graphics initialisation to the x11drv/ttydrv dll init code.
Merged event, keyboard and mouse drivers into USER driver.

windows/keyboard.c

diff --git a/windows/keyboard.c b/windows/keyboard.c
index 2c9ce44..d9c1407 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -20,6 +20,7 @@
 #include "win.h"
 #include "heap.h"
 #include "keyboard.h"
+#include "user.h"
 #include "message.h"
 #include "callback.h"
 #include "builtin16.h"
@@ -32,8 +33,6 @@
 
 /**********************************************************************/
 
-KEYBOARD_DRIVER *KEYBOARD_Driver = NULL;
-
 static LPKEYBD_EVENT_PROC DefKeybEventProc = NULL;
 LPBYTE pKeyStateTable = NULL;
 
@@ -67,7 +66,7 @@
   /* all states to false */
   memset( lpKeyState, 0, 256 );
   
-  if (!initDone) KEYBOARD_Driver->pInit();
+  if (!initDone) USER_Driver->pInitKeyboard();
   initDone = TRUE;
 }
 
@@ -181,7 +180,7 @@
 
 WORD WINAPI VkKeyScan16(CHAR cChar)
 {
-  return KEYBOARD_Driver->pVkKeyScan(cChar);
+    return USER_Driver->pVkKeyScan(cChar);
 }
 
 /******************************************************************************
@@ -214,7 +213,7 @@
  */
 UINT16 WINAPI MapVirtualKey16(UINT16 wCode, UINT16 wMapType)
 {
-  return KEYBOARD_Driver->pMapVirtualKey(wCode,wMapType);
+    return USER_Driver->pMapVirtualKey(wCode,wMapType);
 }
 
 /****************************************************************************
@@ -231,7 +230,7 @@
  */
 INT16 WINAPI GetKeyNameText16(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 {
-  return KEYBOARD_Driver->pGetKeyNameText(lParam, lpBuffer, nSize);
+    return USER_Driver->pGetKeyNameText(lParam, lpBuffer, nSize);
 }
 
 /****************************************************************************
@@ -255,9 +254,7 @@
 INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState, 
                        LPVOID lpChar, UINT16 flags) 
 {
-    return KEYBOARD_Driver->pToAscii(
-        virtKey, scanCode, lpKeyState, lpChar, flags
-    );
+    return USER_Driver->pToAscii( virtKey, scanCode, lpKeyState, lpChar, flags );
 }
 
 /***********************************************************************
@@ -265,7 +262,7 @@
  */
 BOOL KEYBOARD_GetBeepActive()
 {
-  return KEYBOARD_Driver->pGetBeepActive();
+    return USER_Driver->pGetBeepActive();
 }
 
 /***********************************************************************
@@ -273,7 +270,7 @@
  */
 void KEYBOARD_SetBeepActive(BOOL bActivate)
 {
-  KEYBOARD_Driver->pSetBeepActive(bActivate);
+    USER_Driver->pSetBeepActive(bActivate);
 }
 
 /***********************************************************************
@@ -281,6 +278,6 @@
  */
 void KEYBOARD_Beep(void)
 {
-  KEYBOARD_Driver->pBeep();
+    USER_Driver->pBeep();
 }