SDL: add editing context items

Author: chrisws

src/platform/sdl/runtime.cpp

@@ -605,7 +605,7 @@ void Runtime::optionsBox(StringList *items) {
   width += (charWidth * OPTIONS_BOX_WIDTH_EXTRA);
 
   int charHeight = _output->getCharHeight();
-  int textHeight = charHeight + (charHeight / 2);
+  int textHeight = charHeight + (charHeight / 3);
   int height = textHeight * items->size();
   if (_menuX + width >= _output->getWidth()) {
     _menuX = _output->getWidth() - width;
@@ -855,7 +855,6 @@ int debugThread(void *data) {
         // quit
         signalTrace(SDL_FALSE, SDL_TRUE);
         g_breakPoints.removeAll();
-        net_print(socket, "Bye\n");
         net_disconnect(socket);
         socket = -1;
         break;
@@ -873,7 +872,6 @@ int debugThread(void *data) {
 }
 
 extern "C" void dev_trace_line(int lineNo) {
-  runtime->getOutput()->redraw();
   SDL_LockMutex(g_lock);
   g_debugLine = lineNo;
 
@@ -889,6 +887,7 @@ extern "C" void dev_trace_line(int lineNo) {
       }
     }
     if (g_debugBreak) {
+      runtime->getOutput()->redraw();
       g_debugPause = SDL_TRUE;
       while (g_debugPause) {
         SDL_CondWaitTimeout(g_cond, g_lock, COND_WAIT_TIME);

src/platform/sdl/syswm.cpp

@@ -45,7 +45,11 @@ int getStartupFontSize(SDL_Window *window) {
 }
 
 void launchDebug(const char *file) {
-  // TODO
+  STARTUPINFO info={sizeof(info)};
+  PROCESS_INFORMATION processInfo;
+  char cmd[1024];
+  sprintf(cmd, "-p %d -d %s", g_debugPort, file);
+  CreateProcess(g_appPath, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo);
 }
 
 #else

src/ui/system.cpp

@@ -35,7 +35,12 @@
 #define MENU_AUDIO      12
 #define MENU_SCREENSHOT 13
 #define MENU_SCRATCHPAD 14
-#define MENU_SIZE       15
+#define MENU_UNDO       15
+#define MENU_REDO       16
+#define MENU_SAVE       17
+#define MENU_RUN        18
+#define MENU_DEBUG      19
+#define MENU_SIZE       20
 
 #define FONT_SCALE_INTERVAL 10
 #define FONT_MIN 20
@@ -216,7 +221,8 @@ uint32_t System::getModifiedTime() {
   return result;
 }
 
-void System::handleMenu(int menuId) {
+void System::handleMenu(MAEvent &event) {
+  int menuId = event.optionsBoxButtonIndex;
   int fontSize = _output->getFontSize();
   int menuItem = _systemMenu[menuId];
   delete [] _systemMenu;
@@ -288,6 +294,26 @@ void System::handleMenu(int menuId) {
   case MENU_SCRATCHPAD:
     scratchPad();
     break;
+  case MENU_UNDO:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_CTRL('z');
+    break;
+  case MENU_REDO:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_CTRL('y');
+    break;
+  case MENU_SAVE:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_CTRL('s');
+    break;
+  case MENU_RUN:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_F(9);
+    break;
+  case MENU_DEBUG:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_F(5);
+    break;
   }
 
   if (fontSize != _output->getFontSize()) {
@@ -307,7 +333,7 @@ void System::handleEvent(MAEvent &event) {
   switch (event.type) {
   case EVENT_TYPE_OPTIONS_BOX_BUTTON_CLICKED:
     if (_systemMenu != NULL) {
-      handleMenu(event.optionsBoxButtonIndex);
+      handleMenu(event);
     } else if (isRunning()) {
       if (!form_ui::optionSelected(event.optionsBoxButtonIndex)) {
         dev_clrkb();
@@ -687,6 +713,20 @@ void System::showMenu() {
       _systemMenu[index++] = MENU_CUT;
       _systemMenu[index++] = MENU_COPY;
       _systemMenu[index++] = MENU_PASTE;
+
+      if (isEditing()) {
+        items->add(new String("Undo"));
+        items->add(new String("Redo"));
+        items->add(new String("Save"));
+        items->add(new String("Run"));
+        items->add(new String("Debug"));
+        _systemMenu[index++] = MENU_UNDO;
+        _systemMenu[index++] = MENU_REDO;
+        _systemMenu[index++] = MENU_SAVE;
+        _systemMenu[index++] = MENU_RUN;
+        _systemMenu[index++] = MENU_DEBUG;
+      }
+
 #if defined(_SDL)
       items->add(new String("Back"));
       _systemMenu[index++] = MENU_BACK;

src/ui/system.h

@@ -67,7 +67,7 @@ struct System {
   MAEvent getNextEvent() { return processEvents(1); }
   uint32_t getModifiedTime();
   void handleEvent(MAEvent &event);
-  void handleMenu(int menuId);
+  void handleMenu(MAEvent &event);
   bool loadSource(const char *fileName);
   void resize();
   void runEdit(const char *startupBas);