Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-28 11:45:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Started work to update for 1.3 api

Browse Source
This commit is contained in:
Patrice Mandin
2006-09-20 21:22:08 +00:00
parent 140c4d647e
commit 006f974cd8
5 changed files with 21 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/video/ataricommon/SDL_atarievents.c
View File

@@ -60,10 +60,10 @@ enum
static SDLKey keymap[ATARIBIOS_MAXKEYS];
static unsigned char *keytab_normal;
void (*Atari_ShutdownEvents) (void);
void (*SDL_Atari_ShutdownEvents) (void);
static void
Atari_InitializeEvents(_THIS)
SDL_Atari_InitializeEvents(_THIS)
{
const char *envr;
unsigned long cookie_mch;
@@ -81,14 +81,12 @@ Atari_InitializeEvents(_THIS)
case MCH_TT:
case MCH_F30:
case MCH_ARANYM:
this->InitOSKeymap = AtariIkbd_InitOSKeymap;
this->PumpEvents = AtariIkbd_PumpEvents;
Atari_ShutdownEvents = AtariIkbd_ShutdownEvents;
_this->PumpEvents = AtariIkbd_PumpEvents;
SDL_Atari_ShutdownEvents = AtariIkbd_ShutdownEvents;
break;
default:
this->InitOSKeymap = AtariGemdos_InitOSKeymap;
this->PumpEvents = AtariGemdos_PumpEvents;
Atari_ShutdownEvents = AtariGemdos_ShutdownEvents;
_this->PumpEvents = AtariGemdos_PumpEvents;
SDL_Atari_ShutdownEvents = AtariGemdos_ShutdownEvents;
break;
}
@@ -99,42 +97,34 @@ Atari_InitializeEvents(_THIS)
}
if (SDL_strcmp(envr, "ikbd") == 0) {
this->InitOSKeymap = AtariIkbd_InitOSKeymap;
this->PumpEvents = AtariIkbd_PumpEvents;
Atari_ShutdownEvents = AtariIkbd_ShutdownEvents;
_this->PumpEvents = AtariIkbd_PumpEvents;
SDL_Atari_ShutdownEvents = AtariIkbd_ShutdownEvents;
}
if (SDL_strcmp(envr, "gemdos") == 0) {
this->InitOSKeymap = AtariGemdos_InitOSKeymap;
this->PumpEvents = AtariGemdos_PumpEvents;
Atari_ShutdownEvents = AtariGemdos_ShutdownEvents;
_this->PumpEvents = AtariGemdos_PumpEvents;
SDL_Atari_ShutdownEvents = AtariGemdos_ShutdownEvents;
}
if (SDL_strcmp(envr, "bios") == 0) {
this->InitOSKeymap = AtariBios_InitOSKeymap;
this->PumpEvents = AtariBios_PumpEvents;
Atari_ShutdownEvents = AtariBios_ShutdownEvents;
_this->PumpEvents = AtariBios_PumpEvents;
SDL_Atari_ShutdownEvents = AtariBios_ShutdownEvents;
}
}
void
Atari_InitOSKeymap(_THIS)
{
Atari_InitializeEvents(this);
SDL_Atari_InitInternalKeymap(this);
/* Call choosen routine */
this->InitOSKeymap(this);
SDL_Atari_InitInternalKeymap(_this);
}
void
Atari_PumpEvents(_THIS)
{
Atari_InitializeEvents(this);
static int first_time = 1;
if (first_time) {
Atari_InitializeEvents(_this);
first_time = 0;
}
/* Call choosen routine */
this->PumpEvents(this);
_this->PumpEvents(_this);
}
void

8
src/video/ataricommon/SDL_atarievents_c.h
View File

@@ -32,9 +32,6 @@
#include "../SDL_sysvideo.h"
/* Hidden "this" pointer for the video functions */
#define _THIS SDL_VideoDevice *this
#define ATARIBIOS_MAXKEYS 128
/* Special keys state */
@@ -50,10 +47,9 @@ enum {
};
#endif
extern void (*Atari_ShutdownEvents) (void);
extern void (*SDL_Atari_ShutdownEvents) (void);
extern void Atari_InitOSKeymap(_THIS);
extern void Atari_PumpEvents(_THIS);
extern void SDL_Atari_PumpEvents(_THIS);
extern void SDL_Atari_InitInternalKeymap(_THIS);

3
src/video/ataricommon/SDL_biosevents_c.h
View File

@@ -32,9 +32,6 @@
#include "../SDL_sysvideo.h"
/* Hidden "this" pointer for the video functions */
#define _THIS SDL_VideoDevice *this
extern void AtariBios_InitOSKeymap(_THIS);
extern void AtariBios_PumpEvents(_THIS);
extern void AtariBios_ShutdownEvents(void);

3
src/video/ataricommon/SDL_gemdosevents_c.h
View File

@@ -32,9 +32,6 @@
#include "../SDL_sysvideo.h"
/* Hidden "this" pointer for the video functions */
#define _THIS SDL_VideoDevice *this
extern void AtariGemdos_InitOSKeymap(_THIS);
extern void AtariGemdos_PumpEvents(_THIS);
extern void AtariGemdos_ShutdownEvents(void);

3
src/video/ataricommon/SDL_ikbdevents_c.h
View File

@@ -32,9 +32,6 @@
#include "../SDL_sysvideo.h"
/* Hidden "this" pointer for the video functions */
#define _THIS SDL_VideoDevice *this
extern void AtariIkbd_InitOSKeymap(_THIS);
extern void AtariIkbd_PumpEvents(_THIS);
extern void AtariIkbd_ShutdownEvents(void);