Index: rts/Lua/LuaUnsyncedRead.cpp
===================================================================
--- rts/Lua/LuaUnsyncedRead.cpp	(revision 4371)
+++ rts/Lua/LuaUnsyncedRead.cpp	(working copy)
@@ -610,10 +610,12 @@
 	}
 
 	// window coordinates
-	const int wx = (int)lua_tonumber(L, 1) - gu->viewPosX;
-	const int wy = gu->viewSizeY - 1 - (int)lua_tonumber(L, 2);
-	if ((wx < gu->viewPosX) || (wx >= (gu->viewSizeX + gu->viewPosX)) ||
-	    (wy < gu->viewPosY) || (wy >= (gu->viewSizeY + gu->viewPosY))) {
+	const int mx = (int)lua_tonumber(L, 1);
+	const int my = (int)lua_tonumber(L, 2);
+	const int wx = mx + gu->viewPosX;
+	const int wy = gu->viewSizeY - 1 - my - gu->viewPosY;
+	if ((mx < 0) || (mx >= gu->viewSizeX) ||
+	    (my < 0) || (my >= gu->viewSizeY)) {
 		return 0;
 	}
 
Index: rts/Game/UI/MouseHandler.cpp
===================================================================
--- rts/Game/UI/MouseHandler.cpp	(revision 4371)
+++ rts/Game/UI/MouseHandler.cpp	(working copy)
@@ -546,8 +546,8 @@
 void CMouseHandler::HideMouse()
 {
 	if (!hide) {
-		lastx = gu->viewSizeX/2;
-		lasty = gu->viewSizeY/2;
+		lastx = gu->viewSizeX/2 + gu->viewPosX;
+		lasty = gu->viewSizeY/2 + gu->viewPosY;
     SDL_ShowCursor(SDL_DISABLE);
 		mouseInput->SetPos(int2(lastx, lasty));
 		hide = true;
@@ -638,10 +638,10 @@
 		return;
 	}
 
-	int dx = lastx - gu->viewSizeX / 2;
-	int dy = lasty - gu->viewSizeY / 2;
-	lastx = gu->viewSizeX / 2;
-	lasty = gu->viewSizeY / 2;
+	int dx = lastx - (gu->viewSizeX / 2 + gu->viewPosX);
+	int dy = lasty - (gu->viewSizeY / 2 + gu->viewPosY);
+	lastx = gu->viewSizeX / 2 + gu->viewPosX;
+	lasty = gu->viewSizeY / 2 + gu->viewPosY;
 
 	float3 move;
 	move.x = dx;

Index: rts/Game/Game.cpp
===================================================================
--- rts/Game/Game.cpp	(revision 4353)
+++ rts/Game/Game.cpp	(working copy)
@@ -238,6 +238,7 @@
 	hideInterface=false;
 	gameOver=false;
 	windowedEdgeMove=!!configHandler.GetInt("WindowedEdgeMove", 1);
+	fullscreenEdgeMove=!!configHandler.GetInt("FullscreenEdgeMove", 1);
 	showFPS   = !!configHandler.GetInt("ShowFPS",   0);
 	showClock = !!configHandler.GetInt("ShowClock", 1);
 	playerRoster.SetSortTypeByCode(
@@ -3232,7 +3233,7 @@
 
 		movement=float3(0,0,0);
 
-		if (fullscreen || windowedEdgeMove) {
+		if ((fullscreen && fullscreenEdgeMove) || windowedEdgeMove) {
 			int screenW = gu->dualScreenMode ? gu->viewSizeX*2 : gu->viewSizeX;
 			if (mouse->lasty < 2){
 				movement.y+=gu->lastFrameTime;

Index: rts/Game/Game.h
===================================================================
--- rts/Game/Game.h	(revision 4353)
+++ rts/Game/Game.h	(working copy)
@@ -94,6 +94,7 @@
 	bool hideInterface;
 	bool gameOver;
 	bool windowedEdgeMove;
+	bool fullscreenEdgeMove;
 	bool showFPS;
 	bool showClock;
 	bool noSpectatorChat;			//prevents spectator msgs from being seen by players