Track mouse ups/downs for releasing purposes

Capture the mouse on clicks
This hack prevents the cursor from leaving the window when panning the camera or changing directions quickly. This is important for those with high mouse sensitivities.
2025-07-15 10:54:18 +00:00 · 2012-11-03 01:22:56 -04:00 · 2012-10-23 23:21:50 -04:00 · 2012-09-27 22:40:37 +10:00 · 2012-09-27 22:32:41 +10:00 · 2012-09-27 22:25:38 +10:00
31 changed files with 746 additions and 152 deletions
--- a/.hgignore
+++ b/.hgignore
@ -6,4 +6,5 @@ Release/
 Debug/
 syntax: regexp
 ^MOULOpenSourceClientPlugin/Plasma20/test/
+^MOULOpenSourceClientPlugin/Plasma20/tools/
 ^MOULOpenSourceClientPlugin/StaticSDKs/
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln
@ -135,6 +135,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClient", "..\plClient\plC
 		{89316659-F4A9-4E92-8200-C36288A61B9B} = {89316659-F4A9-4E92-8200-C36288A61B9B}
 		{1599855E-CC20-4C3A-A382-5290C40BE08E} = {1599855E-CC20-4C3A-A382-5290C40BE08E}
 		{5C9C6E61-02D6-4BA6-A4F5-6E6AE440E477} = {5C9C6E61-02D6-4BA6-A4F5-6E6AE440E477}
+		{CA2D4E65-EA68-465F-843A-4AF75243B474} = {CA2D4E65-EA68-465F-843A-4AF75243B474}
 		{8E44FB70-5EA0-4D33-B829-E4D16D7C11E3} = {8E44FB70-5EA0-4D33-B829-E4D16D7C11E3}
 		{CA208971-6C77-47F6-AA4B-FB6ECC071132} = {CA208971-6C77-47F6-AA4B-FB6ECC071132}
 		{7D83F872-F06C-4D42-A8F2-D77DC22C5981} = {7D83F872-F06C-4D42-A8F2-D77DC22C5981}
@ -500,6 +501,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plPageOptimizer", "..\plPag
 		{1599855E-CC20-4C3A-A382-5290C40BE08E} = {1599855E-CC20-4C3A-A382-5290C40BE08E}
 		{A10FCF60-7425-48D7-9153-CB9D8AD94C8F} = {A10FCF60-7425-48D7-9153-CB9D8AD94C8F}
 		{5C9C6E61-02D6-4BA6-A4F5-6E6AE440E477} = {5C9C6E61-02D6-4BA6-A4F5-6E6AE440E477}
+		{CA2D4E65-EA68-465F-843A-4AF75243B474} = {CA2D4E65-EA68-465F-843A-4AF75243B474}
 		{8E44FB70-5EA0-4D33-B829-E4D16D7C11E3} = {8E44FB70-5EA0-4D33-B829-E4D16D7C11E3}
 		{CA208971-6C77-47F6-AA4B-FB6ECC071132} = {CA208971-6C77-47F6-AA4B-FB6ECC071132}
 		{7D83F872-F06C-4D42-A8F2-D77DC22C5981} = {7D83F872-F06C-4D42-A8F2-D77DC22C5981}
