#272 - Scripting Input terminal (#273)

* Basic input terminal (#272) with tab-complete

* Try to force a single task for tests

.github/workflows/tests.yml

@@ -75,7 +75,7 @@ jobs:
       continue-on-error: true
       run: |
         cd ${{ runner.workspace }}/MK404/build
-        make Test_Parts
+        make Test_Parts -j1
 
     - run: cd ${{ runner.workspace }}/MK404/build && tar -zcvf snaps_core.tar.gz tests/snaps/
 
@@ -165,7 +165,7 @@ jobs:
       continue-on-error: true
       run: |
         cd ${{ runner.workspace }}/MK404/build
-        make Test_ext1
+        make Test_ext1 -j1
 
     - run: cd ${{ runner.workspace }}/MK404/build && tar -zcvf snaps_ext1.tar.gz tests/snaps/
 

CMakeLists.txt

@@ -328,6 +328,13 @@ else()
 	set(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE OFF)
 endif()
 
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+	message(STATUS "Build type is release, adding extra flags.")
+	target_compile_options(MK404 PRIVATE -flto -mtune=native)
+	target_link_libraries(MK404 -flto)
+endif()
+
+
 add_custom_target(Test_Clean
 	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 	COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_BINARY_DIR}/*.bin_test
@@ -353,14 +360,14 @@ add_custom_target(Coverage.tar.gz
 	DEPENDS Test_Common
 )
 add_custom_target(Test_Parts
-	COMMAND cd ${PROJECT_BINARY_DIR} && env CTEST_OUTPUT_ON_FAILURE=1 ctest -R 'core|part|ext2' --timeout 360
+	COMMAND cd ${PROJECT_BINARY_DIR} && env CTEST_OUTPUT_ON_FAILURE=1 ctest -R 'core|part|ext2' --timeout 300 -j 1
 	COMMAND lcov --capture --gcov-tool="${GCOV_BINARY}" --directory ${PROJECT_BINARY_DIR} --output-file ${PROJECT_BINARY_DIR}/parts.info
 	COMMAND lcov --remove parts.info '/usr/*' -o parts.info
 	COMMAND lcov --remove parts.info '*/3rdParty/*' -o parts.info
 	DEPENDS Test_Common Test_firmwares
 )
 add_custom_target(Test_ext1
-	COMMAND cd ${PROJECT_BINARY_DIR} && env CTEST_OUTPUT_ON_FAILURE=1 ctest -R 'core|ext1' --timeout 120
+	COMMAND cd ${PROJECT_BINARY_DIR} && env CTEST_OUTPUT_ON_FAILURE=1 ctest -R 'core|ext1' --timeout 180 -j 1
 	COMMAND lcov --capture --gcov-tool="${GCOV_BINARY}" --directory ${PROJECT_BINARY_DIR} --output-file ${PROJECT_BINARY_DIR}/ext1.info
 	COMMAND lcov --remove ext1.info '/usr/*' -o ext1.info
 	COMMAND lcov --remove ext1.info '*/3rdParty/*' -o ext1.info

MK404.cpp

@@ -66,10 +66,12 @@ bool m_bStopping = false;
 
 bool m_bTestMode = false;
 
+bool m_bTerminal = false;
+
 // GL context stuff for FPS counting...
 
 int m_iTic =0, m_iLast = 0, m_iFrCount = 0;
-
+int m_iTermHeight = 0;
 
 // pragma: LCOV_EXCL_START
 // Exit cleanly on ^C
@@ -122,6 +124,19 @@ static std::string GetBaseTitle()
 
 std::atomic_bool bIsQuitting {false};
 
+void KeyCB(unsigned char key, int /*x*/, int y)
+{
+	if (y<m_iTermHeight)
+	{
+		KeyController::GLKeyReceiver(key,0,0);
+	}
+	else if (m_bTerminal)
+	{
+		ScriptHost::SetFocus(true);
+		ScriptHost::KeyCB(key);
+	}
+}
+
 void displayCB()		/* function called whenever redisplay needed */
 {
 	if (bIsQuitting || pBoard->GetQuitFlag()) // Stop drawing if shutting down.
@@ -133,9 +148,15 @@ void displayCB()		/* function called whenever redisplay needed */
 	glLoadIdentity();
 	glClear(US(GL_COLOR_BUFFER_BIT) | US(GL_DEPTH_BUFFER_BIT));
 	int iW = glutGet(GLUT_WINDOW_WIDTH);
-	int iH = glutGet(GLUT_WINDOW_HEIGHT);
+	//int iH = glutGet(GLUT_WINDOW_HEIGHT);
+	if (m_bTerminal)
+	{
+		glPushMatrix();
+			glTranslatef(0,m_iTermHeight,0);
+			ScriptHost::Draw();
+		glPopMatrix();
+	}
 	printer->Draw();
-
 	m_iFrCount++;
 	m_iTic=glutGet(GLUT_ELAPSED_TIME);
 	auto iDiff = m_iTic - m_iLast;
@@ -154,8 +175,8 @@ void displayCB()		/* function called whenever redisplay needed */
 		glBegin(GL_QUADS);
 			glVertex2f(0,0);
 			glVertex2f(iW,0);
-			glVertex2f(iW,iH);
-			glVertex2f(0,iH);
+			glVertex2f(iW,static_cast<float>(m_iTermHeight)/4.f);
+			glVertex2f(0, static_cast<float>(m_iTermHeight)/4.f);
 		glEnd();
 		glColor3f(1,0,0);
 		glPushMatrix();
@@ -184,6 +205,11 @@ void MouseCB(int button, int action, int x, int y)	/* called on key press */
 	printer->OnMousePress(button,action,x,y);
 }
 
