summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gtk2_in_qt4.cpp4
-rw-r--r--src/gtk2_in_qt5.cpp168
-rw-r--r--src/host.c4
-rw-r--r--src/instance.c27
-rw-r--r--src/x11_in_qt5.cpp165
5 files changed, 358 insertions, 10 deletions
diff --git a/src/gtk2_in_qt4.cpp b/src/gtk2_in_qt4.cpp
index 641d1ba..ab474be 100644
--- a/src/gtk2_in_qt4.cpp
+++ b/src/gtk2_in_qt4.cpp
@@ -118,8 +118,8 @@ suil_wrapper_new(SuilHost* host,
dlerror();
host->gtk_lib = dlopen(SUIL_GTK2_LIB_NAME, RTLD_LAZY|RTLD_GLOBAL);
if (!host->gtk_lib) {
- fprintf(stderr, "Failed to open %s (%s)\n",
- SUIL_GTK2_LIB_NAME, dlerror());
+ SUIL_ERRORF("Failed to open %s (%s)\n",
+ SUIL_GTK2_LIB_NAME, dlerror());
return NULL;
}
gtk_init(NULL, NULL);
diff --git a/src/gtk2_in_qt5.cpp b/src/gtk2_in_qt5.cpp
new file mode 100644
index 0000000..0d42ffd
--- /dev/null
+++ b/src/gtk2_in_qt5.cpp
@@ -0,0 +1,168 @@
+/*
+ Copyright 2011-2015 David Robillard <http://drobilla.net>
+ Copyright 2015 Rui Nuno Capela <rncbc@rncbc.org>
+
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include <QWindow>
+#include <QWidget>
+
+#include <QVBoxLayout>
+
+#undef signals
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "./suil_config.h"
+#include "./suil_internal.h"
+
+extern "C" {
+
+typedef struct _SuilGtk2InQt5Wrapper SuilGtk2InQt5Wrapper;
+
+struct _SuilGtk2InQt5Wrapper {
+ QWidget* host_widget;
+ QWidget* parent;
+ GtkWidget* plug;
+};
+
+static void
+on_size_request(GtkWidget* widget,
+ GtkRequisition* requisition,
+ gpointer user_data)
+{
+ QWidget* const wrap = (QWidget*)user_data;
+ wrap->setMinimumSize(requisition->width, requisition->height);
+}
+
+static void
+on_size_allocate(GtkWidget* widget,
+ GdkRectangle* allocation,
+ gpointer user_data)
+{
+ QWidget* const wrap = (QWidget*)user_data;
+ wrap->resize(allocation->width, allocation->height);
+}
+
+static void
+wrapper_free(SuilWrapper* wrapper)
+{
+ SuilGtk2InQt5Wrapper* impl = (SuilGtk2InQt5Wrapper*)wrapper->impl;
+
+ if (impl->plug) {
+ gtk_widget_destroy(impl->plug);
+ }
+
+ if (impl->host_widget) {
+ delete impl->host_widget;
+ }
+
+ free(impl);
+}
+
+static int
+wrapper_wrap(SuilWrapper* wrapper,
+ SuilInstance* instance)
+{
+ Qt::WindowFlags wflags = Qt::Window
+ | Qt::CustomizeWindowHint
+ | Qt::WindowTitleHint
+ | Qt::WindowSystemMenuHint
+ | Qt::WindowMinMaxButtonsHint
+ | Qt::WindowCloseButtonHint;
+
+ SuilGtk2InQt5Wrapper* const impl = (SuilGtk2InQt5Wrapper*)wrapper->impl;
+ QWidget* parent = static_cast<QWidget*>(impl->parent);
+ QWidget* const wrap = new QWidget(parent, wflags);
+ GtkWidget* const plug = gtk_plug_new(0);
+ GtkWidget* const widget = (GtkWidget*)instance->ui_widget;
+
+ gtk_container_add(GTK_CONTAINER(plug), widget);
+ gtk_widget_show_all(plug);
+
+ const WId wid = gtk_plug_get_id((GtkPlug *)plug);
+ QWindow* window = QWindow::fromWinId(wid);
+ QWidget* container = QWidget::createWindowContainer(window, wrap);
+ QVBoxLayout* layout = new QVBoxLayout();
+ layout->setMargin(0);
+ layout->setSpacing(0);
+ layout->addWidget(container);
+ wrap->setLayout(layout);
+
+#ifdef SUIL_OLD_GTK
+ wrap->resize(widget->allocation.width, widget->allocation.height);
+#else
+ GtkAllocation alloc;
+ gtk_widget_get_allocation(widget, &alloc);
+ wrap->resize(alloc.width, alloc.height);
+#endif
+
+ g_signal_connect(
+ G_OBJECT(plug), "size-request", G_CALLBACK(on_size_request), wrap);
+
+ g_signal_connect(
+ G_OBJECT(plug), "size-allocate", G_CALLBACK(on_size_allocate), wrap);
+
+ impl->host_widget = wrap;
+ impl->plug = plug;
+ instance->host_widget = wrap;
+
+ return 0;
+}
+
+SUIL_LIB_EXPORT
+SuilWrapper*
+suil_wrapper_new(SuilHost* host,
+ const char* host_type_uri,
+ const char* ui_type_uri,
+ LV2_Feature*** features,
+ unsigned n_features)
+{
+ /* We have to open libgtk here, so Gtk type symbols are present and will be
+ found by the introspection stuff. This is required at least to make
+ GtkBuilder use in UIs work, otherwise they will cause "Invalid object
+ type" errors.
+ */
+ if (!host->gtk_lib) {
+ dlerror();
+ host->gtk_lib = dlopen(SUIL_GTK2_LIB_NAME, RTLD_LAZY|RTLD_GLOBAL);
+ if (!host->gtk_lib) {
+ SUIL_ERRORF("Failed to open %s (%s)\n",
+ SUIL_GTK2_LIB_NAME, dlerror());
+ return NULL;
+ }
+ gtk_init(NULL, NULL);
+ }
+
+ /* Create wrapper implementation. */
+ SuilGtk2InQt5Wrapper* const impl = (SuilGtk2InQt5Wrapper*)
+ calloc(1, sizeof(SuilGtk2InQt5Wrapper));
+
+ /* Set parent widget if given. */
+ for (unsigned i = 0; i < n_features; ++i) {
+ if (!strcmp((*features)[i]->URI, LV2_UI__parent)) {
+ impl->parent = static_cast<QWidget*>((*features)[i]->data);
+ }
+ }
+
+ SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
+ wrapper->wrap = wrapper_wrap;
+ wrapper->free = wrapper_free;
+ wrapper->impl = impl;
+
+ return wrapper;
+}
+
+} // extern "C"
diff --git a/src/host.c b/src/host.c
index 8508b41..379d131 100644
--- a/src/host.c
+++ b/src/host.c
@@ -23,13 +23,11 @@ suil_host_new(SuilPortWriteFunc write_func,
SuilPortSubscribeFunc subscribe_func,
SuilPortUnsubscribeFunc unsubscribe_func)
{
- SuilHost* host = (SuilHost*)malloc(sizeof(struct SuilHostImpl));
+ SuilHost* host = (SuilHost*)calloc(1, sizeof(struct SuilHostImpl));
host->write_func = write_func;
host->index_func = index_func;
host->subscribe_func = subscribe_func;
host->unsubscribe_func = unsubscribe_func;
- host->touch_func = NULL;
- host->gtk_lib = NULL;
return host;
}
diff --git a/src/instance.c b/src/instance.c
index a336dcb..1b26b96 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -24,6 +24,7 @@
#define GTK2_UI_URI LV2_UI__GtkUI
#define QT4_UI_URI LV2_UI__Qt4UI
+#define QT5_UI_URI LV2_UI_PREFIX "Qt5UI"
#define X11_UI_URI LV2_UI__X11UI
#define WIN_UI_URI LV2_UI_PREFIX "WindowsUI"
#define COCOA_UI_URI LV2_UI__CocoaUI
@@ -44,6 +45,8 @@ suil_ui_supported(const char* container_type_uri,
&& !strcmp(ui_type_uri, QT4_UI_URI))
|| (!strcmp(container_type_uri, QT4_UI_URI)
&& !strcmp(ui_type_uri, GTK2_UI_URI))
+ || (!strcmp(container_type_uri, QT5_UI_URI)
+ && !strcmp(ui_type_uri, GTK2_UI_URI))
|| (!strcmp(container_type_uri, GTK2_UI_URI)
&& !strcmp(ui_type_uri, X11_UI_URI))
|| (!strcmp(container_type_uri, GTK2_UI_URI)
@@ -51,6 +54,8 @@ suil_ui_supported(const char* container_type_uri,
|| (!strcmp(container_type_uri, GTK2_UI_URI)
&& !strcmp(ui_type_uri, COCOA_UI_URI))
|| (!strcmp(container_type_uri, QT4_UI_URI)
+ && !strcmp(ui_type_uri, X11_UI_URI))
+ || (!strcmp(container_type_uri, QT5_UI_URI)
&& !strcmp(ui_type_uri, X11_UI_URI))) {
return SUIL_WRAPPING_EMBEDDED;
} else {
@@ -72,36 +77,48 @@ open_wrapper(SuilHost* host,
module_name = "suil_gtk2_in_qt4";
}
#endif
+#ifdef SUIL_WITH_GTK2_IN_QT5
+ if (!strcmp(container_type_uri, QT5_UI_URI)
+ && !strcmp(ui_type_uri, GTK2_UI_URI)) {
+ module_name = "suil_gtk2_in_qt5";
+ }
+#endif
#ifdef SUIL_WITH_QT4_IN_GTK2
if (!strcmp(container_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, QT4_UI_URI)) {
+ && !strcmp(ui_type_uri, QT4_UI_URI)) {
module_name = "suil_qt4_in_gtk2";
}
#endif
#ifdef SUIL_WITH_X11_IN_GTK2
if (!strcmp(container_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, X11_UI_URI)) {
+ && !strcmp(ui_type_uri, X11_UI_URI)) {
module_name = "suil_x11_in_gtk2";
}
#endif
#ifdef SUIL_WITH_WIN_IN_GTK2
if (!strcmp(container_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, WIN_UI_URI)) {
+ && !strcmp(ui_type_uri, WIN_UI_URI)) {
module_name = "suil_win_in_gtk2";
}
#endif
#ifdef SUIL_WITH_COCOA_IN_GTK2
if (!strcmp(container_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, COCOA_UI_URI)) {
+ && !strcmp(ui_type_uri, COCOA_UI_URI)) {
module_name = "suil_cocoa_in_gtk2";
}
#endif
#ifdef SUIL_WITH_X11_IN_QT4
if (!strcmp(container_type_uri, QT4_UI_URI)
- && !strcmp(ui_type_uri, X11_UI_URI)) {
+ && !strcmp(ui_type_uri, X11_UI_URI)) {
module_name = "suil_x11_in_qt4";
}
#endif
+#ifdef SUIL_WITH_X11_IN_QT5
+ if (!strcmp(container_type_uri, QT5_UI_URI)
+ && !strcmp(ui_type_uri, X11_UI_URI)) {
+ module_name = "suil_x11_in_qt5";
+ }
+#endif
if (!module_name) {
SUIL_ERRORF("Unable to wrap UI type <%s> as type <%s>\n",
diff --git a/src/x11_in_qt5.cpp b/src/x11_in_qt5.cpp
new file mode 100644
index 0000000..1f62796
--- /dev/null
+++ b/src/x11_in_qt5.cpp
@@ -0,0 +1,165 @@
+/*
+ Copyright 2011-2015 David Robillard <http://drobilla.net>
+ Copyright 2015 Rui Nuno Capela <rncbc@rncbc.org>
+
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include <QWidget>
+
+#include <QTimerEvent>
+
+#undef signals
+
+#include "./suil_config.h"
+#include "./suil_internal.h"
+
+#ifndef HAVE_LV2_1_6_0
+typedef struct _LV2UI_Idle_Interface LV2UI_Idle_Interface;
+#endif
+
+extern "C" {
+
+typedef struct {
+ QWidget* host_widget;
+ QWidget* parent;
+} SuilX11InQt5Wrapper;
+
+class SuilQX11Widget : public QWidget
+{
+public:
+ SuilQX11Widget(QWidget* parent, Qt::WindowFlags wflags)
+ : QWidget(parent, wflags)
+#ifdef HAVE_LV2_1_6_0
+ , _instance(NULL)
+ , _idle_iface(NULL)
+ , _ui_timer(0)
+#endif
+ {}
+
+#ifdef HAVE_LV2_1_6_0
+ void start_idle(SuilInstance* instance,
+ const LV2UI_Idle_Interface* idle_iface) {
+ _instance = instance;
+ _idle_iface = idle_iface;
+ if (_idle_iface && _ui_timer == 0) {
+ _ui_timer = this->startTimer(30);
+ }
+ }
+
+protected:
+ void timerEvent(QTimerEvent* event) {
+ if (event->timerId() == _ui_timer && _idle_iface) {
+ _idle_iface->idle(_instance->handle);
+ }
+ QWidget::timerEvent(event);
+ }
+
+private:
+ SuilInstance* _instance;
+ const LV2UI_Idle_Interface* _idle_iface;
+ int _ui_timer;
+#endif
+};
+
+static void
+wrapper_free(SuilWrapper* wrapper)
+{
+ SuilX11InQt5Wrapper* impl = (SuilX11InQt5Wrapper*)wrapper->impl;
+
+ if (impl->parent) {
+ delete impl->parent;
+ }
+/*
+ if (impl->host_widget) {
+ delete impl->host_widget;
+ }
+*/
+ free(impl);
+}
+
+static int
+wrapper_wrap(SuilWrapper* wrapper,
+ SuilInstance* instance)
+{
+ SuilX11InQt5Wrapper* const impl = (SuilX11InQt5Wrapper*)wrapper->impl;
+ SuilQX11Widget* const ew = (SuilQX11Widget*)impl->parent;
+
+#ifdef HAVE_LV2_1_6_0
+ if (instance->descriptor->extension_data) {
+ const LV2UI_Idle_Interface* idle_iface
+ = (const LV2UI_Idle_Interface*)
+ instance->descriptor->extension_data(LV2_UI__idleInterface);
+ ew->start_idle(instance, idle_iface);
+ }
+#endif
+
+ impl->host_widget = ew;
+
+ instance->host_widget = impl->host_widget;
+
+ return 0;
+}
+
+static int
+wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
+{
+ QWidget* const ew = (QWidget*)handle;
+ ew->resize(width, height);
+ return 0;
+}
+
+SUIL_LIB_EXPORT
+SuilWrapper*
+suil_wrapper_new(SuilHost* host,
+ const char* host_type_uri,
+ const char* ui_type_uri,
+ LV2_Feature*** features,
+ unsigned n_features)
+{
+ SuilX11InQt5Wrapper* const impl = (SuilX11InQt5Wrapper*)
+ calloc(1, sizeof(SuilX11InQt5Wrapper));
+
+ SuilWrapper* wrapper = (SuilWrapper*)malloc(sizeof(SuilWrapper));
+ wrapper->wrap = wrapper_wrap;
+ wrapper->free = wrapper_free;
+
+ Qt::WindowFlags wflags = Qt::Window
+ | Qt::CustomizeWindowHint
+ | Qt::WindowTitleHint
+ | Qt::WindowSystemMenuHint
+ | Qt::WindowMinMaxButtonsHint
+ | Qt::WindowCloseButtonHint;
+
+ QWidget* const ew = new SuilQX11Widget(NULL, wflags);
+
+ impl->parent = ew;
+
+ wrapper->impl = impl;
+ wrapper->resize.handle = ew;
+ wrapper->resize.ui_resize = wrapper_resize;
+
+ suil_add_feature(features, &n_features, LV2_UI__parent,
+ (void*)(intptr_t)ew->winId());
+
+ suil_add_feature(features, &n_features, LV2_UI__resize,
+ &wrapper->resize);
+
+#ifdef HAVE_LV2_1_6_0
+ suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
+#endif
+
+ return wrapper;
+}
+
+} // extern "C"
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 21:06:12 +0000