src/Builder4/Editor.bjs

[app.Builder.js] / src / Builder4 / Editor.vala

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 8db4787..7fe1971 100644 (file)
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -24,7 +24,9 @@ public class Editor : Object
     public int pos_root_x;
     public int pos_root_y;
     public string ptype;
+    public int last_search_end;
     public string key;
+    public Gtk.SourceSearchContext searchcontext;
     public JsRender.JsRender file;
     public bool pos;
     public bool dirty;
@@ -41,7 +43,9 @@ public class Editor : Object
         this.window = null;
         this.activeEditor = "";
         this.ptype = "";
+        this.last_search_end = 0;
         this.key = "";
+        this.searchcontext = null;
         this.file = null;
         this.pos = false;
         this.dirty = false;
@@ -59,20 +63,6 @@ public class Editor : Object
     }
 
     // user defined functions
-    public Gee.ArrayList<int> search (string txt) {
-       var ret =  new Gee.ArrayList<int>();
-    
-       var str = this.buffer.toString();
-    
-       var lines = str.split("\n");
-       for (var i = 0 ; i < lines.length; i++)  {
-       if (lines[i].contains(txt)) {
-               ret.add(i);
-       }
-      
-       }
-       return ret;
-    }
     public   bool saveContents ()  {
         
         
@@ -126,6 +116,25 @@ public class Editor : Object
                this.view.el.scroll_to_iter(iter,  0.1f, true, 0.0f, 0.5f);
                return false;
        });   
+    }
+    public int search (string txt) {
+    
+       var s = new Gtk.SourceSearchSettings();
+       
+       this.searchcontext = new Gtk.SourceSearchContext(this.buffer.el,s);
+       this.searchcontext .set_highlight(true);
+       s.set_search_text(txt);
+       Gtk.TextIter beg, st,en;
+        
+       this.buffer.el.get_start_iter(out beg);
+       this.searchcontext.forward(beg, out st, out en);
+       
+       
+       return this.searchcontext.get_occurrences_count();
+    
+     
+       
+    
     }
     public   void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key)
     {
@@ -133,7 +142,7 @@ public class Editor : Object
         this.ptype = "";
         this.key  = "";
         this.node = null;
-    
+       this.searchcontext = null;
         
         if (file.xtype != "PlainFile") {
         
@@ -158,6 +167,14 @@ public class Editor : Object
         }
     
            
+    }
+    public void forwardSearch () {
+    
+       if (this.searchcontext == null) {
+               return;
+       }
+       
+    
     }
     public class Xcls_Box2 : Object
     {