mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-25 17:20:43 +02:00
Code Issues Projects Releases Wiki Activity

- completed screen UI work. F11 will save current menu UI config to ini file, F5 will cause a reload of INI realtime

Browse Source
This commit is contained in:
Mark Vejvoda
2010-09-09 21:07:39 +00:00
parent 7f9c9cde28
commit 6a24ca3ad0
30 changed files with 350 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/shared_lib/include/platform/sdl/window.h
View File

@@ -95,6 +95,18 @@ const char vkDown = -10;
const char vkReturn = -11;
const char vkBack = -12;
const char vkTab = -13;
const char vkF1 = -14;
const char vkF2 = -15;
const char vkF3 = -16;
const char vkF4 = -17;
const char vkF5 = -18;
const char vkF6 = -19;
const char vkF7 = -20;
const char vkF8 = -21;
const char vkF9 = -22;
const char vkF10 = -23;
const char vkF11 = -24;
const char vkF12 = -25;
enum WindowStyle{
wsFullscreen,

41
source/shared_lib/sources/platform/sdl/window.cpp
View File

@@ -184,6 +184,7 @@ bool Window::handleEvent() {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
break;
case SDL_KEYUP:
//printf("In [%s::%s] Line :%d\n",__FILE__,__FUNCTION__,__LINE__);
@@ -192,6 +193,8 @@ bool Window::handleEvent() {
Window::isKeyPressedDown = false;
keystate = event.key.keysym;
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] KEY_UP, Raw SDL key [%d] mod [%d] unicode [%d] scancode [%d]\n",__FILE__,__FUNCTION__,__LINE__,event.key.keysym.sym,event.key.keysym.mod,event.key.keysym.unicode,event.key.keysym.scancode);
if(global_window) {
global_window->eventKeyUp(getKey(event.key.keysym,true));
}
@@ -569,6 +572,8 @@ MouseButton Window::getMouseButton(int sdlButton) {
}
char Window::getKey(SDL_keysym keysym,bool skipSpecialKeys) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] keysym.sym [%d] skipSpecialKeys = %d.\n",__FILE__,__FUNCTION__,__LINE__,keysym.sym,skipSpecialKeys);
if(skipSpecialKeys == false) {
switch(keysym.sym) {
case SDLK_LALT:
@@ -615,6 +620,42 @@ char Window::getKey(SDL_keysym keysym,bool skipSpecialKeys) {
return vkTab;
case SDLK_BACKSPACE:
return vkBack;
case SDLK_F1:
return vkF1;
break;
case SDLK_F2:
return vkF2;
break;
case SDLK_F3:
return vkF3;
break;
case SDLK_F4:
return vkF4;
break;
case SDLK_F5:
return vkF5;
break;
case SDLK_F6:
return vkF6;
break;
case SDLK_F7:
return vkF7;
break;
case SDLK_F8:
return vkF8;
break;
case SDLK_F9:
return vkF9;
break;
case SDLK_F10:
return vkF10;
break;
case SDLK_F11:
return vkF11;
break;
case SDLK_F12:
return vkF12;
break;
case SDLK_0:
return '0';
case SDLK_1: