[Scummvm-cvs-logs] scummvm master -> 1e701b3769e09fabe2e2af3d04e698388e9fecee

[kayahr]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cc0d8b6252 WEBOS: Fixed ESCAPE and MENU key on WebOS 1
9e4edcdc1f WEBOS: Removed unused gestureDownTime
1e701b3769 WEBOS: Splitted install directory from package directory.


Commit: cc0d8b6252c0071f74285b2b3f4e8c3ff16b62bb
    https://github.com/scummvm/scummvm/commit/cc0d8b6252c0071f74285b2b3f4e8c3ff16b62bb
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T11:58:08-07:00

Commit Message:
WEBOS: Fixed ESCAPE and MENU key on WebOS 1

Changed paths:
    backends/events/webossdl/webossdl-events.cpp



diff --git a/backends/events/webossdl/webossdl-events.cpp b/backends/events/webossdl/webossdl-events.cpp
index 24aa5f0..0e92e06 100644
--- a/backends/events/webossdl/webossdl-events.cpp
+++ b/backends/events/webossdl/webossdl-events.cpp
@@ -95,6 +95,8 @@ void WebOSSdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod,
 		event.kbd.flags |= Common::KBD_SHIFT;
 	if (mod & KMOD_CTRL)
 		event.kbd.flags |= Common::KBD_CTRL;
+		
+	// Holding down the gesture area emulates the ALT key
 	if (gestureDown)
 		event.kbd.flags |= Common::KBD_ALT;
 }
@@ -115,6 +117,14 @@ bool WebOSSdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
 		return true;
 	}
 
+	// Ensure that ALT key (Gesture down) is ignored when back or forward
+	// gesture is detected. This is needed for WebOS 1 which releases the
+	// gesture tap AFTER the backward gesture event and not BEFORE (Like
+	// WebOS 2).
+	if (ev.key.keysym.sym == 27 || ev.key.keysym.sym == 229) {
+	    gestureDown = false;
+	}
+
 	// Call original SDL key handler.
 	return SdlEventSource::handleKeyDown(ev, event);
 }


Commit: 9e4edcdc1f1b85f1e10181188e64f461d486bf1f
    https://github.com/scummvm/scummvm/commit/9e4edcdc1f1b85f1e10181188e64f461d486bf1f
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T11:58:08-07:00

Commit Message:
WEBOS: Removed unused gestureDownTime

Changed paths:
    backends/events/webossdl/webossdl-events.cpp



diff --git a/backends/events/webossdl/webossdl-events.cpp b/backends/events/webossdl/webossdl-events.cpp
index 0e92e06..3f3efe9 100644
--- a/backends/events/webossdl/webossdl-events.cpp
+++ b/backends/events/webossdl/webossdl-events.cpp
@@ -39,9 +39,6 @@
 // Inidicates if gesture area is pressed down or not.
 static bool gestureDown = false;
 
-// The timestamp when gesture area was pressed down.
-static int gestureDownTime = 0;
-
 // The timestamp when screen was pressed down.
 static int screenDownTime = 0;
 
@@ -113,7 +110,6 @@ bool WebOSSdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
 	// Handle gesture area tap.
 	if (ev.key.keysym.sym == SDLK_WORLD_71) {
 		gestureDown = true;
-		gestureDownTime = getMillis();
 		return true;
 	}
 


Commit: 1e701b3769e09fabe2e2af3d04e698388e9fecee
    https://github.com/scummvm/scummvm/commit/1e701b3769e09fabe2e2af3d04e698388e9fecee
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T11:58:08-07:00

Commit Message:
WEBOS: Splitted install directory from package directory.

Changed paths:
    backends/platform/webos/webos.mk



diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk
index 2b145b0..37223ac 100644
--- a/backends/platform/webos/webos.mk
+++ b/backends/platform/webos/webos.mk
@@ -58,7 +58,8 @@ PATH_DIST = $(srcdir)/dists/webos
 PATH_MOJO = $(PATH_DIST)/mojo
 APP_ID = $(shell basename $(prefix))
 APP_VERSION = $(shell printf "%d.%d.%02d%02d" $(VER_MAJOR) $(VER_MINOR) $(VER_PATCH) $(VER_PACKAGE))
-DESTDIR ?= portdist
+DESTDIR ?= staging
+PORTDISTDIR ?= portdist
 
 install: all
 	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(prefix)"
@@ -87,5 +88,9 @@ endif
 uninstall:
 	$(QUIET)$(RM_REC) "$(DESTDIR)$(prefix)"
 
-package: install
-	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(DESTDIR)"
+package: uninstall install
+	$(QUIET)$(RM_REC) "$(PORTDISTDIR)"
+	$(QUIET)$(MKDIR) "$(PORTDISTDIR)"
+	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(PORTDISTDIR)"
+
+.PHONY: install uninstall package