Use Frame.cpp from upstream.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>

source/CMakeLists.txt

@@ -32,6 +32,7 @@ add_library(appleii SHARED
   SaveState.cpp
   SynchronousEventManager.cpp
   Video.cpp
+  Frame.cpp
 
   Configuration/PropertySheetHelper.cpp
 
@@ -62,7 +63,7 @@ add_library(appleii SHARED
   linux/duplicates/Debug.cpp
   linux/duplicates/WinVideo.cpp
   linux/duplicates/Joystick.cpp
-  linux/duplicates/Frame.cpp
+  linux/duplicates/WinFrame.cpp
   linux/duplicates/SerialComms.cpp
   linux/duplicates/IPropertySheet.cpp
   linux/duplicates/AppleWin.cpp

source/frontends/ncurses/main.cpp

@@ -26,6 +26,7 @@
 #include "linux/benchmark.h"
 #include "linux/paddle.h"
 #include "linux/videobuffer.h"
+#include "linux/interface.h"
 #include "frontends/common2/configuration.h"
 #include "frontends/common2/programoptions.h"
 #include "frontends/common2/utils.h"
@@ -177,7 +178,7 @@ namespace
 
 	CheckCpu();
 
-	FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
+	FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES, true);
 
 	DSInit();
 	MB_Initialize();

source/frontends/qapple/qapple.cpp

@@ -29,6 +29,7 @@
 #include "linux/benchmark.h"
 #include "linux/version.h"
 #include "linux/paddle.h"
+#include "linux/interface.h"
 
 #include "emulator.h"
 #include "memorycontainer.h"
@@ -86,7 +87,7 @@ namespace
         SetWindowTitle();
         window->setWindowTitle(QString::fromStdString(g_pAppTitle));
 
-        FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
+        FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES, true);
 
         // ResetDefaultMachineMemTypes();
 

source/frontends/sa2/main.cpp

@@ -59,7 +59,7 @@ namespace
     LoadConfiguration();
     CheckCpu();
     SetWindowTitle();
-    FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
+    FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES, true);
 
     DSInit();
     MB_Initialize();

source/linux/benchmark.cpp

@@ -6,7 +6,6 @@
 #include "AppleWin.h"
 #include "Memory.h"
 #include "Common.h"
-#include "Frame.h"
 #include "NTSC.h"
 #include "Disk.h"
 #include "CPU.h"
@@ -75,7 +74,7 @@ void VideoBenchmark(std::function<void()> redraw, std::function<void()> refresh)
   // IF THE PROGRAM COUNTER IS NOT IN THE EXPECTED RANGE AT THE END OF THE
   // CPU BENCHMARK, REPORT AN ERROR AND OPTIONALLY TRACK IT DOWN
   if ((regs.pc < 0x300) || (regs.pc > 0x400))
-    if (MessageBox(g_hFrameWindow,
+    if (MessageBox(NULL,
                    TEXT("The emulator has detected a problem while running ")
                    TEXT("the CPU benchmark.  Would you like to gather more ")
                    TEXT("information?"),
@@ -104,13 +103,13 @@ void VideoBenchmark(std::function<void()> redraw, std::function<void()> refresh)
                  (unsigned)loop,
                  (unsigned)lastpc,
                  (unsigned)regs.pc);
-        MessageBox(g_hFrameWindow,
+        MessageBox(NULL,
                    outstr,
                    TEXT("Benchmarks"),
                    MB_ICONINFORMATION | MB_SETFOREGROUND);
       }
       else
-        MessageBox(g_hFrameWindow,
+        MessageBox(NULL,
                    TEXT("The emulator was unable to locate the exact ")
                    TEXT("point of the error.  This probably means that ")
                    TEXT("the problem is external to the emulator, ")
@@ -169,7 +168,7 @@ void VideoBenchmark(std::function<void()> redraw, std::function<void()> refresh)
            (unsigned)(totalmhz10[0] / 10), (unsigned)(totalmhz10[0] % 10), (LPCTSTR)(IS_APPLE2 ? TEXT(" (6502)") : TEXT("")),
            (unsigned)(totalmhz10[1] / 10), (unsigned)(totalmhz10[1] % 10), (LPCTSTR)(IS_APPLE2 ? TEXT(" (6502)") : TEXT("")),
            (unsigned)realisticfps);
-  MessageBox(g_hFrameWindow,
+  MessageBox(NULL,
              outstr,
              TEXT("Benchmarks"),
              MB_ICONINFORMATION | MB_SETFOREGROUND);

source/linux/duplicates/Frame.cpp

@@ -1,46 +0,0 @@
-#include "StdAfx.h"
-
-#include "Common.h"
-
-void FrameSetCursorPosByMousePos()
-{
-}
-
-UINT GetFrameBufferBorderlessWidth(void)
-{
-	static const UINT uFrameBufferBorderlessW = 560;	// 560 = Double Hi-Res
-	return uFrameBufferBorderlessW;
-}
-
-UINT GetFrameBufferBorderlessHeight(void)
-{
-	static const UINT uFrameBufferBorderlessH = 384;	// 384 = Double Scan Line
-	return uFrameBufferBorderlessH;
-}
-
-// NB. These border areas are not visible (... and these border areas are unrelated to the 3D border below)
-UINT GetFrameBufferBorderWidth(void)
-{
-	static const UINT uBorderW = 20;
-	return uBorderW;
-}
-
-UINT GetFrameBufferBorderHeight(void)
-{
-	static const UINT uBorderH = 18;
-	return uBorderH;
-}
-
-UINT GetFrameBufferWidth(void)
-{
-	return GetFrameBufferBorderlessWidth() + 2*GetFrameBufferBorderWidth();
-}
-
-UINT GetFrameBufferHeight(void)
-{
-	return GetFrameBufferBorderlessHeight() + 2*GetFrameBufferBorderHeight();
-}
-
-void FrameUpdateApple2Type()
-{
-}

source/linux/duplicates/WinFrame.cpp

@@ -0,0 +1,7 @@
+void FrameSetCursorPosByMousePos()
+{
+}
+
+void FrameUpdateApple2Type()
+{
+}