mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

More bug fixes for error handling if we have early program launch errors.

Browse Source
This commit is contained in:
Mark Vejvoda
2010-03-23 08:46:20 +00:00
parent 1fbff088e4
commit 221b099c67
5 changed files with 192 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,17 +51,21 @@ bool Window::handleEvent() {
SDL_Event event;
while(SDL_PollEvent(&event)) {
try {
//printf("[%d]\n",event.type);
//printf("START [%d]\n",event.type);
switch(event.type) {
case SDL_QUIT:
return false;
case SDL_MOUSEBUTTONDOWN:
global_window->handleMouseDown(event);
if(global_window) {
global_window->handleMouseDown(event);
}
break;
case SDL_MOUSEBUTTONUP: {
global_window->eventMouseUp(event.button.x,
if(global_window) {
global_window->eventMouseUp(event.button.x,
event.button.y,getMouseButton(event.button.button));
}
break;
}
case SDL_MOUSEMOTION: {
@@ -69,7 +73,10 @@ bool Window::handleEvent() {
ms.leftMouse = (event.motion.state & SDL_BUTTON_LMASK) != 0;
ms.rightMouse = (event.motion.state & SDL_BUTTON_RMASK) != 0;
ms.centerMouse = (event.motion.state & SDL_BUTTON_MMASK) != 0;
global_window->eventMouseMove(event.motion.x, event.motion.y, &ms);
if(global_window) {
global_window->eventMouseMove(event.motion.x, event.motion.y, &ms);
}
break;
}
case SDL_KEYDOWN:
@@ -78,11 +85,15 @@ bool Window::handleEvent() {
&& (event.key.keysym.mod & (KMOD_LALT | KMOD_RALT))) {
toggleFullscreen();
}
global_window->eventKeyDown(getKey(event.key.keysym));
global_window->eventKeyPress(static_cast<char>(event.key.keysym.unicode));
if(global_window) {
global_window->eventKeyDown(getKey(event.key.keysym));
global_window->eventKeyPress(static_cast<char>(event.key.keysym.unicode));
}
break;
case SDL_KEYUP:
global_window->eventKeyUp(getKey(event.key.keysym));
if(global_window) {
global_window->eventKeyUp(getKey(event.key.keysym));
}
break;
}
} catch(std::exception& e) {
@@ -90,6 +101,8 @@ bool Window::handleEvent() {
}
}
//printf("END [%d]\n",event.type);
return true;
}