qt: Switch to QWebEngineView / QWebEnginePage.

The capabilities of QWebEngine* are significantly different than those of the previous QWebPage/QWebView, so the QWebView class was substantially refactored to reflect the new API's. Properties and signals exposed in sclang now follow their Qt counterparts more closely, to make maintainence and upgrades more straightforward in the future. Some calls, such as toHTML and toPlainText, have become asynchronous - these are implemented on the sclang side by passing a callback function as the first argument, which is converted to a QcCallback object and used to signal the language with the results. Though this is only used in webview's currently, it should be easily portable to other async callback cases in sclang if needed.

QtCollider/Common.h

@@ -92,10 +92,13 @@ namespace QtCollider {
   QC_DO_SYMBOL(prRelease); \
   QC_DO_SYMBOL(Rect); \
   QC_DO_SYMBOL(Point); \
+  QC_DO_SYMBOL(Int8Array); \
   QC_DO_SYMBOL(Color); \
   QC_DO_SYMBOL(Size); \
   QC_DO_SYMBOL(QPalette); \
   QC_DO_SYMBOL(Font); \
+  QC_DO_SYMBOL(QCallback); \
+  QC_DO_SYMBOL(WebPage); \
   QC_DO_SYMBOL(QObject); \
   QC_DO_SYMBOL(Layout); \
   QC_DO_SYMBOL(TreeViewItem); \

QtCollider/factories.cpp

@@ -55,6 +55,7 @@ static void doLoadFactories ()
   QC_ADD_FACTORY( QcWaveform );
   QC_ADD_FACTORY( QcTextEdit );
   QC_ADD_FACTORY( QcTreeWidget );
+  QC_ADD_FACTORY( QcCallback );
   QC_ADD_FACTORY( WebView );
   QC_ADD_FACTORY( QcWindow );
   QC_ADD_FACTORY( QcScrollWindow );

QtCollider/metatype.cpp

@@ -22,9 +22,10 @@
 #include "metatype.hpp"
 #include "type_codec.hpp"
 #include "Common.h" // Make sure PyrObject* is declared to QMetaType
-
 #include <PyrKernel.h>
 
+#include "widgets/QcWebView.h"
+
 namespace QtCollider {
 
 static QVector<MetaType*> gMetaTypes;
@@ -46,7 +47,7 @@ void MetaType::initAll()
   qRegisterMetaType< QVector<int> >();
   qRegisterMetaType<SharedImage>();
 
-  gMetaTypes.reserve(20);
+  gMetaTypes.reserve(30);
 
   qc_init_metatype<bool>();
   qc_init_metatype<int>();
@@ -72,6 +73,8 @@ void MetaType::initAll()
   qc_init_metatype< QVector<double> >();
   qc_init_metatype< QVector<int> >();
   qc_init_metatype< QVariantList >();
+  qc_init_metatype<QUrl>();
+  qc_init_metatype<QcCallback*>();
 }
 
 MetaType *MetaType::find( PyrSlot *slot )
@@ -124,6 +127,12 @@ MetaType *MetaType::find( PyrSlot *slot )
       else if( isKindOfSlot( slot, SC_CLASS(QPalette) ) ) {
         return metaType<QPalette>();
       }
+      else if( isKindOfSlot( slot, SC_CLASS(QCallback) ) ) {
+        return metaType<QcCallback*>();
+      }
+      else if( isKindOfSlot( slot, SC_CLASS(WebPage) ) ) {
+        return metaType<WebPage*>();
+      }
       else if( isKindOfSlot( slot, SC_CLASS(QObject) ) ) {
         return metaType<QObjectProxy*>();
       }

QtCollider/metatype.hpp

@@ -31,8 +31,6 @@
 
 namespace QtCollider {
 
-template <typename T> struct TypeCodec;
-
 struct MetaType
 {
 public:

QtCollider/primitives/prim_misc.cpp

@@ -25,6 +25,7 @@
 #include "../type_codec.hpp"
 #include "../QcApplication.h"
 #include "../QObjectProxy.h"
+#include "../widgets/QcWebView.h"
 #include "../style/style.hpp"
 #include "QtCollider.h"
 
@@ -34,6 +35,7 @@
 
 #include <PyrKernel.h>
 
+#include <QDesktopServices>
 #include <QFontDatabase>
 #include <QFontInfo>
 #include <QFontMetrics>
@@ -281,6 +283,22 @@ QC_LANG_PRIMITIVE( Qt_CursorPosition, 0, PyrSlot *r, PyrSlot *a, VMGlobals *g )
     return errNone;
 }
 
+QC_LANG_PRIMITIVE( Qt_SetUrlHandler, 2, PyrSlot *r, PyrSlot *a, VMGlobals *g )
+{
+  if( !QcApplication::compareThread() ) return QtCollider::wrongThreadError();
+
+  QString str = QtCollider::get( a );
+
+  if (IsNil(a+1)) {
+    QDesktopServices::unsetUrlHandler(str);
+  } else {
+    QcCallback* cb = QtCollider::get( a+1 );
+    QDesktopServices::setUrlHandler(str, cb, "onCalled");
+  }
+
+  return errNone;
+}
+
 void defineMiscPrimitives()
 {
   LangPrimitiveDefiner definer;
@@ -300,6 +318,7 @@ void defineMiscPrimitives()
   definer.define<Qt_IsMethodOverridden>();
   definer.define<QWebView_ClearMemoryCaches>();
   definer.define<Qt_CursorPosition>();
+  definer.define<Qt_SetUrlHandler>();
 }
 
 } // namespace QtCollider

QtCollider/type_codec.cpp

@@ -58,6 +58,27 @@ void TypeCodec<QString>::write( PyrSlot *slot, const QString & val )
 }
 
 
