Skip to content

Commit

Permalink
Factorize keyboard mapping between drivers
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmandin
pmandin committed Sep 13, 2006
1 parent ae7f620 commit 10e3f61
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 291 deletions.
75 changes: 75 additions & 0 deletions src/video/ataricommon/SDL_atarievents.c
View file
Expand Up @@ -30,10 +30,13 @@
*/

#include <mint/cookie.h>
#include <mint/ostruct.h>
#include <mint/osbind.h>

#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"

#include "SDL_atarikeys.h"
#include "SDL_atarievents_c.h"
#include "SDL_biosevents_c.h"
#include "SDL_gemdosevents_c.h"
Expand All @@ -48,6 +51,14 @@ enum {
MCH_ARANYM
};

#ifndef KT_NOCHANGE
# define KT_NOCHANGE -1
#endif

/* The translation tables from a console scancode to a SDL keysym */
static SDLKey keymap[ATARIBIOS_MAXKEYS];
static unsigned char *keytab_normal;

void (*Atari_ShutdownEvents)(void);

static void Atari_InitializeEvents(_THIS)
Expand Down Expand Up @@ -108,10 +119,52 @@ void Atari_InitOSKeymap(_THIS)
{
Atari_InitializeEvents(this);

SDL_Atari_InitInternalKeymap(this);

/* Call choosen routine */
this->InitOSKeymap(this);
}

void SDL_Atari_InitInternalKeymap(_THIS)
{
int i;
_KEYTAB *key_tables;

/* Read system tables for scancode -> ascii translation */
key_tables = (_KEYTAB *) Keytbl(KT_NOCHANGE, KT_NOCHANGE, KT_NOCHANGE);
keytab_normal = key_tables->unshift;

/* Initialize keymap */
for ( i=0; i<ATARIBIOS_MAXKEYS; i++ )
keymap[i] = SDLK_UNKNOWN;

/* Functions keys */
for ( i = 0; i<10; i++ )
keymap[SCANCODE_F1 + i] = SDLK_F1+i;

/* Cursor keypad */
keymap[SCANCODE_HELP] = SDLK_HELP;
keymap[SCANCODE_UNDO] = SDLK_UNDO;
keymap[SCANCODE_INSERT] = SDLK_INSERT;
keymap[SCANCODE_CLRHOME] = SDLK_HOME;
keymap[SCANCODE_UP] = SDLK_UP;
keymap[SCANCODE_DOWN] = SDLK_DOWN;
keymap[SCANCODE_RIGHT] = SDLK_RIGHT;
keymap[SCANCODE_LEFT] = SDLK_LEFT;

/* Special keys */
keymap[SCANCODE_ESCAPE] = SDLK_ESCAPE;
keymap[SCANCODE_BACKSPACE] = SDLK_BACKSPACE;
keymap[SCANCODE_TAB] = SDLK_TAB;
keymap[SCANCODE_ENTER] = SDLK_RETURN;
keymap[SCANCODE_DELETE] = SDLK_DELETE;
keymap[SCANCODE_LEFTCONTROL] = SDLK_LCTRL;
keymap[SCANCODE_LEFTSHIFT] = SDLK_LSHIFT;
keymap[SCANCODE_RIGHTSHIFT] = SDLK_RSHIFT;
keymap[SCANCODE_LEFTALT] = SDLK_LALT;
keymap[SCANCODE_CAPSLOCK] = SDLK_CAPSLOCK;
}

