Merge pull request #239 from kovzol/master

kovzol · web-flow · commit 8ae2d96f03f6 · 2023-09-29T21:48:48.000+02:00
4.3 (based on Qt6)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,9 +10,9 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: prerequisites
-      run: sudo apt update && sudo apt install build-essential qttools5-dev-tools qt5-default
+      run: sudo apt update && sudo apt install build-essential qttools5-dev-tools qt6-base-dev libgl1-mesa-dev
     - name: qmake
-      run: qmake
+      run: qmake6
     - name: make
       run: make
 
@@ -23,7 +23,9 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: install-qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: '6.2.4'
     - name: qmake
       run: qmake
     - name: make
diff --git a/CREDITS.md b/CREDITS.md
@@ -18,7 +18,7 @@
 - [Jens Kilian](mailto:jjk@acm.org): BeOS driver, deutsch.cat
 - [Thomas A. K. Kjaer](mailto:takjaer@imv.aau.dk): OS/2 ports (320x200 graphics and AA-lib)
 - [Zbyněk Konečný](mailto:zbynek@geogebra.org): Czech translation
-- [Zoltán Kovács](mailto:zoltan@geogebra.org): Internationalization, Hungarian translations, finalizing version 3.1, bug fixes, web design, current maintainer
+- [Zoltán Kovács](mailto:zoltan@geogebra.org): Internationalization, Hungarian translations, finalizing version 3.1, bug fixes, web design, WebAssembly version, current maintainer
 - [Zsigmond Kovács](mailto:kovzsi@gmail.com): Fractal examples
 - [Bjarnheiður Kristinsdóttir](mailto:bjarnhek@hi.is): Icelandic translation
 - [J.B. Langston III](mailto:jb-langston@austin.rr.com): Native Mac OS X port (from version 3.2.2); web redesign; co-maintainer
@@ -39,6 +39,7 @@
 - [Ilinca Sitaru](mailto:ilinca.sitaru@gmail.com): Romanian translation
 - Daniel Skarda: Fractal examples
 - Andrew Stone ([Stone Design](www.stone.com)): Videator Support, Cocoa improvements, performance mode, bug fixes
