Bug 777: Merge from CYGWIN branch

1 files changed, 6 insertions, 94 deletions

diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h
index 375245f80..f320c98e7 100644
--- a/hw/xwin/winkeybd.h
+++ b/hw/xwin/winkeybd.h
@@ -1,3 +1,5 @@
+#if !defined(WINKEYBD_H)
+#define WINKEYBD_H
 /*
  *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
  *
@@ -32,7 +34,7 @@
 /*
  * We need symbols for the scan codes of keys.
  */
-#include "../xfree86/common/atKeynames.h"
+#include "winkeynames.h"
 
 
 /*
@@ -40,98 +42,7 @@
  *
  * This header declares a static KeySym array called 'map'.
  */
-#include "../xfree86/common/xf86Keymap.h"
-
-
-#if WIN_NEW_KEYBOARD_SUPPORT
-
-/* Define the keymap structure */
-typedef struct
-{
-  DWORD		dwVirtualKey;
-  DWORD		dwXKey;
-} winKeymappingRec, *winKeymappingPtr;
-
-static const winKeymappingRec 
-winKeymap[] = {
-	{VK_BACK,		XK_BackSpace},
-	{VK_TAB,		XK_Tab},
-	{VK_CLEAR,		XK_Clear},
-	{VK_RETURN,		XK_Return},
-	{VK_LSHIFT,		XK_Shift_L},
-	{VK_RSHIFT,		XK_Shift_R},
-	{VK_SHIFT,		XK_Shift_L},
-	{VK_LCONTROL,		XK_Control_L},
-	{VK_RCONTROL,		XK_Control_R},
-	{VK_CONTROL,		XK_Control_L},
-	{VK_LMENU,		XK_Alt_L},
-	{VK_RMENU,		XK_Alt_R},
-	{VK_MENU,		XK_Alt_L},
-	{VK_PAUSE,		XK_Pause},
-	{VK_CAPITAL,		XK_Caps_Lock},
-	{VK_ESCAPE,		XK_Escape},
-	{VK_SPACE,		XK_space},
-	{VK_PRIOR,		XK_Page_Up},
-	{VK_NEXT,		XK_Page_Down},
-	{VK_END,		XK_End},
-	{VK_HOME,		XK_Home},
-	{VK_LEFT,		XK_Left},
-	{VK_UP,			XK_Up},
-	{VK_RIGHT,		XK_Right},
-	{VK_DOWN,		XK_Down},
-	{VK_SELECT,		XK_Select},
-	{VK_EXECUTE,		XK_Execute},
-	{VK_SNAPSHOT,		XK_Print},
-	{VK_INSERT,		XK_Insert},
-	{VK_DELETE,		XK_Delete},
-	{VK_HELP,		XK_Help},
-	{VK_NUMPAD0,		XK_KP_0},
-	{VK_NUMPAD1,		XK_KP_1},
-	{VK_NUMPAD2,		XK_KP_2},
-	{VK_NUMPAD3,		XK_KP_3},
-	{VK_NUMPAD4,		XK_KP_4},
-	{VK_NUMPAD5,		XK_KP_5},
-	{VK_NUMPAD6,		XK_KP_6},
-	{VK_NUMPAD7,		XK_KP_7},
-	{VK_NUMPAD8,		XK_KP_8},
-	{VK_NUMPAD9,		XK_KP_9},
-	{VK_MULTIPLY,		XK_KP_Multiply},
-	{VK_ADD,		XK_KP_Add},
-	{VK_SEPARATOR,		XK_KP_Separator},   // often comma
-	{VK_SUBTRACT,		XK_KP_Subtract},
-	{VK_DECIMAL,		XK_KP_Decimal},
-	{VK_DIVIDE,		XK_KP_Divide},
-	{VK_F1,			XK_F1},
-	{VK_F2,			XK_F2},
-	{VK_F3,			XK_F3},
-	{VK_F4,			XK_F4},
-	{VK_F5,			XK_F5},
-	{VK_F6,			XK_F6},
-	{VK_F7,			XK_F7},
-	{VK_F8,			XK_F8},
-	{VK_F9,			XK_F9},
-	{VK_F10,		XK_F10},
-	{VK_F11,		XK_F11},
-	{VK_F12,		XK_F12},
-	{VK_F13,		XK_F13},
-	{VK_F14,		XK_F14},
-	{VK_F15,		XK_F15},
-	{VK_F16,		XK_F16},
-	{VK_F17,		XK_F17},
-	{VK_F18,		XK_F18},
-	{VK_F19,		XK_F19},
-	{VK_F20,		XK_F20},
-	{VK_F21,		XK_F21},
-	{VK_F22,		XK_F22},
-	{VK_F23,		XK_F23},
-	{VK_F24,		XK_F24},
-	{VK_NUMLOCK,		XK_Num_Lock},
-	{VK_SCROLL,		XK_Scroll_Lock}
-};
-
-static int g_winKeymapEntries = sizeof (winKeymap) / sizeof (winKeymappingRec);
-
-#else /* WIN_NEW_KEYBOARD_SUPPORT */
+#include "winkeymap.h"
 
 #define		WIN_KEYMAP_COLS		3
 
@@ -395,4 +306,5 @@ g_iKeyMap [] = {
   /* 254 */	0,		0,		0,
   /* 255 */	0,		0,		0
 };
-#endif /* WIN_NEW_KEYBOARD_SUPPORT */
+
+#endif /* WINKEYBD_H */