Fix scrolling functionality

[WebThing.git] / plugins / Vimish.cs

diff --git a/plugins/Vimish.cs b/plugins/Vimish.cs
index ebe088c..22f2532 100644 (file)
--- a/plugins/Vimish.cs
+++ b/plugins/Vimish.cs
@@ -17,7 +17,7 @@ public class Vimish : WebThingPlugin {
         commandline = new Gtk.Entry();
         commandline.Activated += command_Activate;
         commandline.KeyPressEvent += command_KeyPress;
-        wt.AttachWidget(commandline, CompassDirection.S, AttachOptions.Fill, AttachOptions.Shrink);
+        wt.AttachWidget(commandline, AttachPoint.S, AttachOptions.Fill, AttachOptions.Shrink);
 
         commandline.Hide();
 
@@ -29,27 +29,6 @@ public class Vimish : WebThingPlugin {
     }
 
     private void Window_KeyPress(object o, KeyPressEventArgs e) {
-        switch(e.Event.Key) {
-        case Gdk.Key.o:
-            CommandStart("open ");
-            break;
-        case Gdk.Key.O:
-            CommandStart("open " + wt.WebView.MainFrame.Uri);
-            break;
-        case Gdk.Key.t:
-            CommandStart("tabopen ");
-            break;
-        case Gdk.Key.T:
-            CommandStart("tabopen " + wt.WebView.MainFrame.Uri);
-            break;
-        case Gdk.Key.colon:
-            CommandlineShow();
-            break;
-        }
-    }
-
-    private void WebView_KeyPress(object o, KeyPressEventArgs e) {
-        Console.WriteLine(e.Event.Key);
         if ((Gdk.ModifierType.ControlMask & e.Event.State) != 0) {
             switch(e.Event.Key) {
             case Gdk.Key.n:
@@ -60,24 +39,49 @@ public class Vimish : WebThingPlugin {
                 break;
             }
         } else {
+            switch(e.Event.Key) {
+            case Gdk.Key.o:
+                CommandStart("open ");
+                break;
+            case Gdk.Key.O:
+                CommandStart("open " + wt.WebView.MainFrame.Uri);
+                break;
+            case Gdk.Key.t:
+                CommandStart("tabopen ");
+                break;
+            case Gdk.Key.T:
+                CommandStart("tabopen " + wt.WebView.MainFrame.Uri);
+                break;
+            case Gdk.Key.colon:
+                CommandlineShow();
+                break;
+            }
+        }
+    }
+
+    private void WebView_KeyPress(object o, KeyPressEventArgs e) {
+        WebView wv = (WebView)o;
+
+        Console.WriteLine(e.Event.Key);
+        if (e.Event.State == Gdk.ModifierType.None) {
             switch(e.Event.Key) {
             case Gdk.Key.j:
-                wt.ScrolledWindow.Vadjustment.Value += wt.ScrolledWindow.Vadjustment.StepIncrement;
+                wt.Bump(0, 1);
                 break;
             case Gdk.Key.k:
-                wt.ScrolledWindow.Vadjustment.Value -= wt.ScrolledWindow.Vadjustment.StepIncrement;
+                wt.Bump(0, -1);
                 break;
             case Gdk.Key.l:
-                wt.ScrolledWindow.Hadjustment.Value += wt.ScrolledWindow.Hadjustment.StepIncrement;
+                wt.Bump(1, 0);
                 break;
             case Gdk.Key.h:
-                wt.ScrolledWindow.Hadjustment.Value -= wt.ScrolledWindow.Hadjustment.StepIncrement;
+                wt.Bump(-1, 0);
                 break;
             case Gdk.Key.r:
-                wt.WebView.Reload();
+                wv.Reload();
                 break;
             case Gdk.Key.Escape:
-                wt.WebView.ExecuteScript("document.activeElement.blur()");
+                wv.ExecuteScript("document.activeElement.blur()");
                 break;
             }
         }
@@ -102,18 +106,28 @@ public class Vimish : WebThingPlugin {
 
     private void command_Activate(object o, EventArgs e) {
         string[] args = Regex.Split(commandline.Text, @"\s+");
-        switch(args[0]) {
+        if (args.Length == 0) return;
+        string cmd = args[0];
+        string[] tmp = new string[args.Length - 1];
+        Array.Copy(args, 1, tmp, 0, tmp.Length);
+        args = tmp;
+        string query = Regex.Replace(commandline.Text, String.Format(@"^{0}\s+", cmd), "");
+
+        switch(cmd) {
         case "close":
             wt.CloseTab();
             break;
         case "open":
-            if (args.Length < 2) return;
-            wt.OpenUri(args[1]);
+            if (args.Length < 1) return;
+            if (!wt.Open(query))
+                Error("Could not open query");
             break;
         case "tabopen":
-            if (args.Length < 2) return;
-            wt.OpenUriTab(args[1]);
-            wt.Tabs.CurrentPage = wt.Tabs.NPages - 1;
+            if (args.Length < 1) return;
+            if (wt.OpenTab(query))
+                wt.Tabs.CurrentPage = wt.Tabs.NPages - 1;
+            else
+                Error("Could not open query");
             break;
         case "n":
             wt.Tabs.NextPage();
@@ -125,12 +139,29 @@ public class Vimish : WebThingPlugin {
             wt.Quit();
             break;
         case "set":
-            if (args.Length == 2)
-                Options[args[1]] = null;
+            if (args.Length == 1)
+                Options[args[0]] = null;
             else
-                Options[args[1]] = args[2];
+                Options[args[0]] = args[1];
             ApplyOptions();
             break;
+        case "save":
+            SaveConfig();
+            break;
+        default:
+            bool found;
+            if (args.Length > 0) {
+                found = wt.Plugins.Call(cmd, args);
+                if (!found)
+                    Error("No function {0}({1}) found", cmd, String.Join(", ", args));
+            } else {
+                found = wt.Plugins.Call(cmd);
+                if (!found)
+                    Error("No function {0}() found", cmd);
+            }
+            if (found)
+                Console.WriteLine("Plugin function {0} called successfully", cmd);
+            break;
         }
         CommandlineHide();
     }
@@ -139,7 +170,7 @@ public class Vimish : WebThingPlugin {
         foreach (string key in Options.Keys) {
             switch(key) {
             case "ShowTabs":
-                bool v = ParseBool(Options[key]);
+                bool v = Config.ParseBool(Options[key]);
                 wt.Tabs.ShowTabs = v;
                 break;
             default:
@@ -149,18 +180,6 @@ public class Vimish : WebThingPlugin {
         }
     }
 
-    private bool ParseBool(string v) {
-        switch(v.ToLower()) {
-        case "true":
-        case "t":
-        case "1":
-        case "on":
-        case "yes":
-            return true;
-        }
-        return false;
-    }
-
     private void Error(string format, params object[] values) {
         Console.WriteLine(format, values);
     }