ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2008-11-05 Mike Kestner <mkestner@novell.com>

Browse source 
* atk/atk-api-2.12.raw: regen
	* gtk/gtk-api-2.12.raw: regen
	* generator/Signal.cs: reinstate old custom marshaler generation and
	generate custom marshaling when 'manual' attr is set.
	* parser/gapi2xml.pl: set manual attr on sigs that have G_TYPE_POINTER
	parameters since the generic closure can't cope with them.

svn path=/trunk/gtk-sharp/; revision=118068
This commit is contained in:
Mike Kestner 2008-11-06 02:23:21 +00:00
parent 6aac9f149f
commit 74105a1c80
5 changed files with 140 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-11-05 Mike Kestner <mkestner@novell.com>
* atk/atk-api-2.12.raw: regen
* gtk/gtk-api-2.12.raw: regen
* generator/Signal.cs: reinstate old custom marshaler generation and
generate custom marshaling when 'manual' attr is set.
* parser/gapi2xml.pl: set manual attr on sigs that have G_TYPE_POINTER
parameters since the generic closure can't cope with them.
2008-11-05 Mike Kestner <mkestner@novell.com>
* gtk/Builder.custom: #if the new API for 2.14 for now so it

6
atk/atk-api-2.12.raw
View file

@ -2214,7 +2214,7 @@
<parameter type="gpointer" name="data" />
</parameters>
</virtual_method>
<signal name="ChildrenChanged" cname="children_changed" when="LAST" field_name="children_changed">
<signal name="ChildrenChanged" cname="children_changed" when="LAST" manual="true" field_name="children_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
@ -2229,7 +2229,7 @@
<parameter type="gboolean" name="focus_in" />
</parameters>
</signal>
<signal name="PropertyChange" cname="property_change" when="LAST" field_name="property_change">
<signal name="PropertyChange" cname="property_change" when="LAST" manual="true" field_name="property_change">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
@ -2250,7 +2250,7 @@
<parameter type="AtkObject*" name="accessible" />
</parameters>
</signal>
<signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST" field_name="active_descendant_changed">
<signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST" manual="true" field_name="active_descendant_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />

122
generator/Signal.cs
View file

@ -30,21 +30,27 @@ namespace GtkSharp.Generation {
public class Signal {
private string name;
private XmlElement elem;
private ReturnValue retval;
private Parameters parms;
private ClassBase container_type;
bool marshaled;
string name;
XmlElement elem;
ReturnValue retval;
Parameters parms;
ClassBase container_type;
public Signal (XmlElement elem, ClassBase container_type)
{
this.elem = elem;
name = elem.GetAttribute ("name");
marshaled = elem.GetAttribute ("manual") == "true";
retval = new ReturnValue (elem ["return-type"]);
parms = new Parameters (elem["parameters"]);
this.container_type = container_type;
}
bool Marshaled {
get { return marshaled; }
}
public string Name {
get {
return name;
@ -85,6 +91,31 @@ namespace GtkSharp.Generation {
}
}
string CallbackSig {
get {
string result = "";
for (int i = 0; i < parms.Count; i++) {
if (i > 0)
result += ", ";
Parameter p = parms [i];
if (p.PassAs != "" && !(p.Generatable is StructBase))
result += p.PassAs + " ";
result += (p.MarshalType + " arg" + i);
}
return result;
}
}
string CallbackName {
get { return Name + "SignalCallback"; }
}
string DelegateName {
get { return Name + "SignalDelegate"; }
}
private string EventArgsName {
get {
if (IsEventHandler)
@ -175,6 +206,82 @@ namespace GtkSharp.Generation {
}
}
public string GenArgsInitialization (StreamWriter sw)
{
if (parms.Count > 1)
sw.WriteLine("\t\t\t\targs.Args = new object[" + (parms.Count - 1) + "];");
string finish = "";
for (int idx = 1; idx < parms.Count; idx++) {
Parameter p = parms [idx];
IGeneratable igen = p.Generatable;
if (p.PassAs != "out") {
if (igen is ManualGen) {
sw.WriteLine("\t\t\t\tif (arg{0} == IntPtr.Zero)", idx);
sw.WriteLine("\t\t\t\t\targs.Args[{0}] = null;", idx - 1);
sw.WriteLine("\t\t\t\telse {");
sw.WriteLine("\t\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
sw.WriteLine("\t\t\t\t}");
} else
sw.WriteLine("\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
}
if (igen is StructBase && p.PassAs == "ref")
finish += "\t\t\t\tif (arg" + idx + " != IntPtr.Zero) System.Runtime.InteropServices.Marshal.StructureToPtr (args.Args[" + (idx-1) + "], arg" + idx + ", false);\n";
else if (p.PassAs != "")
finish += "\t\t\t\targ" + idx + " = " + igen.ToNativeReturn ("((" + p.CSType + ")args.Args[" + (idx - 1) + "])") + ";\n";
}
return finish;
}
public void GenArgsCleanup (StreamWriter sw, string finish)
{
if (IsVoid && finish.Length == 0)
return;
sw.WriteLine("\n\t\t\ttry {");
sw.Write (finish);
if (!IsVoid) {
if (retval.CSType == "bool") {
sw.WriteLine ("\t\t\t\tif (args.RetVal == null)");
sw.WriteLine ("\t\t\t\t\treturn false;");
}
sw.WriteLine("\t\t\t\treturn " + SymbolTable.Table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
}
sw.WriteLine("\t\t\t} catch (Exception) {");
sw.WriteLine ("\t\t\t\tException ex = new Exception (\"args.RetVal or 'out' property unset or set to incorrect type in " + EventHandlerQualifiedName + " callback\");");
sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (ex, true);");
sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return.");
sw.WriteLine ("\t\t\t\tthrow ex;");
sw.WriteLine("\t\t\t}");
}
public void GenCallback (StreamWriter sw)
{
if (IsEventHandler)
return;
sw.WriteLine ("\t\t[GLib.CDeclCallback]");
sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
sw.WriteLine ();
sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
sw.WriteLine("\t\t{");
sw.WriteLine("\t\t\t{0} args = new {0} ();", EventArgsQualifiedName);
sw.WriteLine("\t\t\ttry {");
sw.WriteLine("\t\t\t\tGLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;");
sw.WriteLine("\t\t\t\tif (sig == null)");
sw.WriteLine("\t\t\t\t\tthrow new Exception(\"Unknown signal GC handle received \" + gch);");
sw.WriteLine();
string finish = GenArgsInitialization (sw);
sw.WriteLine("\t\t\t\t{0} handler = ({0}) sig.Handler;", EventHandlerQualifiedName);
sw.WriteLine("\t\t\t\thandler (GLib.Object.GetObject (arg0), args);");
sw.WriteLine("\t\t\t} catch (Exception e) {");
sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, false);");
sw.WriteLine("\t\t\t}");
GenArgsCleanup (sw, finish);
sw.WriteLine("\t\t}");
sw.WriteLine();
}
private bool NeedNew (ClassBase implementor)
{
return elem.HasAttribute ("new_flag") ||
@ -449,6 +556,11 @@ namespace GtkSharp.Generation {
public void GenEvent (StreamWriter sw, ClassBase implementor, string target)
{
string args_type = IsEventHandler ? "" : ", typeof (" + EventArgsQualifiedName + ")";
if (Marshaled) {
GenCallback (sw);
args_type = ", new " + DelegateName + "(" + CallbackName + ")";
}
sw.WriteLine("\t\t[GLib.Signal("+ CName + ")]");
sw.Write("\t\tpublic ");

15
gtk/gtk-api-2.12.raw
View file

@ -1001,6 +1001,11 @@
</callback>
<callback name="ItemFactoryCallback2" cname="GtkItemFactoryCallback2">
<return-type type="void" />
<parameters>
<parameter type="gpointer" name="callback_data" />
<parameter type="guint" name="callback_action" />
<parameter type="GtkWidget*" name="widget" />
</parameters>
</callback>
<callback name="KeySnoopFunc" cname="GtkKeySnoopFunc">
<return-type type="gint" />
@ -1627,7 +1632,7 @@
</method>
</interface>
<interface name="Editable" cname="GtkEditable">
<signal name="InsertText" cname="insert_text" when="LAST" field_name="insert_text">
<signal name="InsertText" cname="insert_text" when="LAST" manual="true" field_name="insert_text">
<return-type type="void" />
<parameters>
<parameter type="GtkEditable*" name="editable" />
@ -2588,7 +2593,7 @@
<parameter type="GtkTreePath*" name="path" />
</parameters>
</signal>
<signal name="RowsReordered" cname="rows_reordered" when="FIRST" field_name="rows_reordered">
<signal name="RowsReordered" cname="rows_reordered" when="FIRST" manual="true" field_name="rows_reordered">
<return-type type="void" />
<parameters>
<parameter type="GtkTreeModel*" name="tree_model" />
@ -9539,7 +9544,7 @@
<parameter type="GtkMenuItem*" name="menu_item" />
</parameters>
</signal>
<signal name="ToggleSizeRequest" cname="toggle_size_request" when="FIRST" field_name="toggle_size_request">
<signal name="ToggleSizeRequest" cname="toggle_size_request" when="FIRST" manual="true" field_name="toggle_size_request">
<return-type type="void" />
<parameters>
<parameter type="GtkMenuItem*" name="menu_item" />
@ -9960,7 +9965,7 @@
</virtual_method>
<childprop name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true" />
<childprop name="Detachable" cname="detachable" type="gboolean" readable="true" writeable="true" />
<signal name="SwitchPage" cname="switch_page" when="LAST" field_name="switch_page">
<signal name="SwitchPage" cname="switch_page" when="LAST" manual="true" field_name="switch_page">
<return-type type="void" />
<parameters>
<parameter type="GtkNotebook*" name="notebook" />
@ -12987,7 +12992,7 @@
<property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true" />
<property name="UpdatePolicy" cname="update-policy" type="GtkSpinButtonUpdatePolicy" readable="true" writeable="true" />
<property name="Value" cname="value" type="gdouble" readable="true" writeable="true" />
<signal name="Input" cname="input" when="LAST" field_name="input">
<signal name="Input" cname="input" when="LAST" manual="true" field_name="input">
<return-type type="gint" />
<parameters>
<parameter type="GtkSpinButton*" name="spin_button" />

1
parser/gapi2xml.pl
View file

@ -947,6 +947,7 @@ sub addSignalElem
$sig_elem->setAttribute('when', $1) if ($spec =~ /_RUN_(\w+)/);
my $method = "";
$sig_elem->setAttribute('manual', 'true') if ($spec =~ /G_TYPE_POINTER/);
if ($spec =~ /_OFFSET\s*\(\w+,\s*(\w+)\)/) {
$method = $1;
$sig_elem->setAttribute('field_name', $1);