Merge remote-tracking branch 'linux/master' into linux

Author: markjfisher

.github/README.md

@@ -51,8 +51,11 @@ Frontend based on ncurses, with a ASCII art graphic mode.
 Keyboard shortcuts
 
 * ``F2``: reset the machine
-* ``F3``: terminate the emulator
-* ``F11``, ``F12``: Save, Load Snapshot
+* ``Shift-F2``: ctrl reset
+* ``F3``: pause
+* ``Shift-F3``: exit (``F4`` as well to avoid key code issues)
+* ``F5``: swap disks
+* ``F11``, ``F12``: Load, Save Snapshot
 * ``ALT-RIGHT``: wider hi res graphis
 * ``ALT-LEFT``: narrower hi res graphics
 * ``ALT-UP``: vertical hi res (smaller)

resource/Apple2_Video.rom

@@ -60,7 +60,6 @@ DEBUG_BUTTON            BITMAP                  "DEBUG.BMP"
 DRIVE1_BUTTON           BITMAP                  "DRIVE1.BMP"
 DRIVE2_BUTTON           BITMAP                  "DRIVE2.BMP"
 SETUP_BUTTON            BITMAP                  "SETUP.BMP"
-CHARSET40               BITMAP                  "CHARSET4.BMP"
 DISKOFF_BITMAP          BITMAP                  "DISKOFF.BMP"
 DISKREAD_BITMAP         BITMAP                  "DISKREAD.BMP"
 DISKWRITE_BITMAP        BITMAP                  "DISKWRIT.BMP"
@@ -358,7 +357,7 @@ IDR_APPLE2_ROM          ROM                     "Apple2.rom"
 IDR_APPLE2_PLUS_ROM     ROM                     "Apple2_Plus.rom"
 IDR_APPLE2_JPLUS_ROM    ROM                     "Apple2_JPlus.rom"
 IDR_APPLE2E_ROM         ROM                     "Apple2e.rom"
-IDR_APPLE2E_ENHANCED_ROM ROM                     "Apple2e_Enhanced.rom"
+IDR_APPLE2E_ENHANCED_ROM ROM                    "Apple2e_Enhanced.rom"
 IDR_PRAVETS_82_ROM      ROM                     "Pravets82.rom"
 IDR_PRAVETS_8M_ROM      ROM                     "Pravets8M.rom"
 IDR_PRAVETS_8C_ROM      ROM                     "Pravets8C.rom"
@@ -371,7 +370,9 @@ IDR_FREEZES_F8_ROM      ROM                     "FREEZES_NON-AUTOSTART_F8_ROM.ro
 // VIDEO ROM
 //
 
+IDR_APPLE2_VIDEO_ROM          ROM               "Apple2_Video.rom"
 IDR_APPLE2_JPLUS_VIDEO_ROM    ROM               "Apple2_JPlus_Video.rom"
+IDR_APPLE2E_ENHANCED_VIDEO_ROM ROM              "Apple2e_Enhanced_Video.rom"
 IDR_BASE64A_VIDEO_ROM         ROM               "Base64A_German_Video.rom"
 
 /////////////////////////////////////////////////////////////////////////////

resource/Apple2e_Enhanced_Video.rom

@@ -28,11 +28,13 @@
 #define IDR_MENU                        125
 #define IDR_APPLE2_ROM                  126
 #define IDR_APPLE2_PLUS_ROM             127
-#define IDR_APPLE2E_ROM                 128
-#define IDR_APPLE2E_ENHANCED_ROM        129
-#define IDD_TFE_SETTINGS_DIALOG         131
-#define IDR_PRINTDRVR_FW                132
-#define IDD_PROPPAGE_ADVANCED           132
+#define IDR_APPLE2_VIDEO_ROM            128
+#define IDR_APPLE2E_ROM                 129
+#define IDR_APPLE2E_ENHANCED_ROM        130
+#define IDR_APPLE2E_ENHANCED_VIDEO_ROM  131
+#define IDD_TFE_SETTINGS_DIALOG         132
+#define IDR_PRINTDRVR_FW                133
+#define IDD_PROPPAGE_ADVANCED           133
 #define IDR_SSC_FW                      134
 #define IDR_MOCKINGBOARD_D_FW           135
 #define IDR_MOUSEINTERFACE_FW           136

resource/Applewin.rc

@@ -153,6 +153,7 @@ void SY6522::Write(BYTE nReg, BYTE nValue)
 		m_regs.ORB = nValue & m_regs.DDRB;
 		break;
 	case 0x01:	// ORA
+	case 0x0f:	// ORA_NO_HS
 		m_regs.ORA = nValue & m_regs.DDRA;
 		break;
 	case 0x02:	// DDRB
@@ -220,8 +221,6 @@ void SY6522::Write(BYTE nReg, BYTE nValue)
 			m_syncEvent[1]->m_canAssertIRQ = (m_regs.IER & IxR_TIMER2) ? true : false;
 		UpdateIFR(0);
 		break;
-	case 0x0f:	// ORA_NO_HS
-		break;
 	}
 }
 
