Renamed SDL_keysym.h to SDL_keycode.h to avoid confusion.
authorSam Lantinga <slouken@libsdl.org>
Wed, 16 Feb 2011 15:46:12 -0800
changeset 53264a4095fe12e3
parent 5325 b9c224e16859
child 5327 42b3eb7984e1
Renamed SDL_keysym.h to SDL_keycode.h to avoid confusion.
VisualC/SDL/SDL_VS2008.vcproj
VisualC/SDL/SDL_VS2010.vcxproj
VisualCE/SDL/SDL.vcproj
Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
Xcode/SDL/SDL.xcodeproj/project.pbxproj
include/SDL_keyboard.h
include/SDL_keycode.h
include/SDL_keysym.h
src/events/SDL_keyboard_c.h
src/video/cocoa/SDL_cocoavideo.h
src/video/x11/SDL_x11video.h
     1.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Wed Feb 16 15:25:10 2011 -0800
     1.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Wed Feb 16 15:46:12 2011 -0800
     1.3 @@ -448,7 +448,7 @@
     1.4  				>
     1.5  			</File>
     1.6  			<File
     1.7 -				RelativePath="..\..\include\SDL_keysym.h"
     1.8 +				RelativePath="..\..\include\SDL_keycode.h"
     1.9  				>
    1.10  			</File>
    1.11  			<File
     2.1 --- a/VisualC/SDL/SDL_VS2010.vcxproj	Wed Feb 16 15:25:10 2011 -0800
     2.2 +++ b/VisualC/SDL/SDL_VS2010.vcxproj	Wed Feb 16 15:46:12 2011 -0800
     2.3 @@ -227,7 +227,7 @@
     2.4      <ClInclude Include="..\..\include\SDL_input.h" />
     2.5      <ClInclude Include="..\..\include\SDL_joystick.h" />
     2.6      <ClInclude Include="..\..\include\SDL_keyboard.h" />
     2.7 -    <ClInclude Include="..\..\include\SDL_keysym.h" />
     2.8 +    <ClInclude Include="..\..\include\SDL_keycode.h" />
     2.9      <ClInclude Include="..\..\include\SDL_loadso.h" />
    2.10      <ClInclude Include="..\..\include\SDL_log.h" />
    2.11      <ClInclude Include="..\..\include\SDL_main.h" />
     3.1 --- a/VisualCE/SDL/SDL.vcproj	Wed Feb 16 15:25:10 2011 -0800
     3.2 +++ b/VisualCE/SDL/SDL.vcproj	Wed Feb 16 15:46:12 2011 -0800
     3.3 @@ -1255,7 +1255,7 @@
     3.4  				>
     3.5  			</File>
     3.6  			<File
     3.7 -				RelativePath="..\..\include\SDL_keysym.h"
     3.8 +				RelativePath="..\..\include\SDL_keycode.h"
     3.9  				>
    3.10  			</File>
    3.11  			<File
     4.1 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Wed Feb 16 15:25:10 2011 -0800
     4.2 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Wed Feb 16 15:46:12 2011 -0800
     4.3 @@ -64,6 +64,7 @@
     4.4  		0402A85912FE70C600CECEE3 /* SDL_shaders_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */; };
     4.5  		0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */; };
     4.6  		04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043B8C12FEA9350076DB1F /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; };
     4.7 +		0417A516130C988500578583 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0417A515130C988500578583 /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
     4.8  		041B2CD912FA0E9E0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2CD812FA0E9E0087D585 /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
     4.9  		041B2CF112FA0F680087D585 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2CEA12FA0F680087D585 /* SDL_render.c */; };
    4.10  		041B2CF212FA0F680087D585 /* SDL_sysrender.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2CEB12FA0F680087D585 /* SDL_sysrender.h */; };
    4.11 @@ -134,7 +135,6 @@
    4.12  		FD3F496C0DEA5B2100C5B771 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8DD0DD52EB400FB1D6B /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.13  		FD3F496D0DEA5B2100C5B771 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8DE0DD52EB400FB1D6B /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.14  		FD3F496E0DEA5B2100C5B771 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.15 -		FD3F496F0DEA5B2100C5B771 /* SDL_keysym.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.16  		FD3F49700DEA5B2100C5B771 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.17  		FD3F49710DEA5B2100C5B771 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E20DD52EB400FB1D6B /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.18  		FD3F49720DEA5B2100C5B771 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E30DD52EB400FB1D6B /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
    4.19 @@ -321,6 +321,7 @@
    4.20  		0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_shaders_gles2.c; sourceTree = "<group>"; };
    4.21  		0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shaders_gles2.h; sourceTree = "<group>"; };
    4.22  		04043B8C12FEA9350076DB1F /* SDL_opengles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2.h; path = ../../include/SDL_opengles2.h; sourceTree = SOURCE_ROOT; };
    4.23 +		0417A515130C988500578583 /* SDL_keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keycode.h; path = ../../include/SDL_keycode.h; sourceTree = SOURCE_ROOT; };
    4.24  		041B2CD812FA0E9E0087D585 /* SDL_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = ../../include/SDL_render.h; sourceTree = SOURCE_ROOT; };
    4.25  		041B2CEA12FA0F680087D585 /* SDL_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render.c; sourceTree = "<group>"; };
    4.26  		041B2CEB12FA0F680087D585 /* SDL_sysrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysrender.h; sourceTree = "<group>"; };
    4.27 @@ -422,7 +423,6 @@
    4.28  		FD99B8DD0DD52EB400FB1D6B /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = ../../include/SDL_events.h; sourceTree = "<group>"; };
    4.29  		FD99B8DE0DD52EB400FB1D6B /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_joystick.h; path = ../../include/SDL_joystick.h; sourceTree = "<group>"; };
    4.30  		FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keyboard.h; path = ../../include/SDL_keyboard.h; sourceTree = "<group>"; };
    4.31 -		FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keysym.h; path = ../../include/SDL_keysym.h; sourceTree = "<group>"; };
    4.32  		FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../include/SDL_loadso.h; sourceTree = "<group>"; };
    4.33  		FD99B8E20DD52EB400FB1D6B /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_main.h; path = ../../include/SDL_main.h; sourceTree = "<group>"; };
    4.34  		FD99B8E30DD52EB400FB1D6B /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_mouse.h; path = ../../include/SDL_mouse.h; sourceTree = "<group>"; };
    4.35 @@ -922,7 +922,7 @@
    4.36  				044E5FB411E6069F0076F181 /* SDL_input.h */,
    4.37  				FD99B8DE0DD52EB400FB1D6B /* SDL_joystick.h */,
    4.38  				FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */,
    4.39 -				FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */,
    4.40 +				0417A515130C988500578583 /* SDL_keycode.h */,
    4.41  				FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */,
    4.42  				04BAC0981300C0F70055DE28 /* SDL_log.h */,
    4.43  				FD99B8E20DD52EB400FB1D6B /* SDL_main.h */,
    4.44 @@ -1176,7 +1176,6 @@
    4.45  				FD3F496C0DEA5B2100C5B771 /* SDL_events.h in Headers */,
    4.46  				FD3F496D0DEA5B2100C5B771 /* SDL_joystick.h in Headers */,
    4.47  				FD3F496E0DEA5B2100C5B771 /* SDL_keyboard.h in Headers */,
    4.48 -				FD3F496F0DEA5B2100C5B771 /* SDL_keysym.h in Headers */,
    4.49  				FD3F49700DEA5B2100C5B771 /* SDL_loadso.h in Headers */,
    4.50  				FD3F49710DEA5B2100C5B771 /* SDL_main.h in Headers */,
    4.51  				FD3F49720DEA5B2100C5B771 /* SDL_mouse.h in Headers */,
    4.52 @@ -1256,6 +1255,7 @@
    4.53  				04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */,
    4.54  				04BAC0991300C0F70055DE28 /* SDL_log.h in Headers */,
    4.55  				04BAC09C1300C1290055DE28 /* SDL_assert_c.h in Headers */,
    4.56 +				0417A516130C988500578583 /* SDL_keycode.h in Headers */,
    4.57  			);
    4.58  			runOnlyForDeploymentPostprocessing = 0;
    4.59  		};
     5.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Wed Feb 16 15:25:10 2011 -0800
     5.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Wed Feb 16 15:46:12 2011 -0800
     5.3 @@ -39,7 +39,6 @@
     5.4  		00162DB609BD222F0037C8D0 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EE01191D2B7F000001 /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
     5.5  		00162DB809BD222F0037C8D0 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F001191D2B7F000001 /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
     5.6  		00162DB909BD222F0037C8D0 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
     5.7 -		00162DBA09BD222F0037C8D0 /* SDL_keysym.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F201191D2B7F000001 /* SDL_keysym.h */; settings = {ATTRIBUTES = (Public, ); }; };
     5.8  		00162DBB09BD222F0037C8D0 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = B29A290D04E5B28700A80002 /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
     5.9  		00162DBC09BD222F0037C8D0 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F301191D2B7F000001 /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
    5.10  		00162DBD09BD222F0037C8D0 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F401191D2B7F000001 /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
    5.11 @@ -111,6 +110,8 @@
    5.12  		00D8DA2A1195093100638393 /* testsdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA1A1195093100638393 /* testsdl.c */; };
    5.13  		04043BBB12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
    5.14  		04043BBC12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
    5.15 +		0417A4F4130C984E00578583 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0417A4F3130C984E00578583 /* SDL_keycode.h */; };
    5.16 +		0417A4F5130C984E00578583 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0417A4F3130C984E00578583 /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
    5.17  		041B2C9512FA0D2A0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2C9412FA0D2A0087D585 /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
    5.18  		041B2C9612FA0D2A0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2C9412FA0D2A0087D585 /* SDL_render.h */; };
    5.19  		041B2CA512FA0D680087D585 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2C9E12FA0D680087D585 /* SDL_render.c */; };
    5.20 @@ -667,6 +668,7 @@
    5.21  		00D8DA1A1195093100638393 /* testsdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testsdl.c; path = ../../test/automated/testsdl.c; sourceTree = SOURCE_ROOT; };
    5.22  		00F5D79E0990CA0D0051C449 /* UniversalBinaryNotes.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = UniversalBinaryNotes.rtf; sourceTree = "<group>"; };
    5.23  		04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glfuncs.h; sourceTree = "<group>"; };
    5.24 +		0417A4F3130C984E00578583 /* SDL_keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keycode.h; path = ../../include/SDL_keycode.h; sourceTree = SOURCE_ROOT; };
    5.25  		041B2C9412FA0D2A0087D585 /* SDL_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = ../../include/SDL_render.h; sourceTree = SOURCE_ROOT; };
    5.26  		041B2C9E12FA0D680087D585 /* SDL_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render.c; sourceTree = "<group>"; };
    5.27  		041B2C9F12FA0D680087D585 /* SDL_sysrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysrender.h; sourceTree = "<group>"; };
    5.28 @@ -895,7 +897,6 @@
    5.29  		0C5AF5EE01191D2B7F000001 /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = ../../include/SDL_events.h; sourceTree = SOURCE_ROOT; };
    5.30  		0C5AF5F001191D2B7F000001 /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_joystick.h; path = ../../include/SDL_joystick.h; sourceTree = SOURCE_ROOT; };
    5.31  		0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_keyboard.h; path = ../../include/SDL_keyboard.h; sourceTree = SOURCE_ROOT; };
    5.32 -		0C5AF5F201191D2B7F000001 /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_keysym.h; path = ../../include/SDL_keysym.h; sourceTree = SOURCE_ROOT; };
    5.33  		0C5AF5F301191D2B7F000001 /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_main.h; path = ../../include/SDL_main.h; sourceTree = SOURCE_ROOT; };
    5.34  		0C5AF5F401191D2B7F000001 /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mouse.h; path = ../../include/SDL_mouse.h; sourceTree = SOURCE_ROOT; };
    5.35  		0C5AF5F501191D2B7F000001 /* SDL_mutex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mutex.h; path = ../../include/SDL_mutex.h; sourceTree = SOURCE_ROOT; };
    5.36 @@ -1109,7 +1110,7 @@
    5.37  				04DEA56F11E6006A00386CAC /* SDL_input.h */,
    5.38  				0C5AF5F001191D2B7F000001 /* SDL_joystick.h */,
    5.39  				0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */,
    5.40 -				0C5AF5F201191D2B7F000001 /* SDL_keysym.h */,
    5.41 +				0417A4F3130C984E00578583 /* SDL_keycode.h */,
    5.42  				B29A290D04E5B28700A80002 /* SDL_loadso.h */,
    5.43  				04BAC0B21300C1CB0055DE28 /* SDL_log.h */,
    5.44  				0C5AF5F301191D2B7F000001 /* SDL_main.h */,
    5.45 @@ -1771,7 +1772,6 @@
    5.46  				00162DB609BD222F0037C8D0 /* SDL_events.h in Headers */,
    5.47  				00162DB809BD222F0037C8D0 /* SDL_joystick.h in Headers */,
    5.48  				00162DB909BD222F0037C8D0 /* SDL_keyboard.h in Headers */,
    5.49 -				00162DBA09BD222F0037C8D0 /* SDL_keysym.h in Headers */,
    5.50  				00162DBB09BD222F0037C8D0 /* SDL_loadso.h in Headers */,
    5.51  				00162DBC09BD222F0037C8D0 /* SDL_main.h in Headers */,
    5.52  				00162DBD09BD222F0037C8D0 /* SDL_mouse.h in Headers */,
    5.53 @@ -1906,6 +1906,7 @@
    5.54  				04043BBB12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */,
    5.55  				04BAC0B31300C1CB0055DE28 /* SDL_log.h in Headers */,
    5.56  				0435673F1303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
    5.57 +				0417A4F5130C984E00578583 /* SDL_keycode.h in Headers */,
    5.58  			);
    5.59  			runOnlyForDeploymentPostprocessing = 0;
    5.60  		};
    5.61 @@ -2035,6 +2036,7 @@
    5.62  				04043BBC12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */,
    5.63  				04BAC0B41300C1CB0055DE28 /* SDL_log.h in Headers */,
    5.64  				043567411303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
    5.65 +				0417A4F4130C984E00578583 /* SDL_keycode.h in Headers */,
    5.66  			);
    5.67  			runOnlyForDeploymentPostprocessing = 0;
    5.68  		};
     6.1 --- a/include/SDL_keyboard.h	Wed Feb 16 15:25:10 2011 -0800
     6.2 +++ b/include/SDL_keyboard.h	Wed Feb 16 15:46:12 2011 -0800
     6.3 @@ -31,7 +31,7 @@
     6.4  
     6.5  #include "SDL_stdinc.h"
     6.6  #include "SDL_error.h"
     6.7 -#include "SDL_keysym.h"
     6.8 +#include "SDL_keycode.h"
     6.9  #include "SDL_video.h"
    6.10  
    6.11  #include "begin_code.h"
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/include/SDL_keycode.h	Wed Feb 16 15:46:12 2011 -0800
     7.3 @@ -0,0 +1,342 @@
     7.4 +/*
     7.5 +    SDL - Simple DirectMedia Layer
     7.6 +    Copyright (C) 1997-2011 Sam Lantinga
     7.7 +
     7.8 +    This library is free software; you can redistribute it and/or
     7.9 +    modify it under the terms of the GNU Lesser General Public
    7.10 +    License as published by the Free Software Foundation; either
    7.11 +    version 2.1 of the License, or (at your option) any later version.
    7.12 +
    7.13 +    This library is distributed in the hope that it will be useful,
    7.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
    7.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    7.16 +    Lesser General Public License for more details.
    7.17 +
    7.18 +    You should have received a copy of the GNU Lesser General Public
    7.19 +    License along with this library; if not, write to the Free Software
    7.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    7.21 +
    7.22 +    Sam Lantinga
    7.23 +    slouken@libsdl.org
    7.24 +*/
    7.25 +
    7.26 +/**
    7.27 + *  \file SDL_keycode.h
    7.28 + *  
    7.29 + *  Defines constants which identify keyboard keys and modifiers.
    7.30 + */
    7.31 +
    7.32 +#ifndef _SDL_keycode_h
    7.33 +#define _SDL_keycode_h
    7.34 +
    7.35 +#include "SDL_stdinc.h"
    7.36 +#include "SDL_scancode.h"
    7.37 +
    7.38 +/**
    7.39 + *  \brief The SDL virtual key representation.
    7.40 + *  
    7.41 + *  Values of this type are used to represent keyboard keys using the current
    7.42 + *  layout of the keyboard.  These values include Unicode values representing
    7.43 + *  the unmodified character that would be generated by pressing the key, or
    7.44 + *  an SDLK_* constant for those keys that do not generate characters.
    7.45 + */
    7.46 +typedef Sint32 SDL_Keycode;
    7.47 +
    7.48 +#define SDLK_SCANCODE_MASK (1<<30)
    7.49 +#define SDL_SCANCODE_TO_KEYCODE(X)	(X | SDLK_SCANCODE_MASK)
    7.50 +
    7.51 +enum
    7.52 +{
    7.53 +    SDLK_UNKNOWN = 0,
    7.54 +
    7.55 +    SDLK_RETURN = '\r',
    7.56 +    SDLK_ESCAPE = '\033',
    7.57 +    SDLK_BACKSPACE = '\b',
    7.58 +    SDLK_TAB = '\t',
    7.59 +    SDLK_SPACE = ' ',
    7.60 +    SDLK_EXCLAIM = '!',
    7.61 +    SDLK_QUOTEDBL = '"',
    7.62 +    SDLK_HASH = '#',
    7.63 +    SDLK_PERCENT = '%',
    7.64 +    SDLK_DOLLAR = '$',
    7.65 +    SDLK_AMPERSAND = '&',
    7.66 +    SDLK_QUOTE = '\'',
    7.67 +    SDLK_LEFTPAREN = '(',
    7.68 +    SDLK_RIGHTPAREN = ')',
    7.69 +    SDLK_ASTERISK = '*',
    7.70 +    SDLK_PLUS = '+',
    7.71 +    SDLK_COMMA = ',',
    7.72 +    SDLK_MINUS = '-',
    7.73 +    SDLK_PERIOD = '.',
    7.74 +    SDLK_SLASH = '/',
    7.75 +    SDLK_0 = '0',
    7.76 +    SDLK_1 = '1',
    7.77 +    SDLK_2 = '2',
    7.78 +    SDLK_3 = '3',
    7.79 +    SDLK_4 = '4',
    7.80 +    SDLK_5 = '5',
    7.81 +    SDLK_6 = '6',
    7.82 +    SDLK_7 = '7',
    7.83 +    SDLK_8 = '8',
    7.84 +    SDLK_9 = '9',
    7.85 +    SDLK_COLON = ':',
    7.86 +    SDLK_SEMICOLON = ';',
    7.87 +    SDLK_LESS = '<',
    7.88 +    SDLK_EQUALS = '=',
    7.89 +    SDLK_GREATER = '>',
    7.90 +    SDLK_QUESTION = '?',
    7.91 +    SDLK_AT = '@',
    7.92 +    /* 
    7.93 +       Skip uppercase letters
    7.94 +     */
    7.95 +    SDLK_LEFTBRACKET = '[',
    7.96 +    SDLK_BACKSLASH = '\\',
    7.97 +    SDLK_RIGHTBRACKET = ']',
    7.98 +    SDLK_CARET = '^',
    7.99 +    SDLK_UNDERSCORE = '_',
   7.100 +    SDLK_BACKQUOTE = '`',
   7.101 +    SDLK_a = 'a',
   7.102 +    SDLK_b = 'b',
   7.103 +    SDLK_c = 'c',
   7.104 +    SDLK_d = 'd',
   7.105 +    SDLK_e = 'e',
   7.106 +    SDLK_f = 'f',
   7.107 +    SDLK_g = 'g',
   7.108 +    SDLK_h = 'h',
   7.109 +    SDLK_i = 'i',
   7.110 +    SDLK_j = 'j',
   7.111 +    SDLK_k = 'k',
   7.112 +    SDLK_l = 'l',
   7.113 +    SDLK_m = 'm',
   7.114 +    SDLK_n = 'n',
   7.115 +    SDLK_o = 'o',
   7.116 +    SDLK_p = 'p',
   7.117 +    SDLK_q = 'q',
   7.118 +    SDLK_r = 'r',
   7.119 +    SDLK_s = 's',
   7.120 +    SDLK_t = 't',
   7.121 +    SDLK_u = 'u',
   7.122 +    SDLK_v = 'v',
   7.123 +    SDLK_w = 'w',
   7.124 +    SDLK_x = 'x',
   7.125 +    SDLK_y = 'y',
   7.126 +    SDLK_z = 'z',
   7.127 +
   7.128 +    SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK),
   7.129 +
   7.130 +    SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1),
   7.131 +    SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2),
   7.132 +    SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3),
   7.133 +    SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4),
   7.134 +    SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5),
   7.135 +    SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6),
   7.136 +    SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7),
   7.137 +    SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8),
   7.138 +    SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9),
   7.139 +    SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10),
   7.140 +    SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11),
   7.141 +    SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12),
   7.142 +
   7.143 +    SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN),
   7.144 +    SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK),
   7.145 +    SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE),
   7.146 +    SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT),
   7.147 +    SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME),
   7.148 +    SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP),
   7.149 +    SDLK_DELETE = '\177',
   7.150 +    SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END),
   7.151 +    SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN),
   7.152 +    SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT),
   7.153 +    SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT),
   7.154 +    SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN),
   7.155 +    SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP),
   7.156 +
   7.157 +    SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR),
   7.158 +    SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE),
   7.159 +    SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY),
   7.160 +    SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS),
   7.161 +    SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS),
   7.162 +    SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER),
   7.163 +    SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1),
   7.164 +    SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2),
   7.165 +    SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3),
   7.166 +    SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4),
   7.167 +    SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5),
   7.168 +    SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6),
   7.169 +    SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7),
   7.170 +    SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8),
   7.171 +    SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9),
   7.172 +    SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0),
   7.173 +    SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD),
   7.174 +
   7.175 +    SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION),
   7.176 +    SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER),
   7.177 +    SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS),
   7.178 +    SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13),
   7.179 +    SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14),
   7.180 +    SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15),
   7.181 +    SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16),
   7.182 +    SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17),
   7.183 +    SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18),
   7.184 +    SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19),
   7.185 +    SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20),
   7.186 +    SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21),
   7.187 +    SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22),
   7.188 +    SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23),
   7.189 +    SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24),
   7.190 +    SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE),
   7.191 +    SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP),
   7.192 +    SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU),
   7.193 +    SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT),
   7.194 +    SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP),
   7.195 +    SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN),
   7.196 +    SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO),
   7.197 +    SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT),
   7.198 +    SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY),
   7.199 +    SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE),
   7.200 +    SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND),
   7.201 +    SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE),
   7.202 +    SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP),
   7.203 +    SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN),
   7.204 +    SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA),
   7.205 +    SDLK_KP_EQUALSAS400 =
   7.206 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400),
   7.207 +
   7.208 +    SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE),
   7.209 +    SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ),
   7.210 +    SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL),
   7.211 +    SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR),
   7.212 +    SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR),
   7.213 +    SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2),
   7.214 +    SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR),
   7.215 +    SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT),
   7.216 +    SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER),
   7.217 +    SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN),
   7.218 +    SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL),
   7.219 +    SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL),
   7.220 +
   7.221 +    SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00),
   7.222 +    SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000),
   7.223 +    SDLK_THOUSANDSSEPARATOR =
   7.224 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR),
   7.225 +    SDLK_DECIMALSEPARATOR =
   7.226 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR),
   7.227 +    SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT),
   7.228 +    SDLK_CURRENCYSUBUNIT =
   7.229 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT),
   7.230 +    SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN),
   7.231 +    SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN),
   7.232 +    SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE),
   7.233 +    SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE),
   7.234 +    SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB),
   7.235 +    SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE),
   7.236 +    SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A),
   7.237 +    SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B),
   7.238 +    SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C),
   7.239 +    SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D),
   7.240 +    SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E),
   7.241 +    SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F),
   7.242 +    SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR),
   7.243 +    SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER),
   7.244 +    SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT),
   7.245 +    SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS),
   7.246 +    SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER),
   7.247 +    SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND),
   7.248 +    SDLK_KP_DBLAMPERSAND =
   7.249 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND),
   7.250 +    SDLK_KP_VERTICALBAR =
   7.251 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR),
   7.252 +    SDLK_KP_DBLVERTICALBAR =
   7.253 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR),
   7.254 +    SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON),
   7.255 +    SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH),
   7.256 +    SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE),
   7.257 +    SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT),
   7.258 +    SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM),
   7.259 +    SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE),
   7.260 +    SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL),
   7.261 +    SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR),
   7.262 +    SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD),
   7.263 +    SDLK_KP_MEMSUBTRACT =
   7.264 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT),
   7.265 +    SDLK_KP_MEMMULTIPLY =
   7.266 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY),
   7.267 +    SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE),
   7.268 +    SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS),
   7.269 +    SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR),
   7.270 +    SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY),
   7.271 +    SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY),
   7.272 +    SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL),
   7.273 +    SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL),
   7.274 +    SDLK_KP_HEXADECIMAL =
   7.275 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL),
   7.276 +
   7.277 +    SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL),
   7.278 +    SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT),
   7.279 +    SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT),
   7.280 +    SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI),
   7.281 +    SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL),
   7.282 +    SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT),
   7.283 +    SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT),
   7.284 +    SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI),
   7.285 +
   7.286 +    SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE),
   7.287 +
   7.288 +    SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT),
   7.289 +    SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV),
   7.290 +    SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP),
   7.291 +    SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY),
   7.292 +    SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE),
   7.293 +    SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT),
   7.294 +    SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW),
   7.295 +    SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL),
   7.296 +    SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR),
   7.297 +    SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER),
   7.298 +    SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH),
   7.299 +    SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME),
   7.300 +    SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK),
   7.301 +    SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD),
   7.302 +    SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP),
   7.303 +    SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH),
   7.304 +    SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS),
   7.305 +
   7.306 +    SDLK_BRIGHTNESSDOWN =
   7.307 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN),
   7.308 +    SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP),
   7.309 +    SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH),
   7.310 +    SDLK_KBDILLUMTOGGLE =
   7.311 +        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE),
   7.312 +    SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN),
   7.313 +    SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP),
   7.314 +    SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT),
   7.315 +    SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP)
   7.316 +};
   7.317 +
   7.318 +/**
   7.319 + * \brief Enumeration of valid key mods (possibly OR'd together).
   7.320 + */
   7.321 +typedef enum
   7.322 +{
   7.323 +    KMOD_NONE = 0x0000,
   7.324 +    KMOD_LSHIFT = 0x0001,
   7.325 +    KMOD_RSHIFT = 0x0002,
   7.326 +    KMOD_LCTRL = 0x0040,
   7.327 +    KMOD_RCTRL = 0x0080,
   7.328 +    KMOD_LALT = 0x0100,
   7.329 +    KMOD_RALT = 0x0200,
   7.330 +    KMOD_LGUI = 0x0400,
   7.331 +    KMOD_RGUI = 0x0800,
   7.332 +    KMOD_NUM = 0x1000,
   7.333 +    KMOD_CAPS = 0x2000,
   7.334 +    KMOD_MODE = 0x4000,
   7.335 +    KMOD_RESERVED = 0x8000
   7.336 +} SDL_Keymod;
   7.337 +
   7.338 +#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
   7.339 +#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
   7.340 +#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
   7.341 +#define KMOD_GUI	(KMOD_LGUI|KMOD_RGUI)
   7.342 +
   7.343 +#endif /* _SDL_keycode_h */
   7.344 +
   7.345 +/* vi: set ts=4 sw=4 expandtab: */
     8.1 --- a/include/SDL_keysym.h	Wed Feb 16 15:25:10 2011 -0800
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,342 +0,0 @@
     8.4 -/*
     8.5 -    SDL - Simple DirectMedia Layer
     8.6 -    Copyright (C) 1997-2011 Sam Lantinga
     8.7 -
     8.8 -    This library is free software; you can redistribute it and/or
     8.9 -    modify it under the terms of the GNU Lesser General Public
    8.10 -    License as published by the Free Software Foundation; either
    8.11 -    version 2.1 of the License, or (at your option) any later version.
    8.12 -
    8.13 -    This library is distributed in the hope that it will be useful,
    8.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    8.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    8.16 -    Lesser General Public License for more details.
    8.17 -
    8.18 -    You should have received a copy of the GNU Lesser General Public
    8.19 -    License along with this library; if not, write to the Free Software
    8.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    8.21 -
    8.22 -    Sam Lantinga
    8.23 -    slouken@libsdl.org
    8.24 -*/
    8.25 -
    8.26 -/**
    8.27 - *  \file SDL_keysym.h
    8.28 - *  
    8.29 - *  Defines constants which identify keyboard keys and modifiers.
    8.30 - */
    8.31 -
    8.32 -#ifndef _SDL_keysym_h
    8.33 -#define _SDL_keysym_h
    8.34 -
    8.35 -#include "SDL_stdinc.h"
    8.36 -#include "SDL_scancode.h"
    8.37 -
    8.38 -/**
    8.39 - *  \brief The SDL virtual key representation.
    8.40 - *  
    8.41 - *  Values of this type are used to represent keyboard keys using the current
    8.42 - *  layout of the keyboard.  These values include Unicode values representing
    8.43 - *  the unmodified character that would be generated by pressing the key, or
    8.44 - *  an SDLK_* constant for those keys that do not generate characters.
    8.45 - */
    8.46 -typedef Sint32 SDL_Keycode;
    8.47 -
    8.48 -#define SDLK_SCANCODE_MASK (1<<30)
    8.49 -#define SDL_SCANCODE_TO_KEYCODE(X)	(X | SDLK_SCANCODE_MASK)
    8.50 -
    8.51 -enum
    8.52 -{
    8.53 -    SDLK_UNKNOWN = 0,
    8.54 -
    8.55 -    SDLK_RETURN = '\r',
    8.56 -    SDLK_ESCAPE = '\033',
    8.57 -    SDLK_BACKSPACE = '\b',
    8.58 -    SDLK_TAB = '\t',
    8.59 -    SDLK_SPACE = ' ',
    8.60 -    SDLK_EXCLAIM = '!',
    8.61 -    SDLK_QUOTEDBL = '"',
    8.62 -    SDLK_HASH = '#',
    8.63 -    SDLK_PERCENT = '%',
    8.64 -    SDLK_DOLLAR = '$',
    8.65 -    SDLK_AMPERSAND = '&',
    8.66 -    SDLK_QUOTE = '\'',
    8.67 -    SDLK_LEFTPAREN = '(',
    8.68 -    SDLK_RIGHTPAREN = ')',
    8.69 -    SDLK_ASTERISK = '*',
    8.70 -    SDLK_PLUS = '+',
    8.71 -    SDLK_COMMA = ',',
    8.72 -    SDLK_MINUS = '-',
    8.73 -    SDLK_PERIOD = '.',
    8.74 -    SDLK_SLASH = '/',
    8.75 -    SDLK_0 = '0',
    8.76 -    SDLK_1 = '1',
    8.77 -    SDLK_2 = '2',
    8.78 -    SDLK_3 = '3',
    8.79 -    SDLK_4 = '4',
    8.80 -    SDLK_5 = '5',
    8.81 -    SDLK_6 = '6',
    8.82 -    SDLK_7 = '7',
    8.83 -    SDLK_8 = '8',
    8.84 -    SDLK_9 = '9',
    8.85 -    SDLK_COLON = ':',
    8.86 -    SDLK_SEMICOLON = ';',
    8.87 -    SDLK_LESS = '<',
    8.88 -    SDLK_EQUALS = '=',
    8.89 -    SDLK_GREATER = '>',
    8.90 -    SDLK_QUESTION = '?',
    8.91 -    SDLK_AT = '@',
    8.92 -    /* 
    8.93 -       Skip uppercase letters
    8.94 -     */
    8.95 -    SDLK_LEFTBRACKET = '[',
    8.96 -    SDLK_BACKSLASH = '\\',
    8.97 -    SDLK_RIGHTBRACKET = ']',
    8.98 -    SDLK_CARET = '^',
    8.99 -    SDLK_UNDERSCORE = '_',
   8.100 -    SDLK_BACKQUOTE = '`',
   8.101 -    SDLK_a = 'a',
   8.102 -    SDLK_b = 'b',
   8.103 -    SDLK_c = 'c',
   8.104 -    SDLK_d = 'd',
   8.105 -    SDLK_e = 'e',
   8.106 -    SDLK_f = 'f',
   8.107 -    SDLK_g = 'g',
   8.108 -    SDLK_h = 'h',
   8.109 -    SDLK_i = 'i',
   8.110 -    SDLK_j = 'j',
   8.111 -    SDLK_k = 'k',
   8.112 -    SDLK_l = 'l',
   8.113 -    SDLK_m = 'm',
   8.114 -    SDLK_n = 'n',
   8.115 -    SDLK_o = 'o',
   8.116 -    SDLK_p = 'p',
   8.117 -    SDLK_q = 'q',
   8.118 -    SDLK_r = 'r',
   8.119 -    SDLK_s = 's',
   8.120 -    SDLK_t = 't',
   8.121 -    SDLK_u = 'u',
   8.122 -    SDLK_v = 'v',
   8.123 -    SDLK_w = 'w',
   8.124 -    SDLK_x = 'x',
   8.125 -    SDLK_y = 'y',
   8.126 -    SDLK_z = 'z',
   8.127 -
   8.128 -    SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK),
   8.129 -
   8.130 -    SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1),
   8.131 -    SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2),
   8.132 -    SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3),
   8.133 -    SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4),
   8.134 -    SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5),
   8.135 -    SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6),
   8.136 -    SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7),
   8.137 -    SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8),
   8.138 -    SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9),
   8.139 -    SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10),
   8.140 -    SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11),
   8.141 -    SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12),
   8.142 -
   8.143 -    SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN),
   8.144 -    SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK),
   8.145 -    SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE),
   8.146 -    SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT),
   8.147 -    SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME),
   8.148 -    SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP),
   8.149 -    SDLK_DELETE = '\177',
   8.150 -    SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END),
   8.151 -    SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN),
   8.152 -    SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT),
   8.153 -    SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT),
   8.154 -    SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN),
   8.155 -    SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP),
   8.156 -
   8.157 -    SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR),
   8.158 -    SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE),
   8.159 -    SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY),
   8.160 -    SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS),
   8.161 -    SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS),
   8.162 -    SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER),
   8.163 -    SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1),
   8.164 -    SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2),
   8.165 -    SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3),
   8.166 -    SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4),
   8.167 -    SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5),
   8.168 -    SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6),
   8.169 -    SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7),
   8.170 -    SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8),
   8.171 -    SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9),
   8.172 -    SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0),
   8.173 -    SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD),
   8.174 -
   8.175 -    SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION),
   8.176 -    SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER),
   8.177 -    SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS),
   8.178 -    SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13),
   8.179 -    SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14),
   8.180 -    SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15),
   8.181 -    SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16),
   8.182 -    SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17),
   8.183 -    SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18),
   8.184 -    SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19),
   8.185 -    SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20),
   8.186 -    SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21),
   8.187 -    SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22),
   8.188 -    SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23),
   8.189 -    SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24),
   8.190 -    SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE),
   8.191 -    SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP),
   8.192 -    SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU),
   8.193 -    SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT),
   8.194 -    SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP),
   8.195 -    SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN),
   8.196 -    SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO),
   8.197 -    SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT),
   8.198 -    SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY),
   8.199 -    SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE),
   8.200 -    SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND),
   8.201 -    SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE),
   8.202 -    SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP),
   8.203 -    SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN),
   8.204 -    SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA),
   8.205 -    SDLK_KP_EQUALSAS400 =
   8.206 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400),
   8.207 -
   8.208 -    SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE),
   8.209 -    SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ),
   8.210 -    SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL),
   8.211 -    SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR),
   8.212 -    SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR),
   8.213 -    SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2),
   8.214 -    SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR),
   8.215 -    SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT),
   8.216 -    SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER),
   8.217 -    SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN),
   8.218 -    SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL),
   8.219 -    SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL),
   8.220 -
   8.221 -    SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00),
   8.222 -    SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000),
   8.223 -    SDLK_THOUSANDSSEPARATOR =
   8.224 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR),
   8.225 -    SDLK_DECIMALSEPARATOR =
   8.226 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR),
   8.227 -    SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT),
   8.228 -    SDLK_CURRENCYSUBUNIT =
   8.229 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT),
   8.230 -    SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN),
   8.231 -    SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN),
   8.232 -    SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE),
   8.233 -    SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE),
   8.234 -    SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB),
   8.235 -    SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE),
   8.236 -    SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A),
   8.237 -    SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B),
   8.238 -    SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C),
   8.239 -    SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D),
   8.240 -    SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E),
   8.241 -    SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F),
   8.242 -    SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR),
   8.243 -    SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER),
   8.244 -    SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT),
   8.245 -    SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS),
   8.246 -    SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER),
   8.247 -    SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND),
   8.248 -    SDLK_KP_DBLAMPERSAND =
   8.249 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND),
   8.250 -    SDLK_KP_VERTICALBAR =
   8.251 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR),
   8.252 -    SDLK_KP_DBLVERTICALBAR =
   8.253 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR),
   8.254 -    SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON),
   8.255 -    SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH),
   8.256 -    SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE),
   8.257 -    SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT),
   8.258 -    SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM),
   8.259 -    SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE),
   8.260 -    SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL),
   8.261 -    SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR),
   8.262 -    SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD),
   8.263 -    SDLK_KP_MEMSUBTRACT =
   8.264 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT),
   8.265 -    SDLK_KP_MEMMULTIPLY =
   8.266 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY),
   8.267 -    SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE),
   8.268 -    SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS),
   8.269 -    SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR),
   8.270 -    SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY),
   8.271 -    SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY),
   8.272 -    SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL),
   8.273 -    SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL),
   8.274 -    SDLK_KP_HEXADECIMAL =
   8.275 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL),
   8.276 -
   8.277 -    SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL),
   8.278 -    SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT),
   8.279 -    SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT),
   8.280 -    SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI),
   8.281 -    SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL),
   8.282 -    SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT),
   8.283 -    SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT),
   8.284 -    SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI),
   8.285 -
   8.286 -    SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE),
   8.287 -
   8.288 -    SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT),
   8.289 -    SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV),
   8.290 -    SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP),
   8.291 -    SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY),
   8.292 -    SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE),
   8.293 -    SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT),
   8.294 -    SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW),
   8.295 -    SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL),
   8.296 -    SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR),
   8.297 -    SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER),
   8.298 -    SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH),
   8.299 -    SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME),
   8.300 -    SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK),
   8.301 -    SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD),
   8.302 -    SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP),
   8.303 -    SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH),
   8.304 -    SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS),
   8.305 -
   8.306 -    SDLK_BRIGHTNESSDOWN =
   8.307 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN),
   8.308 -    SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP),
   8.309 -    SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH),
   8.310 -    SDLK_KBDILLUMTOGGLE =
   8.311 -        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE),
   8.312 -    SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN),
   8.313 -    SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP),
   8.314 -    SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT),
   8.315 -    SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP)
   8.316 -};
   8.317 -
   8.318 -/**
   8.319 - * \brief Enumeration of valid key mods (possibly OR'd together).
   8.320 - */
   8.321 -typedef enum
   8.322 -{
   8.323 -    KMOD_NONE = 0x0000,
   8.324 -    KMOD_LSHIFT = 0x0001,
   8.325 -    KMOD_RSHIFT = 0x0002,
   8.326 -    KMOD_LCTRL = 0x0040,
   8.327 -    KMOD_RCTRL = 0x0080,
   8.328 -    KMOD_LALT = 0x0100,
   8.329 -    KMOD_RALT = 0x0200,
   8.330 -    KMOD_LGUI = 0x0400,
   8.331 -    KMOD_RGUI = 0x0800,
   8.332 -    KMOD_NUM = 0x1000,
   8.333 -    KMOD_CAPS = 0x2000,
   8.334 -    KMOD_MODE = 0x4000,
   8.335 -    KMOD_RESERVED = 0x8000
   8.336 -} SDL_Keymod;
   8.337 -
   8.338 -#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
   8.339 -#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
   8.340 -#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
   8.341 -#define KMOD_GUI	(KMOD_LGUI|KMOD_RGUI)
   8.342 -
   8.343 -#endif /* _SDL_keysym_h */
   8.344 -
   8.345 -/* vi: set ts=4 sw=4 expandtab: */
     9.1 --- a/src/events/SDL_keyboard_c.h	Wed Feb 16 15:25:10 2011 -0800
     9.2 +++ b/src/events/SDL_keyboard_c.h	Wed Feb 16 15:46:12 2011 -0800
     9.3 @@ -24,7 +24,7 @@
     9.4  #ifndef _SDL_keyboard_c_h
     9.5  #define _SDL_keyboard_c_h
     9.6  
     9.7 -#include "SDL_keysym.h"
     9.8 +#include "SDL_keycode.h"
     9.9  #include "SDL_events.h"
    9.10  
    9.11  /* Initialize the keyboard subsystem */
    10.1 --- a/src/video/cocoa/SDL_cocoavideo.h	Wed Feb 16 15:25:10 2011 -0800
    10.2 +++ b/src/video/cocoa/SDL_cocoavideo.h	Wed Feb 16 15:46:12 2011 -0800
    10.3 @@ -29,7 +29,7 @@
    10.4  #include <ApplicationServices/ApplicationServices.h>
    10.5  #include <Cocoa/Cocoa.h>
    10.6  
    10.7 -#include "SDL_keysym.h"
    10.8 +#include "SDL_keycode.h"
    10.9  #include "../SDL_sysvideo.h"
   10.10  
   10.11  #include "SDL_cocoaclipboard.h"
    11.1 --- a/src/video/x11/SDL_x11video.h	Wed Feb 16 15:25:10 2011 -0800
    11.2 +++ b/src/video/x11/SDL_x11video.h	Wed Feb 16 15:46:12 2011 -0800
    11.3 @@ -24,7 +24,7 @@
    11.4  #ifndef _SDL_x11video_h
    11.5  #define _SDL_x11video_h
    11.6  
    11.7 -#include "SDL_keysym.h"
    11.8 +#include "SDL_keycode.h"
    11.9  
   11.10  #include "../SDL_sysvideo.h"
   11.11