X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=WebThing.cs;h=ff5135467b97ddbbd81d411c4e787fd0e61fe450;hb=2744fefc32dbe9b59a570f6515d51121b8fcfbe3;hp=7855ae3ee9c8bbdbd23741e27b7bd6c57bfaafcd;hpb=0b2e5f8fffd9ed781a1ddab279dbd6fec5c7695a;p=WebThing.git diff --git a/WebThing.cs b/WebThing.cs index 7855ae3..ff51354 100644 --- a/WebThing.cs +++ b/WebThing.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Reflection; using System.IO; using System.Text.RegularExpressions; using System.Runtime.InteropServices; @@ -9,7 +8,7 @@ using GtkSharp; using WebKit; namespace bytex64.WebThing { - public enum CompassDirection { + public enum AttachPoint { N, E, S, W, Interior } @@ -40,182 +39,125 @@ namespace bytex64.WebThing { public Gtk.Notebook Tabs { get { return _Tabs; } } - /* - private int _CurrentTab; - public int CurrentTab { - get { return _CurrentTab; } - set { - if (value >= _Tabs.Count) - _CurrentTab = _Tabs.Count - 1; - else if (value < 0) - _CurrentTab = 0; - else - _CurrentTab = value; - - _WebView.Hide(); - _ScrolledWindow.Remove(_WebView); - _WebView = _Tabs[_CurrentTab]; - _ScrolledWindow.Add(_WebView); - foreach (WebView view in Tabs) - Console.WriteLine(view.MainFrame.Uri); - _WebView.Show(); - _WebView.GrabFocus(); - } - } - */ private Gtk.Table WidgetGrid; private Gtk.Alignment InteriorOverlay; - public Dictionary Plugins; - public Dictionary Options; - public string[] Arguments; + public PluginManager Plugins; + public SearchHandler Search; [DllImport ("SoupSettings.dll")] private static extern void soup_settings(); + // Main setup public void Run() { Application.Init(); - Plugins = new Dictionary(); - ParseArgs(); soup_settings(); + Config.ParseCommandLine(); + Config.Load(); + //Config.DumpOptions(); + + // Initialize Window _Window = new Gtk.Window("WebThing"); - _Window.SetWmclass("webthing", "WebThing"); + // The GTK+ docs say not to use this, but the defaults are + // based on the executable name, which I don't like. + _Window.SetWmclass("webthing", "WebThing"); _Window.Role = "browser"; + { + int w, h; + + if (Config.Options.ContainsKey("Width")) + w = Convert.ToInt32(Config.Options["Width"]); + else + w = 640; + + if (Config.Options.ContainsKey("Height")) + h = Convert.ToInt32(Config.Options["Height"]); + else + h = 480; + + _Window.DefaultSize = new Gdk.Size(w, h); + } _Window.Destroyed += delegate { Quit(); }; + // Initialize WidgetGrid + // The WidgetGrid holds the Tabs (and thus WebKit) and + // AttachPoint.Interior in the center, and allows widgets to + // be added on the sides of the browser WidgetGrid = new Gtk.Table(3, 3, false); _Window.Add(WidgetGrid); + // Initialize Tabs + // Tabs are a core feature of WebThing, not a plugin. By + // default, they do nothing -- Tab manipulation is left to + // plugins to define. _Tabs = new Gtk.Notebook(); + _Tabs.ShowBorder = false; + _Tabs.Scrollable = true; _Tabs.SwitchPage += Tabs_SwitchPage; WidgetGrid.Attach(_Tabs, 1, 2, 1, 2); + // InteriorOverlay goes over top of the Tabs to contain + // widgets that hover over the content, like progress, or + // inline search. This is not a very solid idea ATM. InteriorOverlay = new Gtk.Alignment(1, 0, 0, 0); WidgetGrid.Attach(InteriorOverlay, 1, 2, 1, 2); _Window.ShowAll(); - WebThingView newview = NewWebThingView(); + // Load Plugins + Plugins = new PluginManager(this); + Plugins.Load(); - // TODO: Conf.Get("plugins") instead of hard-coded path? - using (TextReader f = new StreamReader("plugins.conf")) { - string line; - while ((line = f.ReadLine()) != null) { - line = line.Trim(); - LoadPlugin(line); - } - } + // Load Search Handlers + Search = new SearchHandler(this); - WebViewSetupPlugins(newview.WebView); - newview.WebView.GrabFocus(); + // Create a new, default WebThingView if one has not already + // been created. + if (Tabs.NPages == 0) + OpenTab("http://dominionofawesome.com/"); + WebView.GrabFocus(); Application.Run(); } - protected void ParseArgs() { - Options = new Dictionary(); - Queue q = new Queue(); - foreach (string s in System.Environment.GetCommandLineArgs()) { - q.Enqueue(s); - } - q.Dequeue(); // Remove self argument - - Regex SimpleOpt = new Regex(@"^-([a-zA-Z0-9]+)$"); - Regex LongOpt = new Regex(@"^--([\w-]+)$"); - string OptLast = null; - List args = new List(); - - while (q.Count > 0) { - string opt = q.Dequeue(); - Match m; - - m = SimpleOpt.Match(opt); - if (m.Success) { - string s = m.Groups[1].Value; - if (s.Length > 1) { - foreach (char c in s) { - Options[c.ToString()] = ""; - } - OptLast = null; - } else { - Options[s] = ""; - OptLast = s; - } - continue; - } - - m = LongOpt.Match(opt); - if (m.Success) { - string s = m.Groups[1].Value; - Options[s] = ""; - OptLast = s; - continue; - } - - // else - - if (OptLast != null) { - Options[OptLast] = opt; - OptLast = null; - } else { - args.Add(opt); - } - } - Arguments = args.ToArray(); - - /* - Console.WriteLine("Options:"); - foreach (string key in Options.Keys) - Console.WriteLine(" {0}\t{1}", key, Options[key]); - - Console.WriteLine("Arguments: {0}", String.Join(" ", Arguments)); - */ - } - - public void LoadPlugin(string assemblyname) { - Assembly a = Assembly.LoadFile("plugins/" + assemblyname + ".dll"); - Type[] types = a.GetTypes(); - foreach (Type t in types) { - if (t.IsSubclassOf(typeof(WebThingPlugin))) { - WebThingPlugin p = (WebThingPlugin) a.CreateInstance(t.FullName, false, BindingFlags.ExactBinding, null, null, null, null); - p.Init(this); - Plugins[t.FullName] = p; - Console.WriteLine("Successfully loaded {0}", t.FullName); - } - } + public void Quit() { + Plugins.Deinit(); + Application.Quit(); } - public void AttachWidget(Gtk.Widget widget, CompassDirection direction, AttachOptions xoptions, AttachOptions yoptions) { + // Widget attachment + public void AttachWidget(Gtk.Widget widget, AttachPoint direction, AttachOptions xoptions, AttachOptions yoptions) { switch(direction) { - case CompassDirection.N: + case AttachPoint.N: WidgetGrid.Attach(widget, 0, 3, 0, 1, xoptions, yoptions, 0, 0); break; - case CompassDirection.E: + case AttachPoint.E: WidgetGrid.Attach(widget, 2, 3, 1, 2, xoptions, yoptions, 0, 0); break; - case CompassDirection.S: + case AttachPoint.S: WidgetGrid.Attach(widget, 0, 3, 2, 3, xoptions, yoptions, 0, 0); break; - case CompassDirection.W: + case AttachPoint.W: WidgetGrid.Attach(widget, 0, 1, 1, 2, xoptions, yoptions, 0, 0); break; - case CompassDirection.Interior: + case AttachPoint.Interior: InteriorOverlay.Add(widget); break; } } - public void AttachWidget(Gtk.Widget widget, CompassDirection direction) { + public void AttachWidget(Gtk.Widget widget, AttachPoint direction) { AttachWidget(widget, direction, 0, 0); } - public WebView NewTab() { + // Tab management + public WebThingView NewTab() { WebThingView newview = NewWebThingView(); - WebViewSetupPlugins(newview.WebView); - return newview.WebView; + Plugins.WebViewSetup(newview.WebView); + return newview; } private WebThingView NewWebThingView() { @@ -230,12 +172,6 @@ namespace bytex64.WebThing { return newview; } - private void WebViewSetupPlugins(WebView view) { - foreach (string key in Plugins.Keys) { - Plugins[key].InitWebView(view); - } - } - public void CloseTab() { CloseTab(_Tabs.Page); } @@ -247,34 +183,60 @@ namespace bytex64.WebThing { _Tabs.RemovePage(tab); view.Dispose(); } catch (ArgumentOutOfRangeException) { + Console.WriteLine("Attempted to close tab out of range: {0}", tab); } } } - public string FixUri(string Uri) { - if (!Regex.IsMatch(Uri, @"://")) { - return String.Format("http://{0}", Uri); + private void Tabs_SwitchPage(object o, SwitchPageArgs e) { + Gtk.Widget page = _Tabs.GetNthPage((int)e.PageNum); + _Window.Title = _Tabs.GetTabLabelText(page) + " - WebThing"; + } + + // Uri loading + private string GetUri(string query) { + Uri u; + try { + u = new Uri(query); + return u.ToString(); + } catch(UriFormatException) { + try { + u = new Uri(String.Format("http://{0}", query)); + return u.ToString(); + } catch (UriFormatException) { + return Search.Transform(query); + } } - return Uri; } - public void OpenUri(string Uri) { - wv.Open(FixUri(Uri)); + public bool Open(string query) { + string uri = GetUri(query); + if (uri == null) return false; + + wv.Open(uri); + return true; } - public void OpenUriTab(string Uri) { - WebView view = NewTab(); - view.Open(FixUri(Uri)); + public bool OpenTab(string query) { + WebThingView wtv = NewTab(); + string uri = GetUri(query); + if (uri == null) return false; + + wtv.WebView.Open(uri); + return true; } - public void Quit() { - // TODO: Create a way of shutting down plugins - Application.Quit(); + public void Scroll(double x, double y) { + ScrolledWindow.Hadjustment.Value += x; + if (ScrolledWindow.Hadjustment.Value > ScrolledWindow.Hadjustment.Upper - ScrolledWindow.Hadjustment.PageSize) + ScrolledWindow.Hadjustment.Value = ScrolledWindow.Hadjustment.Upper - ScrolledWindow.Hadjustment.PageSize; + ScrolledWindow.Vadjustment.Value += y; + if (ScrolledWindow.Vadjustment.Value > ScrolledWindow.Vadjustment.Upper - ScrolledWindow.Vadjustment.PageSize) + ScrolledWindow.Vadjustment.Value = ScrolledWindow.Vadjustment.Upper - ScrolledWindow.Vadjustment.PageSize; } - private void Tabs_SwitchPage(object o, SwitchPageArgs e) { - Gtk.Widget page = _Tabs.GetNthPage((int)e.PageNum); - _Window.Title = _Tabs.GetTabLabelText(page) + " - WebThing"; + public void Bump(int x, int y) { + Scroll(x * ScrolledWindow.Hadjustment.StepIncrement, y * ScrolledWindow.Vadjustment.StepIncrement); } } }