X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=959b610ca28cad3777988c2ec2cd895d9b5389e6;hp=e404023238d20fbff50b84e618e008a5152b3147;hb=dacae015c228c0c3a6023b20ea3ea7e4997c74e4;hpb=1d5c57bd4e63de8e28f327a7f836d5ff6964ab09

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index e40402323..959b610ca 100644
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -48,7 +48,7 @@ function BuildLists () {
     
  
 
-    var ns_list = [ 'Gtk' , 'Gdk', 'Pango', 'GtkSource', 'WebKit', 'Vte'] ; //NameSpace.namespaces();
+    var ns_list = [ 'Gtk' , 'Gdk', 'Pango', 'GtkSource', 'WebKit', 'Vte', 'GtkClutter'] ; //NameSpace.namespaces();
      
     ns_list = ns_list.sort();
     // let's try and load them, so we find out early what will fail.
@@ -90,6 +90,7 @@ function BuildLists () {
             //titleType : odata.titleType,
             extendsClasses : [],
             can_contain : [],
+            can_contain_using: [],
           //  can_be_added_to : [],
             //using_methods : { },
             can_be_added_to_as : {}
@@ -129,8 +130,16 @@ function BuildLists () {
                     addable_type = p.memberOf + '.' + p.type;
                 }
                 
-                
-               
+                if (m.memberOf == 'Gtk.Buildable') {
+                    return;
+                }
+				//"Gtk.Widget:add_accelerator",
+				//"Gtk.Widget:add_device_events"
+
+                if (m.name.match(/^(add_mnemonic_label|add_accelerator|add_device_events)$/)) {
+                    return;
+                }
+        
                 // in theory you can not add a window to anything.. ???
                 //if ('Gtk.Window' == addable_type || methods[addable_type].extendsClasses.indexOf('Gtk.Window') > -1) {
                 //    return;
@@ -144,7 +153,9 @@ function BuildLists () {
                 //}
                 
                 methods[cls].can_contain.pushUnique(addable_type);
-                
+                var add = m.memberOf +':'+ m.name;
+ 
+                methods[cls].can_contain_using.pushUnique(add);
                 //methods[cls].using_methods[m.name] = m.params;
                 
                 //if (methods[addable_type].can_be_added_to.indexOf(cls) < 0) { 
@@ -152,7 +163,6 @@ function BuildLists () {
                 //}
                 
                 
-                var add = m.memberOf +':'+ m.name;
                 
                 if (typeof(methods[addable_type].can_be_added_to_as[cls]) == 'undefined') {
                     methods[addable_type].can_be_added_to_as[cls]=[];
@@ -257,9 +267,26 @@ function BuildLists () {
     this.methods = methods;
     this.allmethods = methods;
     this.implementations = implementations;
-    //print(JSON.stringify(methods,null,4));
+    print(JSON.stringify(methods,null,4)); Seed.exit();
     // dump out a usage file..
     
+    
+    
+    
+    
+    function verifyUsage(parent,child)
+    {
+        
+        
+        
+        
+    }
+    
+    
+    
+    
+    
+    
     // basically anything that is a Gtk.Container, should be available at the top.
     /*
 left:
@@ -286,10 +313,17 @@ right:
         tops[ch] = [ '*top' ];
     });
     for(var cls in methods) {
+        if (cls =='Gtk.Builder') {
+            continue;
+        }
         for (var par in methods[cls].can_be_added_to_as) {
+            
             if (typeof(usage[par]) == 'undefined') {
                 usage[par] = [];
             }
+            
+            verifyUsage(par,cls);
+            
             usage[par].pushUnique(cls);
             if (typeof(tops[cls]) == 'undefined') {
                 tops[cls] = [];
@@ -297,7 +331,16 @@ right:
             tops[cls].pushUnique(par);
         }
     }
-    function canTop(cls) {
+    function canTop(cls, rec) {
+        
+        rec = rec || 0;
+        //print('CANTOP: ' + cls + ' =' + rec);
+        if (rec > 5) {
+       //     print('SKIP : ' + cls);
+        }
+        if (typeof(tops[cls]) == 'undefined') {
+            return false;
+        }
         for (var i =0; i < tops[cls].length; i++) {
             if (tops[cls][i] == '*top') {
                 return true;
@@ -305,7 +348,7 @@ right:
             if (cls == tops[cls][i]) {
                 continue;
             }
-            if (canTop(cls)) {
+            if (canTop(tops[cls][i], rec+1)) {
                 return true;
             }
         }
@@ -313,20 +356,49 @@ right:
         
     }
     var nusage = {};
+	var usage_left = {};
     for(var par in usage) {
         // see if the parent can be added to something.
         if (!canTop(par)) {
             continue;
         }
+		var duped = false;
+		for(var dupe in usage) {
+			if (par != dupe
+				&& typeof(nusage[dupe]) != 'undefined'
+				&& usage[par].join(',') == usage[dupe].join(',')) {
+				duped = true;
+				
+				if (typeof(usage_left[dupe]) == 'undefined') {
+					usage_left[dupe] = []; 
+				}
+				//print(par+ ' is a dupe of ' + dupe);
+				usage_left[dupe].pushUnique(par);
+				break;
+			}
+		}
+		 if (duped) {
+		 	continue;
+		 }
         nusage[par] = usage[par];
         
     }
-    
-    print(JSON.stringify(nusage,null,4));
-    
-    
-    
-    
+    usage = nusage;
+    //print(JSON.stringify(nusage,null,4));  Seed.exit();
+    print(JSON.stringify(methods['Gtk.TextView'],null,4));
+
+    var str = [];
+	for(var par in usage) {
+		str.push('left');
+		str.push('   ' + par);
+		if (typeof(usage_left[par]) != 'undefined') {
+			usage_left[par].forEach(function(d) { str.push('    ' + d);});
+		}
+		str.push('right');
+		usage[par].forEach(function(d) { str.push('    ' + d);});
+		str.push('');
+	}
+	print(str.join("\n"));
     //print(JSON.stringify(implementations ,null,4));
     /*
       methods is