Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 261 insertions, 259 deletions

diff --git a/xorg-server/hw/xwin/winkeybd.h b/xorg-server/hw/xwin/winkeybd.h
index 292d05cb6..545aef751 100644
--- a/xorg-server/hw/xwin/winkeybd.h
+++ b/xorg-server/hw/xwin/winkeybd.h
@@ -45,264 +45,266 @@
  * may not be associated with the appropriate scan code/extended bit
  */
 const int
-g_iKeyMap [] = {
-  /* count	Windows VK,	ASCII,		ASCII when extended VK */
-  /* 0 */	0,		0,		0,
-  /* 1 */	0,		0,		0,
-  /* 2 */	0,		0,		0,
-  /* 3 */	VK_CANCEL,	0,		KEY_Break,
-  /* 4 */	0,		0,		0,
-  /* 5 */	0,		0,		0,
-  /* 6 */	0,		0,		0,
-  /* 7 */	0,		0,		0,
-  /* 8 */	0,		0,		0,
-  /* 9 */	0,		0,		0,
-  /* 10 */	0,		0,		0,
-  /* 11 */	0,		0,		0,
-  /* 12 */	0,		0,		0,
-  /* 13 */	VK_RETURN,	0,		KEY_KP_Enter,
-  /* 14 */	0,		0,		0,
-  /* 15 */	0,		0,		0,
-  /* 16 */	VK_SHIFT,	0,		0,
-  /* 17 */	VK_CONTROL,	0,		KEY_RCtrl,
-  /* 18 */	VK_MENU,	0,		KEY_AltLang,
-  /* 19 */	VK_PAUSE,	KEY_Pause,	0,
-  /* 20 */	0,		0,		0,
-  /* 21 */	0,		0,		0,
-  /* 22 */	0,		0,		0,
-  /* 23 */	0,		0,		0,
-  /* 24 */	0,		0,		0,
-  /* 25 */	0,		0,		0,
-  /* 26 */	0,		0,		0,
-  /* 27 */	0,		0,		0,
-  /* 28 */	0,		0,		0,
-  /* 29 */	0,		0,		0,
-  /* 30 */	0,		0,		0,
-  /* 31 */	0,		0,		0,
-  /* 32 */	0,		0,		0,
-  /* 33 */	VK_PRIOR,	KEY_PgUp,	KEY_PgUp,
-  /* 34 */	VK_NEXT,	KEY_PgDown,	KEY_PgDown,
-  /* 35 */	VK_END,		KEY_End,	KEY_End,
-  /* 36 */	VK_HOME,	KEY_Home,	KEY_Home,
-  /* 37 */	VK_LEFT,	KEY_Left,	KEY_Left,
-  /* 38 */	VK_UP,		KEY_Up,	 	KEY_Up,
-  /* 39 */	VK_RIGHT,	KEY_Right,	KEY_Right,
-  /* 40 */	VK_DOWN,	KEY_Down,	KEY_Down,
-  /* 41 */	0,		0,		0,
-  /* 42 */	0,		0,		0,
-  /* 43 */	0,		0,		0,
-  /* 44 */	VK_SNAPSHOT,	0,		KEY_Print,  
-  /* 45 */	VK_INSERT,	0,		KEY_Insert,
-  /* 46 */	VK_DELETE,	0,		KEY_Delete,
-  /* 47 */	0,		0,		0,
-  /* 48 */	0,		0,		0,
-  /* 49 */	0,		0,		0,
-  /* 50 */	0,		0,		0,
-  /* 51 */	0,		0,		0,
-  /* 52 */	0,		0,		0,
-  /* 53 */	0,		0,		0,
-  /* 54 */	0,		0,		0,
-  /* 55 */	0,		0,		0,
-  /* 56 */	0,		0,		0,
-  /* 57 */	0,		0,		0,
-  /* 58 */	0,		0,		0,
-  /* 59 */	0,		0,		0,
-  /* 60 */	0,		0,		0,
-  /* 61 */	0,		0,		0,
-  /* 62 */	0,		0,		0,
-  /* 63 */	0,		0,		0,
-  /* 64 */	0,		0,		0,
-  /* 65 */	0,		0,		0,
-  /* 66 */	0,		0,		0,
-  /* 67 */	0,		0,		0,
-  /* 68 */	0,		0,		0,
-  /* 69 */	0,		0,		0,
-  /* 70 */	0,		0,		0,
-  /* 71 */	0,		0,		0,
-  /* 72 */	0,		0,		0,
-  /* 73 */	0,		0,		0,
-  /* 74 */	0,		0,		0,
-  /* 75 */	0,		0,		0,
-  /* 76 */	0,		0,		0,
-  /* 77 */	0,		0,		0,
-  /* 78 */	0,		0,		0,
-  /* 79 */	0,		0,		0,
-  /* 80 */	0,		0,		0,
-  /* 81 */	0,		0,		0,
-  /* 82 */	0,		0,		0,
-  /* 83 */	0,		0,		0,
-  /* 84 */	0,		0,		0,
-  /* 85 */	0,		0,		0,
-  /* 86 */	0,		0,		0,
-  /* 87 */	0,		0,		0,
-  /* 88 */	0,		0,		0,
-  /* 89 */	0,		0,		0,
-  /* 90 */	0,		0,		0,
-  /* 91 */	VK_LWIN,	KEY_LMeta,	0,
-  /* 92 */	VK_RWIN,	KEY_RMeta,	0,
-  /* 93 */	VK_APPS,	KEY_Menu,	0,
-  /* 94 */	0,		0,		0,
-  /* 95 */	0,		0,		0,
-  /* 96 */	0,		0,		0,
-  /* 97 */	0,		0,		0,
-  /* 98 */	0,		0,		0,
-  /* 99 */	0,		0,		0,
-  /* 100 */	0,		0,		0,
-  /* 101 */	0,		0,		0,
-  /* 102 */	0,		0,		0,
-  /* 103 */	0,		0,		0,
-  /* 104 */	0,		0,		0,
-  /* 105 */	0,		0,		0,
-  /* 106 */	0,		0,		0,
-  /* 107 */	0,		0,		0,
-  /* 108 */	0,		0,		0,
-  /* 109 */	0,		0,		0,
-  /* 110 */	0,		0,		0,
-  /* 111 */	VK_DIVIDE,	0,		KEY_KP_Divide,
-  /* 112 */	0,		0,		0,
-  /* 113 */	0,		0,		0,
-  /* 114 */	0,		0,		0,
-  /* 115 */	0,		0,		0,
-  /* 116 */	0,		0,		0,
-  /* 117 */	0,		0,		0,
-  /* 118 */	0,		0,		0,
-  /* 119 */	0,		0,		0,
-  /* 120 */	0,		0,		0,
-  /* 121 */	0,		0,		0,
-  /* 122 */	0,		0,		0,
-  /* 123 */	0,		0,		0,
-  /* 124 */	0,		0,		0,
-  /* 125 */	0,		0,		0,
-  /* 126 */	0,		0,		0,
-  /* 127 */	0,		0,		0,
-  /* 128 */	0,		0,		0,
-  /* 129 */	0,		0,		0,
-  /* 130 */	0,		0,		0,
-  /* 131 */	0,		0,		0,
-  /* 132 */	0,		0,		0,
-  /* 133 */	0,		0,		0,
-  /* 134 */	0,		0,		0,
-  /* 135 */	0,		0,		0,
-  /* 136 */	0,		0,		0,
-  /* 137 */	0,		0,		0,
-  /* 138 */	0,		0,		0,
-  /* 139 */	0,		0,		0,
-  /* 140 */	0,		0,		0,
-  /* 141 */	0,		0,		0,
-  /* 142 */	0,		0,		0,
-  /* 143 */	0,		0,		0,
-  /* 144 */	0,		0,		0,
-  /* 145 */	0,		0,		0,
-  /* 146 */	0,		0,		0,
-  /* 147 */	0,		0,		0,
-  /* 148 */	0,		0,		0,
-  /* 149 */	0,		0,		0,
-  /* 150 */	0,		0,		0,
-  /* 151 */	0,		0,		0,
-  /* 152 */	0,		0,		0,
-  /* 153 */	0,		0,		0,
-  /* 154 */	0,		0,		0,
-  /* 155 */	0,		0,		0,
-  /* 156 */	0,		0,		0,
-  /* 157 */	0,		0,		0,
-  /* 158 */	0,		0,		0,
-  /* 159 */	0,		0,		0,
-  /* 160 */	VK_LSHIFT,	KEY_ShiftL,	KEY_ShiftL,
-  /* 161 */	VK_RSHIFT,	KEY_ShiftR,	KEY_ShiftR,
-  /* 162 */	VK_LCONTROL,	KEY_LCtrl,	KEY_LCtrl,
-  /* 163 */	VK_RCONTROL,	KEY_RCtrl,	KEY_RCtrl,
-  /* 164 */	VK_LMENU,	KEY_Alt,	KEY_Alt,
-  /* 165 */	VK_RMENU,	KEY_AltLang,	KEY_AltLang,
-  /* 166 */	0,		0,		0,
-  /* 167 */	0,		0,		0,
-  /* 168 */	0,		0,		0,
-  /* 169 */	0,		0,		0,
-  /* 170 */	0,		0,		0,
-  /* 171 */	0,		0,		0,
-  /* 172 */	0,		0,		0,
-  /* 173 */	VK_VOLUME_MUTE,	0,		KEY_Mute,
-  /* 174 */	VK_VOLUME_DOWN,	0,		KEY_AudioLower,
-  /* 175 */	VK_VOLUME_UP,	0,		KEY_AudioRaise,
-  /* 176 */	VK_MEDIA_NEXT_TRACK,	0,	KEY_NEXTSONG,
-  /* 177 */	VK_MEDIA_PREV_TRACK,	0,	KEY_PREVIOUSSONG,
-  /* 178 */	VK_MEDIA_STOP,	0,		KEY_STOPCD,
-  /* 179 */	VK_MEDIA_PLAY_PAUSE,	0,	KEY_PLAYPAUSE,
-  /* 180 */	0,		0,		0,
-  /* 181 */	0,		0,		0,
-  /* 182 */	0,		0,		0,
-  /* 183 */	0,		0,		0,
-  /* 184 */	0,		0,		0,
-  /* 185 */	0,		0,		0,
-  /* 186 */	0,		0,		0,
-  /* 187 */	0,		0,		0,
-  /* 188 */	0,		0,		0,
-  /* 189 */	0,		0,		0,
-  /* 190 */	0,		0,		0,
-  /* 191 */	0,		0,		0,
-  /* 192 */	0,		0,		0,
-  /* 193 */	0,		0,		0,
-  /* 194 */	0,		0,		0,
-  /* 195 */	0,		0,		0,
-  /* 196 */	0,		0,		0,
-  /* 197 */	0,		0,		0,
-  /* 198 */	0,		0,		0,
-  /* 199 */	0,		0,		0,
-  /* 200 */	0,		0,		0,
-  /* 201 */	0,		0,		0,
-  /* 202 */	0,		0,		0,
-  /* 203 */	0,		0,		0,
-  /* 204 */	0,		0,		0,
-  /* 205 */	0,		0,		0,
-  /* 206 */	0,		0,		0,
-  /* 207 */	0,		0,		0,
-  /* 208 */	0,		0,		0,
-  /* 209 */	0,		0,		0,
-  /* 210 */	0,		0,		0,
-  /* 211 */	0,		0,		0,
-  /* 212 */	0,		0,		0,
-  /* 213 */	0,		0,		0,
-  /* 214 */	0,		0,		0,
-  /* 215 */	0,		0,		0,
-  /* 216 */	0,		0,		0,
-  /* 217 */	0,		0,		0,
-  /* 218 */	0,		0,		0,
-  /* 219 */	0,		0,		0,
-  /* 220 */	0,		0,		0,
-  /* 221 */	0,		0,		0,
-  /* 222 */	0,		0,		0,
-  /* 223 */	VK_OEM_8,	0,		KEY_RCtrl,  /* at least on Canadian Multilingual Standard layout */
-  /* 224 */	0,		0,		0,
-  /* 225 */	0,		0,		0,
-  /* 226 */	0,		0,		0,
-  /* 227 */	0,		0,		0,
-  /* 228 */	0,		0,		0,
-  /* 229 */	0,		0,		0,
-  /* 230 */	0,		0,		0,
-  /* 231 */	0,		0,		0,
-  /* 232 */	0,		0,		0,
-  /* 233 */	0,		0,		0,
-  /* 234 */	0,		0,		0,
-  /* 235 */	0,		0,		0,
-  /* 236 */	0,		0,		0,
-  /* 237 */	0,		0,		0,
-  /* 238 */	0,		0,		0,
-  /* 239 */	0,		0,		0,
-  /* 240 */	0,		0,		0,
-  /* 241 */	0,		0,		0,
-  /* 242 */	0,		0,		0,
-  /* 243 */	0,		0,		0,
-  /* 244 */	0,		0,		0,
-  /* 245 */	0,		0,		0,
-  /* 246 */	0,		0,		0,
-  /* 247 */	0,		0,		0,
-  /* 248 */	0,		0,		0,
-  /* 249 */	0,		0,		0,
-  /* 250 */	0,		0,		0,
-  /* 251 */	0,		0,		0,
-  /* 252 */	0,		0,		0,
-  /* 253 */	0,		0,		0,
-  /* 254 */	0,		0,		0,
-  /* 255 */	VK_FN,		0,		KEY_Fn  /* Most keyboards don't generate a scancode for Fn, but a few do... */
+ g_iKeyMap[] = {
+    /* count      Windows VK,     ASCII,          ASCII when extended VK */
+    /* 0 */ 0, 0, 0,
+    /* 1 */ 0, 0, 0,
+    /* 2 */ 0, 0, 0,
+    /* 3 */ VK_CANCEL, 0, KEY_Break,
+    /* 4 */ 0, 0, 0,
+    /* 5 */ 0, 0, 0,
+    /* 6 */ 0, 0, 0,
+    /* 7 */ 0, 0, 0,
+    /* 8 */ 0, 0, 0,
+    /* 9 */ 0, 0, 0,
+    /* 10 */ 0, 0, 0,
+    /* 11 */ 0, 0, 0,
+    /* 12 */ 0, 0, 0,
+    /* 13 */ VK_RETURN, 0, KEY_KP_Enter,
+    /* 14 */ 0, 0, 0,
+    /* 15 */ 0, 0, 0,
+    /* 16 */ VK_SHIFT, 0, 0,
+    /* 17 */ VK_CONTROL, 0, KEY_RCtrl,
+    /* 18 */ VK_MENU, 0, KEY_AltLang,
+    /* 19 */ VK_PAUSE, KEY_Pause, 0,
+    /* 20 */ 0, 0, 0,
+    /* 21 */ 0, 0, 0,
+    /* 22 */ 0, 0, 0,
+    /* 23 */ 0, 0, 0,
+    /* 24 */ 0, 0, 0,
+    /* 25 */ 0, 0, 0,
+    /* 26 */ 0, 0, 0,
+    /* 27 */ 0, 0, 0,
+    /* 28 */ 0, 0, 0,
+    /* 29 */ 0, 0, 0,
+    /* 30 */ 0, 0, 0,
+    /* 31 */ 0, 0, 0,
+    /* 32 */ 0, 0, 0,
+    /* 33 */	VK_PRIOR,	KEY_PgUp,	KEY_PgUp,
+    /* 34 */	VK_NEXT,	KEY_PgDown,	KEY_PgDown,
+    /* 35 */	VK_END,		KEY_End,	KEY_End,
+    /* 36 */	VK_HOME,	KEY_Home,	KEY_Home,
+    /* 37 */	VK_LEFT,	KEY_Left,	KEY_Left,
+    /* 38 */	VK_UP,		KEY_Up,	 	KEY_Up,
+    /* 39 */	VK_RIGHT,	KEY_Right,	KEY_Right,
+    /* 40 */	VK_DOWN,	KEY_Down,	KEY_Down,
+    /* 41 */ 0, 0, 0,
+    /* 42 */ 0, 0, 0,
+    /* 43 */ 0, 0, 0,
+    /* 44 */ VK_SNAPSHOT, 0, KEY_Print,
+    /* 45 */ VK_INSERT, 0, KEY_Insert,
+    /* 46 */ VK_DELETE, 0, KEY_Delete,
+    /* 47 */ 0, 0, 0,
+    /* 48 */ 0, 0, 0,
+    /* 49 */ 0, 0, 0,
+    /* 50 */ 0, 0, 0,
+    /* 51 */ 0, 0, 0,
+    /* 52 */ 0, 0, 0,
+    /* 53 */ 0, 0, 0,
+    /* 54 */ 0, 0, 0,
+    /* 55 */ 0, 0, 0,
+    /* 56 */ 0, 0, 0,
+    /* 57 */ 0, 0, 0,
+    /* 58 */ 0, 0, 0,
+    /* 59 */ 0, 0, 0,
+    /* 60 */ 0, 0, 0,
+    /* 61 */ 0, 0, 0,
+    /* 62 */ 0, 0, 0,
+    /* 63 */ 0, 0, 0,
+    /* 64 */ 0, 0, 0,
+    /* 65 */ 0, 0, 0,
+    /* 66 */ 0, 0, 0,
+    /* 67 */ 0, 0, 0,
+    /* 68 */ 0, 0, 0,
+    /* 69 */ 0, 0, 0,
+    /* 70 */ 0, 0, 0,
+    /* 71 */ 0, 0, 0,
+    /* 72 */ 0, 0, 0,
+    /* 73 */ 0, 0, 0,
+    /* 74 */ 0, 0, 0,
+    /* 75 */ 0, 0, 0,
+    /* 76 */ 0, 0, 0,
+    /* 77 */ 0, 0, 0,
+    /* 78 */ 0, 0, 0,
+    /* 79 */ 0, 0, 0,
+    /* 80 */ 0, 0, 0,
+    /* 81 */ 0, 0, 0,
+    /* 82 */ 0, 0, 0,
+    /* 83 */ 0, 0, 0,
+    /* 84 */ 0, 0, 0,
+    /* 85 */ 0, 0, 0,
+    /* 86 */ 0, 0, 0,
+    /* 87 */ 0, 0, 0,
+    /* 88 */ 0, 0, 0,
+    /* 89 */ 0, 0, 0,
+    /* 90 */ 0, 0, 0,
+    /* 91 */ VK_LWIN, KEY_LMeta, 0,
+    /* 92 */ VK_RWIN, KEY_RMeta, 0,
+    /* 93 */ VK_APPS, KEY_Menu, 0,
+    /* 94 */ 0, 0, 0,
+    /* 95 */ 0, 0, 0,
+    /* 96 */ 0, 0, 0,
+    /* 97 */ 0, 0, 0,
+    /* 98 */ 0, 0, 0,
+    /* 99 */ 0, 0, 0,
+    /* 100 */ 0, 0, 0,
+    /* 101 */ 0, 0, 0,
+    /* 102 */ 0, 0, 0,
+    /* 103 */ 0, 0, 0,
+    /* 104 */ 0, 0, 0,
+    /* 105 */ 0, 0, 0,
+    /* 106 */ 0, 0, 0,
+    /* 107 */ 0, 0, 0,
+    /* 108 */ 0, 0, 0,
+    /* 109 */ 0, 0, 0,
+    /* 110 */ 0, 0, 0,
+    /* 111 */ VK_DIVIDE, 0, KEY_KP_Divide,
+    /* 112 */ 0, 0, 0,
+    /* 113 */ 0, 0, 0,
+    /* 114 */ 0, 0, 0,
+    /* 115 */ 0, 0, 0,
+    /* 116 */ 0, 0, 0,
+    /* 117 */ 0, 0, 0,
+    /* 118 */ 0, 0, 0,
+    /* 119 */ 0, 0, 0,
+    /* 120 */ 0, 0, 0,
+    /* 121 */ 0, 0, 0,
+    /* 122 */ 0, 0, 0,
+    /* 123 */ 0, 0, 0,
+    /* 124 */ 0, 0, 0,
+    /* 125 */ 0, 0, 0,
+    /* 126 */ 0, 0, 0,
+    /* 127 */ 0, 0, 0,
+    /* 128 */ 0, 0, 0,
+    /* 129 */ 0, 0, 0,
+    /* 130 */ 0, 0, 0,
+    /* 131 */ 0, 0, 0,
+    /* 132 */ 0, 0, 0,
+    /* 133 */ 0, 0, 0,
+    /* 134 */ 0, 0, 0,
+    /* 135 */ 0, 0, 0,
+    /* 136 */ 0, 0, 0,
+    /* 137 */ 0, 0, 0,
+    /* 138 */ 0, 0, 0,
+    /* 139 */ 0, 0, 0,
+    /* 140 */ 0, 0, 0,
+    /* 141 */ 0, 0, 0,
+    /* 142 */ 0, 0, 0,
+    /* 143 */ 0, 0, 0,
+    /* 144 */ 0, 0, 0,
+    /* 145 */ 0, 0, 0,
+    /* 146 */ 0, 0, 0,
+    /* 147 */ 0, 0, 0,
+    /* 148 */ 0, 0, 0,
+    /* 149 */ 0, 0, 0,
+    /* 150 */ 0, 0, 0,
+    /* 151 */ 0, 0, 0,
+    /* 152 */ 0, 0, 0,
+    /* 153 */ 0, 0, 0,
+    /* 154 */ 0, 0, 0,
+    /* 155 */ 0, 0, 0,
+    /* 156 */ 0, 0, 0,
+    /* 157 */ 0, 0, 0,
+    /* 158 */ 0, 0, 0,
+    /* 159 */ 0, 0, 0,
+    /* 160 */	VK_LSHIFT,	KEY_ShiftL,	KEY_ShiftL,
+    /* 161 */	VK_RSHIFT,	KEY_ShiftR,	KEY_ShiftR,
+    /* 162 */	VK_LCONTROL,	KEY_LCtrl,	KEY_LCtrl,
+    /* 163 */	VK_RCONTROL,	KEY_RCtrl,	KEY_RCtrl,
+    /* 164 */	VK_LMENU,	KEY_Alt,	KEY_Alt,
+    /* 165 */	VK_RMENU,	KEY_AltLang,	KEY_AltLang,
+    /* 166 */ 0, 0, 0,
+    /* 167 */ 0, 0, 0,
+    /* 168 */ 0, 0, 0,
+    /* 169 */ 0, 0, 0,
+    /* 170 */ 0, 0, 0,
+    /* 171 */ 0, 0, 0,
+    /* 172 */ 0, 0, 0,
+    /* 173 */ VK_VOLUME_MUTE, 0, KEY_Mute,
+    /* 174 */ VK_VOLUME_DOWN, 0, KEY_AudioLower,
+    /* 175 */ VK_VOLUME_UP, 0, KEY_AudioRaise,
+    /* 176 */ VK_MEDIA_NEXT_TRACK, 0, KEY_NEXTSONG,
+    /* 177 */ VK_MEDIA_PREV_TRACK, 0, KEY_PREVIOUSSONG,
+    /* 178 */ VK_MEDIA_STOP, 0, KEY_STOPCD,
+    /* 179 */ VK_MEDIA_PLAY_PAUSE, 0, KEY_PLAYPAUSE,
+    /* 180 */ 0, 0, 0,
+    /* 181 */ 0, 0, 0,
+    /* 182 */ 0, 0, 0,
+    /* 183 */ 0, 0, 0,
+    /* 184 */ 0, 0, 0,
+    /* 185 */ 0, 0, 0,
+    /* 186 */ 0, 0, 0,
+    /* 187 */ 0, 0, 0,
+    /* 188 */ 0, 0, 0,
+    /* 189 */ 0, 0, 0,
+    /* 190 */ 0, 0, 0,
+    /* 191 */ 0, 0, 0,
+    /* 192 */ 0, 0, 0,
+    /* 193 */ 0, 0, 0,
+    /* 194 */ 0, 0, 0,
+    /* 195 */ 0, 0, 0,
+    /* 196 */ 0, 0, 0,
+    /* 197 */ 0, 0, 0,
+    /* 198 */ 0, 0, 0,
+    /* 199 */ 0, 0, 0,
+    /* 200 */ 0, 0, 0,
+    /* 201 */ 0, 0, 0,
+    /* 202 */ 0, 0, 0,
+    /* 203 */ 0, 0, 0,
+    /* 204 */ 0, 0, 0,
+    /* 205 */ 0, 0, 0,
+    /* 206 */ 0, 0, 0,
+    /* 207 */ 0, 0, 0,
+    /* 208 */ 0, 0, 0,
+    /* 209 */ 0, 0, 0,
+    /* 210 */ 0, 0, 0,
+    /* 211 */ 0, 0, 0,
+    /* 212 */ 0, 0, 0,
+    /* 213 */ 0, 0, 0,
+    /* 214 */ 0, 0, 0,
+    /* 215 */ 0, 0, 0,
+    /* 216 */ 0, 0, 0,
+    /* 217 */ 0, 0, 0,
+    /* 218 */ 0, 0, 0,
+    /* 219 */ 0, 0, 0,
+    /* 220 */ 0, 0, 0,
+    /* 221 */ 0, 0, 0,
+    /* 222 */ 0, 0, 0,
+    /* 223 */ VK_OEM_8, 0, KEY_RCtrl,
+                                        /* at least on Canadian Multilingual Standard layout */
+    /* 224 */ 0, 0, 0,
+    /* 225 */ 0, 0, 0,
+    /* 226 */ 0, 0, 0,
+    /* 227 */ 0, 0, 0,
+    /* 228 */ 0, 0, 0,
+    /* 229 */ 0, 0, 0,
+    /* 230 */ 0, 0, 0,
+    /* 231 */ 0, 0, 0,
+    /* 232 */ 0, 0, 0,
+    /* 233 */ 0, 0, 0,
+    /* 234 */ 0, 0, 0,
+    /* 235 */ 0, 0, 0,
+    /* 236 */ 0, 0, 0,
+    /* 237 */ 0, 0, 0,
+    /* 238 */ 0, 0, 0,
+    /* 239 */ 0, 0, 0,
+    /* 240 */ 0, 0, 0,
+    /* 241 */ 0, 0, 0,
+    /* 242 */ 0, 0, 0,
+    /* 243 */ 0, 0, 0,
+    /* 244 */ 0, 0, 0,
+    /* 245 */ 0, 0, 0,
+    /* 246 */ 0, 0, 0,
+    /* 247 */ 0, 0, 0,
+    /* 248 */ 0, 0, 0,
+    /* 249 */ 0, 0, 0,
+    /* 250 */ 0, 0, 0,
+    /* 251 */ 0, 0, 0,
+    /* 252 */ 0, 0, 0,
+    /* 253 */ 0, 0, 0,
+    /* 254 */ 0, 0, 0,
+    /* 255 */ VK_FN, 0, KEY_Fn
+                                /* Most keyboards don't generate a scancode for Fn, but a few do... */
 };
 
-#endif /* WINKEYBD_H */
+#endif                          /* WINKEYBD_H */