Add mouse expansion port option

Astro8-Emulator/main.cpp

@@ -38,6 +38,8 @@ using namespace std;
 
 bool compileOnly, assembleOnly, runAstroExecutable;
 
+bool usingKeyboard = true;
+
 
 int AReg = 0;
 int BReg = 0;
@@ -335,6 +337,8 @@ int main(int argc, char** argv)
 			assembleOnly = true;
 		else if (argval == "-r" || argval == "--run") // Run an already assembled program in AstroEXE format
 			runAstroExecutable = true;
+		else if (argval == "-nk" || argval == "--nokeyboard") // Use the mouse mode for the emulator
+			usingKeyboard = false;
 	}
 	cout << to_string(compileOnly) << " " << to_string(assembleOnly) << " " << to_string(runAstroExecutable) << " " << endl;
 
@@ -562,17 +566,32 @@ int main(int argc, char** argv)
 				{
 					running = false;
 				}
-				else if (event.type == SDL_KEYDOWN) {
+				// If using the keyboard in the expansion port
+				if (usingKeyboard) {
+					if (event.type == SDL_KEYDOWN) {
+
+						// Keyboard support
+						expansionPort = ConvertAsciiToSdcii((int)(event.key.keysym.scancode));
 
-					// Keyboard support
-					expansionPort = ConvertAsciiToSdcii((int)(event.key.keysym.scancode));
+						cout << "  expansionPort: " << (int)(event.key.keysym.scancode) << endl;
+					}
+					else if (event.type == SDL_KEYUP) {
 
-					cout << "  expansionPort: " << (int)(event.key.keysym.scancode) << endl;
+						// Keyboard support
+						expansionPort = 168; // Keyboard idle state is 168 (max value), since 0 is reserved for space
+					}
 				}
-				else if (event.type == SDL_KEYUP) {
+				// If using the mouse in the expansion port
+				else if (!usingKeyboard) {
+					if (event.type == SDL_MOUSEMOTION) {
 
-					// Keyboard support
-					expansionPort = 168; // Keyboard idle state is 168 (max value), since 0 is reserved for space
+						// Mouse support
+						//if(event.motion.x)
+						expansionPort = (event.motion.x << 8) + event.motion.y;
+
+						cout << "\n" << (int)(event.motion.x) << " " << (int)(event.motion.y);
+						cout << "\n" << expansionPort;
+					}
 				}
 			}
 		}
@@ -1101,7 +1120,7 @@ vector<std::string> parseCode(const std::string& input)
 	myStream << processedOutput;
 
 	return outputBytes;
-}
+		}
 
 void ComputeStepInstructions(const std::string& stepContents, char* stepComputedInstruction) {
 
@@ -1264,7 +1283,7 @@ void GenerateMicrocode()
 			}
 		}
 
-	}
+			}
 
 	// Do actual processing
 #if DEV_MODE
@@ -1339,7 +1358,7 @@ void GenerateMicrocode()
 				output[BinToDec(startaddress + midaddress + charToString(newendaddress))] = BinToHexFilled(stepComputedInstruction, 5);
 			}
 		}
-	}
+			}
 
 	// Print the output
 	std::string processedOutput = "";
@@ -1370,7 +1389,7 @@ void GenerateMicrocode()
 	fstream myStream;
 	myStream.open("./microinstructions_cpu", ios::out);
 	myStream << processedOutput;
-}
+		}
 
 vector<string> vars;
 vector<string> labels;

Astro8-Emulator/x64/Release/Astro8-Emulator.log

@@ -1,6 +1,28 @@
-  Generating code
-  10 of 1088 functions ( 0.9%) were compiled, the rest were copied from previous compilation.
+  main.cpp
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(71,30): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(134,30): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(135,30): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(136,30): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(137,30): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(138,29): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\processing.h(139,29): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(296,24): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(536,24): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(631,24): warning C5051: attribute 'likely' requires at least '/std:c++20'; ignored
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(649,10): warning C4244: '=': conversion from 'uint64_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(661,32): warning C5051: attribute 'unlikely' requires at least '/std:c++20'; ignored
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(792,5): warning C5051: attribute 'likely' requires at least '/std:c++20'; ignored
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(821,32): warning C5051: attribute 'unlikely' requires at least '/std:c++20'; ignored
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(935,45): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(935,32): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1218,42): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1549,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1552,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1555,28): warning C4244: '+=': conversion from 'double' to 'unsigned long', possible loss of data
+D:\Code\Astro8-Computer\Astro8-Emulator\main.cpp(1760,32): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
+  Generating code
+  1 of 1088 functions (<0.1%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    5 functions had inline decision re-evaluated but remain unchanged
+    0 functions had inline decision re-evaluated but remain unchanged
   Finished generating code
   Astro8-Emulator.vcxproj -> D:\Code\Astro8-Computer\Astro8-Emulator\x64\Release\Astro8-Emulator.exe