SDL: update context menu

Author: chrisws

ChangeLog

@@ -5,6 +5,8 @@
 	- F1 key for keywords surrounded by punctuation
 	- page scrolling with up/down arrow keys
 	- pressing tab at the bottom no longer jumps to the top
+	- display additional editor context menu items
+	Added a basic debugger
 
 2015-08-02
 	Fix display output before DELAY

src/common/inet.h

@@ -124,10 +124,10 @@ void net_disconnect(socket_t s);
 /**
  * @ingroup net
  *
- * returns true if something is waitting in input-buffer
+ * returns true if something is waiting in input-buffer
  *
  * @param s the socket
- * @return non-zero if something is waitting in input-buffer; otherwise returns 0
+ * @return non-zero if something is waiting in input-buffer; otherwise returns 0
  */
 int net_peek(socket_t s);
 

src/platform/sdl/runtime.cpp

@@ -162,7 +162,7 @@ void Runtime::debugStart(TextEditInput *editWidget, const char *file) {
 
   if (g_debugee != -1) {
     net_print(g_debugee, "l\n");
-    open = net_input(g_debugee, buf, sizeof(buf), "\r\n") > 0;
+    open = net_input(g_debugee, buf, sizeof(buf), "\n") > 0;
   } else {
     open = false;
   }
@@ -175,7 +175,7 @@ void Runtime::debugStart(TextEditInput *editWidget, const char *file) {
     g_debugee = net_connect("localhost", g_debugPort);
     if (g_debugee != -1) {
       net_print(g_debugee, "l\n");
-      size = net_input(g_debugee, buf, sizeof(buf), "\r\n");
+      size = net_input(g_debugee, buf, sizeof(buf), "\n");
       if (size > 0) {
         editWidget->gotoLine(buf);
         appLog("Debug session ready");
@@ -194,14 +194,21 @@ void Runtime::debugStep(TextEditInput *edit, TextEditHelpWidget *help, bool cont
     int size;
     net_print(g_debugee, cont ? "c\n" : "n\n");
     net_print(g_debugee, "l\n");
-    size = net_input(g_debugee, buf, sizeof(buf), "\r\n");
+    size = net_input(g_debugee, buf, sizeof(buf), "\n");
     if (size > 0) {
       edit->gotoLine(buf);
       net_print(g_debugee, "v\n");
-      size = net_input(g_debugee, buf, sizeof(buf), "\1");
-      if (size > 0) {
-        help->reload(buf);
-      }
+      help->reload(NULL);
+      do {
+        size = net_input(g_debugee, buf, sizeof(buf), "\1\n");
+        if (buf[0] == '\1') {
+          break;
+        }
+        if (size > 0) {
+          help->append(buf, size);
+          help->append("\n", 1);
+        }
+      } while (size > 0);
     }
   }
 }
@@ -630,7 +637,7 @@ void Runtime::optionsBox(StringList *items) {
   }
 
   _output->redraw();
-  while (selectedIndex == -1) {
+  while (selectedIndex == -1 && !isClosing()) {
     MAEvent ev = processEvents(true);
     if (ev.type == EVENT_TYPE_KEY_PRESSED &&
         ev.key == 27) {

src/ui/inputs.cpp

@@ -1079,7 +1079,16 @@ void MenuButton::draw(int x, int y, int w, int h, int chw) {
     if (len * chw >= _width) {
       len = _width / chw;
     }
+    int charHeight = g_system->getOutput()->getCharHeight();
+    int textY = y + (_height - charHeight) / 2;
+
     maSetColor(_pressed ? _fg : _bg);
-    maDrawText(x + 4, y + 4, _label.c_str(), len);
+    maDrawText(x + 4, textY, _label.c_str(), len);
+    if (!_pressed && _index > 0 && _index % 2 == 0) {
+      maSetColor(0x3b3a36);
+      maLine(x + 2, y, x + _width - 2, y);
+      maSetColor(0x46453f);
+      maLine(x + 2, y - 1, x + _width - 2, y - 1);
+    }
   }
 }

src/ui/system.cpp

@@ -40,7 +40,8 @@
 #define MENU_SAVE       17
 #define MENU_RUN        18
 #define MENU_DEBUG      19
-#define MENU_SIZE       20
+#define MENU_OUTPUT     20
+#define MENU_SIZE       21
 
 #define FONT_SCALE_INTERVAL 10
 #define FONT_MIN 20
@@ -314,6 +315,10 @@ void System::handleMenu(MAEvent &event) {
     event.type = EVENT_TYPE_KEY_PRESSED;
     event.key = SB_KEY_F(5);
     break;
+  case MENU_OUTPUT:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_CTRL('o');
+    break;
   }
 
   if (fontSize != _output->getFontSize()) {
@@ -720,11 +725,13 @@ void System::showMenu() {
         items->add(new String("Save"));
         items->add(new String("Run"));
         items->add(new String("Debug"));
+        items->add(new String("Output"));
         _systemMenu[index++] = MENU_UNDO;
         _systemMenu[index++] = MENU_REDO;
         _systemMenu[index++] = MENU_SAVE;
         _systemMenu[index++] = MENU_RUN;
         _systemMenu[index++] = MENU_DEBUG;
+        _systemMenu[index++] = MENU_OUTPUT;
       }
 
 #if defined(_SDL)

src/ui/textedit.cpp

@@ -611,7 +611,9 @@ void TextEditInput::reload(const char *text) {
   _scroll = 0;
   _cursorRow = 0;
   _buf.clear();
-  _buf.insertChars(0, text, strlen(text));
+  if (text != NULL) {
+    _buf.insertChars(0, text, strlen(text));
+  }
   stb_textedit_initialize_state(&_state, false);
 }
 

src/ui/textedit.h

@@ -69,6 +69,7 @@ struct TextEditInput : public FormEditInput {
   TextEditInput(const char *text, int chW, int chH, int x, int y, int w, int h);
   virtual ~TextEditInput();
 
+  void append(const char *text, int len) { _buf.append(text, len); }
   void completeWord(const char *word);
   void draw(int x, int y, int w, int h, int chw);
   bool edit(int key, int screenWidth, int charWidth);