void Atari_PumpEvents(_THIS)
{
Atari_InitializeEvents(this);
Expand Down Expand Up @@ -162,3 +215,25 @@ Uint16 SDL_AtariToUnicodeTable[256]={
0x2261,0x00B1,0x2265,0x2264,0x2320,0x2321,0x00F7,0x2248,
0x00B0,0x2022,0x00B7,0x221A,0x207F,0x00B2,0x00B3,0x00AF
};

SDL_keysym *SDL_Atari_TranslateKey(int scancode, SDL_keysym *keysym,
SDL_bool pressed)
{
int asciicode = 0;

/* Set the keysym information */
keysym->scancode = scancode;
keysym->mod = KMOD_NONE;
keysym->sym = keymap[scancode];
keysym->unicode = 0;

if (keysym->sym == SDLK_UNKNOWN) {
keysym->sym = asciicode = keytab_normal[scancode];
}

if (SDL_TranslateUNICODE && pressed) {
keysym->unicode = SDL_AtariToUnicodeTable[asciicode];
}

return(keysym);
}
19 changes: 19 additions & 0 deletions src/video/ataricommon/SDL_atarievents_c.h
View file
Expand Up @@ -35,12 +35,31 @@
/* Hidden "this" pointer for the video functions */
#define _THIS SDL_VideoDevice *this

#define ATARIBIOS_MAXKEYS 128

/* Special keys state */
#ifndef K_RSHIFT
enum {
K_RSHIFT=0,
K_LSHIFT,
K_CTRL,
K_ALT,
K_CAPSLOCK,
K_CLRHOME,
K_INSERT
};
#endif

extern void (*Atari_ShutdownEvents)(void);

extern void Atari_InitOSKeymap(_THIS);
extern void Atari_PumpEvents(_THIS);

extern void SDL_Atari_InitInternalKeymap(_THIS);

/* Atari to Unicode charset translation table */
extern Uint16 SDL_AtariToUnicodeTable[256];
SDL_keysym *SDL_Atari_TranslateKey(int scancode, SDL_keysym *keysym,
SDL_bool pressed);

#endif /* _SDL_ATARI_EVENTS_H_ */
90 changes: 6 additions & 84 deletions src/video/ataricommon/SDL_biosevents.c
View file
Expand Up @@ -39,30 +39,10 @@
#include "SDL_xbiosevents_c.h"
#include "SDL_ataridevmouse_c.h"

/* To save state of keyboard */
#define ATARIBIOS_MAXKEYS 128

static unsigned char bios_currentkeyboard[ATARIBIOS_MAXKEYS];
static unsigned char bios_previouskeyboard[ATARIBIOS_MAXKEYS];
static unsigned char bios_currentascii[ATARIBIOS_MAXKEYS];
static SDL_bool use_dev_mouse = SDL_FALSE;

/* Special keys state */
enum {
K_RSHIFT=0,
K_LSHIFT,
K_CTRL,
K_ALT,
K_CAPSLOCK,
K_CLRHOME,
K_INSERT
};

/* The translation tables from a console scancode to a SDL keysym */
static SDLKey keymap[ATARIBIOS_MAXKEYS];

static SDL_keysym *TranslateKey(int scancode, int asciicode, SDL_keysym *keysym,
SDL_bool pressed);
static void UpdateSpecialKeys(int special_keys_state);

void AtariBios_InitOSKeymap(_THIS)
Expand All @@ -73,45 +53,15 @@ void AtariBios_InitOSKeymap(_THIS)
SDL_memset(bios_currentkeyboard, 0, sizeof(bios_currentkeyboard));
SDL_memset(bios_previouskeyboard, 0, sizeof(bios_previouskeyboard));

/* Initialize keymap */
for ( i=0; i<ATARIBIOS_MAXKEYS; i++ )
keymap[i] = SDLK_UNKNOWN;

/* Functions keys */
for ( i = 0; i<10; i++ )
keymap[SCANCODE_F1 + i] = SDLK_F1+i;

/* Cursor keypad */
keymap[SCANCODE_HELP] = SDLK_HELP;
keymap[SCANCODE_UNDO] = SDLK_UNDO;
keymap[SCANCODE_INSERT] = SDLK_INSERT;
keymap[SCANCODE_CLRHOME] = SDLK_HOME;
keymap[SCANCODE_UP] = SDLK_UP;
keymap[SCANCODE_DOWN] = SDLK_DOWN;
keymap[SCANCODE_RIGHT] = SDLK_RIGHT;
keymap[SCANCODE_LEFT] = SDLK_LEFT;

/* Special keys */
keymap[SCANCODE_ESCAPE] = SDLK_ESCAPE;
keymap[SCANCODE_BACKSPACE] = SDLK_BACKSPACE;
keymap[SCANCODE_TAB] = SDLK_TAB;
keymap[SCANCODE_ENTER] = SDLK_RETURN;
keymap[SCANCODE_DELETE] = SDLK_DELETE;
keymap[SCANCODE_LEFTCONTROL] = SDLK_LCTRL;
keymap[SCANCODE_LEFTSHIFT] = SDLK_LSHIFT;
keymap[SCANCODE_RIGHTSHIFT] = SDLK_RSHIFT;
keymap[SCANCODE_LEFTALT] = SDLK_LALT;
keymap[SCANCODE_CAPSLOCK] = SDLK_CAPSLOCK;

use_dev_mouse = (SDL_AtariDevMouse_Open()!=0) ? SDL_TRUE : SDL_FALSE;

vectors_mask = ATARI_XBIOS_JOYSTICKEVENTS; /* XBIOS joystick events */
if (!use_dev_mouse) {
vectors_mask |= ATARI_XBIOS_MOUSEEVENTS; /* XBIOS mouse events */
}
if (Getcookie(C_MiNT, &dummy)==C_FOUND) {
/* if (Getcookie(C_MiNT, &dummy)==C_FOUND) {
vectors_mask = 0;
}
}*/

SDL_AtariXbios_InstallVectors(vectors_mask);
}
Expand All @@ -126,15 +76,8 @@ void AtariBios_PumpEvents(_THIS)

while (Bconstat(_CON)) {
unsigned long key_pressed;
unsigned char asciicode, scancode;

key_pressed=Bconin(_CON);

asciicode = key_pressed;
scancode = key_pressed >> 16;

bios_currentkeyboard[scancode]=0xFF;
bios_currentascii[scancode]=asciicode;
bios_currentkeyboard[(key_pressed>>16)&(ATARIBIOS_MAXKEYS-1)]=0xFF;
}

/* Read special keys */
Expand All @@ -145,12 +88,12 @@ void AtariBios_PumpEvents(_THIS)
/* Key pressed ? */
if (bios_currentkeyboard[i] && !bios_previouskeyboard[i])
SDL_PrivateKeyboard(SDL_PRESSED,
TranslateKey(i, bios_currentascii[i], &keysym, SDL_TRUE));
SDL_Atari_TranslateKey(i, &keysym, SDL_TRUE));

