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();
}
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:
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.ScrolledWindow.Hadjustment.Value -= wt.ScrolledWindow.Hadjustment.StepIncrement;
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;
}
}
Options[args[1]] = args[2];
ApplyOptions();
break;
+ case "save":
+ SaveConfig();
+ break;
+ default:
+ bool found;
+ if (args.Length > 1) {
+ string[] callargs = new string[args.Length - 1];
+ Array.Copy(args, 1, callargs, 0, args.Length - 1);
+ found = wt.Plugins.Call(args[0], callargs);
+ if (!found)
+ Error("No function {0}({1}) found", args[0], String.Join(", ", callargs));
+ } else {
+ found = wt.Plugins.Call(args[0]);
+ if (!found)
+ Error("No function {0}() found", args[0]);
+ }
+ if (found)
+ Console.WriteLine("Plugin function {0} called successfully", args[0]);
+ break;
}
CommandlineHide();
}
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:
}
}
- 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);
}