X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=0c7b2bc9ead9c77e3cbdd0e0cdd66820fcb8f709;hb=f927f87326fa8196765f0c524cb514a2152f66c3;hp=b9f81534b642f90ce387357c97025777afee1f0d;hpb=cf00e062beb8ca6e253a906c12ee72b1ff4137b8;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index b9f81534b..0c7b2bc9e 100644
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -69,10 +69,10 @@ function BuildLists () {
             classes[odata.alias] = odata;
         });
     });
-    //print(JSON.stringify(classes['Gtk.CellRenderer'] , null, 4));
-    //print(JSON.stringify(classes['Gtk.CellRenderer'].titleType, null, 4));
-    //print(JSON.stringify(classes['Gtk.CellRenderer'].childClasses, null, 4));
-    //print(JSON.stringify(classes['Gtk.CellRenderer'].implementedBy, null, 4));
+    //print(JSON.(classes['Gtk.CellRenderer'] , null, 4));
+    //print(JSON.(classes['Gtk.CellRenderer'].titleType, null, 4));
+    //print(JSON.(classes['Gtk.CellRenderer'].childClasses, null, 4));
+    //print(JSON.(classes['Gtk.CellRenderer'].implementedBy, null, 4));
           
     
 
@@ -108,7 +108,7 @@ function BuildLists () {
        
         
         //print(cls);
-        //print(JSON.stringify(odata.methods,null,4));
+        //print(JSON.(odata.methods,null,4));
         odata.methods.forEach(function(m) {
             
             
@@ -117,14 +117,14 @@ function BuildLists () {
              if (!m.name.match(/^(add|pack)/)) {
                 return;
             }
-            //print(JSON.stringify(m,null,4));
+            //print(JSON.(m,null,4));
             m.params.forEach(function(p) {
                  
                 if (!p.type || typeof(classes[p.type]) == 'undefined') {
                     return;
                 }
                 // now add it..
-                //print(JSON.stringify(p));Seed.exit();
+                //print(JSON.(p));Seed.exit();
                 var addable_type = p.type;
                 if (addable_type.indexOf('.') < 0) {
                     addable_type = p.memberOf + '.' + p.type;
@@ -181,13 +181,13 @@ function BuildLists () {
                 });
                 // also needs to add
                 //print(addable_type);
-                //print(JSON.stringify(implementations[addable_type], null,4));
+                //print(JSON.(implementations[addable_type], null,4));
                  
                 
                 implementations[addable_type].forEach(function(addable_child) {
                     
                     //if (addable_child == 'Gtk.AboutDialog') {
-                    //    print(JSON.stringify(methods[addable_child].extendsClasses,null,4));Seed.exit();
+                    //    print(JSON.(methods[addable_child].extendsClasses,null,4));Seed.exit();
                         
                     //}
                     
@@ -267,37 +267,59 @@ function BuildLists () {
     this.methods = methods;
     this.allmethods = methods;
     this.implementations = implementations;
-    //print(JSON.stringify(methods,null,4)); Seed.exit();
+    //print(JSON.(methods,null,4)); Seed.exit();
     // dump out a usage file..
-    
+	this.failed = [];
+    var failed = this.failed;
     function verifyUsageMethod(parent,child,method)
     {
         // currently only verifies add on container.
         if (method !='Gtk.Container:add') {
             return true;
         }
+        if (failed.indexOf(parent) > -1) {
+            return false;
+        }
         
-        var cls = parent.split('.').pop();
+        var ar =  parent.split('.')
+        var cls =ar[1];
+        var ns =ar[0];
          
-        
+        /*
         if (parent == 'Gtk.Bin' || methods['Gtk.Bin'].extendsClasses.indexOf(parent) > -1) {
             return false;
         }
         if (['GtkSource.CompletionInfo',
              'Gtk.MenuShell',
-             'Gtk.SourceView', // ??? nothing can be added to it?
+             'GtkSource.View', // ??? nothing can be added to it?
+             'WebKit.WebView', // ??? nothing can be added to it?
              'GtkClutter.Embed'
              ].indexOf(parent) > -1) {
              return false;
         }
+        */
         
-        print("TRY ctor:  " + parent );
-
-        var x = new imports.gi.Gtk[cls]();
-        print("TRY child type:  " + parent);
         
-        print(parent + " : says children are of type : " + x.child_type());
-        return true;
+        try {
+            var x = new imports.gi[ns][cls]();
+        } catch(e) {
+            failed.push(parent);
+            print("TRY ctor:  " + parent );
+            print(JSON.(e));
+            return false;
+        }
+        
+        //print("TRY child type:  " + parent);
+        var ct = x.child_type();
+        //print(parent + " : says children are of type : " + ct);
+        // get the Gtype for the child?
+        var GObject = imports.gi.GObject;
+        var match = GObject.type_from_name(ar.join(''));
+        //print([match, ct]);
+        //print ("matching?" + (GObject.type_is_a(match,  ct ) ? "YES" : "NO"));
+        
+        
+        return GObject.type_is_a(match,  ct )  ? true : false;
         
     }
     
@@ -360,13 +382,15 @@ right:
         }
         for (var par in methods[cls].can_be_added_to_as) {
             
+            if (!verifyUsage(par,cls)) {
+                continue;
+            }
+            
             if (typeof(usage[par]) == 'undefined') {
                 usage[par] = [];
             }
             
-            if (!verifyUsage(par,cls)) {
-                continue;
-            }
+           
             
             usage[par].pushUnique(cls);
             if (typeof(tops[cls]) == 'undefined') {
@@ -375,6 +399,8 @@ right:
             tops[cls].pushUnique(par);
         }
     }
+    
+    
     function canTop(cls, rec) {
         
         rec = rec || 0;
@@ -397,8 +423,22 @@ right:
             }
         }
         return false;
-        
     }
+    var lefts = {};
+    for(var par in usage) {
+        var left = usage[par].join(',');
+        if (typeof(lefts[left]) == 'undefined') {
+            lefts[left] = [];
+        }
+        lefts[left].push(par);
+    }
+    print (JSON.(lefts,null,4));
+    Seed.quit();
+        
+        
+        
+        
+    print (JSON.(usage,null,4));
     var nusage = {};
 	var usage_left = {};
     for(var par in usage) {
@@ -428,8 +468,8 @@ right:
         
     }
     usage = nusage;
-    //print(JSON.stringify(nusage,null,4));  Seed.exit();
-    print(JSON.stringify(methods['Gtk.TextView'],null,4));
+    //print(JSON.(nusage,null,4));  Seed.exit();
+    print(JSON.(methods['Gtk.TextView'],null,4));
 
     var str = [];
 	for(var par in usage) {
@@ -443,11 +483,11 @@ right:
 		str.push('');
 	}
 	print(str.join("\n"));
-    //print(JSON.stringify(implementations ,null,4));
+    //print(JSON.(implementations ,null,4));
     /*
       methods is
         [a class]
-            [has methods that use this object]
+            [has  methods that use this object]
                 [list of methods of the top class..]
      
      
@@ -474,10 +514,12 @@ right:
     */
     
     
-    //print(JSON.stringify(implementations,null,4));
+    //print(JSON.(implementations,null,4));
     
 }
 imports.gi.Gtk.init(Seed.argv);
+
+imports.gi.GtkClutter.init(Seed.argv);
 BuildLists();
 
 // we now have a list of classes / methods that can be used..