/* Key unpressed ? */
if (bios_previouskeyboard[i] && !bios_currentkeyboard[i])
SDL_PrivateKeyboard(SDL_RELEASED,
TranslateKey(i, bios_currentascii[i], &keysym, SDL_FALSE));
SDL_Atari_TranslateKey(i, &keysym, SDL_FALSE));
}

if (use_dev_mouse) {
Expand All @@ -160,7 +103,7 @@ void AtariBios_PumpEvents(_THIS)
}

/* Will be previous table */
SDL_memcpy(bios_previouskeyboard, bios_currentkeyboard, ATARIBIOS_MAXKEYS);
SDL_memcpy(bios_previouskeyboard, bios_currentkeyboard, sizeof(bios_previouskeyboard));
}

static void UpdateSpecialKeys(int special_keys_state)
Expand All @@ -169,7 +112,6 @@ static void UpdateSpecialKeys(int special_keys_state)
{ \
if (special_keys_state & (1<<(numbit))) { \
bios_currentkeyboard[scancode]=0xFF; \
bios_currentascii[scancode]=0; \
} \
}

Expand All @@ -180,26 +122,6 @@ static void UpdateSpecialKeys(int special_keys_state)
UPDATE_SPECIAL_KEYS(K_CAPSLOCK, SCANCODE_CAPSLOCK);
}

static SDL_keysym *TranslateKey(int scancode, int asciicode, SDL_keysym *keysym,
SDL_bool pressed)
{
/* Set the keysym information */
keysym->scancode = scancode;

if (asciicode)
keysym->sym = asciicode;
else
keysym->sym = keymap[scancode];

keysym->mod = KMOD_NONE;
keysym->unicode = 0;
if (SDL_TranslateUNICODE && pressed) {
keysym->unicode = SDL_AtariToUnicodeTable[asciicode];
}

return(keysym);
}

void AtariBios_ShutdownEvents(void)
{
SDL_AtariXbios_RestoreVectors();
Expand Down

0 comments on commit 10e3f61

Please sign in to comment.