Merge pull request #79 from chrisws/0_12_15

0 12 15

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2019-06-27 (0.12.15)
+	FLTK: file file save as
+	UI: fix reported crash in android printing null
+
 2019-06-22 (0.12.15)
 	FLTK: reactivated the FLTK port using FLTK v1.4
 

configure.ac

@@ -205,7 +205,7 @@ function buildSDL() {
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS}"
 
      dnl backlinking support for modules
-     PACKAGE_LIBS="${PACKAGE_LIBS} -ldl"
+     PACKAGE_LIBS="${PACKAGE_LIBS} -ldl -no-pie"
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
      PACKAGE_LIBS="-static-libgcc ${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"
    esac
@@ -344,7 +344,7 @@ function buildFLTK() {
 
    FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk-config --cxxflags`"
    FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++11 -Wno-unknown-pragmas"
-   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images`"
+   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images` -no-pie"
 
    dnl do not depend on cygwin.dll under cygwin build
    case "${host_os}" in

src/platform/fltk/EditorWidget.cxx

@@ -629,7 +629,6 @@ bool EditorWidget::checkSave(bool discard) {
   } else {
     r = fl_choice(msg, "Save", "Cancel", NULL, NULL);
   }
-  fprintf(stderr, "selected %d\n", r);
   if (r == 0) {
     // save selected
     save_file();
@@ -652,8 +651,8 @@ void EditorWidget::copyText() {
 /**
  * saves the editor buffer to the given file name
  */
-void EditorWidget::doSaveFile(const char *newfile) {
-  if (!_dirty && strcmp(newfile, _filename) == 0) {
+void EditorWidget::doSaveFile(const char *newfile, bool force) {
+  if (!force && !_dirty && strcmp(newfile, _filename) == 0) {
     // neither buffer or filename have changed
     return;
   }

src/platform/fltk/EditorWidget.h

@@ -97,7 +97,7 @@ struct EditorWidget : public Fl_Group, StatusBar {
 
   bool checkSave(bool discard);
   void copyText();
-  void doSaveFile(const char *newfile);
+  void doSaveFile(const char *newfile, bool force=false);
   void fileChanged(bool loadfile);
   bool focusWidget();
   const char *getFilename() { return _filename; }

src/platform/fltk/FileWidget.cxx

@@ -266,7 +266,7 @@ void FileWidget::fileOpen(EditorWidget *_saveEditorAs) {
 //
 void FileWidget::openPath(const char *newPath, StringList *recentPaths) {
   if (newPath && access(newPath, R_OK) == 0) {
-    strcpy(_path, newPath);
+    strlcpy(_path, newPath, PATH_MAX);
   } else {
     getcwd(_path, sizeof(_path));
   }
@@ -285,7 +285,7 @@ void FileWidget::openPath(const char *newPath, StringList *recentPaths) {
 void FileWidget::changeDir(const char *target) {
   char newPath[PATH_MAX + 1];
 
-  strcpy(newPath, _path);
+  strlcpy(newPath, _path, PATH_MAX);
 
   // file browser window
   if (strcmp(target, "..") == 0) {
@@ -299,9 +299,9 @@ void FileWidget::changeDir(const char *target) {
   } else {
     // go down a level
     if (newPath[strlen(newPath) - 1] != '/') {
-      strcat(newPath, "/");
+      strlcat(newPath, "/", PATH_MAX);
     }
-    strcat(newPath, target);
+    strlcat(newPath, target, PATH_MAX);
   }
   setDir(newPath);
 }
@@ -311,7 +311,7 @@ void FileWidget::changeDir(const char *target) {
 //
 void FileWidget::setDir(const char *target) {
   if (chdir(target) == 0) {
-    strcpy(_path, target);
+    strlcpy(_path, target, PATH_MAX);
     displayPath();
   } else {
     fl_message("Invalid path '%s'", target);
@@ -365,10 +365,10 @@ void FileWidget::displayPath() {
   if (_saveEditorAs) {
     const char *path = _saveEditorAs->getFilename();
     const char *slash = strrchr(path, '/');
-    html.append("<b>Save ").append(slash ? slash + 1 : path).append(" as:<br>")
+    html.append("<b>Save ").append(slash ? slash + 1 : path).append(" as:<font size=3><br>")
         .append("<input size=220 type=text value='").append(slash ? slash + 1 : path)
         .append("' name=saveas>&nbsp;<input type=button onclick='")
-        .append(CMD_SAVE_AS).append("' value='Save As'><br><br>");
+        .append(CMD_SAVE_AS).append("' value='Save As'><br><font size=1>");
   }
 
   _recentPaths->sort(stringCompare);
@@ -433,7 +433,7 @@ void FileWidget::enterPath() {
   const char *newPath = fl_input("Enter path:", _path);
   if (newPath != 0) {
     if (chdir(newPath) == 0) {
-      strcpy(_path, newPath);
+      strlcpy(_path, newPath, PATH_MAX);
       displayPath();
     } else {
       fl_message("Invalid path '%s'", newPath);
@@ -497,23 +497,26 @@ void FileWidget::saveAs() {
         // substitute ~ for $HOME contents
         const char *home = dev_getenv("HOME");
         if (home) {
-          strcpy(savepath, home);
+          strlcpy(savepath, home, PATH_MAX);
         } else {
           savepath[0] = 0;
         }
-        strcat(savepath, enteredPath + 1);
+        strlcat(savepath, enteredPath + 1, PATH_MAX);
       } else if (enteredPath[0] == '/' || enteredPath[1] == ':') {
         // absolute path given
-        strcpy(savepath, enteredPath);
+        strlcpy(savepath, enteredPath, PATH_MAX);
       } else {
-        strcpy(savepath, _path);
-        strcat(savepath, "/");
-        strcat(savepath, enteredPath);
+        strlcpy(savepath, _path, PATH_MAX);
+        strlcat(savepath, "/", PATH_MAX);
+        strlcat(savepath, enteredPath, PATH_MAX);
+      }
+      if (strcasecmp(savepath + strlen(savepath) - 4, ".bas") != 0) {
+        strlcat(savepath, ".bas", PATH_MAX);
       }
       const char *msg = "%s\n\nFile already exists.\nDo you want to replace it?";
       if (access(savepath, 0) != 0 || fl_choice(msg, "Yes", "No", 0, savepath) == 0) {
-        _saveEditorAs->doSaveFile(savepath);
-        }
+        _saveEditorAs->doSaveFile(savepath, true);
+      }
     }
   }
 }

src/platform/fltk/HelpView.cxx

@@ -30,10 +30,6 @@ const char *aboutText =
 const char CMD_LEVEL1_OPEN = '+';
 const char CMD_LEVEL2_OPEN = '!';
 const char CMD_MORE = '^';
-const char LEVEL1_OPEN[]   = "+ ";
-const char LEVEL2_OPEN[]   = "  + ";
-const char LEVEL1_CLOSE[]  = " - ";
-const char LEVEL2_CLOSE[]  = "   - ";
 
 HelpView *helpView;
 

src/platform/fltk/HelpWidget.cxx

@@ -437,6 +437,11 @@ struct BrNode : public BaseNode {
 struct AnchorNode : public BaseNode {
   AnchorNode(Attributes &p) :
     BaseNode(),
+    x1(0),
+    x2(0),
+    y1(0),
+    y2(0),
+    lineHeight(0),
     wrapxy(0),
     pushed(0) {
     p.getName(name);
@@ -1446,7 +1451,7 @@ void createDropList(InputNode *node, strlib::List<String *> *options) {
 
 void InputNode::update(strlib::List<NamedInput *> *names, Properties<String *> *env, Attributes *a) {
   Fl_Valuator *valuator;
-  Fl_Input *input;
+  Fl_Input *input = NULL;
   Fl_Color color;
   strlib::String *name = a->getName();
   strlib::String *value = a->getValue();
@@ -1490,7 +1495,6 @@ void InputNode::update(strlib::List<NamedInput *> *names, Properties<String *> *
     }
     break;
   case ID_TEXTBOX:
-    button->box(FL_NO_BOX);
     input = (Fl_Input *)button;
     if (value && value->length()) {
       input->value(value->c_str());
@@ -1523,17 +1527,11 @@ void InputNode::update(strlib::List<NamedInput *> *names, Properties<String *> *
   // set colors
   color = getColor(a->getBgColor(), 0);
   if (color) {
-    button->color(color);       // background
-  } else {
-    button->color(BUTTON_COLOR);
+    button->color(color);
   }
   color = getColor(a->getFgColor(), 0);
   if (color) {
-    button->labelcolor(color);  // foreground
-    button->color(color);
-  } else {
-    button->labelcolor(ANCHOR_COLOR);
-    button->color(ANCHOR_COLOR);
+    button->labelcolor(color);
   }
 
   // set alignment
@@ -1587,6 +1585,10 @@ void InputNode::display(Display *out) {
     button->size(4 + (fl_width("$") * cols), button->h());
     height = 4 + (fl_height() + fl_descent() * rows);
     break;
+  case ID_TEXTBOX:
+    ((Fl_Input *)button)->textfont(out->font);
+    ((Fl_Input *)button)->textsize(out->fontSize);
+    break;
   default:
     break;
   }
@@ -1598,7 +1600,7 @@ void InputNode::display(Display *out) {
   button->labelfont(out->font);
   button->labelsize(out->fontSize);
   if (button->y() + button->h() < out->y2 && button->y() >= 0) {
-    button->clear_visible();
+    button->set_visible();
   } else {
     // draw a fake control in case partially visible
     fl_color(button->color());
@@ -1862,6 +1864,11 @@ void HelpWidget::resize(int x, int y, int w, int h) {
 }
 
 void HelpWidget::draw() {
+  if (damage() == FL_DAMAGE_CHILD) {
+    Fl_Group::draw();
+    return;
+  }
+
   int vscroll = -scrollbar->value();
   Display out;
   out.uline = false;
@@ -2008,7 +2015,7 @@ void HelpWidget::draw() {
   for (int n = 0; n < numchildren; n++) {
     Fl_Widget &w = *child(n);
     if (&w != scrollbar) {
-      update_child(w);
+      draw_child(w);
     }
   }
   fl_pop_clip();
@@ -2370,7 +2377,7 @@ void HelpWidget::compile() {
           } else {
             prop = p.get("size");
             if (prop != NULL) {
-              fontSize = 7 + (prop->toInteger() * 2);
+              fontSize = (int)labelsize() + (prop->toInteger() - 1);
             }
           }
           prop = p.get("face");

src/ui/ansiwidget.cpp

@@ -185,7 +185,7 @@ int AnsiWidget::getScreenId(bool back) {
 
 // prints the contents of the given string onto the backbuffer
 void AnsiWidget::print(const char *str) {
-  int len = strlen(str);
+  int len = (str == NULL ? 0 : strlen(str));
   if (len) {
     _back->drawInto();
 

src/ui/strlib.cpp

@@ -23,7 +23,7 @@ String::String(const char *s) {
 }
 
 String::String(const String &s) {
-  _buffer = strdup(s._buffer);
+  _buffer = s._buffer == NULL ? NULL : strdup(s._buffer);
 }
 
 String::String(const char *s, int len) : _buffer(NULL) {