+QUrl TypeCodec<QUrl>::read( PyrSlot *slot )
+{
+  if( IsSym(slot) ) {
+    return QUrl(QString::fromUtf8( slotRawSymbol(slot)->name ));
+  }
+  else if( isKindOfSlot( slot, class_string ) ) {
+    int len = slotRawObject( slot )->size;
+    return QUrl(QString::fromUtf8( slotRawString(slot)->s, len ));
+  } else {
+    return QUrl();
+  }
+}
+
+
+void TypeCodec<QUrl>::write( PyrSlot *slot, const QUrl & val )
+{
+  PyrString *str = newPyrString( gMainVMGlobals->gc,
+                                val.toString().toUtf8().constData(), 0, true );
+  SetObject( slot, str );
+}
+
 QPointF TypeCodec<QPointF>::read( PyrSlot *slot )
 {
   PyrSlot *slots = slotRawObject( slot )->slots;

QtCollider/type_codec.hpp

@@ -41,13 +41,14 @@
 #include <QPalette>
 #include <QWidget>
 #include <QVector>
+#include <QUrl>
 #include <QVariantList>
 
 class QObjectProxy;
 
 namespace QtCollider {
 
-template <typename T> struct TypeCodec { };
+template <typename T, typename EnabledT=void> struct TypeCodec { };
 
 // Forwarding from QtCollider namespace to TypeCodec
 
@@ -211,6 +212,18 @@ template <> struct TypeCodec<QString>
   static void write( PyrSlot *slot, const QString & val );
 };
 
+template <> struct TypeCodec<QUrl>
+{
+  static QUrl read( PyrSlot *slot );
+
+  static QUrl safeRead( PyrSlot *slot )
+  {
+    return read(slot);
+  }
+
+  static void write( PyrSlot *slot, const QUrl & val );
+};
+
 template <> struct TypeCodec<QPointF>
 {
   static QPointF read( PyrSlot *slot );
@@ -425,6 +438,34 @@ template <> struct TypeCodec<QVariantList>
   static void write( PyrSlot *slot, const QVariantList & );
 };
 
+template<typename QObjectT>
+struct TypeCodec<QObjectT, void>
+{
+  static QObjectT read( PyrSlot *slot )
+  {
+    return safeRead(slot);
+  }
+
+  static QObjectT safeRead( PyrSlot *slot )
+  {
+    QObjectProxy* proxy = TypeCodec<QObjectProxy*>::safeRead(slot);
+
+    if (proxy) {
+      QObjectT action = qobject_cast<QObjectT>(proxy->object());
+      return action;
+    } else {
+      return 0;
+    }
+  }
+
+  static void write(PyrSlot * slot, QObjectT object)
+  {
+    QObject* qobject = qobject_cast<QObject*>(object);
+    TypeCodec<QObject*>::write(slot, qobject);
+  }
+
+};
+
 } // namespace QtCollider
 
 #endif // QT_COLLIDER_TYPE_CODEC_INCLUDED