X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fui_sdl.c;h=520ac0091dd23f74a654a8589d7a99889bb47a28;hb=48025ef1ac8dd0445bc6a07fbc6c1ac9cb07991e;hp=6917c6c12d4e5b078de1eb5d3d47de5bd881b222;hpb=b8b25ae01e13c655608fb6705574e5218b1a519f;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/ui_sdl.c b/AcessNative/acesskernel_src/ui_sdl.c
index 6917c6c1..520ac009 100644
--- a/AcessNative/acesskernel_src/ui_sdl.c
+++ b/AcessNative/acesskernel_src/ui_sdl.c
@@ -38,7 +38,7 @@ int UI_Initialise(int MaxWidth, int MaxHeight)
 	// 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);
+	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();
@@ -131,18 +131,27 @@ void UI_MainLoop(void)
 				acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym,
 					event.key.keysym.unicode);
 				
-				if( gUI_KeyboardCallback )
-					gUI_KeyboardCallback(acess_sym);
+				if( gUI_KeyboardCallback ) {
+					gUI_KeyboardCallback(KEY_ACTION_RAWSYM|event.key.keysym.sym);
+					gUI_KeyboardCallback(KEY_ACTION_PRESS|acess_sym);
+				}
 				break;
 			
 			case SDL_KEYUP:
 				acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym,
 					event.key.keysym.unicode);
 				
-				if( gUI_KeyboardCallback )
-					gUI_KeyboardCallback(0x80000000|acess_sym);
+				if( gUI_KeyboardCallback ) {
+					gUI_KeyboardCallback(KEY_ACTION_RAWSYM|event.key.keysym.sym);
+					gUI_KeyboardCallback(KEY_ACTION_RELEASE|acess_sym);
+				}
 				break;
-			
+
+			case SDL_USEREVENT:
+				SDL_UpdateRect(gScreen, 0, 0, giUI_Width, giUI_Height);
+				SDL_Flip(gScreen);
+				break;		
+	
 			default:
 				break;
 			}
@@ -198,5 +207,13 @@ 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);
+	SDL_Event	e;
+
+	e.type = SDL_USEREVENT;
+	e.user.code = 0;
+	e.user.data1 = 0;
+	e.user.data2 = 0;	
+
+	SDL_PushEvent( &e );
 }