Move hsMessageBox from CoreLib to PubUtilLib/plMessageBox

H-uru · Aug 16, 2023 · 9d91abf · 9d91abf
1 parent 6f85e90
commit 9d91abf
Show file tree

Hide file tree

Showing 40 changed files with 325 additions and 209 deletions.
diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt
@@ -210,6 +210,7 @@ target_link_libraries(
         plGLight
         plInputCore
         plMessage
+        plMessageBox
         plModifier
         plNetClient
         plNetCommon

diff --git a/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm b/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm
@@ -65,6 +65,7 @@
 #include "pfGameGUIMgr/pfGameGUIMgr.h"
 #include "plInputCore/plInputDevice.h"
 #include "plMessage/plDisplayScaleChangedMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plNetClient/plNetClientMgr.h"
 #include "plNetGameLib/plNetGameLib.h"
 #include "plProduct.h"

diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -106,6 +106,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plMessage/plResPatcherMsg.h"
 #include "plMessage/plRoomLoadNotifyMsg.h"
 #include "plMessage/plTransitionMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plModifier/plSimpleModifier.h"
 #include "plNetClient/plLinkEffectsMgr.h"
 #include "plNetClient/plNetLinkingMgr.h"

diff --git a/Sources/Plasma/Apps/plClient/plClientLoader.cpp b/Sources/Plasma/Apps/plClient/plClientLoader.cpp
@@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPipeline.h"
 
 #include "plClientResMgr/plClientResMgr.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plNetClient/plNetClientMgr.h"
 #include "plPhysX/plSimulationMgr.h"
 #include "plResMgr/plResManager.h"

diff --git a/Sources/Plasma/Apps/plClient/win32/winmain.cpp b/Sources/Plasma/Apps/plClient/win32/winmain.cpp
@@ -68,6 +68,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClient/plNetClientMgr.h"
 #include "plNetGameLib/plNetGameLib.h"
 #include "plMessage/plDisplayScaleChangedMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plPhysX/plPXSimulation.h"
 #include "plPipeline/hsG3DDeviceSelector.h"
 #include "plResMgr/plLocalization.h"

diff --git a/Sources/Plasma/Apps/plCrashHandler/CMakeLists.txt b/Sources/Plasma/Apps/plCrashHandler/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(
     PRIVATE
         CoreLib
         plClipboard
+        plMessageBox
         pfCrashHandler
 
         $<$<PLATFORM_ID:Windows>:Comctl32>

diff --git a/Sources/Plasma/Apps/plCrashHandler/winmain.cpp b/Sources/Plasma/Apps/plCrashHandler/winmain.cpp
@@ -59,6 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "resource.h"
 
 #include "plClipboard/plClipboard.h"
+#include "plMessageBox/hsMessageBox.h"
 
 #include "pfCrashHandler/plCrashSrv.h"
 

diff --git a/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt b/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(
         CoreLib
         pnAsyncCore
         pnNetBase
+        plMessageBox
         plNetGameLib
         plStatusLog
         plWinDpi

diff --git a/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp b/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp
@@ -51,6 +51,7 @@ Mead, WA   99021
 
 #include "pnAsyncCore/pnAsyncCore.h"
 
+#include "plMessageBox/hsMessageBox.h"
 #include "plNetGameLib/plNetGameLib.h"
 #include "plStatusLog/plStatusLog.h"
 

diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt
@@ -23,8 +23,6 @@ set(CoreLib_SOURCES
     plProduct.cpp
     plViewTransform.cpp
     hsWindows.cpp
-    $<$<PLATFORM_ID:Darwin>:HeadSpin_Mac.mm>
-    $<$<PLATFORM_ID:Windows>:HeadSpin_Win.cpp>
 )
 
 if(CMAKE_USE_WIN32_THREADS_INIT)
@@ -85,7 +83,6 @@ target_link_libraries(
         "$<$<PLATFORM_ID:Darwin>:-framework Accelerate>"
     PRIVATE
         "$<$<PLATFORM_ID:Darwin>:-framework CoreFoundation>"
-        "$<$<PLATFORM_ID:Darwin>:-framework Cocoa>"
 )
 target_include_directories(
     CoreLib

diff --git a/Sources/Plasma/CoreLib/HeadSpin.cpp b/Sources/Plasma/CoreLib/HeadSpin.cpp
@@ -273,45 +273,6 @@ void hsStatusMessageF(const char * fmt, ...)
 
 #endif
 
-bool hsMessageBox_SuppressPrompts = false;
-
-#if !defined(HS_BUILD_FOR_APPLE) && !defined(HS_BUILD_FOR_WIN32)
-// Need a proper implementation for Linux, but for now let's just print out to the console
-int hsMessageBoxWithOwner(hsWindowHndl owner, const ST::string& message, const ST::string& caption, int kind, int icon)
-{
-    if (hsMessageBox_SuppressPrompts)
-        return hsMBoxOk;
-
-    hsStatusMessage(ST::format("{}\n{}", message, caption).c_str());
-    return hsMBoxCancel;
-}
-#endif
-
-int hsMessageBoxWithOwner(hsWindowHndl owner, const char* message, const char* caption, int kind, int icon)
-{
-    return hsMessageBoxWithOwner(owner, ST::string::from_latin_1(message), ST::string::from_latin_1(caption), kind, icon);
-}
-
-int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t* message, const wchar_t* caption, int kind, int icon)
-{
-    return hsMessageBoxWithOwner(owner, ST::string::from_wchar(message), ST::string::from_wchar(caption), kind, icon);
-}
-
-int hsMessageBox(const ST::string& message, const ST::string& caption, int kind, int icon)
-{
-    return hsMessageBoxWithOwner(nullptr, message, caption, kind, icon);
-}
-
-int hsMessageBox(const char* message, const char* caption, int kind, int icon)
-{
-    return hsMessageBoxWithOwner(nullptr, ST::string::from_latin_1(message), ST::string::from_latin_1(caption), kind, icon);
-}
-
-int hsMessageBox(const wchar_t* message, const wchar_t* caption, int kind, int icon)
-{
-    return hsMessageBoxWithOwner(nullptr, ST::string::from_wchar(message), ST::string::from_wchar(caption), kind, icon);
-}
-
 /**************************************/
 char* hsStrcpy(char* dst, const char* src)
 {

diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h
@@ -58,8 +58,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <cstdint>
 #include <type_traits>
 
-namespace ST { class string; }
-
 //======================================
 // Winblows Hacks
 //======================================
@@ -278,40 +276,6 @@ inline char *hsStrncpy(char *strDest, const char *strSource, size_t count)
 #    define strnicmp    strncasecmp
 #endif
 
-enum {              // Kind of MessageBox...passed to hsMessageBox
-    hsMessageBoxAbortRetyIgnore,
-    hsMessageBoxNormal,             // Just Ok
-    hsMessageBoxOkCancel,
-    hsMessageBoxRetryCancel,
-    hsMessageBoxYesNo,
-    hsMessageBoxYesNoCancel,
-};
-
-enum {
-    hsMessageBoxIconError,
-    hsMessageBoxIconQuestion,
-    hsMessageBoxIconExclamation,
-    hsMessageBoxIconAsterisk,
-};
-
-enum {          // RETURN VALUES FROM hsMessageBox
-    hsMBoxOk = 1,       // OK button was selected. 
-    hsMBoxCancel,   // Cancel button was selected. 
-    hsMBoxAbort,    // Abort button was selected. 
-    hsMBoxRetry,    // Retry button was selected. 
-    hsMBoxIgnore,   // Ignore button was selected. 
-    hsMBoxYes,      // Yes button was selected. 
-    hsMBoxNo        // No button was selected. 
-};
-
-extern bool hsMessageBox_SuppressPrompts;
-int hsMessageBox(const ST::string& message, const ST::string& caption, int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBox(const char* message, const char* caption, int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBox(const wchar_t* message, const wchar_t* caption, int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBoxWithOwner(hsWindowHndl owner, const ST::string& message, const ST::string& caption, int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBoxWithOwner(hsWindowHndl owner, const char* message, const char* caption, int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t* message, const wchar_t* caption, int kind, int icon=hsMessageBoxIconAsterisk);
-
 // flag testing / clearing
 #define hsCheckBits(f,c) ((f & c)==c)
 #define hsTestBits(f,b)  ( (f) & (b)   )

diff --git a/Sources/Plasma/CoreLib/HeadSpin_Mac.mm b/Sources/Plasma/CoreLib/HeadSpin_Mac.mm
diff --git a/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
@@ -49,6 +49,7 @@ target_link_libraries(
         plNetGameLib
         plNetMessage
         plMessage
+        plMessageBox
         plModifier
         plParticleSystem
         plPhysical

diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
@@ -74,6 +74,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plMessage/plConsoleMsg.h"
 #include "plMessage/plInputEventMsg.h"
 #include "plMessage/plInputIfaceMgrMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plPipeline/plDebugText.h"
 
 #include "pfConsoleCore/pfConsoleEngine.h"

diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp
@@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "HeadSpin.h"
 #include "hsExceptions.h"
+#include "plMessageBox/hsMessageBox.h"
 
 
 //// ParseDirectory //////////////////////////////////////////////////////////

diff --git a/Sources/Plasma/FeatureLib/pfDXPipeline/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfDXPipeline/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries(pfDXPipeline
         plGImage
         plGLight
         plMessage
+        plMessageBox
         plResMgr
         plScene
         plStatusLog

diff --git a/Sources/Plasma/FeatureLib/pfDXPipeline/plDXPipeline.cpp b/Sources/Plasma/FeatureLib/pfDXPipeline/plDXPipeline.cpp
@@ -113,6 +113,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plGLight/plShadowMaster.h"
 #include "plGLight/plShadowSlave.h"
 #include "plMessage/plDeviceRecreateMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plResMgr/plLocalization.h"
 #include "plScene/plRenderRequest.h"
 #include "plScene/plVisMgr.h"

diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt
@@ -23,6 +23,7 @@ add_subdirectory(plInterp)
 add_subdirectory(plIntersect)
 add_subdirectory(plMath)
 add_subdirectory(plMessage)
+add_subdirectory(plMessageBox)
 add_subdirectory(plModifier)
 add_subdirectory(plNetClient)
 add_subdirectory(plNetClientComm)

diff --git a/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt
@@ -96,6 +96,7 @@ target_link_libraries(
         plInputCore
         plInterp
         plMessage
+        plMessageBox
         plNetClient
         plNetCommon
         plNetMessage

diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
@@ -63,6 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plDrawable/plSpaceTree.h"
 #include "plGImage/plMipmap.h"
 #include "plMessage/plRenderMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plResMgr/plKeyFinder.h"
 #include "plSDL/plSDL.h"
 #include "plSurface/hsGMaterial.h"

diff --git a/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt
@@ -49,6 +49,7 @@ target_link_libraries(
         pnDispatch
         pnMessage
         pnNucleusInc
+        plMessageBox
         plResMgr
         JPEG::JPEG
         PNG::PNG

diff --git a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp
@@ -53,6 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTimer.h"
 #include "plMipmap.h"
 #include "plMessage/plRenderMsg.h"
+#include "plMessageBox/hsMessageBox.h"
 #include "plPipeline.h"
 #include "pnDispatch/plDispatch.h"
 #include "pnKeyedObject/plFixedKey.h"