#define const
#include "ui.h"
#undef const
-#include <tpl_drv_keyboard.h>
+#include <api_drv_keyboard.h>
// === IMPORTS ===
extern void AcessNative_Exit(void);
// === PROTOTYPES ===
int UI_Initialise(int MaxWidth, int MaxHeight);
- int UI_MainThread(void *Unused);
void UI_BlitBitmap(int DstX, int DstY, int SrcW, int SrcH, Uint32 *Bitmap);
void UI_BlitFramebuffer(int DstX, int DstY, int SrcX, int SrcY, int W, int H);
void UI_FillBitmap(int X, int Y, int W, int H, Uint32 Value);
giUI_Width = MaxWidth;
giUI_Height = MaxHeight;
- // Start main thread
- gInputThread = SDL_CreateThread(UI_MainThread, NULL);
+ // Set up video
+ SDL_Init(SDL_INIT_VIDEO);
+ printf("UI attempting %ix%i %ibpp\n", giUI_Width, giUI_Height, 32);
+ gScreen = SDL_SetVideoMode(giUI_Width, giUI_Height, 32, 0);
+ if( !gScreen ) {
+ fprintf(stderr, "Couldn't set %ix%i video mode: %s\n", giUI_Width, giUI_Height, SDL_GetError());
+ SDL_Quit();
+ exit(2);
+ }
+ SDL_WM_SetCaption("Acess2", "Acess2");
- while(gScreen == NULL)
- SDL_Delay(10);
+ giUI_Width = gScreen->w;
+ giUI_Height = gScreen->h;
+ giUI_Pitch = gScreen->pitch;
+
+ printf("UI window %ix%i %i bytes per line\n", giUI_Width, giUI_Height, giUI_Pitch);
+ SDL_EnableUNICODE(1);
+
return 0;
}
// Fast return
if( gUI_Keymap[shiftState][Sym] )
return gUI_Keymap[shiftState][Sym];
+
+ // Enter key on acess returns \n, but SDL returns \r
+ if( Sym == SDLK_RETURN )
+ Unicode = '\n';
// How nice of you, a unicode value
if( Unicode )
case SDLK_F10: ret = KEY_F10; break;
case SDLK_F11: ret = KEY_F11; break;
case SDLK_F12: ret = KEY_F12; break;
+ case SDLK_RETURN: ret = '\n'; break;
default:
printf("Unhandled key code %i\n", Sym);
break;
return ret;
}
-int UI_MainThread(void *Unused)
+void UI_MainLoop(void)
{
SDL_Event event;
Uint32 acess_sym;
-
- SDL_Init(SDL_INIT_VIDEO);
-
- // Set up video
- gScreen = SDL_SetVideoMode(giUI_Width, giUI_Height, 32, 0);
- if( !gScreen ) {
- fprintf(stderr, "Couldn't set %ix%i video mode: %s\n", giUI_Width, giUI_Height, SDL_GetError());
- SDL_Quit();
- exit(2);
- }
- SDL_WM_SetCaption("Acess2", "Acess2");
-
- giUI_Width = gScreen->w;
- giUI_Height = gScreen->h;
- giUI_Pitch = gScreen->pitch;
-
- SDL_EnableUNICODE(1);
-
+
for( ;; )
{
while(SDL_PollEvent(&event))
{
case SDL_QUIT:
AcessNative_Exit();
- return 0;
+ return ;
case SDL_KEYDOWN:
acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym,