X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fui_sdl.c;h=a3e4d4b9cc681beb3671622c3845b082f6587ad6;hb=13078002b01ee4f63eb2001d2ef479a2a006ea32;hp=3f3cb1397cf89b8009261209869792de95904c06;hpb=3764c294f21229bdf700f436fa4884f5e76e0d3a;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/ui_sdl.c b/AcessNative/acesskernel_src/ui_sdl.c
index 3f3cb139..a3e4d4b9 100644
--- a/AcessNative/acesskernel_src/ui_sdl.c
+++ b/AcessNative/acesskernel_src/ui_sdl.c
@@ -7,14 +7,13 @@
 #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);
@@ -28,6 +27,7 @@ SDL_Thread	*gInputThread;
  int	giUI_Pitch = 0;
 tUI_KeybardCallback	gUI_KeyboardCallback;
 Uint32	gUI_Keymap[2][SDLK_LAST];	// Upper/Lower case
+ int	gbUpdateTriggered = 0;
 
 // === FUNCTIONS ===
 int UI_Initialise(int MaxWidth, int MaxHeight)
@@ -36,16 +36,29 @@ int UI_Initialise(int MaxWidth, int MaxHeight)
 	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, SDL_DOUBLEBUF);
+ 	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;
 }
 
-Uint32 UI_GetAcessKeyFromSDL(SDLKey Sym, Uint16 Unicode)
+Uint32 UI_GetAcessKeyFromSDL(SDLKey Sym)
 {
 	Uint8	*keystate = SDL_GetKeyState(NULL);
 	 int	shiftState = 0;
@@ -57,95 +70,120 @@ Uint32 UI_GetAcessKeyFromSDL(SDLKey Sym, Uint16 Unicode)
 	// Fast return
 	if( gUI_Keymap[shiftState][Sym] )
 		return gUI_Keymap[shiftState][Sym];
-	
-	// How nice of you, a unicode value
-	if( Unicode )
-	{
-		ret = Unicode;
-	}
-	// Ok, we need to do work :(
-	else
+
+	switch(Sym)
 	{
-		switch(Sym)
-		{
-		case SDLK_UP:	ret = KEY_UP;	break;
-		case SDLK_DOWN:	ret = KEY_DOWN;	break;
-		case SDLK_LEFT:	ret = KEY_LEFT;	break;
-		case SDLK_RIGHT:ret = KEY_RIGHT;break;
-		case SDLK_CAPSLOCK:	ret = KEY_CAPSLOCK;	break;
-		case SDLK_F1:	ret = KEY_F1;	break;
-		case SDLK_F2:	ret = KEY_F2;	break;
-		case SDLK_F3:	ret = KEY_F3;	break;
-		case SDLK_F4:	ret = KEY_F4;	break;
-		case SDLK_F5:	ret = KEY_F5;	break;
-		case SDLK_F6:	ret = KEY_F6;	break;
-		case SDLK_F7:	ret = KEY_F7;	break;
-		case SDLK_F8:	ret = KEY_F8;	break;
-		case SDLK_F9:	ret = KEY_F9;	break;
-		case SDLK_F10:	ret = KEY_F10;	break;
-		case SDLK_F11:	ret = KEY_F11;	break;
-		case SDLK_F12:	ret = KEY_F12;	break;
-		default:
-			printf("Unhandled key code %i\n", Sym);
-			break;
-		}
+	case SDLK_a ... SDLK_z:
+		ret = Sym - SDLK_a + KEYSYM_a;
+		break;
+	case SDLK_0 ... SDLK_9:
+		ret = Sym - SDLK_0 + KEYSYM_0;
+		break;
+	case SDLK_SLASH:	ret = KEYSYM_SLASH;	break;
+	case SDLK_CAPSLOCK:	ret = KEYSYM_CAPS;	break;
+	case SDLK_TAB:	ret = KEYSYM_TAB;	break;
+	case SDLK_UP:	ret = KEYSYM_UPARROW;	break;
+	case SDLK_DOWN:	ret = KEYSYM_DOWNARROW;	break;
+	case SDLK_LEFT:	ret = KEYSYM_LEFTARROW;	break;
+	case SDLK_RIGHT:ret = KEYSYM_RIGHTARROW;break;
+	case SDLK_F1:	ret = KEYSYM_F1;	break;
+	case SDLK_F2:	ret = KEYSYM_F2;	break;
+	case SDLK_F3:	ret = KEYSYM_F3;	break;
+	case SDLK_F4:	ret = KEYSYM_F4;	break;
+	case SDLK_F5:	ret = KEYSYM_F5;	break;
+	case SDLK_F6:	ret = KEYSYM_F6;	break;
+	case SDLK_F7:	ret = KEYSYM_F7;	break;
+	case SDLK_F8:	ret = KEYSYM_F8;	break;
+	case SDLK_F9:	ret = KEYSYM_F9;	break;
+	case SDLK_F10:	ret = KEYSYM_F10;	break;
+	case SDLK_F11:	ret = KEYSYM_F11;	break;
+	case SDLK_F12:	ret = KEYSYM_F12;	break;
+	case SDLK_RETURN:	ret = KEYSYM_RETURN;	break;
+	case SDLK_LALT: 	ret = KEYSYM_LEFTALT;	break;
+	case SDLK_LCTRL: 	ret = KEYSYM_LEFTCTRL;	break;
+	case SDLK_LSHIFT:	ret = KEYSYM_LEFTSHIFT;	break;
+	case SDLK_LSUPER:	ret = KEYSYM_LEFTGUI;	break;
+	case SDLK_RALT: 	ret = KEYSYM_RIGHTALT;	break;
+	case SDLK_RCTRL: 	ret = KEYSYM_RIGHTCTRL;	break;
+	case SDLK_RSHIFT: 	ret = KEYSYM_RIGHTSHIFT;	break;
+	case SDLK_RSUPER:	ret = KEYSYM_RIGHTGUI;	break;
+	case SDLK_BACKSPACE:	ret = KEYSYM_BACKSP;	break;
+	default:
+		printf("Unhandled key code %i\n", Sym);
+		break;
 	}
 	
 	gUI_Keymap[shiftState][Sym] = ret;
 	return ret;
 }
 
