Provide support for gdk.Event.

pekim · Oct 11, 2019 · c626093 · c626093
1 parent d705fdc
commit c626093
Show file tree

Hide file tree

Showing 75 changed files with 26,908 additions and 865 deletions.
diff --git a/internal/generate/records.go b/internal/generate/records.go
@@ -51,10 +51,12 @@ func (rr Records) forName(name string) *Record {
  return nil
 }
 
-func (rr Records) mergeAddenda(addenda Records) {
+func (rr *Records) mergeAddenda(addenda Records) {
  for _, addendaRecord := range addenda {
  if record := rr.forName(addendaRecord.Name); record != nil {
  record.mergeAddenda(addendaRecord)
+ } else {
+ *rr = append(*rr, addendaRecord)
  }
  }
 }

diff --git a/internal/gir-files/Gdk-3.0-addenda.gir b/internal/gir-files/Gdk-3.0-addenda.gir
@@ -4,6 +4,8 @@
  xmlns:c="https://www.gtk.org/introspection/c/1.0"
  xmlns:glib="https://www.gtk.org/introspection/glib/1.0"
 >
+ <c:include name="gdk_event.h"/>
+
  <namespace>
  <bitfield name="ModifierType" c:type="guint"/>
 
@@ -29,6 +31,16 @@
  <record version="3.22" name="DrawingContextClass"/>
  <record version="3.22" name="MonitorClass"/>
 
+ <!--
+ gobbi does not support generation for C union types.
+ To work around this, define GdkEvent as a record (struct).
+ -->
+ <record name="Event" c:type="GdkEvent_">
+ <field name="type" writable="1">
+ <type name="EventType" c:type="GdkEventType"/>
+ </field>
+ </record>
+
  <interface name="DevicePad" version="3.22"/>
  </namespace>
 </repository>
diff --git a/internal/gir-files/Gtk-3.0-addenda.gir b/internal/gir-files/Gtk-3.0-addenda.gir
@@ -4,6 +4,8 @@
  xmlns:c="https://www.gtk.org/introspection/c/1.0"
  xmlns:glib="https://www.gtk.org/introspection/glib/1.0"
 >
+ <c:include name="../gdk/gdk_event.h"/>
+
  <namespace>
  <bitfield name="StyleContextPrintFlags" version="3.20"/>
 

diff --git a/internal/gir-files/GtkSource-3.0-addenda.gir b/internal/gir-files/GtkSource-3.0-addenda.gir
@@ -5,8 +5,9 @@
  xmlns:glib="https://www.gtk.org/introspection/glib/1.0"
 >
  <c:include name="gtksourceview/completion-providers/words/gtksourcecompletionwords.h"/>
+ <c:include name="../gdk/gdk_event.h"/>
 
- <namespace>
+  <namespace>
  <class name="Region" version="3.22"/>
  <class name="SpaceDrawer" version="3.24"/>
  <class name="Tag" version="3.20"/>

diff --git a/lib/gdk/boolean.go b/lib/gdk/boolean.go
diff --git a/lib/gdk/gdk_event.h b/lib/gdk/gdk_event.h
@@ -0,0 +1,14 @@
+#include <gdk/gdk.h>
+
+/*
+ Although cgo can access C struct field names that are keywords,
+ by prefixing them with an underscore, it cannot do the same
+ for C unions. This causes a problem for the "type" field in
+ the GdkEvent union.
+
+ To work around this, define an equivalent struct for GdkEvent.
+*/
+typedef struct _GdkEvent_
+{
+ GdkEventType type;
+} GdkEvent_;
diff --git a/lib/gdk/v-.go b/lib/gdk/v-.go
diff --git a/lib/gdk/v-2.10.go b/lib/gdk/v-2.10.go
diff --git a/lib/gdk/v-2.12.go b/lib/gdk/v-2.12.go