|
From: Andy S. <And...@co...> - 2010-05-15 17:04:27
|
diffing dir...
Sat May 15 12:37:17 EDT 2010 Andy Stewart <laz...@gm...>
* Make `webkit` generate individual signals.
Ignore-this: cddff1a5bf1671f47f4d3ffd69c3ae3d
{
hunk ./webkit/Graphics/UI/Gtk/WebKit/Download.chs 78
+{#import Graphics.UI.Gtk.WebKit.Signals#}
hunk ./webkit/Graphics/UI/Gtk/WebKit/Internal.chs 44
+{#import Graphics.UI.Gtk.WebKit.Signals#}
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebInspector.chs 61
+{#import Graphics.UI.Gtk.WebKit.Signals#}
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs 200
+{#import Graphics.UI.Gtk.WebKit.Signals#}
hunk ./webkit/Graphics/UI/Gtk/WebKit/WebView.chs 203
-import Graphics.UI.GtkInternals
addfile ./webkit/marshal.list
hunk ./webkit/marshal.list 1
+# see glib-genmarshal(1) for a detailed description of the file format,
+# possible parameter types are:
+# VOID indicates no return type, or no extra
+# parameters. if VOID is used as the parameter
+# list, no additional parameters may be present.
+# BOOLEAN for boolean types (gboolean)
+# CHAR for signed char types (gchar)
+# UCHAR for unsigned char types (guchar)
+# INT for signed integer types (gint)
+# UINT for unsigned integer types (guint)
+# LONG for signed long integer types (glong)
+# ULONG for unsigned long integer types (gulong)
+# ENUM for enumeration types (gint)
+# FLAGS for flag enumeration types (guint)
+# FLOAT for single-precision float types (gfloat)
+# DOUBLE for double-precision float types (gdouble)
+# STRING for string types (gchar*)
+# BOXED for boxed (anonymous but reference counted) types (GBoxed*)
+# POINTER for anonymous pointer types (gpointer)
+# NONE deprecated alias for VOID
+# BOOL deprecated alias for BOOLEAN
+
+#
+# One discrepancy from Gtk+ is that for signals that may pass NULL for an object
+# reference, the Haskell signal should be passed a 'Maybe GObject'.
+# We therefore have two variants that are marshalled as a maybe type:
+#
+# OBJECT for GObject or derived types (GObject*)
+# MOBJECT for GObject or derived types (GObject*) that may be NULL
+
+# Furthermore, some objects needs to be destroyed synchronously from the main loop of
+# Gtk rather than during GC. These objects need to be marshalled using TOBJECT (for thread-safe
+# object). It doesn't hurt to use TOBJECT for an object that doesn't need it, except for the
+# some performance. As a rule of thumb, use TOBJECT for all libraries that build on package
+# 'gtk' and use OBJECT for all packages that only need packages 'glib', 'pango', 'cairo',
+# 'gio'. Again both variants exist. Note that the same names will be generated for OBJECT and
+# TOBJECT, so you have to remove the OBJECT handler if you need both.
+#
+# TOBJECT for GObject or derived types (GObject*)
+# MTOBJECT for GObject or derived types (GObject*) that may be NULL
+
+# If you add a new signal type, please check that it actually works!
+# If it is a Boxed type check that the reference counting is right.
+
+VOID:POINTER,POINTER
+BOOLEAN:TOBJECT
+BOOLEAN:TOBJECT,STRING,BOXED
+POINTER:TOBJECT
+BOOLEAN:INT,INT,STRING
+BOOLEAN:STRING,STRING,INT,STRING
+BOOLEAN:TOBJECT,STRING
+BOOLEAN:TOBJECT,STRING,STRING
+BOOLEAN:TOBJECT,TOBJECT,TOBJECT,TOBJECT
+BOOLEAN:TOBJECT,TOBJECT,STRING,TOBJECT
+NONE:TOBJECT,TOBJECT,TOBJECT,TOBJECT
+BOOLEAN:ENUM,INT
+BOOLEAN:NONE
+NONE:NONE
+NONE:TOBJECT,STRING
+NONE:TOBJECT,TOBJECT
+NONE:STRING,STRING
+NONE:TOBJECT
+NONE:INT
+NONE:STRING
hunk ./webkit/webkit.cabal 23
-x-Types-File: Graphics/UI/Gtk/WebKit/Types.chs
-x-Types-ModName: Graphics.UI.Gtk.WebKit.Types
-x-Types-Forward: *Graphics.UI.GtkInternals
-x-Types-Destructor: objectUnrefFromMainloop
hunk ./webkit/webkit.cabal 25
+ marshal.list
+[_^I_][_^I_][_^I_][_^I_][_^I_][_$_]
+x-Types-File: Graphics/UI/Gtk/WebKit/Types.chs
+x-Types-Tag: webkit
+x-Types-ModName: Graphics.UI.Gtk.WebKit.Types
+x-Types-Forward: *Graphics.UI.GtkInternals
+x-Types-Destructor: objectUnrefFromMainloop
hunk ./webkit/webkit.cabal 69
+ Graphics.UI.Gtk.WebKit.Signals
hunk ./webkit/webkit.cabal 73
+ x-Signals-File: Graphics/UI/Gtk/WebKit/Signals.chs
+ x-Signals-Modname: Graphics.UI.Gtk.WebKit.Signals
+ x-Signals-Types: marshal.list
+ x-Signals-Import: Graphics.UI.GtkInternals
+[_^I_][_^I_][_$_]
hunk ./webkit/webkit.cabal 79
- x-Types-Tag: webkit
}
|