-int UI_MainThread(void *Unused)
+Uint32 UI_GetButtonBits(Uint8 sdlstate)
+{
+	Uint32	rv = 0;
+	rv |= sdlstate & SDL_BUTTON(SDL_BUTTON_LEFT)	? (1 << 0) : 0;
+	rv |= sdlstate & SDL_BUTTON(SDL_BUTTON_RIGHT)	? (1 << 1) : 0;
+	rv |= sdlstate & SDL_BUTTON(SDL_BUTTON_MIDDLE)	? (1 << 2) : 0;
+	rv |= sdlstate & SDL_BUTTON(SDL_BUTTON_X1)	? (1 << 3) : 0;
+	rv |= sdlstate & SDL_BUTTON(SDL_BUTTON_X2)	? (1 << 4) : 0;
+	return rv;
+}
+
+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_WaitEvent(&event) )
 	{
-		while(SDL_PollEvent(&event))
+		switch(event.type)
 		{
-			switch(event.type)
-			{
-			case SDL_QUIT:
-				AcessNative_Exit();
-				return 0;
-				
-			case SDL_KEYDOWN:
-				acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym,
-					event.key.keysym.unicode);
-				
-				if( gUI_KeyboardCallback )
-					gUI_KeyboardCallback(acess_sym);
-				break;
+		case SDL_QUIT:
+			AcessNative_Exit();
+			return ;
 			
-			case SDL_KEYUP:
-				acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym,
-					event.key.keysym.unicode);
-				
-				if( gUI_KeyboardCallback )
-					gUI_KeyboardCallback(0x80000000|acess_sym);
-				break;
+		case SDL_KEYDOWN:
+			acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym);
+			// Enter key on acess returns \n, but SDL returns \r
+			if(event.key.keysym.sym == SDLK_RETURN)
+				event.key.keysym.unicode = '\n';				
+
+			if( gUI_KeyboardCallback ) {
+				gUI_KeyboardCallback(KEY_ACTION_RAWSYM|acess_sym);
+				gUI_KeyboardCallback(KEY_ACTION_PRESS|event.key.keysym.unicode);
+			}
+			break;
+		
+		case SDL_KEYUP:
+			acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym);
 			
-			default:
-				break;
+			if( gUI_KeyboardCallback ) {
+				gUI_KeyboardCallback(KEY_ACTION_RAWSYM|acess_sym);
+				gUI_KeyboardCallback(KEY_ACTION_RELEASE|0);
 			}
+			break;
+
+		case SDL_USEREVENT:
+			if( gbUpdateTriggered )
+			{
+				gbUpdateTriggered = 0;
+				SDL_UpdateRect(gScreen, 0, 0, giUI_Width, giUI_Height);
+				SDL_Flip(gScreen);
+			}
+			break;
+		
+		case SDL_MOUSEMOTION: {
+			int abs[] = {event.motion.x, event.motion.y};
+			int delta[] = {event.motion.xrel, event.motion.yrel};
+			Mouse_HandleEvent(UI_GetButtonBits(SDL_GetMouseState(NULL, NULL)), delta, abs);
+			break; }
+		case SDL_MOUSEBUTTONUP:
+		case SDL_MOUSEBUTTONDOWN: {
+			int abs[] = {event.button.x, event.button.y};
+			Mouse_HandleEvent(UI_GetButtonBits(SDL_GetMouseState(NULL, NULL)), NULL, abs);
+			break; }
+
+		default:
+			break;
 		}
 	}
 }
@@ -198,5 +236,17 @@ void UI_FillBitmap(int X, int Y, int W, int H, Uint32 Value)
 void UI_Redraw(void)
 {
 	// TODO: Keep track of changed rectangle
-	SDL_UpdateRect(gScreen, 0, 0, giUI_Width, giUI_Height);
+//	SDL_UpdateRect(gScreen, 0, 0, giUI_Width, giUI_Height);
+	if( gbUpdateTriggered == 0 )
+	{
+		gbUpdateTriggered = 1;
+		SDL_Event	e;
+
+		e.type = SDL_USEREVENT;
+		e.user.code = 0;
+		e.user.data1 = 0;
+		e.user.data2 = 0;	
+
+		SDL_PushEvent( &e );
+	}
 }