+void PassiveMotionCB(int /*x*/, int y)
+{
+	ScriptHost::SetFocus(y>m_iTermHeight);
+}
+
 void MotionCB(int x, int y)
 {
 	printer->OnMouseMove(x,y);
@@ -209,11 +235,23 @@ void timerCB(int i)
 void ResizeCB(int w, int h)
 {
 	std::pair<int,int> winSize = printer->GetWindowSize();
+	if (m_bTerminal)
+	{
+		winSize.second+=10;
+	}
 	float fWS = static_cast<float>(w)/static_cast<float>(winSize.first*4);
 	float fHS = static_cast<float>(h)/static_cast<float>(winSize.second*4);
 	float fScale = std::max(fWS,fHS);
 	int iW = 4.f*static_cast<float>(winSize.first)*fScale;
 	int iH = 4.f*static_cast<float>(winSize.second)*fScale;
+	if (m_bTerminal)
+	{
+		m_iTermHeight = iH - (fScale*40.f);
+	}
+	else
+	{
+		m_iTermHeight = iH;
+	}
 	if (iW!=w || iH !=h)
 	{
 		iWinH = iH;
@@ -234,8 +272,9 @@ int initGL()
 {
 	// Set up projection matrix
 	glutDisplayFunc(displayCB);		/* set window's display callback */
-	glutKeyboardFunc(KeyController::GLKeyReceiver);		/* set window's key callback */
+	glutKeyboardFunc(KeyCB);		/* set window's key callback */
 	glutMouseFunc(MouseCB);
+	glutPassiveMotionFunc(PassiveMotionCB);
 	glutMotionFunc(MotionCB);
 	glutTimerFunc(1000, timerCB, 0);
 	glutReshapeFunc(ResizeCB);
@@ -273,6 +312,7 @@ int main(int argc, char *argv[])
 	MultiSwitchArg argSpam("v","verbose","Increases verbosity of the output, where supported.",cmd);
 	ValueArg<int> argVCDRate("","tracerate", "Sets the logging frequency of the VCD trace (default 100uS)",false, 100,"integer",cmd);
 	MultiArg<string> argVCD("t","trace","Enables VCD traces for the specified categories or IRQs. use '-t ?' to get a printout of available traces",false,"string",cmd);
+	SwitchArg argTerm("","terminal","Enable an in-UI terminal for interactive scripting (--EXPERIMENTAL!!--)", cmd);
 	SwitchArg argTest("","test","Run it test mode (no graphics, don't auto-exit.", cmd);
 	SwitchArg argSkew("","skew-correct","Attempt to correct for fast clock skew of the simulated board", cmd);
 	SwitchArg argSerial("s","serial","Connect a printer's serial port to a PTY instead of printing its output to the console.", cmd);
@@ -338,6 +378,8 @@ int main(int argc, char *argv[])
 	}
 	bool bNoGraphics = argGfx.isSet() && (argGfx.getValue()=="none");
 
+	m_bTerminal = argTerm.isSet();
+
 	m_bTestMode = (argModel.getValue()=="Test_Printer") | argTest.isSet();
 
 	Config::Get().SetExtrusionMode(PrintVisualType::GetNameToType().at(argExtrusion.getValue()));
@@ -370,8 +412,13 @@ int main(int argc, char *argv[])
 
 		std::pair<int,int> winSize = printer->GetWindowSize();
 		int pixsize = 4;
+		if (m_bTerminal)
+		{
+			winSize.second +=10;
+		}
 		iWinW = winSize.first * pixsize;
-		iWinH = winSize.second * pixsize;
+		iWinH = (winSize.second)*pixsize;
+		m_iTermHeight = winSize.second*pixsize;
 		glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
 #ifndef TEST_MODE
 		glutSetOption(GLUT_MULTISAMPLE,2);
@@ -443,6 +490,10 @@ int main(int argc, char *argv[])
 	if (!bNoGraphics)
 	{
 		ScriptHost::CreateRootMenu(window);
+		if (argTerm.isSet())
+		{
+			ScriptHost::SetupAutocomplete();
+		}
 	}
 
 	// This is a little lazy, I know. Figure it out once we have non-einsy printers.