*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Sun, 31 Mar 2002 03:34:16 +0000
changeset 32713fc64213765
parent 326 72d55d02cb47
child 328 dc21fa30faa9
*** empty log message ***
src/video/wincommon/SDL_sysevents.c
src/video/wincommon/SDL_wingl.c
src/video/windib/SDL_dibevents.c
src/video/windib/SDL_vkeys.h
src/video/windx5/SDL_dx5events.c
     1.1 --- a/src/video/wincommon/SDL_sysevents.c	Sun Mar 31 03:34:11 2002 +0000
     1.2 +++ b/src/video/wincommon/SDL_sysevents.c	Sun Mar 31 03:34:16 2002 +0000
     1.3 @@ -131,6 +131,7 @@
     1.4  #ifndef NO_GETKEYBOARDSTATE
     1.5  	SDLMod state;
     1.6  	BYTE keyboard[256];
     1.7 +	Uint8 *kstate = SDL_GetKeyState(NULL);
     1.8  
     1.9  	state = KMOD_NONE;
    1.10  	if ( GetKeyboardState(keyboard) ) {
    1.11 @@ -154,9 +155,11 @@
    1.12  		}
    1.13  		if ( keyboard[VK_NUMLOCK] & 0x01) {
    1.14  			state |= KMOD_NUM;
    1.15 +			kstate[SDLK_NUMLOCK] = SDL_PRESSED;
    1.16  		}
    1.17  		if ( keyboard[VK_CAPITAL] & 0x01) {
    1.18  			state |= KMOD_CAPS;
    1.19 +			kstate[SDLK_CAPSLOCK] = SDL_PRESSED;
    1.20  		}
    1.21  	}
    1.22  	SDL_SetModState(state);
     2.1 --- a/src/video/wincommon/SDL_wingl.c	Sun Mar 31 03:34:11 2002 +0000
     2.2 +++ b/src/video/wincommon/SDL_wingl.c	Sun Mar 31 03:34:16 2002 +0000
     2.3 @@ -27,8 +27,7 @@
     2.4  
     2.5  /* WGL implementation of SDL OpenGL support */
     2.6  
     2.7 -#include <windows.h>
     2.8 -
     2.9 +#include "SDL_opengl.h"
    2.10  #include "SDL_error.h"
    2.11  #include "SDL_lowvideo.h"
    2.12  #include "SDL_wingl_c.h"
     3.1 --- a/src/video/windib/SDL_dibevents.c	Sun Mar 31 03:34:11 2002 +0000
     3.2 +++ b/src/video/windib/SDL_dibevents.c	Sun Mar 31 03:34:16 2002 +0000
     3.3 @@ -215,6 +215,7 @@
     3.4  	VK_keymap[VK_BACKSLASH] = SDLK_BACKSLASH;
     3.5  	VK_keymap[VK_RBRACKET] = SDLK_RIGHTBRACKET;
     3.6  	VK_keymap[VK_GRAVE] = SDLK_BACKQUOTE;
     3.7 +	VK_keymap[VK_BACKTICK] = SDLK_BACKQUOTE;
     3.8  	VK_keymap[VK_A] = SDLK_a;
     3.9  	VK_keymap[VK_B] = SDLK_b;
    3.10  	VK_keymap[VK_C] = SDLK_c;
     4.1 --- a/src/video/windib/SDL_vkeys.h	Sun Mar 31 03:34:11 2002 +0000
     4.2 +++ b/src/video/windib/SDL_vkeys.h	Sun Mar 31 03:34:16 2002 +0000
     4.3 @@ -66,13 +66,14 @@
     4.4  
     4.5  /* These keys haven't been defined, but were experimentally determined */
     4.6  #define VK_SEMICOLON	0xBA
     4.7 -#define VK_EQUALS		0xBB
     4.8 -#define VK_COMMA		0xBC
     4.9 -#define VK_MINUS		0xBD
    4.10 -#define VK_PERIOD		0xBE
    4.11 -#define VK_SLASH		0xBF
    4.12 -#define VK_GRAVE		0xC0
    4.13 -#define VK_LBRACKET		0xDB
    4.14 +#define VK_EQUALS	0xBB
    4.15 +#define VK_COMMA	0xBC
    4.16 +#define VK_MINUS	0xBD
    4.17 +#define VK_PERIOD	0xBE
    4.18 +#define VK_SLASH	0xBF
    4.19 +#define VK_GRAVE	0xC0
    4.20 +#define VK_LBRACKET	0xDB
    4.21  #define VK_BACKSLASH	0xDC
    4.22 -#define VK_RBRACKET		0xDD
    4.23 +#define VK_RBRACKET	0xDD
    4.24  #define VK_APOSTROPHE	0xDE
    4.25 +#define VK_BACKTICK	0xDF
     5.1 --- a/src/video/windx5/SDL_dx5events.c	Sun Mar 31 03:34:11 2002 +0000
     5.2 +++ b/src/video/windx5/SDL_dx5events.c	Sun Mar 31 03:34:16 2002 +0000
     5.3 @@ -625,6 +625,9 @@
     5.4  #ifndef DIK_PAUSE
     5.5  #define DIK_PAUSE	0xC5
     5.6  #endif
     5.7 +#ifndef DIK_OEM_102
     5.8 +#define DIK_OEM_102	0x56	/* < > | on UK/Germany keyboards */
     5.9 +#endif
    5.10  	int i;
    5.11  
    5.12  	/* Map the DIK scancodes to SDL keysyms */
    5.13 @@ -675,6 +678,7 @@
    5.14  	DIK_keymap[DIK_GRAVE] = SDLK_BACKQUOTE;
    5.15  	DIK_keymap[DIK_LSHIFT] = SDLK_LSHIFT;
    5.16  	DIK_keymap[DIK_BACKSLASH] = SDLK_BACKSLASH;
    5.17 +	DIK_keymap[DIK_OEM_102] = SDLK_BACKSLASH;
    5.18  	DIK_keymap[DIK_Z] = SDLK_z;
    5.19  	DIK_keymap[DIK_X] = SDLK_x;
    5.20  	DIK_keymap[DIK_C] = SDLK_c;