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

fiddling around with #138

Browse Source
This commit is contained in:
titiger
2016-11-06 22:00:51 +01:00
parent 0c3c636064
commit 4a85b17794
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ private:
static bool tryVSynch; static bool tryVSynch;
static int64 lastToggle; static int64 lastToggle;
static void setLastToggle(int64 lastMouseEvent) {Window::lastToggle = lastToggle;} static void setLastToggle(int64 lastToggle) {Window::lastToggle = lastToggle;}
static int64 getLastToggle() {return Window::lastToggle;} static int64 getLastToggle() {return Window::lastToggle;}
static void setLastMouseEvent(int64 lastMouseEvent) {Window::lastMouseEvent = lastMouseEvent;} static void setLastMouseEvent(int64 lastMouseEvent) {Window::lastMouseEvent = lastMouseEvent;}

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

@@ -48,7 +48,7 @@ MouseState Window::mouseState;
bool Window::isKeyPressedDown = false; bool Window::isKeyPressedDown = false;
bool Window::isFullScreen = false; bool Window::isFullScreen = false;
SDL_keysym Window::keystate; SDL_keysym Window::keystate;
int64 Window::lastToggle = -5000; int64 Window::lastToggle = -1000;
bool Window::isActive = false; bool Window::isActive = false;
#ifdef WIN32 #ifdef WIN32
@@ -145,7 +145,7 @@ Window::Window() {
Window::isActive = true; Window::isActive = true;
lastMouseEvent = 0; lastMouseEvent = 0;
lastToggle = -5000; lastToggle = -1000;
mousePos = Vec2i(0); mousePos = Vec2i(0);
mouseState.clear(); mouseState.clear();
@@ -175,7 +175,7 @@ Window::Window(SDL_Window *sdlWindow) {
Window::isActive = true; Window::isActive = true;
lastMouseEvent = 0; lastMouseEvent = 0;
lastToggle = -5000; lastToggle = -1000;
mousePos = Vec2i(0); mousePos = Vec2i(0);
mouseState.clear(); mouseState.clear();
@@ -370,7 +370,7 @@ bool Window::handleEvent() {
&& (event.key.keysym.mod & (KMOD_LALT | KMOD_RALT))) { && (event.key.keysym.mod & (KMOD_LALT | KMOD_RALT))) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d] SDLK_RETURN pressed.\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d] SDLK_RETURN pressed.\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
if(Chrono::getCurMillis()-getLastToggle()>5000){ if(Chrono::getCurMillis()-getLastToggle()>1000){
toggleFullscreen(); toggleFullscreen();
setLastToggle(Chrono::getCurMillis()); setLastToggle(Chrono::getCurMillis());
} }
@@ -422,10 +422,12 @@ bool Window::handleEvent() {
if(global_window) { if(global_window) {
global_window->eventKeyUp(event.key); global_window->eventKeyUp(event.key);
} }
string keyName = SDL_GetKeyName(event.key.keysym.sym);
if( (keyName == "Return" || keyName == "Enter")){ // here is the problem, we have with too many key up events:
setLastToggle(-5000); // string keyName = SDL_GetKeyName(event.key.keysym.sym);
} // if( (keyName == "Return" || keyName == "Enter")){
// setLastToggle(-1000);
// }
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("In [%s::%s Line: %d] =================================== END OF SDL SDL_KEYUP ================================\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("In [%s::%s Line: %d] =================================== END OF SDL SDL_KEYUP ================================\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
@@ -436,7 +438,7 @@ bool Window::handleEvent() {
codeLocation = "k"; codeLocation = "k";
// if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] SDL_ACTIVEEVENT event.active.state = %d event.active. = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,event.active.state,event.active.gain); // if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] SDL_ACTIVEEVENT event.active.state = %d event.active. = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,event.active.state,event.active.gain);
// //
// if(SystemFlags::VERBreturnOSE_MODE_ENABLED) printf ("In [%s::%s Line: %d] Window::isActive = %d event.active.state = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,Window::isActive,event.active.state); // if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("In [%s::%s Line: %d] Window::isActive = %d event.active.state = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,Window::isActive,event.active.state);
// //
// // Check if the program has lost window focus // // Check if the program has lost window focus
// if ((event.active.state & (SDL_APPACTIVE | SDL_APPINPUTFOCUS))) { // if ((event.active.state & (SDL_APPACTIVE | SDL_APPINPUTFOCUS))) {