@ -596,6 +598,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClientPatcher", "..\plCli
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClipboard", "..\..\PubUtilLib\plClipboard\plClipboard.vcproj", "{CA2D4E65-EA68-465F-843A-4AF75243B474}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plFileEncrypt", "..\plFileEncrypt\plFileEncrypt.vcproj", "{728CE37F-B032-45D1-B3B5-EF94D4B8A919}"
+	ProjectSection(ProjectDependencies) = postProject
+		{677C542F-9027-418D-9D9E-2D526E9FCD09} = {677C542F-9027-418D-9D9E-2D526E9FCD09}
+		{8444A94C-FD1E-47D2-B978-B42ED198F234} = {8444A94C-FD1E-47D2-B978-B42ED198F234}
+		{4054C94F-866A-4AA7-874B-2AFCFEF23A71} = {4054C94F-866A-4AA7-874B-2AFCFEF23A71}
+		{89316659-F4A9-4E92-8200-C36288A61B9B} = {89316659-F4A9-4E92-8200-C36288A61B9B}
+		{CA208971-6C77-47F6-AA4B-FB6ECC071132} = {CA208971-6C77-47F6-AA4B-FB6ECC071132}
+		{032566E8-A751-4863-89E3-CEC33703B3C1} = {032566E8-A751-4863-89E3-CEC33703B3C1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plFileSecure", "..\plFileSecure\plFileSecure.vcproj", "{E5F40B98-A55E-486D-9A93-8008BF153495}"
+	ProjectSection(ProjectDependencies) = postProject
+		{677C542F-9027-418D-9D9E-2D526E9FCD09} = {677C542F-9027-418D-9D9E-2D526E9FCD09}
+		{8444A94C-FD1E-47D2-B978-B42ED198F234} = {8444A94C-FD1E-47D2-B978-B42ED198F234}
+		{4054C94F-866A-4AA7-874B-2AFCFEF23A71} = {4054C94F-866A-4AA7-874B-2AFCFEF23A71}
+		{89316659-F4A9-4E92-8200-C36288A61B9B} = {89316659-F4A9-4E92-8200-C36288A61B9B}
+		{CA208971-6C77-47F6-AA4B-FB6ECC071132} = {CA208971-6C77-47F6-AA4B-FB6ECC071132}
+		{032566E8-A751-4863-89E3-CEC33703B3C1} = {032566E8-A751-4863-89E3-CEC33703B3C1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plPythonPack", "..\plPythonPack\plPythonPack.vcproj", "{84868043-5563-435A-A176-76A059653D5C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{677C542F-9027-418D-9D9E-2D526E9FCD09} = {677C542F-9027-418D-9D9E-2D526E9FCD09}
+		{8444A94C-FD1E-47D2-B978-B42ED198F234} = {8444A94C-FD1E-47D2-B978-B42ED198F234}
+		{4054C94F-866A-4AA7-874B-2AFCFEF23A71} = {4054C94F-866A-4AA7-874B-2AFCFEF23A71}
+		{A32201A8-0255-4863-97B8-4A569C18C624} = {A32201A8-0255-4863-97B8-4A569C18C624}
+		{A47A0DF4-F080-42B4-BC3B-865A02387089} = {A47A0DF4-F080-42B4-BC3B-865A02387089}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@ -605,8 +640,6 @@ Global
 		Release_Patcher = Release_Patcher
 		Release_Server = Release_Server
 	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{0736D624-C5F6-4B44-96FC-B27C2841D2F9}.Debug.ActiveCfg = Debug|Win32
 		{0736D624-C5F6-4B44-96FC-B27C2841D2F9}.Debug.Build.0 = Debug|Win32
@ -1796,6 +1829,54 @@ Global
 		{F1DC998F-6B75-48FF-8446-D59AF448678E}.Release_Patcher.Build.0 = Release_Patcher|Win32
 		{F1DC998F-6B75-48FF-8446-D59AF448678E}.Release_Server.ActiveCfg = Release_Patcher|Win32
 		{F1DC998F-6B75-48FF-8446-D59AF448678E}.Release_Server.Build.0 = Release_Patcher|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug.ActiveCfg = Debug|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug.Build.0 = Debug|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Patcher.ActiveCfg = Debug|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Patcher.Build.0 = Debug|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Server.ActiveCfg = Debug|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Server.Build.0 = Debug|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.ActiveCfg = Release|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.Build.0 = Release|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Patcher.ActiveCfg = Release|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Patcher.Build.0 = Release|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.ActiveCfg = Release|Win32
+		{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.Build.0 = Release|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Debug.ActiveCfg = Debug|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Debug.Build.0 = Debug|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Debug_Patcher.ActiveCfg = Debug|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Debug_Patcher.Build.0 = Debug|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Debug_Server.ActiveCfg = Debug|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Debug_Server.Build.0 = Debug|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Release.ActiveCfg = Release|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Release.Build.0 = Release|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Release_Patcher.ActiveCfg = Release|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Release_Patcher.Build.0 = Release|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Release_Server.ActiveCfg = Release|Win32
+		{728CE37F-B032-45D1-B3B5-EF94D4B8A919}.Release_Server.Build.0 = Release|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Debug.ActiveCfg = Debug|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Debug.Build.0 = Debug|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Debug_Patcher.ActiveCfg = Debug|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Debug_Patcher.Build.0 = Debug|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Debug_Server.ActiveCfg = Debug|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Debug_Server.Build.0 = Debug|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Release.ActiveCfg = Release|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Release.Build.0 = Release|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Release_Patcher.ActiveCfg = Release|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Release_Patcher.Build.0 = Release|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Release_Server.ActiveCfg = Release|Win32
+		{E5F40B98-A55E-486D-9A93-8008BF153495}.Release_Server.Build.0 = Release|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Debug.ActiveCfg = Debug|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Debug.Build.0 = Debug|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Debug_Patcher.ActiveCfg = Debug|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Debug_Patcher.Build.0 = Debug|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Debug_Server.ActiveCfg = Debug|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Debug_Server.Build.0 = Debug|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Release.ActiveCfg = Release|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Release.Build.0 = Release|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Release_Patcher.ActiveCfg = Release|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Release_Patcher.Build.0 = Release|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Release_Server.ActiveCfg = Release|Win32
+		{84868043-5563-435A-A176-76A059653D5C}.Release_Server.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plFileEncrypt/plFileEncrypt.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plFileEncrypt/plFileEncrypt.vcproj
@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="plFileEncrypt"
+	ProjectGUID="{728CE37F-B032-45D1-B3B5-EF94D4B8A919}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@ -51,7 +52,9 @@
 				TypeLibraryName=".\Debug/plFileEncrypt.tlb"
 				HeaderFileName=""/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				Description="Copy to Tools directory"
+				CommandLine="xcopy     /Y     &quot;$(TargetPath)&quot;      ..\..\..\..\tools\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@ -112,7 +115,9 @@
 				TypeLibraryName=".\Release/plFileEncrypt.tlb"
 				HeaderFileName=""/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				Description="Copy to Tools directory"
+				CommandLine="xcopy     /Y     &quot;$(TargetPath)&quot;      ..\..\..\..\tools\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plFileSecure/plFileSecure.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plFileSecure/plFileSecure.vcproj
@ -52,7 +52,9 @@
 				TypeLibraryName=".\Debug/plFileSecure.tlb"
 				HeaderFileName=""/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				Description="Copy to Tools directory"
+				CommandLine="xcopy     /Y     &quot;$(TargetPath)&quot;      ..\..\..\..\tools\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@ -114,7 +116,9 @@
 				TypeLibraryName=".\Release/plFileSecure.tlb"
 				HeaderFileName=""/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				Description="Copy to Tools directory"
+				CommandLine="xcopy     /Y     &quot;$(TargetPath)&quot;      ..\..\..\..\tools\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plClipboard/plClipboard.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plClipboard/plClipboard.vcproj
@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="plClipboard"
+	ProjectGUID="{CA2D4E65-EA68-465F-843A-4AF75243B474}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\plClipboard.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				ForceConformanceInForLoopScope="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Debug\plClipboard.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plClipboard\plClipboard.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plClipboard\plClipboard.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
@ -1546,6 +1546,7 @@ hsBool plClient::StartInit()

 	pfGameGUIMgr::GetInstance()->SetAspectRatio( aspectratio );
 	plMouseDevice::Instance()->SetDisplayResolution((float)fPipeline->Width(), (float)fPipeline->Height());
+	plInputManager::SetRecenterMouse(false);

 	// create the listener for the audio system:
 	plListener* pLMod = TRACKED_NEW plListener;
@ -1635,7 +1636,7 @@ void plClient::ShutdownDLLs()

 hsBool plClient::MainLoop()
 {
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 	if (PythonInterface::UsePythonDebugger())
 	{
 		PythonInterface::PythonDebugger()->Update();
@ -2207,7 +2208,6 @@ void plClient::ResetDisplayDevice(int Width, int Height, int ColorDepth, hsBool
 	else
 	{
 		SetWindowPos( fWindowHndl, HWND_TOP, 0, 0, Width, Height, flags );
-		::ClipCursor(nil);
 	}

 	WindowActivate(true);
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
@ -57,6 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../plNetClient/plNetClientMgr.h"
 #include "../plNetClient/plNetLinkingMgr.h"
 #include "../plInputCore/plInputManager.h"
+#include "../plInputCore/plInputDevice.h"
 #include "../plUnifiedTime/plUnifiedTime.h"
 #include "plPipeline.h"
 #include "../plResMgr/plResManager.h"
@ -431,34 +432,48 @@ void DebugMsgF(const char* format, ...);
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {	
 	static bool gDragging = false;
-	static UInt32 keyState=0;
+	static UInt8 mouse_down = 0;

    // Handle messages
    switch (message) {		
-		case WM_KEYDOWN :
-		case WM_LBUTTONDOWN	:
-		case WM_RBUTTONDOWN :
-		case WM_LBUTTONDBLCLK :		// The left mouse button was double-clicked. 
-		case WM_MBUTTONDBLCLK :		// The middle mouse button was double-clicked. 
-		case WM_MBUTTONDOWN :		// The middle mouse button was pressed. 
-		case WM_RBUTTONDBLCLK :		// The right mouse button was double-clicked. 
+		case WM_LBUTTONDOWN:
+		case WM_RBUTTONDOWN:
+		case WM_LBUTTONDBLCLK:
+		case WM_MBUTTONDBLCLK:
+		case WM_MBUTTONDOWN:
+		case WM_RBUTTONDBLCLK:
+			// Ensure we don't leave the client area during clicks
+			if (!(mouse_down++))
+				SetCapture(hWnd);
+			// fall through to old case
+		case WM_KEYDOWN:
 			// If they did anything but move the mouse, quit any intro movie playing.
+			if (gClient)
 			{
-				if( gClient )
-					gClient->SetQuitIntro(true);
-			}
-			// Fall through to other events
-		case WM_KEYUP :
-		case WM_LBUTTONUP :
-		case WM_RBUTTONUP :
-		case WM_MBUTTONUP :			// The middle mouse button was released. 
-		case WM_MOUSEMOVE :
-		case 0x020A:				// fuc&ing windows b.s...
-			{
-				if (gClient && gClient->WindowActive() && gClient->GetInputManager())
-				{
+				gClient->SetQuitIntro(true);
+
+				// normal input processing
+				if (gClient->WindowActive() && gClient->GetInputManager())
+					gClient->GetInputManager()->HandleWin32ControlEvent(message, wParam, lParam, hWnd);
+			}
+			break;
+		case WM_LBUTTONUP:
+		case WM_RBUTTONUP:
+		case WM_MBUTTONUP:
+			// Stop hogging the cursor
+			if (!(--mouse_down))
+				ReleaseCapture();
+			// fall through to input processing
+		case WM_MOUSEWHEEL:
+		case WM_KEYUP:
+		   if (gClient && gClient->WindowActive() && gClient->GetInputManager())
+			   gClient->GetInputManager()->HandleWin32ControlEvent(message, wParam, lParam, hWnd);
+			break;
+
+		case WM_MOUSEMOVE:
+			{
+				if (gClient && gClient->GetInputManager())
 					gClient->GetInputManager()->HandleWin32ControlEvent(message, wParam, lParam, hWnd);
-				}
 			}
 			break;

@ -497,6 +512,31 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
            }
 			break;

+		case WM_SETCURSOR:
+			{
+				static bool winCursor = true;
+				if (LOWORD(lParam) == HTCLIENT)
+				{
+					if (winCursor)
+					{
+						winCursor = false;
+						ShowCursor(FALSE);
+						plMouseDevice::ShowCursor();
+					}
+				}
+				else
+				{
+					if (!winCursor)
+					{
+						winCursor = true;
+						ShowCursor(TRUE);
+						plMouseDevice::HideCursor();
+					}
+				}
+				return TRUE;
+			}
+			break;
+
        case WM_ACTIVATE:
 			{
 				bool active = (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE);
@ -508,28 +548,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 					(LOWORD(wParam) == WA_CLICKACTIVE) ? "true" : "false");

 				if (gClient && !minimized && !gClient->GetDone())
-				{
-					if (LOWORD(wParam) == WA_CLICKACTIVE)
-					{
-						// See if they've clicked on the frame, in which case they just want to
-						// move, not activate, us.
-						POINT pt;
-						GetCursorPos(&pt);
-						ScreenToClient(hWnd, &pt);
-
-						RECT rect;
-						GetClientRect(hWnd, &rect);
-
-						if( (pt.x < rect.left)
-							||(pt.x >= rect.right)
-							||(pt.y < rect.top)
-							||(pt.y >= rect.bottom) )
-						{
-							active = false;
-						}
-					}
 					gClient->WindowActivate(active);
-				}
 				else
 				{
 					gPendingActivate = true;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
@ -71,13 +71,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../plAvatar/plArmatureMod.h"
 #include "../plAvatar/plAvBrainHuman.h"
 #include "../plNetClient/plNetClientMgr.h"
-//#define aspect_HDTV // maybe someday we'll be on the xbox...
-
-#ifdef aspect_HDTV
-#define FOV_RATIO 1.78
-#else
-#define FOV_RATIO 1.33333333
-#endif

 hsBool plCameraBrain1_FirstPerson::fDontFade = false;
 hsScalar plCameraBrain1::fFallAccel			= 20.0f;
@ -257,7 +250,7 @@ void plCameraBrain1::IAnimateFOV(double time)
 		dH = fFOVGoal;
 	}

-	fCamera->SetFOVw( (hsScalar)(dH * FOV_RATIO) );
+	fCamera->SetFOVw( (hsScalar)(dH * plVirtualCam1::GetAspectRatio()) );
 	fCamera->SetFOVh( dH );

 }
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
@ -7040,6 +7040,7 @@ PF_CONSOLE_CMD( Python,							// Group name
 }

 #ifndef LIMIT_CONSOLE_COMMANDS
+#ifdef HAVE_CYPYTHONIDE
 PF_CONSOLE_CMD( Python,
 			    UsePythonDebugger,
 				"",
@ -7047,6 +7048,7 @@ PF_CONSOLE_CMD( Python,
 {
 	PythonInterface::UsePythonDebugger(true);
 }
+#endif


 #include "../pfMessage/pfBackdoorMsg.h"
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp
@ -61,6 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 #include "../pnInputCore/plKeyMap.h"
+#include "../plClipboard/plClipboard.h"

 #include <locale>

@ -501,6 +502,34 @@ hsBool	pfGUIEditBoxMod::HandleKeyEvent( pfGameGUIMgr::EventType event, plKeyDef
 				DoSomething();		// Query WasEscaped() to see if it was escape vs enter
 				return true;
 			}
+			else if (modifiers & pfGameGUIMgr::kCtrlDown) 
+			{
+				if (key == KEY_C) 
+				{
+					plClipboard::GetInstance().SetClipboardText(fBuffer);
+				}
+				else if (key == KEY_V)
+				{
+					wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
+					if (contents != nil) 
+					{
+						size_t len = wcslen(contents);
+						if (len > 0) 
+						{
+							wchar_t* insertTarget = fBuffer + fCursorPos;
+							size_t bufferTailLen = wcslen(insertTarget) + 1; //include terminating \0
+							if (fCursorPos + len + bufferTailLen < fBufferSize) 
+							{
+								memmove(insertTarget + len, insertTarget, bufferTailLen * sizeof(wchar_t));
+								memcpy(insertTarget, contents, len * sizeof(wchar_t));
+								fCursorPos += len;
+								HandleExtendedEvent( kValueChanging );
+							}
+						}
+						delete contents;
+					}
+				}
+			}
 			else
 			{
 				fIgnoreNextKey = false;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp
@ -60,6 +60,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../plGImage/plDynamicTextMap.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
+#include "../plClipboard/plClipboard.h"


 //// Tiny Helper Class ///////////////////////////////////////////////////////
@ -1172,9 +1173,6 @@ hsBool	pfGUIMultiLineEditCtrl::HandleKeyEvent( pfGameGUIMgr::EventType event, pl
 	if ((fPrevCtrl || fNextCtrl) && (fLineStarts.GetCount() <= GetFirstVisibleLine()))
 		return true; // we're ignoring if we can't actually edit our visible frame (and we're linked)

-	if (modifiers & pfGameGUIMgr::kCtrlDown)
-		return true; // we're ignoring ctrl key events
-
 	if( event == pfGameGUIMgr::kKeyDown || event == pfGameGUIMgr::kKeyRepeat )
 	{
 		// Use arrow keys to do our dirty work
@ -1219,6 +1217,22 @@ hsBool	pfGUIMultiLineEditCtrl::HandleKeyEvent( pfGameGUIMgr::EventType event, pl
 //			fEscapedFlag = true;
 			DoSomething();		// Query WasEscaped() to see if it was escape vs enter
 		}
+		else if (modifiers & pfGameGUIMgr::kCtrlDown) 
+		{
+			if (key == KEY_C) 
+			{
+				plClipboard::GetInstance().SetClipboardText(fBuffer.AcquireArray());
+			}
+			else if (key == KEY_V)
+			{
+				wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
+				if (contents != nil) 
+				{
+					InsertString(contents);
+					delete contents;
+				}
+			}
+		} 
 		else
 		{
 			fIgnoreNextKey = false;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
@ -649,25 +649,25 @@ UInt32 cyMisc::ConvertGMTtoDni(UInt32 gtime)
 	plUnifiedTime utime = plUnifiedTime();
 	utime.SetSecs(dtime);
 	// check for daylight savings time in New Mexico and adjust
-	if ( utime.GetMonth() >= 4 && utime.GetMonth() < 11 )
+	if ( utime.GetMonth() >= 3 && utime.GetMonth() <= 11 )
 	{
 		plUnifiedTime dstStart = plUnifiedTime();
-		dstStart.SetGMTime(utime.GetYear(),4,1,2,0,0);
-		// find first Sunday after 4/1 (first sunday of April)
+		dstStart.SetGMTime(utime.GetYear(),3,8,2,0,0);
+		// find first Sunday after (including) 3/8 (second Sunday of March)
 		UInt32 days_to_go = 7 - dstStart.GetDayOfWeek();
 		if (days_to_go == 7)
 			days_to_go = 0;
 		UInt32 dstStartSecs = dstStart.GetSecs() + days_to_go * kOneDay;

 		plUnifiedTime dstEnd = plUnifiedTime();
-		dstEnd.SetGMTime(utime.GetYear(),10,25,1,0,0);
-		// find first sunday after 10/25 (last sunday of Oct.)
+		dstEnd.SetGMTime(utime.GetYear(),11,1,1,0,0);
+		// find first sunday after (including) 11/1 (first Sunday of November)
 		days_to_go = 7 - dstEnd.GetDayOfWeek();
 		if (days_to_go == 7)
 			days_to_go = 0;
 		UInt32 dstEndSecs = dstEnd.GetSecs() + days_to_go * kOneDay;

-		if ( dtime > dstStartSecs && dtime < dstEndSecs )
+		if ( dtime >= dstStartSecs && dtime < dstEndSecs )
 			// add hour for daylight savings time
 			dtime += kOneHour;
 	}
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp
@ -196,7 +196,7 @@ PyObject* PythonInterface::dbgOut = nil;
 PyObject* PythonInterface::dbgSlice = nil;				// time slice function for the debug window
 plStatusLog* PythonInterface::dbgLog = nil;				// output logfile

-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 bool PythonInterface::usePythonDebugger = false;
 plCyDebServer PythonInterface::debugServer;
 bool PythonInterface::requestedExit = false;
@ -205,7 +205,7 @@ bool PythonInterface::requestedExit = false;
 // stupid Windows.h  and who started including that!
 #undef DrawText

-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 // Special includes for debugging
 #include <frameobject.h>

@ -856,7 +856,7 @@ void PythonInterface::initPython()
 		Py_SetProgramName("plasma");
 		Py_Initialize();

-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 		if (usePythonDebugger)
 		{
 			debugServer.SetCallbackClass(&debServerCallback);
@ -1528,7 +1528,7 @@ void PythonInterface::finiPython()
 	initialized--;
 	if ( initialized < 1 && Py_IsInitialized() != 0 && IsInShutdown )
 	{
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 		if (usePythonDebugger)
 			debugServer.Disconnect();
 #endif
@ -1675,7 +1675,7 @@ int PythonInterface::getOutputAndReset(std::string *output)
 		pyOutputRedirector::ClearData(stdOut);

 		// tell python debugger
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 		if (UsePythonDebugger())
 			PythonInterface::PythonDebugger()->StdOut(strVal);
 #endif
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h
@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStlUtils.h"
 #include <python.h>

-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"
 #endif

@ -82,7 +82,7 @@ private:
 	static PyObject* dbgSlice;	// time slice function for the debug window
 	static plStatusLog* dbgLog;

-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 	static bool usePythonDebugger;
 	static bool requestedExit;
 	static plCyDebServer debugServer;
@ -228,7 +228,7 @@ public:
 	//
 	static pyKey* GetpyKeyFromPython(PyObject* pkey);

-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 	static bool UsePythonDebugger() { return usePythonDebugger; }
 	static void UsePythonDebugger(bool use) { usePythonDebugger = use; }

--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
@ -1363,12 +1363,19 @@ hsBool plPythonFileMod::MsgReceive(plMessage* msg)
 							// depending on the data type create the data
 							switch ( eventData->fDataType )
 							{
-								case proEventData::kNumber:
-									PyList_SetItem(event, 3, PyFloat_FromDouble(eventData->fNumber));
+								case proEventData::kFloat:
+									PyList_SetItem(event, 3, PyFloat_FromDouble(eventData->fNumber.f));
 									break;
 								case proEventData::kKey:
 									PyList_SetItem(event, 3, pyKey::New(eventData->fKey));
 									break;
+								case proEventData::kInt:
+									PyList_SetItem(event, 3, PyInt_FromLong(eventData->fNumber.i));
+									break;
+								default:
+									Py_XINCREF(Py_None);
+									PyList_SetItem(event, 3, Py_None);
+									break;
 							}
 							// add this event record to the main event list (lists within a list)
 							PyList_Append(levents, event);
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
@ -151,6 +151,16 @@ void pyNotify::AddVarNumber(const char* name, hsScalar number)
 	fBuildMsg.AddVariableEvent(name,number);
 }

+void pyNotify::AddVarNumber(const char* name, Int32 number)
+{
+	fBuildMsg.AddVariableEvent(name,number);
+}
+
+void pyNotify::AddVarNull(const char* name)
+{
+	fBuildMsg.AddVariableEvent(name);
+}
+
 void pyNotify::AddVarKey(const char* name, pyKey* key)
 {
 	fBuildMsg.AddVariableEvent(name, key ? key->getKey() : plKey() );
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyNotify.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyNotify.h
@ -100,6 +100,8 @@ public:
 	virtual void AddPickEvent(hsBool enabled, pyKey* other, pyKey* self, pyPoint3 hitPoint);
 	virtual void AddControlKeyEvent( Int32 key, hsBool down );
 	virtual void AddVarNumber(const char* name, hsScalar number);
+	virtual void AddVarNumber(const char* name, Int32 number);
+	virtual void AddVarNull(const char* name);
 	virtual void AddVarKey(const char* name, pyKey* key);
 	virtual void AddFacingEvent( hsBool enabled, pyKey* other, pyKey* self, hsScalar dot);
 	virtual void AddContainerEvent( hsBool entering, pyKey* container, pyKey* contained);
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp
@ -194,18 +194,86 @@ PYTHON_METHOD_DEFINITION(ptNotify, addControlKeyEvent, args)
 }

 PYTHON_METHOD_DEFINITION(ptNotify, addVarNumber, args)
+{
+	char* name;
+	PyObject* number = NULL;
+	if (!PyArg_ParseTuple(args, "s|O", &name, &number))
+	{
+		PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and optional number");
+		PYTHON_RETURN_ERROR;
+	}
+
+	if (number == NULL || number == Py_None)
+		self->fThis->AddVarNull(name);
+	else if (PyInt_Check(number))
+		self->fThis->AddVarNumber(name, PyInt_AsLong(number));
+	else if (PyLong_Check(number))
+	{
+		// try as int first
+		Int32 i = (Int32)PyLong_AsLong(number);
+		if (!PyErr_Occurred())
+		{
+			self->fThis->AddVarNumber(name, i);
+		}
+		else
+		{
+			// OverflowError, try float
+			PyErr_Clear();
+			self->fThis->AddVarNumber(name, (float)PyLong_AsDouble(number));
+		}
+	}
+	else if (PyNumber_Check(number)) 
+	{
+		PyObject* f = PyNumber_Float(number);
+		self->fThis->AddVarNumber(name, (float)PyFloat_AsDouble(f));
+		Py_DECREF(f);
+	} 
+	else
+	{
+		PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and optional number");
+		PYTHON_RETURN_ERROR;
+	}
+	PYTHON_RETURN_NONE;
+}
+
+PYTHON_METHOD_DEFINITION(ptNotify, addVarFloat, args)
 {
 	char* name;
 	float number;
 	if (!PyArg_ParseTuple(args, "sf", &name, &number))
 	{
-		PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and a float");
+		PyErr_SetString(PyExc_TypeError, "addVarFloat expects a string and a float");
 		PYTHON_RETURN_ERROR;
 	}
 	self->fThis->AddVarNumber(name, number);
 	PYTHON_RETURN_NONE;
 }

+PYTHON_METHOD_DEFINITION(ptNotify, addVarInt, args)
+{
+	char* name;
+	Int32 number;
+	if (!PyArg_ParseTuple(args, "sl", &name, &number))
+	{
+		PyErr_SetString(PyExc_TypeError, "addVarInt expects a string and a integer");
+		PYTHON_RETURN_ERROR;
+	}
+	self->fThis->AddVarNumber(name, number);
+	PYTHON_RETURN_NONE;
+}
+
+PYTHON_METHOD_DEFINITION(ptNotify, addVarNull, args)
+{
+	char* name;
+	if (!PyArg_ParseTuple(args, "s", &name))
+	{
+		PyErr_SetString(PyExc_TypeError, "addVarNull expects a string");
+		PYTHON_RETURN_ERROR;
+	}
+	self->fThis->AddVarNull(name);
+	PYTHON_RETURN_NONE;
+}
+
 PYTHON_METHOD_DEFINITION(ptNotify, addVarKey, args)
 {
 	char* name;
@ -337,6 +405,13 @@ PYTHON_START_METHODS_TABLE(ptNotify)
 	PYTHON_METHOD(ptNotify, addPickEvent, "Params: enabledFlag,pickerKey,pickeeKey,hitPoint\nAdd a pick event record to the Notify message"),
 	PYTHON_METHOD(ptNotify, addControlKeyEvent, "Params: keynumber,downFlag\nAdd a keyboard event record to the Notify message"),
 	PYTHON_METHOD(ptNotify, addVarNumber, "Params: name,number\nAdd a number variable event record to the Notify message\n"
+				"Method will try to pick appropriate variable type\n"
+				"This event record is used to pass a number variable to another python program"),
+	PYTHON_METHOD(ptNotify, addVarFloat, "Params: name,number\nAdd a float variable event record to the Notify message\n"
+				"This event record is used to pass a number variable to another python program"),
+	PYTHON_METHOD(ptNotify, addVarInt, "Params: name,number\nAdd a int variable event record to the Notify message\n"
+				"This event record is used to pass a number variable to another python program"),
+	PYTHON_METHOD(ptNotify, addVarNull, "Params: name,number\nAdd a null (no data) variable event record to the Notify message\n"
 				"This event record is used to pass a number variable to another python program"),
 	PYTHON_METHOD(ptNotify, addVarKey, "Params: name,key\nAdd a ptKey variable event record to the Notify message\n"
 				"This event record is used to pass a ptKey variable to another python program"),
@ -402,8 +477,10 @@ void pyNotify::AddPlasmaConstantsClasses(PyObject *m)
 	PYTHON_ENUM_END(m, PtEventType);

 	PYTHON_ENUM_START(PtNotifyDataType);
-	PYTHON_ENUM_ELEMENT(PtNotifyDataType, kNumber,	proEventData::kNumber);
-	PYTHON_ENUM_ELEMENT(PtNotifyDataType, kKey,		proEventData::kKey);
+	PYTHON_ENUM_ELEMENT(PtNotifyDataType, kFloat,  proEventData::kFloat);
+	PYTHON_ENUM_ELEMENT(PtNotifyDataType, kInt,  proEventData::kInt);
+	PYTHON_ENUM_ELEMENT(PtNotifyDataType, kNull,  proEventData::kNull);
+	PYTHON_ENUM_ELEMENT(PtNotifyDataType, kKey,     proEventData::kKey);
 	PYTHON_ENUM_END(m, PtNotifyDataType);

 	PYTHON_ENUM_START(PtMultiStageEventType);
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp
@ -173,8 +173,14 @@ void plNotifyMsg::AddEvent( proEventData* ed )
 				proVariableEventData *evt = (proVariableEventData *)ed;
 				switch (evt->fDataType)
 				{
-					case proEventData::kNumber:
-						AddVariableEvent(evt->fName, evt->fNumber);
+					case proEventData::kFloat:
+						AddVariableEvent(evt->fName, evt->fNumber.f);
+						break;
+					case proEventData::kInt:
+						AddVariableEvent(evt->fName, evt->fNumber.i);
+						break;
+					case proEventData::kNull:
+						AddVariableEvent(evt->fName);
 						break;
 					case proEventData::kKey:
 						AddVariableEvent(evt->fName, evt->fKey);
@ -587,10 +593,43 @@ void plNotifyMsg::AddVariableEvent( const char* name, hsScalar number )
 	// create the control key event record
 	proVariableEventData* pED = TRACKED_NEW proVariableEventData;
 	pED->fName = hsStrcpy(nil,name);
-//	pED->fName = (char*)name;
-	pED->fDataType = proEventData::kNumber;
-	pED->fNumber = number;
-	fEvents.Append(pED);	// then add it to the list of event records
+	pED->fDataType = proEventData::kFloat;
+	pED->fNumber.f = number;
+	fEvents.Append(pED);    // then add it to the list of event records
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+//  Function   : AddVariableEvent
+//  PARAMETERS : name    - name of the variable
+//             : number  - the value of the variable as a number
+//
+//  PURPOSE    : Add a variable event record to this notify message
+//
+void plNotifyMsg::AddVariableEvent( const char* name, Int32 number )
+{
+	// create the control key event record
+	proVariableEventData* pED = TRACKED_NEW proVariableEventData;
+	pED->fName = hsStrcpy(nil,name);
+	pED->fDataType = proEventData::kInt;
+	pED->fNumber.i = number;
+	fEvents.Append(pED);    // then add it to the list of event records
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+//  Function   : AddVariableEvent
+//  PARAMETERS : name    - name of the variable
+//
+//  PURPOSE    : Add a variable event record to this notify message
+//
+void plNotifyMsg::AddVariableEvent( const char* name)
+{
+    // create the control key event record
+    proVariableEventData* pED = TRACKED_NEW proVariableEventData;
+    pED->fName = hsStrcpy(nil,name);
+    pED->fDataType = proEventData::kNull;
+    fEvents.Append(pED);    // then add it to the list of event records
 }


@ -1284,11 +1323,39 @@ void proVariableEventData::IDestruct()
 	fName = nil;
 }

+void proVariableEventData::IReadNumber(hsStream * stream) {
+	switch (fDataType) {
+	case kFloat:
+		fNumber.f = stream->ReadSwapScalar();
+		break;
+	case kInt:
+		fNumber.i = stream->ReadSwap32();
+		break;
+	default: 
+		stream->ReadSwap32(); //ignore
+		break;
+	}
+}
+
+void proVariableEventData::IWriteNumber(hsStream * stream) {
+	   switch (fDataType) {
+	case kFloat:
+		stream->WriteSwapScalar(fNumber.f);
+		break;
+	case kInt:
+		stream->WriteSwap32(fNumber.i);
+		break;
+	default: 
+		stream->WriteSwap32(0);
+		break;
+	}
+}
+
 void proVariableEventData::IRead(hsStream* stream, hsResMgr* mgr)
 {
 	fName = stream->ReadSafeString();
 	fDataType = stream->ReadSwap32();
-	fNumber = stream->ReadSwapScalar();
+	IReadNumber(stream);
 	fKey = mgr->ReadKey(stream);
 }

@ -1296,7 +1363,7 @@ void proVariableEventData::IWrite(hsStream* stream, hsResMgr* mgr)
 {
 	stream->WriteSafeString(fName);
 	stream->WriteSwap32(fDataType);
-	stream->WriteSwapScalar(fNumber);
+	IWriteNumber(stream);
 	mgr->WriteKey(stream, fKey);
 }

@ -1318,7 +1385,7 @@ void proVariableEventData::IReadVersion(hsStream* s, hsResMgr* mgr)
 	if (contentFlags.IsBitSet(kProVariableDataType))
 		fDataType = s->ReadSwap32();
 	if (contentFlags.IsBitSet(kProVariableNumber))
-		fNumber = s->ReadSwapScalar();
+		IReadNumber(s);
 	if (contentFlags.IsBitSet(kProVariableKey))
 		fKey = mgr->ReadKey(s);
 }
@ -1337,7 +1404,7 @@ void proVariableEventData::IWriteVersion(hsStream* s, hsResMgr* mgr)
 	// kProVariableDataType
 	s->WriteSwap32(fDataType);
 	// kProVariableNumber
-	s->WriteSwapScalar(fNumber);
+	IWriteNumber(s);
 	// kProVariableKey
 	mgr->WriteKey(s, fKey);
 }
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h
@ -87,8 +87,10 @@ public:

 	enum dataType
 	{
-		kNumber=1,
+		kFloat=1,
 		kKey,
+		kInt,
+		kNull,
 		kNotta
 	};

@ -181,7 +183,10 @@ proEventType(Variable)
 	Int32	fDataType;		// type of data

 	// Can't be a union, sadly, but it isn't that much of a waste of space...
-	hsScalar	fNumber;	// if its a number
+	union {
+		hsScalar f;
+		Int32 i;
+	} fNumber; // if its a number
 	plKey		fKey;		// if its a plKey (pointer to something)


@ -193,6 +198,9 @@ protected:

 	virtual void IReadVersion(hsStream* s, hsResMgr* mgr);
 	virtual void IWriteVersion(hsStream* s, hsResMgr* mgr);
+
+	virtual void IReadNumber(hsStream * stream);
+	virtual void IWriteNumber(hsStream * stream);
 };

 proEventType(Facing)
@ -368,6 +376,8 @@ public:
 	void AddPickEvent( const plKey &other, const plKey& self, hsBool enabled, hsPoint3 hitPoint );
 	void AddControlKeyEvent( Int32 key, hsBool down );
 	void AddVariableEvent( const char* name, hsScalar number );
+	void AddVariableEvent( const char* name, Int32 number );
+	void AddVariableEvent( const char* name );
 	void AddVariableEvent( const char *name, const plKey &key);
 	void AddFacingEvent( const plKey &other, const plKey &self, hsScalar dot, hsBool enabled);
 	void AddContainerEvent( const plKey &container, const plKey &contained, hsBool entering);
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp
@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 // This line must NEVER be modified manually; it is automatically updated
 // by the build server.
-#define BUILD_ID 902
+#define BUILD_ID 906
 COMPILER_ASSERT(BUILD_ID != 0);


--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
@ -1232,24 +1232,21 @@ hsBool plClothingOutfit::MsgReceive(plMessage* msg)
 		if (fAvatar && fGroup != plClothingMgr::kClothingBaseNoOptions)
 		{
 			plDrawable *spans = fAvatar->FindDrawable();
-			const hsBounds3Ext &bnds = spans->GetWorldBounds();
-			if (bnds.GetType() == kBoundsNormal)
-			{
-				// This is a bit hacky... The drawable code has just run through and updated
-				// each span's bounds (see plDrawableSpans::IUpdateMatrixPaletteBoundsHack())
-				// but not the world bounds for the entire drawable. So we tell the space tree
-				// to refresh. However, the pageTreeMgr would then get confused because the
-				// space tree is no longer dirty (see plPageTreeMgr::IRefreshTree()), 
-				// causing the avatar to only draw if the origin is in view. 
-				// So we just force it dirty, and everyone's happy.
-				spans->GetSpaceTree()->Refresh();
-				spans->GetSpaceTree()->MakeDirty();
+			// This is a bit hacky... The drawable code has just run through and updated
+			// each span's bounds (see plDrawableSpans::IUpdateMatrixPaletteBoundsHack())
+			// but not the world bounds for the entire drawable. So we tell the space tree
+			// to refresh. However, the pageTreeMgr would then get confused because the
+			// space tree is no longer dirty (see plPageTreeMgr::IRefreshTree()), 
+			// causing the avatar to only draw if the origin is in view. 
+			// So we just force it dirty, and everyone's happy.
+			spans->GetSpaceTree()->Refresh();
+			spans->GetSpaceTree()->MakeDirty();

-				// Where were we? Oh yeah... if this avatar is in view it needs a texture. Tell
-				// the pipeline.
-				if (preMsg->Pipeline()->TestVisibleWorld(spans->GetSpaceTree()->GetWorldBounds()))
-					preMsg->Pipeline()->SubmitClothingOutfit(this);				
-			}
+			// Where were we? Oh yeah... if this avatar is in view it needs a texture. Tell
+			// the pipeline.
+			const hsBounds3Ext &bnds = spans->GetSpaceTree()->GetWorldBounds();
+			if ((bnds.GetType() == kBoundsNormal) && preMsg->Pipeline()->TestVisibleWorld(bnds))
+				preMsg->Pipeline()->SubmitClothingOutfit(this);
 		}
 	}
 
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plClipboard/plClipboard.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plClipboard/plClipboard.cpp
@ -0,0 +1,113 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+or by snail mail at:
+Cyan Worlds, Inc.
+14617 N Newport Hwy
+Mead, WA   99021
+
+*==LICENSE==*/
+
+#include "HeadSpin.h"
+#include "plClipboard.h"
+
+plClipboard& plClipboard::GetInstance()
+{
+	static plClipboard theInstance;
+	return theInstance;
+}
+
+bool plClipboard::IsTextInClipboard() 
+{
+#ifdef HS_BUILD_FOR_WIN32
+	return ::IsClipboardFormatAvailable(CF_UNICODETEXT);
+#else
+	return false;
+#endif
+}
+
+wchar_t* plClipboard::GetClipboardText()
+{
+	if (!IsTextInClipboard()) 
+		return nil;
+
+#ifdef HS_BUILD_FOR_WIN32
+	if (!::OpenClipboard(NULL))
+		return nil;
+
+	HANDLE clipboardData = ::GetClipboardData(CF_UNICODETEXT);
+	size_t size = ::GlobalSize(clipboardData) / sizeof(wchar_t);
+	wchar_t* clipboardDataPtr = (wchar_t*)::GlobalLock(clipboardData);
+
+	wchar_t* result = new wchar_t[size];
+	wcsncpy(result, clipboardDataPtr, size);
+
+	::GlobalUnlock(clipboardData);	
+	::CloseClipboard();
+
+	return result;
+#else
+	return plString::Null;
+#endif	
+}
+
+void plClipboard::SetClipboardText(const wchar_t* text)
+{
+	if (text == nil)
+		return;
+#ifdef HS_BUILD_FOR_WIN32
+	size_t len = wcslen(text);
+
+	if (len == 0) 
+		return;
+
+	HGLOBAL copy = ::GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(wchar_t));
+	if (copy == NULL) 
+		return;
+
+	if (!::OpenClipboard(NULL))
+		return;
+
+	::EmptyClipboard();
+
+	wchar_t* target = (wchar_t*)::GlobalLock(copy);
+	wcsncpy(target, text, len + 1);
+	::GlobalUnlock(copy); 
+
+	::SetClipboardData(CF_UNICODETEXT, copy);
+	::CloseClipboard();
+#endif
+}
+
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plClipboard/plClipboard.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plClipboard/plClipboard.h
@ -0,0 +1,62 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+	  Cyan Worlds, Inc.
+	  14617 N Newport Hwy
+	  Mead, WA   99021
+
+*==LICENSE==*/
+
+#ifndef _plClipboard_h
+#define _plClipboard_h
+
+//// Class Definition /////////////////////////////////////////////////////////
+
+class plClipboard
+{
+	private:
+	
+		plClipboard() {}
+		plClipboard(const plClipboard& rhs) {}
+		
+	public:
+		bool IsTextInClipboard();
+		wchar_t* GetClipboardText();
+		void SetClipboardText(const wchar_t* text);
+		static plClipboard& GetInstance( void );
+};
+
+#endif // _Clipboard_h
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
@ -933,28 +933,3 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
 	return false;
 }

-
-
-void plMouseDevice::HandleWindowActivate(bool bActive, HWND hWnd)
-{
-	if ( bActive )
-	{
-		RECT rect;
-		::GetClientRect(hWnd,&rect);
-
-//		rect.right /= plInputManager::GetInstance()->GetMouseScale();
-//		rect.bottom /= plInputManager::GetInstance()->GetMouseScale();
-
-		::MapWindowPoints( hWnd, NULL, (POINT *)&rect, 2 );
-		::ClipCursor(&rect);
-		::ShowCursor( FALSE );
-		SetCapture(hWnd);
-
-	}
-	else
-	{
-		ReleaseCapture();
-		::ClipCursor(nil);
-		::ShowCursor( TRUE );
-	}	
-}
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
@ -173,7 +173,6 @@ public:
 	~plMouseDevice();

 	const char* GetInputName() { return "mouse"; }
-	void HandleWindowActivate(bool bActive, HWND hWnd);

 	hsBool	HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); }
 	void	SetControlFlag(int f) 
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
@ -563,10 +563,7 @@ void plDInputMgr::AddDevice(IDirectInputDevice8* device)

 void plDInputMgr::ConfigureDevice()
 {
-	::ClipCursor(nil);
 	::ShowCursor( TRUE );
-	ReleaseCapture();
-		

 	DICOLORSET dics;
    ZeroMemory(&dics, sizeof(DICOLORSET));
@ -587,13 +584,7 @@ void plDInputMgr::ConfigureDevice()
 	for (int i = 0; i < fDI->fSticks.Count(); i++)
 		fDI->fSticks[i]->fDevice->SetActionMap( fDI->fActionFormat, NULL, DIDSAM_FORCESAVE );

-	RECT rect;
-	::GetClientRect(fhWnd,&rect);
-	::ClientToScreen(fhWnd,(LPPOINT)&rect);
-	::ClipCursor(&rect);
 	::ShowCursor( FALSE );
-	SetCapture(fhWnd);
-
 }

 hsBool plDInputMgr::MsgReceive(plMessage* msg)
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
@ -2233,7 +2233,6 @@ hsBool plDXPipeline::IResetDevice()
 	{
 		IClearShadowSlaves();

-		ReleaseCapture();
 		Sleep(100);
 		HRESULT coopLev = fD3DDevice->TestCooperativeLevel();
 		if( coopLev == D3DERR_DEVICELOST )
@ -2281,8 +2280,6 @@ hsBool plDXPipeline::IResetDevice()
 			/// all device-specific stuff needs to be recreated
 			plDeviceRecreateMsg* clean = TRACKED_NEW plDeviceRecreateMsg();
 			plgDispatch::MsgSend(clean);
-
-			SetCapture(fSettings.fHWnd);
 		}
 		fDevWasLost = true;
 		fDeviceLost = false;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp
@ -263,9 +263,9 @@ void plUnifiedTime::ToCurrentTime()
 	SetToUTC();
 }

-hsBool plUnifiedTime::SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec, int dst)
+hsBool plUnifiedTime::SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec)
 {
-	if( !SetTime( year, month, day, hour, minute, second, usec, dst ) )
+	if( !SetTime( year, month, day, hour, minute, second, usec, 0 ) )
 		return false;

 	fSecs -= IGetLocalTimeZoneOffset();
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.h
@ -129,7 +129,7 @@ public:
 	void SetSecsDouble(double secs);
 	void SetMicros(const UInt32 micros) { fMicros = micros; }
 	hsBool SetTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
-	hsBool SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
+	hsBool SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0);
 	hsBool SetToUTC();
 	void ToCurrentTime();
 	void ToEpoch() { fSecs = 0; fMicros = 0;}
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Tools/plLocalizationEditor/res/icon1.ico
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Tools/plLocalizationEditor/res/icon1.ico
Author	SHA1	Message	Date
Adam Johnson	d638355955	Track mouse ups/downs for releasing purposes	2012-11-03 01:22:56 -04:00
Adam Johnson	a617803fd0	Capture the mouse on clicks This hack prevents the cursor from leaving the window when panning the camera or changing directions quickly. This is important for those with high mouse sensitivities.	2012-10-23 23:21:50 -04:00
Skoader	7f3d416290	Fix no cursor when not the top level window. WM_MOUSEMOVE messages were only processed when the window was active.	2012-09-27 22:40:37 +10:00
Skoader	ec29c270e4	Fix clicking on the title bar does not activate the window.	2012-09-27 22:32:41 +10:00
Skoader	357d4aa7d1	Fix no cursor on window frame and title bar. Remove mouse capture and handle visibility via WM_SETCURSOR messages instead of window activation events.	2012-09-27 22:25:38 +10:00
Joseph Davies	487f63f60b	Fix mouse recentering. Existing fix didn't apply until after SecurePreloader completed. This disables the mouse recentering earlier.	2012-01-20 05:18:04 -08:00
Joseph Davies	3c552912fa	Removed ClipCursor which prevented cursor from leaving client window. Disabled cursor being re-centered during progress screen.	2011-07-10 19:10:51 -07:00
Christian Walther	8146e7fe24	Tag begin and end of the submission to Cyan (discontiguous - excluding 104cf80f1d52)	2012-05-18 22:26:22 +02:00
Christian Walther	8b8e39685a	Merged in cwalther/cwe/notify_int (mainly by boq) (https://foundry.openuru.org/fisheye/cru/CWE-12 ) Allow plNotify variable events to carry integers in addition to floats This fixes crashes when trying to upload a KI note with an odd vault node id > 2^24 to an imager, and allows for future cleanup of other plNotifyMsg uses. To be accompanied by moulscript 886c4.	2012-05-18 21:08:59 +02:00
Christian Walther	8ba666ee6c	Merged in cwalther/cwe/cypythonide (pull request #8 ) Wrap uses of the missing CyPythonIDE with #ifdef HAVE_CYPYTHONIDE This fix is needed to build an internal client (without /DPLASMA_EXTERNAL_RELEASE). It is designed to match the corresponding fix in H-uru/Plasma (b76fd10 etc.).	2012-05-18 21:07:16 +02:00
Christian Walther	2ac64918c6	Merged in cwalther/cwe/moretools (pull request #7 ) Add plFileEncrypt, plFileSecure, plPythonPack to AllClient.sln As requested at http://forums.openuru.org/viewtopic.php?p=6100#p6100 . Build products are placed in MOULOpenSourceClientPlugin/Plasma20/tools/ (as plPythonPack.exe already was).	2012-05-18 21:04:42 +02:00
Christian Walther	35775dd701	Merged in "Fix an Aspect Ratio Assumption" (http://foundry.openuru.org/fisheye/cru/CWE-11 ) Fix an Aspect Ratio Assumption	2012-05-18 20:52:47 +02:00
Christian Walther	17284220bc	Merged in "Fix Landing Behaviors" (http://foundry.openuru.org/fisheye/cru/CWE-10 ) Fix Landing Behaviors How to Verify: The avatar should now land on the ground from jumps as in PotS. Therefore, standing jumps produce a full landing, downhill jumps produce a blended landing based on how far down the avatar fell, and uphill jumps produce no landing.	2012-05-18 20:51:16 +02:00
Christian Walther	b0cbd18f2c	Merged in dst (http://foundry.openuru.org/fisheye/cru/CWE-8 ) DST Fix Original implementation by Adam Johnson, with some bug fixes by Christian Walther. Includes a fix for plUnifiedTime::SetGMTime not working correctly when the given time falls into local DST.	2012-05-18 20:49:59 +02:00
Christian Walther	445a837d27	Merged in boq/cwe-ou/plClipboard (pull request #6 , https://foundry.openuru.org/fisheye/cru/CWE-9 ) Basic clipboard functionality Adds following commands to single- and multiline edit boxes: Ctrl-C - copy field contents to system clipboard Ctrl-V - paste contents of clipboard at current cursor position	2012-05-18 20:48:39 +02:00
rarified	4cfe5adf70	Merge Cyan updates to OpenUru * Build ID from MOULa * Bookshelf fixes	2012-05-10 18:56:40 -06:00
CyanWorlds	136c27c7f3	Bump build ID to current	2012-05-09 16:56:29 -07:00
Bartek Bok	bf6d2a4459	Always copy terminating NULL when pasting	2012-04-27 21:50:33 +02:00
rarified	9db1361535	Merged in Skoader/cwe-ou (pull request #5 ) (Crucible CWE-7)	2012-04-10 08:12:22 -06:00
Christian Walther	e583bf6d74	Also handle Python long integers in addVarNumber.	2012-04-09 09:50:40 +02:00
Bartek Bok	350295425a	Allow int in plNotify --- .../Plasma/FeatureLib/pfPython/plPythonFileMod.cpp \| 11 ++- Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp \| 10 ++ Sources/Plasma/FeatureLib/pfPython/pyNotify.h \| 2 + .../Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp \| 68 +++++++++++++++- .../Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp \| 87 +++++++++++++++++-- Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h \| 14 +++- 6 files changed, 175 insertions(+), 17 deletions(-)	2012-04-09 01:29:47 +02:00
Christian Walther	aaabc9c333	Add plFileEncrypt, plFileSecure, plPythonPack to AllClient.sln.	2012-04-06 21:02:24 +02:00
Adam Johnson	ccefcfdb13	Fix an aspect ratio assumption	2012-04-03 12:55:02 -04:00
Christian Walther	a9cb4723d0	Fix KI daylight saving time calculation. The previous implementation had the following bugs: - DST was truncated to end of October - DST start was off by one week in years where March 1st is a Monday - DST start was off by one second (1:59:59 -> 2:00:00 -> 3:00:01 instead of the correct 1:59:59 -> 3:00:00 -> 3:00:01) Tested against tzdata 2009g.	2012-03-31 20:13:58 +02:00
Christian Walther	59b04b546f	Fix plUnifiedTime::SetGMTime The default value of the "dst" argument must be 0, because -1 leads to incorrect results when the given time falls into local DST. However, a "dst" argument makes no sense on a method that deals with GMT anyway, so remove it entirely.	2012-03-31 20:06:55 +02:00
Adam Johnson	423e0c2142	Use George Bush style (2007) DST begin/end dates	2012-03-28 16:36:37 -04:00
Bartek Bok	e4458717c9	Fix possible WinApi misuse	2012-03-05 11:06:05 +01:00
Bartek Bok	a99ed37f23	Missing null checks and small style fixes	2012-03-04 18:55:44 +01:00
Christian Walther	568b05fe70	Add & integrate project file for plClipboard.	2012-03-04 15:17:11 +01:00
Bartek Bok	9bd019fbf3	plClipboard	2012-03-04 11:57:45 +01:00
CyanWorlds	cbea546c61	Christian's fix inability to go to a higher page in a book than the next after what has already been displayed. Fixes books on the Relto bookshelf not remembering their last open page beyond the second.	2012-02-07 17:14:08 -08:00
Skoader	c0b428b342	Fix avatar clothing bounds test. The bounds type test was performed on stale bounding data from the previous frame resulting in the avatar being drawn without textures for a frame after switching from 1st to 3rd person camera.	2012-01-28 13:08:16 +11:00
CyanWorlds	1c8c0f4e0e	Christian Walther's Python SDL fixes - for real this time.	2012-01-19 09:20:38 -08:00
CyanWorlds	196657fa60	Added Donate button to the login screen Added fixes from Christian Walther for the Python SDL tuples Added plLocalizationEditor source and project	2012-01-18 13:46:47 -08:00
Christian Walther	19cd10abd7	Wrap uses of the missing CyPythonIDE with #ifdef HAVE_CYPYTHONIDE to make things compile, like in H-uru/Plasma.	2011-04-27 20:52:15 +02:00