FLTK: fix memory leaks

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2019-11-30 (0.12.17)
+	FLTK: fix memory leaks
+	FLTK: implement audio
+
 2019-11-30 (0.12.17)
 	ANDROID: fix module access in newer android versions.
 	UI: code cleanup

src/platform/fltk/BasicEditor.cxx

@@ -161,6 +161,8 @@ BasicEditor::BasicEditor(int x, int y, int w, int h, StatusBar *status) :
 }
 
 BasicEditor::~BasicEditor() {
+  buffer(nullptr);
+  delete _textbuf;
   delete _stylebuf;
 }
 

src/platform/fltk/BasicEditor.h

@@ -22,7 +22,7 @@ struct StatusBar {
 
 struct BasicEditor : public Fl_Text_Editor {
   BasicEditor(int x, int y, int w, int h, StatusBar *status);
-  ~BasicEditor();
+  virtual ~BasicEditor();
 
   bool findText(const char *find, bool forward, bool updatePos);
   int handle(int e);

src/platform/fltk/MainWindow.cxx

@@ -120,7 +120,7 @@ bool MainWindow::basicMain(EditorWidget *editWidget,
   if (!toolExec) {
     if (opt_ide == IDE_NONE) {
       // run in a separate window with the ide hidden
-      fullScreen = new BaseWindow(w(), h(), _system);
+      fullScreen = new BaseWindow(w(), h(), _runtime);
       fullScreen->box(FL_NO_BOX);
       fullScreen->callback(quit_cb);
       fullScreen->add(_out);
@@ -143,7 +143,7 @@ bool MainWindow::basicMain(EditorWidget *editWidget,
     restart = false;
     runMode = run_state;
     chdir(path);
-    success = _system->run(filename);
+    success = _runtime->run(filename);
   }
   while (restart);
 
@@ -454,7 +454,7 @@ void MainWindow::font_size_incr(Fl_Widget *w, void *eventData) {
     if (size < MAX_FONT_SIZE) {
       editWidget->setFontSize(size + 1);
       updateConfig(editWidget);
-      _system->setFontSize(size + 1);
+      _runtime->setFontSize(size + 1);
     }
   } else {
     handle(EVENT_INCREASE_FONT);
@@ -468,7 +468,7 @@ void MainWindow::font_size_decr(Fl_Widget *w, void *eventData) {
     if (size > MIN_FONT_SIZE) {
       editWidget->setFontSize(size - 1);
       updateConfig(editWidget);
-      _system->setFontSize(size - 1);
+      _runtime->setFontSize(size - 1);
     }
   } else {
     handle(EVENT_DECREASE_FONT);
@@ -907,20 +907,12 @@ bool initialise(int argc, char **argv) {
   return true;
 }
 
-/**
- * save application state at program exit
- */
-void save_profile(void) {
-  wnd->_profile->save(wnd);
-}
-
 /**
  * application entry point
  */
 int main(int argc, char **argv) {
   int result;
   if (initialise(argc, argv)) {
-    atexit(save_profile);
     Fl::run();
     result = 0;
   } else {
@@ -1012,7 +1004,7 @@ MainWindow::MainWindow(int w, int h) :
   _outputGroup->labelfont(FL_HELVETICA);
   _outputGroup->user_data((void *)gw_output);
   _out = new GraphicsWidget(x1, y1 + 1, x2, y2 -1);
-  _system = new Runtime(x2, y2 - 1, DEF_FONT_SIZE);
+  _runtime = new Runtime(x2, y2 - 1, DEF_FONT_SIZE);
   _outputGroup->resizable(_out);
   _outputGroup->end();
   _tabGroup->resizable(_outputGroup);
@@ -1023,7 +1015,9 @@ MainWindow::MainWindow(int w, int h) :
 }
 
 MainWindow::~MainWindow() {
-  delete _system;
+  _profile->save(this);
+  delete _profile;
+  delete _runtime;
 }
 
 Fl_Group *MainWindow::createTab(GroupWidgetEnum groupWidgetEnum, const char *label) {
@@ -1341,7 +1335,7 @@ void MainWindow::setTitle(Fl_Window *widget, const char *filename) {
 }
 
 void MainWindow::setBreak() {
-  _system->setExit(false);
+  _runtime->setExit(false);
   runMode = break_state;
 }
 
@@ -1363,15 +1357,15 @@ bool MainWindow::isIdeHidden() {
 
 void MainWindow::resize(int x, int y, int w, int h) {
   BaseWindow::resize(x, y, w, h);
-  _system->resize(_out->w(), _out->h());
+  _runtime->resize(_out->w(), _out->h());
 }
 
 void MainWindow::resizeDisplay(int x, int y, int w, int h) {
   // resize the graphics widget (output tab child)
   _out->resize(x, y, w, h);
 
   // resize the runtime platforn
-  _system->resize(w, h);
+  _runtime->resize(w, h);
 }
 
 /**
@@ -1398,7 +1392,7 @@ bool MainWindow::logPrint() {
 
 int MainWindow::handle(int e) {
   int result;
-  if (getSelectedTab() == _outputGroup && _system->handle(e)) {
+  if (getSelectedTab() == _outputGroup && _runtime->handle(e)) {
     result = 1;
   } else {
     result = BaseWindow::handle(e);

src/platform/fltk/MainWindow.h

@@ -149,7 +149,7 @@ struct MainWindow : public BaseWindow {
 
   // display system
   GraphicsWidget *_out;
-  Runtime *_system;
+  Runtime *_runtime;
 
   // main output
   Fl_Group *_outputGroup;

src/platform/fltk/display.h

@@ -16,6 +16,7 @@
 
 struct Font {
   Font(Fl_Font font, Fl_Fontsize size) :  _font(font),  _size(size) {}
+  virtual ~Font() {}
   void setCurrent() { fl_font(_font, _size); }
 
 private:

src/platform/fltk/runtime.cxx

@@ -45,11 +45,12 @@ Runtime::Runtime(int w, int h, int defsize) : System() {
   _output->construct();
   _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
   _output->setFontSize(defsize);
-  open_audio();
+  audio_open();
 }
 
 Runtime::~Runtime() {
-  close_audio();
+  delete _output;
+  audio_close();
 }
 
 void Runtime::alert(const char *title, const char *message) {

src/platform/fltk/runtime.h

@@ -14,7 +14,7 @@
 
 struct Runtime : public System {
   Runtime(int w, int h, int defSize);
-  ~Runtime();
+  virtual ~Runtime();
 
   void addShortcut(const char *) {}
   void alert(const char *title, const char *message);

src/platform/fltk/utils.cxx

@@ -7,6 +7,9 @@
 //
 
 #include <config.h>
+#if !defined(_Win32)
+#include <sys/socket.h>
+#endif
 #include <stdint.h>
 #include "lib/str.h"
 #include "utils.h"