@@ -348,6 +347,7 @@ BYTE SY6522::Read(BYTE nReg)
 		if (m_isMegaAudio) nValue = 0x00;			// MegaAudio: IRB just reads as $00
 		break;
 	case 0x01:	// IRA
+	case 0x0f:	// IRA_NO_HS
 		nValue = m_regs.ORA | (m_isBusDriven ? 0x00 : (m_regs.DDRA ^ 0xff));	// NB. Inputs bits driven by AY8913 if in PSG READ mode
 		if (m_isMegaAudio) nValue = 0x00;			// MegaAudio: IRA just reads as $00
 		break;
@@ -400,9 +400,6 @@ BYTE SY6522::Read(BYTE nReg)
 		if (m_isMegaAudio)
 			nValue &= 0x7F;
 		break;
-	case 0x0f:	// ORA_NO_HS
-		nValue = m_regs.ORA;
-		break;
 	}
 
 	return nValue;

resource/CHARSET4.BMP

@@ -6,34 +6,36 @@ pkg_search_module(YAML REQUIRED yaml-0.1)
 pkg_search_module(MINIZIP REQUIRED minizip)
 pkg_search_module(SLIRP slirp)
 
+# if slirp is not found, we will try pcap
+# if it is not found either, a dummy pcap will be compiled
+# but network will be badly affected
+
 if ("${SLIRP_FOUND}" STREQUAL "")
-  message(WARNING "'libslirp' not found. Will use 'libpcap' instead")
-endif()
+  message(WARNING "'libslirp' not found: will try 'libpcap' instead")
 
-pkg_search_module(PCAP libpcap)
-if ("${PCAP_FOUND}" STREQUAL "")
-  # old versions of pcap do not work with pkg-config
-  # this is necessary on Rapsberri Pi OS
-  execute_process(COMMAND pcap-config --cflags
-    OUTPUT_VARIABLE PCAP_INCLUDE_DIRS
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    RESULT_VARIABLE STATUS)
-  if ("${STATUS}" STREQUAL "0")
-    message("Found 'libpcap' via pcap-config")
-  else()
-    message(FATAL_ERROR "Cannot locate 'libpcap-dev'")
+  pkg_search_module(PCAP libpcap)
+  if ("${PCAP_FOUND}" STREQUAL "")
+    # old versions of pcap do not work with pkg-config
+    # this is necessary on Rapsberri Pi OS
+    execute_process(COMMAND pcap-config --cflags
+      OUTPUT_VARIABLE PCAP_INCLUDE_DIRS
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      RESULT_VARIABLE STATUS)
+    if ("${STATUS}" STREQUAL "0")
+      message("Found 'libpcap' via pcap-config")
+      execute_process(COMMAND pcap-config --libs
+        OUTPUT_VARIABLE PCAP_LIBRARIES
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set(PCAP_FOUND "1")
+    endif()
   endif()
-  execute_process(COMMAND pcap-config --libs
-    OUTPUT_VARIABLE PCAP_LIBRARIES
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
 find_package(Boost REQUIRED)
 
 include(${CMAKE_SOURCE_DIR}/source/slip.cmake)
 
 set(SOURCE_FILES
-  Tfe/tfearch.cpp
   Tfe/tfesupp.cpp
   Tfe/NetworkBackend.cpp
   Tfe/PCapBackend.cpp
@@ -121,6 +123,12 @@ set(SOURCE_FILES
   linux/duplicates/FourPlay.cpp
   linux/duplicates/SNESMAX.cpp
   linux/duplicates/Keyboard.cpp
+  linux/duplicates/PageConfig.cpp
+  linux/duplicates/PageConfigTfe.cpp
+  linux/duplicates/PageInput.cpp
+  linux/duplicates/PageSound.cpp
+  linux/duplicates/PageDisk.cpp
+  linux/duplicates/PageAdvanced.cpp
 
   devrelay/commands/Close.cpp
   devrelay/commands/Control.cpp
@@ -274,6 +282,12 @@ add_library(appleii STATIC
   ${HEADER_FILES}
   )
 
+if ("${PCAP_FOUND}" STREQUAL "1")
+  target_sources(appleii PRIVATE Tfe/tfearch.cpp)
+else()
+  target_sources(appleii PRIVATE linux/duplicates/tfearch.cpp)
+endif()
+
 target_include_directories(appleii PRIVATE
   ${YAML_INCLUDE_DIRS}
   ${PCAP_INCLUDE_DIRS}

resource/Debug_Font.bmp

@@ -124,7 +124,7 @@ char FormatChar4Font(const BYTE b, bool* pWasHi_, bool* pWasLo_)
 // Disassembly
 	/*
 		// Thought about moving MouseText to another location, say high bit, 'A' + 0x80
-		// But would like to keep compatibility with existing CHARSET40
+		// But would like to keep compatibility with existing CHARSET40 - UPDATE: we now use original video ROMs (GH#1308)
 		// Since we should be able to display all apple chars 0x00 .. 0xFF with minimal processing
 		// Use CONSOLE_COLOR_ESCAPE_CHAR to shift to mouse text
 		* Apple Font