UI: fix crash with online command when site down

Author: chrisws

ChangeLog

@@ -2,6 +2,10 @@
 	Fix debugger launch in linux build
 	Fix editor variable handling
 	Fix image drawing
+	Fix PAINT infinite loop
+	Fix keyboard handling for non-us keymaps
+	Fix Ctrl+Home editor keystroke handler
+	Fix crash with online command if site is down
 
 2015-10-20
 	Fix LET when assigning a value to a MAP/ARRAY field

documentation/build_kwp.cpp

@@ -240,14 +240,15 @@ int main(int argc, char *argv[]) {
   fprintf(stdout, "  const char *package;\n");
   fprintf(stdout, "  const char *keyword;\n");
   fprintf(stdout, "  const char *signature;\n");
+  fprintf(stdout, "  const char *nodeId;\n");
   fprintf(stdout, "  const char *help;\n");
   fprintf(stdout, "} keyword_help[] = {\n");
 
   int max_keyword_len = 0;
   List_each(HelpItem *, it, helpItems) {
     HelpItem *item = (*it);
-    fprintf(stdout, "{\"%s\",\"%s\",\"%s\",\"%s\"},\n", item->package,
-            item->keyword, item->signature, item->help);
+    fprintf(stdout, "{\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"},\n", item->package,
+            item->keyword, item->signature, item->id, item->help);
     int len = strlen(item->keyword);
     if (len > max_keyword_len) {
       max_keyword_len = len;

src/common/fs_socket_client.c

@@ -18,7 +18,7 @@ int sockcl_open(dev_file_t *f) {
   int port;
   char server[129];
 
-  // open "SOCL:smallbasic.sf.net:80" as #1 
+  // open "SOCL:smallbasic.sf.net:80" as #1
   // open "SOCL:80" as #2
   f->drv_dw[0] = 1;
   p = strchr(f->name + 5, ':');
@@ -132,7 +132,10 @@ int http_read(dev_file_t *f, var_t *var_p) {
 
   while (1) {
     int bytes = net_read(f->handle, (char *) rxbuff, sizeof(rxbuff));
-    if (bytes == 0) {
+    if (bytes == -1) {
+      httpOK = 0;
+      break;
+    } else if (bytes == 0) {
       break;                    // no more data
     }
     // assumes http header < 1024 bytes

src/platform/sdl/editor.cpp

@@ -11,6 +11,17 @@
 #include "common/sbapp.h"
 #include "ui/system.h"
 #include "ui/textedit.h"
+#include "platform/sdl/syswm.h"
+
+void onlineHelp(const char *nodeId) {
+  if (nodeId != NULL) {
+    char path[100];
+    sprintf(path, "http://smallbasic.sf.net/?q=node/%s", nodeId);
+    browseFile(path);
+  } else {
+    browseFile("http://smallbasic.sourceforge.net/");
+  }
+}
 
 void System::editSource(strlib::String &loadPath) {
   logEntered();
@@ -90,7 +101,6 @@ void System::editSource(strlib::String &loadPath) {
       }
 
       switch (event.key) {
-      case SB_KEY_F(2):
       case SB_KEY_F(3):
       case SB_KEY_F(8):
       case SB_KEY_F(10):
@@ -131,6 +141,10 @@ void System::editSource(strlib::String &loadPath) {
         helpWidget->createKeywordIndex();
         helpWidget->show();
         break;
+      case SB_KEY_F(2):
+        redraw = false;
+        onlineHelp(widget->getNodeId());
+        break;
       case SB_KEY_F(5):
         saveFile(editWidget, loadPath);
         _output->setStatus("Debug. F6=Step, F7=Continue, Esc=Close");

src/platform/sdl/syswm.cpp

@@ -57,6 +57,21 @@ void launchDebug(const char *file) {
   }
 }
 
+#if defined(WIN32)
+#include <windows.h>
+#include <fltk/Window.h>
+#include <fltk/win32.h>
+#endif
+
+void browseFile(const char *url) {
+  SDL_SysWMinfo wminfo;
+  SDL_VERSION(&wminfo.version);
+  if (SDL_GetWindowWMInfo(window, &wminfo) == 1) {
+    HWND hwnd = wminfo.info.win.window;
+    ShellExecute(hwnd, "open", url, 0, 0, SW_SHOWNORMAL);
+  }
+}
+
 #else
 #include <unistd.h>
 #include <errno.h>
@@ -90,4 +105,19 @@ void launchDebug(const char *file) {
   }
 }
 
+void browseFile(const char *url) {
+  if (fork() == 0) {
+    fclose(stderr);
+    fclose(stdin);
+    fclose(stdout);
+    execlp("htmlview", "htmlview", url, NULL);
+    execlp("google-chrome", "google-chrome", url, NULL);
+    execlp("chromium-browser", "chromium-browser", url, NULL);
+    execlp("firefox", "firefox", url, NULL);
+    execlp("mozilla", "mozilla", url, NULL);
+    // exit in case exec failed
+    ::exit(0);
+  }
+}
+
 #endif

src/platform/sdl/syswm.h

@@ -14,5 +14,6 @@
 void loadIcon(SDL_Window *window);
 int getStartupFontSize(SDL_Window *window);
 void launchDebug(const char *file);
+void browseFile(const char *url);
 
 #endif

src/ui/system.cpp

@@ -412,13 +412,16 @@ char *System::loadResource(const char *fileName) {
     _output->setStatus("Loading...");
     _output->redraw();
     if (dev_fopen(handle, fileName, 0)) {
-      http_read(f, var_p);
-      int len = var_p->v.p.size;
-      buffer = (char *)malloc(len + 1);
-      memcpy(buffer, var_p->v.p.ptr, len);
-      buffer[len] = '\0';
+      if (http_read(f, var_p) == 0) {
+        systemPrint("\nfailed to read %s\n", fileName);
+      } else {
+        int len = var_p->v.p.size;
+        buffer = (char *)malloc(len + 1);
+        memcpy(buffer, var_p->v.p.ptr, len);
+        buffer[len] = '\0';
+      }
     } else {
-      systemPrint("\nfailed to open %s", fileName);
+      systemPrint("\nfailed to open %s\n", fileName);
     }
     _output->setStatus(NULL);
     dev_fclose(handle);

src/ui/textedit.cpp

@@ -1221,6 +1221,21 @@ char *TextEditInput::getSelection(int *start, int *end) {
   return result;
 }
 
+const char *TextEditInput::getNodeId() {
+  char *selection = getWordBeforeCursor();
+  const char *result = NULL;
+  int len = selection != NULL ? strlen(selection) : 0;
+  if (len > 0) {
+    for (int i = 0; i < keyword_help_len && !result; i++) {
+      if (strcasecmp(selection, keyword_help[i].keyword) == 0) {
+        result = keyword_help[i].nodeId;
+      }
+    }
+  }
+  free(selection);
+  return result;
+}
+
 char *TextEditInput::getWordBeforeCursor() {
   char *result;
   if (_state.select_start == _state.select_end) {

src/ui/textedit.h

@@ -106,6 +106,7 @@ struct TextEditInput : public FormEditInput {
   bool isDirty() { return _dirty && _state.undostate.undo_point > 0; }
   void setDirty(bool dirty) { _dirty = dirty; }
   void resize(int w, int h) { _width = w; _height = h; }
+  const char *getNodeId();
   char *getWordBeforeCursor();
   bool replaceNext(const char *text);
   int  getCompletions(StringList *list, int max);