git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AcessNative - TCP client implimented, buggy
[tpg/acess2.git]
/
AcessNative
/
acesskernel_src
/
ui_sdl.c
diff --git
a/AcessNative/acesskernel_src/ui_sdl.c
b/AcessNative/acesskernel_src/ui_sdl.c
index
6917c6c
..
ae1d811
100644
(file)
--- 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);
// 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();
if( !gScreen ) {
fprintf(stderr, "Couldn't set %ix%i video mode: %s\n", giUI_Width, giUI_Height, SDL_GetError());
SDL_Quit();
@@
-102,6
+102,8
@@
Uint32 UI_GetAcessKeyFromSDL(SDLKey Sym, Uint16 Unicode)
case SDLK_F11: ret = KEY_F11; break;
case SDLK_F12: ret = KEY_F12; break;
case SDLK_RETURN: ret = '\n'; break;
case SDLK_F11: ret = KEY_F11; break;
case SDLK_F12: ret = KEY_F12; break;
case SDLK_RETURN: ret = '\n'; break;
+ case SDLK_LALT: ret = KEY_LALT; break;
+ case SDLK_RALT: ret = KEY_RALT; break;
default:
printf("Unhandled key code %i\n", Sym);
break;
default:
printf("Unhandled key code %i\n", Sym);
break;
@@
-131,18
+133,27
@@
void UI_MainLoop(void)
acess_sym = UI_GetAcessKeyFromSDL(event.key.keysym.sym,
event.key.keysym.unicode);
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);
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;
break;
-
+
+ case SDL_USEREVENT:
+ SDL_UpdateRect(gScreen, 0, 0, giUI_Width, giUI_Height);
+ SDL_Flip(gScreen);
+ break;
+
default:
break;
}
default:
break;
}
@@
-198,5
+209,13
@@
void UI_FillBitmap(int X, int Y, int W, int H, Uint32 Value)
void UI_Redraw(void)
{
// TODO: Keep track of changed rectangle
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 );
}
}
UCC
git Repository :: git.ucc.asn.au