Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. v0.6.2-1651-g2a8af85
|
From: Jaka K. <lyn...@us...> - 2011-09-05 21:21:56
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 2a8af85e8ffb72923e1014f99756fe5a464bfd9a (commit)
Summary of changes:
gemrb/plugins/SDLVideo/SDLVideo.cpp | 50 +++++++++++++++++-----------------
1 files changed, 25 insertions(+), 25 deletions(-)
from 7fdc589d721f7236d1f91c3fa9ae4c5223bab495 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=2a8af85e8ffb72923e1014f99756fe5a464bfd9a
commit 2a8af85e8ffb72923e1014f99756fe5a464bfd9a
Author: Jaka Kranjc <lyn...@us...>
Date: Mon Sep 5 23:20:34 2011 +0200
sdlvideo: fixed spaces vs tabs mess
-w suggested
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index f259c7a..f9a0e03 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -41,7 +41,7 @@
#ifdef TARGET_OS_IPHONE
extern "C" {
- #include "SDL_sysvideo.h"
+ #include "SDL_sysvideo.h"
}
#include "SDL_uikitkeyboard.h"
#endif
@@ -276,8 +276,8 @@ int SDLVideoDriver::PollEvents() {
unsigned long time = lastTime;
unsigned char key = 0;
- static bool ignoreNextMouseUp = false;
- static Uint16 numFingers = 0;
+ static bool ignoreNextMouseUp = false;
+ static Uint16 numFingers = 0;
#if SDL_VERSION_ATLEAST(1,3,0)
/* multitouch gesture support */
@@ -291,7 +291,7 @@ int SDLVideoDriver::PollEvents() {
if(state){
xScaleFactor = state->xres / disp->w;
yScaleFactor = state->yres / disp->h;
- }
+ }
static bool touchHold = false;
static Uint32 touchHoldTime = 0;
@@ -299,11 +299,11 @@ int SDLVideoDriver::PollEvents() {
static SDL_MouseButtonEvent rightMouseUpEvent = {SDL_MOUSEBUTTONUP, 0, SDL_BUTTON_RIGHT, SDL_RELEASED, 0, 0, 0, 0};
if (touchHold && (SDL_GetTicks() - touchHoldTime) >= TOUCH_RC_NUM_TICKS) {
- SDL_Event evtDown;
- evtDown.type = SDL_MOUSEBUTTONDOWN;
- evtDown.button = rightMouseDownEvent;
+ SDL_Event evtDown;
+ evtDown.type = SDL_MOUSEBUTTONDOWN;
+ evtDown.button = rightMouseDownEvent;
- SDL_PushEvent(&evtDown);
+ SDL_PushEvent(&evtDown);
GameControl* gc = core->GetGameControl();
if (Evnt->GetMouseFocusedControlType() == IE_GUI_GAMECONTROL && gc && gc->GetTargetMode() == TARGET_MODE_NONE) {
@@ -451,11 +451,11 @@ int SDLVideoDriver::PollEvents() {
Evnt->KeyPress( key, modstate);
}
break;
- //!!!!!!!!!!!!
- // !!!: currently SDL brodcasts both mouse and touch events on touch
- // there is no API to prevent the mouse events so I have hacked the mouse events.
- // watch future SDL 1.3 releases to see if/when disabling mouse events from the touchscreen is available
- //!!!!!!!!!!!!
+ //!!!!!!!!!!!!
+ // !!!: currently SDL brodcasts both mouse and touch events on touch
+ // there is no API to prevent the mouse events so I have hacked the mouse events.
+ // watch future SDL 1.3 releases to see if/when disabling mouse events from the touchscreen is available
+ //!!!!!!!!!!!!
case SDL_MOUSEMOTION:
if (numFingers > 1) break;
lastevent = false;
@@ -513,7 +513,7 @@ int SDLVideoDriver::PollEvents() {
Evnt->MouseWheelScroll( scrollX, scrollY );
break;
case SDL_FINGERMOTION://SDL 1.3+
- //For swipes. gestures needing pinch or rotate need to use SDL_MULTIGESTURE or SDL_DOLLARGESTURE
+ //For swipes. gestures needing pinch or rotate need to use SDL_MULTIGESTURE or SDL_DOLLARGESTURE
touchHold = false;
if (Evnt) {
if (numFingers == core->NumFingScroll || Evnt->GetMouseFocusedControlType() == IE_GUI_TEXTAREA) { //any # of fingers will scroll a text area
@@ -526,17 +526,17 @@ int SDLVideoDriver::PollEvents() {
}
//invert the coordinates such that dragging down scrolls up etc.
int scrollX = (event.tfinger.dx / xScaleFactor) * -1;
- int scrollY = (event.tfinger.dy / yScaleFactor) * -1;
+ int scrollY = (event.tfinger.dy / yScaleFactor) * -1;
Evnt->MouseWheelScroll( scrollX, scrollY );
} else if (numFingers == core->NumFingKboard ) {
- ignoreNextMouseUp = true;
- if ((event.tfinger.dy / yScaleFactor) * -1 >= MIN_GESTURE_DELTA_PIXELS){
- ShowSoftKeyboard();
- } else if((event.tfinger.dy / yScaleFactor) * -1 <= -MIN_GESTURE_DELTA_PIXELS){
- HideSoftKeyboard();
- }
- }
+ ignoreNextMouseUp = true;
+ if ((event.tfinger.dy / yScaleFactor) * -1 >= MIN_GESTURE_DELTA_PIXELS){
+ ShowSoftKeyboard();
+ } else if((event.tfinger.dy / yScaleFactor) * -1 <= -MIN_GESTURE_DELTA_PIXELS){
+ HideSoftKeyboard();
+ }
+ }
}
break;
case SDL_FINGERDOWN://SDL 1.3+
@@ -569,7 +569,7 @@ int SDLVideoDriver::PollEvents() {
break;
//multitouch gestures
case SDL_MULTIGESTURE://SDL 1.3+
- // use this for pinch or rotate gestures. see also SDL_DOLLARGESTURE
+ // use this for pinch or rotate gestures. see also SDL_DOLLARGESTURE
numFingers = event.mgesture.numFingers;
/*
// perhapps formation rotation should be implemented here as a rotate gesture.
@@ -587,7 +587,7 @@ int SDLVideoDriver::PollEvents() {
case SDL_WINDOWEVENT_RESTORED://SDL 1.3
/*
reset all static variables as if no events have happened yet
- restoring from "minimized state" should be a clean slate.
+ restoring from "minimized state" should be a clean slate.
*/
numFingers = 0;
touchHoldTime = 0;
@@ -597,7 +597,7 @@ int SDLVideoDriver::PollEvents() {
core->GetAudioDrv()->Resume();//this is for ANDROID mostly
break;
case SDL_WINDOWEVENT_RESIZED://SDL 1.2
- // this event exists in SDL 1.2, but this handler is only getting ompiled under 1.3+
+ // this event exists in SDL 1.2, but this handler is only getting ompiled under 1.3+
printMessage("SDLVideo", "Window resized so your window surface is now invalid.\n", LIGHT_RED);
break;
}
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|