[Gemrb-commits] gemrb: branch master updated. v0.7.1-10-gb00fe01

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  b00fe0171cc5135bf28c60b9c7f7fb4425143c57 (commit)
       via  3869644dde659f23c3dc36233889628312ad9efb (commit)

Summary of changes:
 apple/GemRB.xcodeproj/project.pbxproj |    2 +-
 gemrb/plugins/SDLVideo/SDL20Video.cpp |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
      from  2c2b6254d5377f80e8bb863adfcc6e21d440186e (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=b00fe0171cc5135bf28c60b9c7f7fb4425143c57

commit b00fe0171cc5135bf28c60b9c7f7fb4425143c57
Author: Brad Allred <bra...@me...>
Date:   Thu Jul 19 16:46:30 2012 -0600

    Multitouch: fix triggering a mouse up event after scrolling the viewport and prevent very unlikely crash when focusCtrl is NULL.

diff --git a/gemrb/plugins/SDLVideo/SDL20Video.cpp b/gemrb/plugins/SDLVideo/SDL20Video.cpp
index 8693d70..84b8bbd 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.cpp
+++ b/gemrb/plugins/SDLVideo/SDL20Video.cpp
@@ -395,7 +395,7 @@ int SDL20VideoDriver::ProcessEvent(const SDL_Event & event)
 			if (numFingers == core->NumFingScroll
 				|| (numFingers != core->NumFingKboard && (focusCtrl && focusCtrl->ControlType == IE_GUI_TEXTAREA))) {
 				//any # of fingers != NumFingKBoard will scroll a text area
-				if (focusCtrl->ControlType == IE_GUI_TEXTAREA) {
+				if (focusCtrl && focusCtrl->ControlType == IE_GUI_TEXTAREA) {
 					// if we are scrolling a text area we dont want the keyboard in the way
 					HideSoftKeyboard();
 				} else {
@@ -454,7 +454,6 @@ int SDL20VideoDriver::ProcessEvent(const SDL_Event & event)
 											 (event.tfinger.y / yScaleFactor) + yOffset,
 											 mouseButton, GetModState(SDL_GetModState()) );
 					}
-					ignoreNextFingerUp = false;
 				}
 				if (numFingers != core->NumFingInfo) {
 					// FIXME: this is "releasing" the ALT key even when it hadn't been previously "pushed"

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3869644dde659f23c3dc36233889628312ad9efb

commit 3869644dde659f23c3dc36233889628312ad9efb
Author: Brad Allred <bra...@me...>
Date:   Thu Jul 19 16:41:45 2012 -0600

    Xcode: fix SDLVideo.so not being copied to application bundle after build.

diff --git a/apple/GemRB.xcodeproj/project.pbxproj b/apple/GemRB.xcodeproj/project.pbxproj
index bc4daf7..055c23f 100644
--- a/apple/GemRB.xcodeproj/project.pbxproj
+++ b/apple/GemRB.xcodeproj/project.pbxproj
@@ -4150,7 +4150,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "#build the SDLVideo driver. we cannot have it as a target dependency because we use \"bundle loader\"\nxcodebuild -project GemRB.xcodeproj -target SDLVideo -configuration $CONFIGURATION SYMROOT=\"$SYMROOT\"\ncp $BUILT_PRODUCTS_DIR/SDLVideo.so \"$BUILT_PRODUCTS_DIR/$PLUGINS_FOLDER_PATH\"/SDLVideo.so\n\n#copy GUIScripts to bundle\ncp -r ../gemrb/GUIScripts/ \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/GUIScripts\n#copy Override to bundle\ncp -r ../gemrb/override/ \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/override\n#clear the cmake files and make files\nfind \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/ -name CMakeLists.txt | xargs -I{} rm {}\nfind \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/ -name Makefile.am | xargs -I{} rm {}\n\n#increment the version number for the build\nREV=`git log --pretty=format:'' | wc -l | sed 's/\\ //g'`\nVERSION=`git describe --tags --dirty=-patched`\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"";
+			shellScript = "#build the SDLVideo driver. we cannot have it as a target dependency because we use \"bundle loader\"\nxcodebuild -project GemRB.xcodeproj -target SDLVideo -configuration $CONFIGURATION SYMROOT=\"$SYMROOT\"\ncp \"$BUILT_PRODUCTS_DIR\"/SDLVideo.so \"$BUILT_PRODUCTS_DIR/$PLUGINS_FOLDER_PATH\"/SDLVideo.so\n\n#copy GUIScripts to bundle\ncp -r ../gemrb/GUIScripts/ \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/GUIScripts\n#copy Override to bundle\ncp -r ../gemrb/override/ \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/override\n#clear the cmake files and make files\nfind \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/ -name CMakeLists.txt | xargs -I{} rm {}\nfind \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/Resources/ -name Makefile.am | xargs -I{} rm {}\n\n#increment the version number for the build\nREV=`git log --pretty=format:'' | wc -l | sed 's/\\ //g'`\nVERSION=`git describe --tags --dirty=-patched`\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"";
 		};
 		A2BD125D15A8E32B000FAB95 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator