Changeset 386

Timestamp:

01/05/08 17:39:25 (1 year ago)

Author:

Mike Wey

Message:

Make the wrapper generate correct code for signals in interfaces and templates

Files:

• trunk/src/gtk/RecentChooserIF.d (modified) (5 diffs)
• trunk/src/gtk/RecentChooserT.d (modified) (9 diffs)
• trunk/wrap/APILookupGtk.txt (modified) (1 diff)
• trunk/wrap/utils/GtkDClass.d (modified) (23 diffs)
• trunk/wrap/utils/GtkWrapper.d (modified) (4 diffs)
• trunk/wrap/utils/convparms.d (modified) (2 diffs)
• trunk/wrap/utils/funct.d (modified) (2 diffs)

trunk/src/gtk/RecentChooserIF.d

@@ -31 +31 @@
- * clss    = RecentChooserT
- * interf  = RecentChooserIF
-Yes
-Yes
+No
+No
- * template for:
- * extend  = 
@@ -43 +43 @@
- * omit code:
- * omit signals:
- *  - item-activated
- *  - selection-changed
- * imports:
- *  - glib.Str
@@ -94 +92 @@
-    
-    /**
+     */
+    
+    void delegate(RecentChooserIF)[] onItemActivatedListeners();
+    /**
-     * This signal is emitted when the user "activates" a recent item
-     * in the recent chooser. This can happen by double-clicking on an item
@@ -100 +102 @@
-     * Since 2.10
-     */
-, ConnectFlags
-
+ dlg, ConnectFlags connectFlags=cast(ConnectFlags)0
+void delegate(RecentChooserIF)[] onSelectionChangedListeners();
-    /**
-     * This signal is emitted when there is a change in the set of
@@ -112 +114 @@
-     * GtkRecentChooserMenu
-     */
-
-
-
-
+
-    
-    /**

trunk/src/gtk/RecentChooserT.d

@@ -30 +30 @@
- * ctorStrct=
- * clss    = RecentChooserT
-
-Yes
-Yes
+RecentChooserIF
+No
+No
- * template for:
- *  - TStruct
@@ -44 +44 @@
- * omit code:
- * omit signals:
- *  - item-activated
- *  - selection-changed
- * imports:
- *  - glib.Str
@@ -97 +95 @@
-    
-    
-
+
+
-    int[char[]] connectedSignals;
-    
-
-
-
-
-
-
-
-
+
+
+
+
+
-    /**
-     * This signal is emitted when the user "activates" a recent item
@@ -117 +113 @@
-    void addOnItemActivated(void delegate(RecentChooserIF) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
-    {
-        onItemActivatedListeners ~= dlg;
-        
-        if(itemActivatedData is null)
-        {
-            itemActivatedData = new UserData;
-        }
-        itemActivatedData.recentChooser = this;
-        itemActivatedData.listeners = onItemActivatedListeners;
-        
-        if ( !("item-activated" in connectedSignals) )
-        {
@@ -132 +119 @@
-            "item-activated",
-            cast(GCallback)&callBackItemActivated,
-itemActivatedData
+cast(RecentChooserIF)this
-            null,
-            connectFlags);
-            connectedSignals["item-activated"] = 1;
-        }
-
-
+
+
+
-    {
-        bool consumed = false;
-        
-data.l
+recentChooserIF.onItemActivatedL
-        {
-data.recentChooser
+recentChooserIF
-        }
-        
@@ -150 +138 @@
-    }
-    
-
-
+
+
+
+
+
-    /**
-     * This signal is emitted when there is a change in the set of
@@ -164 +155 @@
-    void addOnSelectionChanged(void delegate(RecentChooserIF) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
-    {
-        onSelectionChangedListeners ~= dlg;
-        
-        if(selectionChangedData is null)
-        {
-            selectionChangedData = new UserData;
-        }
-        
-        selectionChangedData.recentChooser = this;
-        selectionChangedData.listeners = onSelectionChangedListeners;
-        
-        if ( !("selection-changed" in connectedSignals) )
-        {
@@ -180 +161 @@
-            "selection-changed",
-            cast(GCallback)&callBackSelectionChanged,
-selectionChangedData
+cast(RecentChooserIF)this
-            null,
-            connectFlags);
-            connectedSignals["selection-changed"] = 1;
-        }
-
-
+
+
+
-    {
-        bool consumed = false;
-        
-data.l
+recentChooserIF.onSelectionChangedL
-        {
-data.recentChooser
+recentChooserIF
-        }
-        
@@ -198 +180 @@
-    }
-    
-    /**
-     */
-    
-    /**

trunk/wrap/APILookupGtk.txt

@@ -6090 +6090 @@
-#import: glib.ErrorG
-#structWrap: GError** ErrorG*
-
-interfaceCode: start
-    /**
-     * This signal is emitted when the user "activates" a recent item
-     * in the recent chooser. This can happen by double-clicking on an item
-     * in the recently used resources list, or by pressing
-     * Enter.
-     * Since 2.10
-     */
-    void addOnItemActivated(void delegate(RecentChooserIF), ConnectFlags);
-    
-    /**
-     * This signal is emitted when there is a change in the set of
-     * selected recently used resources. This can happen when a user
-     * modifies the selection with the mouse or the keyboard, or when
-     * explicitely calling functions to change the selection.
-     * Since 2.10
-     * See Also
-     * GtkRecentManager, GtkRecentChooserDialog, GtkRecentChooserWidget,
-     * GtkRecentChooserMenu
-     */
-    void addOnSelectionChanged(void delegate(RecentChooserIF), ConnectFlags);
-interfaceCode: end
-
-code: start
-    /** */
-    int[char[]] connectedSignals;
-
-    public struct UserData
-    {
-        RecentChooserIF recentChooser;
-        void delegate(RecentChooserIF)[] listeners;
-    }
-
-    UserData* itemActivatedData;
-    void delegate(RecentChooserIF)[] onItemActivatedListeners;
-    /**
-     * This signal is emitted when the user "activates" a recent item
-     * in the recent chooser. This can happen by double-clicking on an item
-     * in the recently used resources list, or by pressing
-     * Enter.
-     * Since 2.10
-     */
-    void addOnItemActivated(void delegate(RecentChooserIF) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
-    {
-        onItemActivatedListeners ~= dlg;
-
-        if(itemActivatedData is null)
-        {
-            itemActivatedData = new UserData;
-        }
-        itemActivatedData.recentChooser = this;
-        itemActivatedData.listeners = onItemActivatedListeners;
-
-        if ( !("item-activated" in connectedSignals) )
-        {
-            Signals.connectData(
-            getStruct(),
-            "item-activated",
-            cast(GCallback)&callBackItemActivated,
-            cast(void*)itemActivatedData,
-            null,
-            connectFlags);
-            connectedSignals["item-activated"] = 1;
-        }
-    }
-    extern(C) static void callBackItemActivated(GtkRecentChooser* chooserStruct, UserData* data)
-    {
-        bool consumed = false;
-
-        foreach ( void delegate(RecentChooserIF) dlg ; data.listeners )
-        {
-            dlg(data.recentChooser);
-        }
-        
-        return consumed;
-    }
-
-    UserData* selectionChangedData;
-    void delegate(RecentChooserIF)[] onSelectionChangedListeners;
-    /**
-     * This signal is emitted when there is a change in the set of
-     * selected recently used resources. This can happen when a user
-     * modifies the selection with the mouse or the keyboard, or when
-     * explicitely calling functions to change the selection.
-     * Since 2.10
-     * See Also
-     * GtkRecentManager, GtkRecentChooserDialog, GtkRecentChooserWidget,
-     * GtkRecentChooserMenu
-     */
-    void addOnSelectionChanged(void delegate(RecentChooserIF) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
-    {
-        onSelectionChangedListeners ~= dlg;
-
-        if(selectionChangedData is null)
-        {
-            selectionChangedData = new UserData;
-        }
-        selectionChangedData.recentChooser = this;
-        selectionChangedData.listeners = onSelectionChangedListeners;
-
-        if ( !("selection-changed" in connectedSignals) )
-        {
-            Signals.connectData(
-            getStruct(),
-            "selection-changed",
-            cast(GCallback)&callBackSelectionChanged,
-            cast(void*)selectionChangedData,
-            null,
-            connectFlags);
-            connectedSignals["selection-changed"] = 1;
-        }
-    }
-    extern(C) static void callBackSelectionChanged(GtkRecentChooser* chooserStruct, UserData* data)
-    {
-        bool consumed = false;
-
-        foreach ( void delegate(RecentChooserIF) dlg ; data.listeners )
-        {
-            dlg(data.recentChooser);
-        }
-        
-        return consumed;
-    }
-code: end
-
-interface: RecentChooserIF
-outFile: RecentChooserT

trunk/wrap/utils/GtkDClass.d

@@ -74 +74 @@
-    ConvParms* convParms;
-
-    bool isInterface;
-    char[] iFaceChar = "";
-
@@ -187 +186 @@
-        //writefln("collectStructs %s", std.string.strip(inLines[currLine]));
-        this.inAPI = inAPI;
-
-
+
-        else iFaceChar = "";
-        HtmlStrip stripper = new HtmlStrip();
@@ -467 +465 @@
-    {
-        char[] h;
-nterf.length > 0
+sInterface
-        {
-            h = "public interface "~convParms.interf;
@@ -562 +560 @@
-            char[] var = toVar(gtkStruct.dup);
-            text ~= "";
-
+convParms.
-            {
-                text ~= "/** the main Gtk struct */";
@@ -576 +574 @@
-                {
-                    text ~= "public "~gtkStruct~"* get"~convParms.clss~"Struct()"~iFaceChar;
-
+convParms.
-                    {
-                        text ~= "{";
@@ -587 +585 @@
-                {
-                    text ~= "public "~gtkStruct~"* get"~convParms.clss~"Struct()"~iFaceChar;
-
+convParms.
-                    {
-                        text ~= "{";
@@ -597 +595 @@
-                    text ~= "/** the main Gtk struct as a void* */";
-                    text ~= "protected void* getStruct()"~iFaceChar;
-
+convParms.
-                    {
-                        text ~= "{";
@@ -607 +605 @@
-                    {
-                        // GObject has a specific constructor for the struct
-
+convParms.
-                        {
-                            text ~= "/**";
@@ -690 +688 @@
-        char[] code;
-
-
+convParms.
-        else code = convParms.classCode;
-
@@ -970 +968 @@
-                if ( needSignalImports )
-                {
-
+convParms.
-                    {
-                        text ~= "int[char[]] connectedSignals;";
@@ -979 +977 @@
-                }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -988 +1004 @@
-    }
-
-
+
+
+
+
+
+
+
-    void addExternCallback(inout char[][] text, Funct fun, char[] gtkDSignal, char[] dlg)
-    {
-
+convParms.
-        {
-            text ~= "extern(C) static void callBack"~gtkDSignal~"("
@@ -1019 +1041 @@
-    {
-        text ~= "void addOn"~gtkDSignalName~"("~dlg~" dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)"~iFaceChar;
-
+convParms.
-        {
-            text ~= "{";
@@ -1039 +1061 @@
-            text ~= "           \""~signalName~"\", ";
-            text ~= "           cast(GCallback)&callBack"~gtkDSignalName~", ";
-
+
+
+
+
+
+
-            text ~= "           null, ";
-            //text ~= "         ConnectFlags.AFTER);";
-            text ~= "           connectFlags);";
-            //text ~= "         cast(ConnectFlags)0);";
-            //text ~= "         0);";
-            text ~= "   connectedSignals[\""~signalName~"\"] = 1;";
-            text ~= "}";
-
+
+
+
+
+
+
-            text ~= "}";
-        }
-    }
-
-
-    public static char[] getClassVar(ConvParms* convParms)
-    {
-        char[] cv;
-
-
+
+
+
+
+
+
-        {
-            cv = convParms.clss.dup;
@@ -1192 +1225 @@
-        {
-            if ( !convParms.strictPrefix
-
+convParms.
-                )
-            {
@@ -1203 +1236 @@
-        {
-            if ( !convParms.strictPrefix
-
+convParms.
-                )
-            {
@@ -1212 +1245 @@
-        {
-            if ( !convParms.strictPrefix
-
+convParms.
-                )
-            {
@@ -1221 +1254 @@
-        {
-            if ( !convParms.strictPrefix
-
+convParms.
-                )
-            {
@@ -1229 +1262 @@
-        else if ( startsWith(lines[0], "GTK_STOCK_") )
-        {
-
+convParms.
-            {
-                collectStockItems(lines, convParms);
@@ -1238 +1271 @@
-                )
-        {
-
+convParms.
-            {
-                collectGTypes(lines, convParms);
@@ -2022 +2055 @@
-                if ( fun.name.length==0 || fun.name[0] == '(' )
-                {
-
+convParms.
-                    {
-                        if ( !convParms.strictPrefix )
@@ -2162 +2195 @@
-                    else
-                    {
-
+convParms.
-                        {
-                            char[] externalDeclaration = fun.getExternal(convParms, wrapper.getAliases());
@@ -2184 +2217 @@
-                            addComments();
-                            member ~= gtkDDeclaration~iFaceChar;
-
+convParms.
-                            {
-                                member ~= "{";

trunk/wrap/utils/GtkWrapper.d

@@ -589 +589 @@
-                    convParms.templ.length = 0;
-                    convParms.outFile = convParms.interf;
+                    convParms.isInterface = true;
-                    buildText ~= "\nprivate import "
-                            ~convParms.outPack~"."
@@ -596 +597 @@
-                    convParms.templ = saveTempl;
-                    // mark not interface (anymore)
-nterf = ""
+sInterface = false
-                    // as outFile is always the last definition
-                    // there is no need to restore it
@@ -667 +668 @@
-            convParms.outFile,convParms.bindDir);
-        GtkDClass gtkDClass = new GtkDClass(this);
-
+   
-        gtkDClass.openGtkDClass(text, convParms);
-
@@ -688 +689 @@
-        }
-        writefln("gtk Wrapped %s", gtkDClass.getOutFile(outputRoot, srcDir));
-convParms.interf.length == 0
+!convParms.isInterface
-        {
-            convParms.clearAll();

trunk/wrap/utils/convparms.d

@@ -37 +37 @@
-    public char[] clss;
-    public char[] interf;
+    public bool isInterface;  ///Are we generating an interface.
-    public char[][] templ;
-    public char[] extend;
@@ -67 +68 @@
-        clss.length = 0;
-        interf.length = 0;
+        isInterface = false;
-        extend.length = 0;
-        prefixes.length = 0;

trunk/wrap/utils/funct.d

@@ -261 +261 @@
-            if ( i == parms.length-1 )
-            {
-
+
+
+
+
-            }
-            else if ( i>=firstParameter
@@ -346 +349 @@
-                if ( count == parmsWrap.length-1 )
-                {
-
+
+
+
+
+
+
+
+
+
+
-                }
-                else