summaryrefslogtreecommitdiffstats
path: root/src/x11_in_gtk3.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/x11_in_gtk3.c')
-rw-r--r--src/x11_in_gtk3.c40
1 files changed, 25 insertions, 15 deletions
diff --git a/src/x11_in_gtk3.c b/src/x11_in_gtk3.c
index 6ec1994..06620c6 100644
--- a/src/x11_in_gtk3.c
+++ b/src/x11_in_gtk3.c
@@ -14,24 +14,31 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <string.h>
-
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkx.h>
-
-#include "./suil_internal.h"
+#include "suil_internal.h"
+#include "lv2/core/lv2.h"
#include "lv2/options/options.h"
+#include "lv2/ui/ui.h"
#include "lv2/urid/urid.h"
+#include "suil/suil.h"
-#define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type())
-#define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper))
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gclosure.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
-typedef struct _SuilX11Wrapper SuilX11Wrapper;
-typedef struct _SuilX11WrapperClass SuilX11WrapperClass;
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
-struct _SuilX11Wrapper {
+typedef struct {
GtkSocket socket;
GtkPlug* plug;
SuilWrapper* wrapper;
@@ -43,14 +50,17 @@ struct _SuilX11Wrapper {
int initial_height;
int req_width;
int req_height;
-};
+} SuilX11Wrapper;
-struct _SuilX11WrapperClass {
+typedef struct {
GtkSocketClass parent_class;
-};
+} SuilX11WrapperClass;
GType suil_x11_wrapper_get_type(void); // Accessor for SUIL_TYPE_X11_WRAPPER
+#define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type())
+#define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper))
+
G_DEFINE_TYPE(SuilX11Wrapper, suil_x11_wrapper, GTK_TYPE_SOCKET)
/**