+- [Abhishek Tiwari](mailto:tabhishek432@gmail.com): WebAssembly version, [contributions for GSoC 2023](https://github.com/tabhishek432/GSoC-2023-xaos)
 - [Márton Török](mailto:marton.torok@gmail.com): Small fixes for pipes
 - [Pavel Tzekov](mailto:paveltz@csoft.bg): Win32 support
 - Charles Vidal: Tcl/Tk interface
@@ -54,7 +55,7 @@ XaoS uses the following libraries. These libraries may be included with some
 binary distributions of XaoS.
 
 ### [Qt](https://www.qt.io/)
-Copyright © 2020 The Qt Company
+Copyright © 2023 The Qt Company
 
 License GPLv2+: [GNU GPL version 2 or later](https://gnu.org/licenses/gpl.html)
 
diff --git a/NEWS b/NEWS
@@ -1,3 +1,23 @@
+RELEASE NOTES FOR XAOS VERSION 4.3
+----------------------------------
+
+New Features
+============
+
+o Migration to Qt 6.
+
+o WebAssembly port, that is, a full-featured web version is available. Tested with Qt >= 6.5.2.
+
+o Progress bar for time consuming operations (only on native platforms).
+
+Bug Fixes
+=========
+
+o Example files are loaded properly even if XaoS is not installed (that is, the examples are not flattened).
+
+o User formulas are not duplicated in the history.
+
+
 RELEASE NOTES FOR XAOS VERSION 4.2.1
 ------------------------------------
 
diff --git a/README.md b/README.md
@@ -7,14 +7,16 @@ choose without the long calculation required by other fractal generators.
 It has many other features too, like different fractal types, autopilot,
 special coloring modes, random palette generation, color cycling, etc.
 
-You can try the XaoS zooming algorithm online using
-[XaoS.js](http://xaos-project.github.io/XaoSjs/).
+XaoS (since version 4.3, September 2023) is available as a full-featured web application as well.
+You can try it at its [current webpage](https://matek.hu/zoltan/xaos).
+Also, you can try a simplified version of the XaoS zooming algorithm online using
+[XaoS.js](https://xaos-project.github.io/XaoSjs/).
 
-XaoS is based on [Qt](http://www.qt.io), and has been tested on Linux, Mac, and Windows. It
+XaoS is based on [Qt](http://www.qt.io), and has been tested on Windows, Mac and Linux. It
 should also work on any other platform supporting Qt Widgets, like the BSDs.
 
-- Original authors: [Jan Hubička](http://www.ucw.cz/~hubicka/) and [Thomas Marsh](https://www.linkedin.com/in/thomasmarsh).
-- Current maintainers: [J.B. Langston](https://www.linkedin.com/in/jblangston/) and [Zoltán Kovács](https://sites.google.com/site/kovzol/).
+- Original authors: [Jan Hubička](https://www.ucw.cz/~hubicka/) and [Thomas Marsh](https://www.linkedin.com/in/thomasmarsh).
+- Current maintainers: [J.B. Langston](https://www.linkedin.com/in/jblangston/) and [Zoltán Kovács](https://matek.hu/zoltan).
 - See [CREDITS](CREDITS.md) for a complete list of contributors.
 
 Project Resources
@@ -48,7 +50,7 @@ or implement a new feature yourself, pull requests are very welcome.
 License
 -------
 
-Copyright © 1996-2020 XaoS Contributors
+Copyright © 1996-2023 XaoS Contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/XaoS.pro b/XaoS.pro
@@ -2,8 +2,10 @@
 # Project created by QtCreator 2009-10-29T19:21:55
 # -------------------------------------------------
 
-lessThan(QT_MAJOR_VERSION, 5): error("requires Qt >= 5")
-lessThan(QT_MINOR_VERSION, 7): error("requires Qt >= 5.7")
+lessThan(QT_MAJOR_VERSION, 6): error("requires Qt >= 6")
+wasm {
+lessThan(QT_MINOR_VERSION, 5): error("requires Qt >= 6.5.2")
+}
 
 TEMPLATE = app
 
@@ -49,15 +51,19 @@ isEmpty(QMAKE_LRELEASE) {
     }
     unix {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
     } else {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
     }
 }
 
 CONFIG += optimize_full
+CONFIG += c++11
+
 QMAKE_CXXFLAGS += -ffast-math
 QMAKE_CFLAGS += -ffast-math
 
+QMAKE_CXXFLAGS += -fpermissive
 RESOURCES += XaoS.qrc
 
 DESTDIR = $$PWD/bin
@@ -75,6 +81,11 @@ isEmpty(PREFIX) {
     PREFIX = /usr/local
     }
 DEFINES += DATAPATH=\\\"$$PREFIX/share/XaoS\\\"
+wasm{
+    QMAKE_LFLAGS += --preload-file $$PWD/examples@$$DATAPATH/examples
+    QMAKE_LFLAGS += --preload-file $$PWD/catalogs@$$DATAPATH/catalogs
+    QMAKE_LFLAGS += --preload-file $$PWD/tutorial@$$DATAPATH/tutorial
+}
 executable.files = bin/xaos
 executable.path = $$PREFIX/bin
 examples.path = $$PREFIX/share/XaoS/examples
diff --git a/src/engine/fractal.cpp b/src/engine/fractal.cpp
@@ -55,7 +55,7 @@ static void recalc_view(fractal_context *c)
     number_t xs = c->s.rr, ys = c->s.ri * c->windowwidth / c->windowheight,
              xc = c->s.cr, yc = c->s.ci, size;
     precalculate_rotation(c);
-    rotate(*c, xc, yc);
+    my_rotate(*c, xc, yc);
     /*assert(c->s.rr >= 0);
        assert(c->s.ri >= 0); */
 
diff --git a/src/include/config.h b/src/include/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 // XaoS release
-#define XaoS_VERSION "4.2.1"
+#define XaoS_VERSION "4.3"
 
 // URLs
 #define HELP_URL "https://github.com/xaos-project/XaoS/wiki"
diff --git a/src/include/fractal.h b/src/include/fractal.h
@@ -114,7 +114,7 @@ struct symmetryinfo2 {
 #define BTRACEOK                                                               \
     ((cformula.flags & (2 << cfractalc.mandelbrot)) &&                         \
      !cfractalc.incoloringmode && cfractalc.coloringmode != 7)
-#define rotate(f, x, y)                                                        \
+#define my_rotate(f, x, y)                                                        \
     {                                                                          \
         number_t tmp;                                                          \
         tmp = (x) * (f).cos - (y) * (f).sin;                                   \
diff --git a/src/ui-hlp/menu.cpp b/src/ui-hlp/menu.cpp
@@ -6,6 +6,7 @@
 #include <QTextStream>
 #include <QMessageBox>
 #include <QSettings>
+#include <QRegularExpression>
 
 #include "filter.h"
 #include "config.h"
@@ -799,7 +800,7 @@ static void uih_loadgpl(struct uih_context *uih, xio_constpath d)
         }
 
         for(int i = 4; i < 35; i++) {
-            QStringList currcolors = colorvals[i].split(QRegExp("\\s+"));
+            QStringList currcolors = colorvals[i].split(QRegularExpression("\\s+"));
             int r = currcolors[0].toInt();
             int g = currcolors[1].toInt();
             int b = currcolors[2].toInt();
@@ -1239,10 +1240,14 @@ void uih_registermenus_i18n(void)
                  MENUFLAG_INTERRUPT | MENUFLAG_NOPLAY, uih_playfile,
                  playdialog);
     MENUSEPARATOR_I("file");
+
+    // Rendering activities in the WebAssembly version make little sense, and therefore not supported at the moment:
+#ifndef __wasm
     MENUDIALOG_I("file", NULL, TR("Menu", "Render"), "renderanim", UI,
                  uih_render, uih_renderdialog);
     MENUDIALOG_I("file", NULL, TR("Menu", "Render Image"), "renderimg", UI,
                  uih_renderimg, uih_renderimgdialog);
+#endif
     MENUSEPARATOR_I("file");
     MENUNOP_I("file", NULL, TR("Menu", "Load random example"), "loadexample",
               MENUFLAG_INTERRUPT, uih_loadexample);
diff --git a/src/ui-hlp/play.cpp b/src/ui-hlp/play.cpp
@@ -173,7 +173,7 @@ void uih_update_lines(uih_context *c)
             case 2:
                 x = l->x1;
                 y = l->y1;
-                rotate(*(c->fcontext), x, y);
+                my_rotate(*(c->fcontext), x, y);
                 x = (x - c->fcontext->rs.nc) /
                     (c->fcontext->rs.mc - c->fcontext->rs.nc) *
                     c->zengine->image->width;
@@ -185,7 +185,7 @@ void uih_update_lines(uih_context *c)
                 c->zengine->action->convertup(c->zengine, &x1, &y1);
                 x = l->x2;
                 y = l->y2;
-                rotate(*(c->fcontext), x, y);
+                my_rotate(*(c->fcontext), x, y);
                 x = (x - c->fcontext->rs.nc) /
                     (c->fcontext->rs.mc - c->fcontext->rs.nc) *
                     c->zengine->image->width;
@@ -224,7 +224,7 @@ void uih_update_lines(uih_context *c)
                 default:
                     x = l->mx1;
                     y = l->my1;
-                    rotate(*(c->fcontext), x, y);
+                    my_rotate(*(c->fcontext), x, y);
                     x = (x - c->fcontext->rs.nc) /
                         (c->fcontext->rs.mc - c->fcontext->rs.nc) *
                         c->zengine->image->width;
@@ -236,7 +236,7 @@ void uih_update_lines(uih_context *c)
                     c->zengine->action->convertup(c->zengine, &mx1, &my1);
                     x = l->mx2;
                     y = l->my2;
-                    rotate(*(c->fcontext), x, y);
+                    my_rotate(*(c->fcontext), x, y);
                     x = (x - c->fcontext->rs.nc) /
                         (c->fcontext->rs.mc - c->fcontext->rs.nc) *
                         c->zengine->image->width;
diff --git a/src/ui/customdialog.cpp b/src/ui/customdialog.cpp
@@ -16,7 +16,7 @@
 
 QStringList fnames = {};
 
-QString format(number_t number)
+QString CustomDialog::format(number_t number)
 {
     char buf[256];
 #ifdef USE_FLOAT128
@@ -51,13 +51,13 @@ CustomDialog::CustomDialog(struct uih_context *uih, const menuitem *item,
 
             QLineEdit *real = new QLineEdit(format(dialog[i].deffloat), this);
             QFontMetrics metric(real->font());
-            real->setMinimumWidth(metric.width(real->text()) * 1.1);
+            real->setMinimumWidth(metric.horizontalAdvance(real->text()) * 1.1);
             real->setObjectName(label + "real");
             // real->setValidator(new QDoubleValidator(real));
 
             QLineEdit *imag = new QLineEdit(format(dialog[i].deffloat2), this);
             imag->setObjectName(label + "imag");
-            imag->setMinimumWidth(metric.width(imag->text()) * 1.1);
+            imag->setMinimumWidth(metric.horizontalAdvance(imag->text()) * 1.1);
             // imag->setValidator(new QDoubleValidator(imag));
 
             QBoxLayout *layout = new QBoxLayout(QBoxLayout::LeftToRight);
@@ -74,7 +74,7 @@ CustomDialog::CustomDialog(struct uih_context *uih, const menuitem *item,
 
             QLineEdit *filename = new QLineEdit(dialog[i].defstr, this);
             QFontMetrics metric(filename->font());
-            filename->setMinimumWidth(metric.width(filename->text()) * 1.1);
+            filename->setMinimumWidth(metric.horizontalAdvance(filename->text()) * 1.1);
             filename->setObjectName(label);
 
             QToolButton *chooser = new QToolButton(this);
@@ -250,7 +250,7 @@ CustomDialog::CustomDialog(struct uih_context *uih, const menuitem *item,
                 field->setText(dialog[i].defstr);
             }
             QFontMetrics metric(field->font());
-            field->setMinimumWidth(metric.width(field->text()) * 1.1);
+            field->setMinimumWidth(metric.horizontalAdvance(field->text()) * 1.1);
             formLayout->addRow(label, field);
         }
     }
diff --git a/src/ui/customdialog.h b/src/ui/customdialog.h
@@ -34,6 +34,7 @@ class CustomDialog : public QDialog
                  const menudialog *dialog, QWidget *parent = 0);
     void accept();
     dialogparam *parameters();
+    static QString format(number_t number);
 };
 
 #endif // CUSTOMDIALOG_H
diff --git a/src/ui/fractalwidget.cpp b/src/ui/fractalwidget.cpp
@@ -16,7 +16,7 @@ FractalWidget::FractalWidget()
     setAttribute(Qt::WA_OpaquePaintEvent, true);
 }
 
-QPoint FractalWidget::mousePosition() { return m_mousePosition; }
+QPointF FractalWidget::mousePosition() { return m_mousePosition; }
 
 void FractalWidget::setImage(struct image *image) { m_image = image; }
 
@@ -75,6 +75,6 @@ void FractalWidget::mouseMoveEvent(QMouseEvent *event)
 
 void FractalWidget::wheelEvent(QWheelEvent *event)
 {
-    m_mousePosition = event->pos();
+    m_mousePosition = event->position();
     event->ignore();
 }
diff --git a/src/ui/fractalwidget.h b/src/ui/fractalwidget.h
@@ -19,7 +19,7 @@ class FractalWidget : public QWidget
   private:
     struct image *m_image = NULL;
     QSize m_sizeHint;
-    QPoint m_mousePosition = QPoint(0, 0);
+    QPointF m_mousePosition = QPointF(0.0, 0.0);
 
   protected:
     void mouseMoveEvent(QMouseEvent *event);
@@ -35,7 +35,7 @@ class FractalWidget : public QWidget
   public:
     FractalWidget();
     QSize sizeHint() const;
-    QPoint mousePosition();
+    QPointF mousePosition();
     void setImage(struct image *image);
 };
 
diff --git a/src/ui/image_qt.cpp b/src/ui/image_qt.cpp
@@ -63,7 +63,7 @@ int xtextwidth(struct image */*image*/, void *font, const char *text)
     line[pos] = '\0';
 
     QFontMetrics metrics(getFont(font));
-    return metrics.width(line) + 1;
+    return metrics.horizontalAdvance(line) + 1;
 }
 
 int xtextheight(struct image */*image*/, void *font)
@@ -75,7 +75,7 @@ int xtextheight(struct image */*image*/, void *font)
 int xtextcharw(struct image */*image*/, void *font, const char c)
 {
     QFontMetrics metrics(getFont(font));
-    return metrics.width(c);
+    return metrics.horizontalAdvance(c);
 }
 
 // Saves image as png with xpf chunk data
@@ -98,7 +98,7 @@ const char* readpng(xio_constpath filename)
     const QImage xaos_image = reader.read();
     QString xpf_chunk = xaos_image.text("Metadata");
     const char *xpf_data = NULL;
-    if(xpf_chunk != NULL or !xpf_chunk.isEmpty())
+    if(xpf_chunk != QString() or !xpf_chunk.isEmpty())
         xpf_data = mystrdup(xpf_chunk.toStdString().c_str());
     return xpf_data;
 }
diff --git a/src/ui/main.cpp b/src/ui/main.cpp
@@ -321,12 +321,12 @@ static void ui_about(struct uih_context *uih)
             QSysInfo::kernelType() + " " +
             // QSysInfo::kernelVersion() + " "
             // QSysInfo::buildAbi() + " " +
-            QSysInfo::buildCpuArchitecture() +
+            QSysInfo::buildCpuArchitecture() + ", Qt " + QT_VERSION_STR +
             ")"
             "<br>"
             "Fast interactive real-time fractal zoomer/morpher<br><br>"
             "Original Authors: Jan Hubička and Thomas Marsh<br>"
-            "Copyright © 1996-2020 XaoS Contributors<br>"
+            "Copyright © 1996-2023 XaoS Contributors<br>"
             "<br>"
             "This program is free software; you can redistribute it and/or modify "
             "it under the terms of the GNU General Public License as published by "
@@ -363,12 +363,16 @@ void uih_setlanguage(uih_context *c, int l)
     settings.setValue("MainWindow/language", lang2(l));
     QMessageBox msgBox;
     msgBox.setText(TR("Message", "XaoS must restart to change the language."));
+#ifndef __wasm
     msgBox.setInformativeText(TR("Message", "Do you want to quit now?"));
     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+#endif
     int ret = msgBox.exec();
+#ifndef __wasm
     if (ret == QMessageBox::Yes) {
         exit(0);
     }
+#endif
 }
 
 #ifndef Q_OS_MAC
@@ -477,8 +481,10 @@ static void ui_registermenus_i18n(void)
 {
     int no_menuitems_i18n =
         ui_no_menuitems_i18n; /* This variable must be local. */
+#ifndef __wasm
     MENUINT_I("file", NULL, TR("Menu", "Quit"), "quit",
               MENUFLAG_INTERRUPT | MENUFLAG_ATSTARTUP, ui_quit, UI);
+#endif
 
     MENUNOP_I("ui", NULL, TR("Menu", "Message Font..."), "font", UI, ui_font);
     MENUNOP_I("uia", NULL, TR("Menu", "Message Font..."), "font", UI, ui_font);
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
diff --git a/src/util/xmenu.cpp b/src/util/xmenu.cpp
diff --git a/src/util/xstdio.cpp b/src/util/xstdio.cpp
