From 4656107105495acfadb0ce68dfa5b12035f3fe76 Mon Sep 17 00:00:00 2001
From: Mason Larobina <mason.larobina@gmail.com>
Date: Fri, 6 Aug 2010 03:14:23 +0800
Subject: [PATCH] Huge refactor of rc.lua & added vim-like buffer bindings

---
 lib/bind.lua |  62 ++++-
 lib/util.lua |  12 +
 rc.lua       | 819 +++++++++++++++++++++++++++++++++++------------------------
 3 files changed, 554 insertions(+), 339 deletions(-)
 rewrite rc.lua (72%)

diff --git a/lib/bind.lua b/lib/bind.lua
index 8fbea88..c876b1b 100644
--- a/lib/bind.lua
+++ b/lib/bind.lua
@@ -7,9 +7,14 @@ local assert = assert
 local type = type
 local util = require("util")
 local unpack = unpack
+local string = string
 
 module("bind")
 
+-- Weak table of argects and their buffers
+local buffers = {}
+setmetatable(buffers, { __mode = "k" })
+
 -- Modifiers to ignore
 ignore_modifiers = { "Mod2", "Lock" }
 
@@ -30,21 +35,62 @@ function filter_mods(mods, remove_shift)
 end
 
 -- Create new key binding
-function key(mods, key, func)
+function key(mods, key, func, ...)
     local mods = filter_mods(mods, #key == 1)
-    return { mods = mods, key = key, func = func }
+    return { mods = mods, key = key, func = func, args = arg}
+end
+
+-- Create new buffer binding
+function buf(pattern, func, ...)
+    return { pattern = pattern, func = func, args = arg}
+end
+
+-- Check if there exists a key binding in the `binds` table which matches the
+-- pressed key and modifier mask and execute it.
+function match_key(binds, mods, key, arg)
+    for _, k in ipairs(binds) do
+        if k.key == key and util.table.isclone(k.mods, mods) then
+            k.func(arg, k.args)
+            return true
+        end
+    end
+end
+
+-- Check if there exists a buffer binding in the `binds` table which matches
+-- the given buffer and execute it.
+function match_buf(binds, buffer, arg)
+    for _, b in ipairs(binds) do
+        if b.pattern and string.match(buffer, b.pattern) then
+            b.func(arg, buffer, b.args)
+            return true
+        end
+    end
 end
 
 -- Check if a bind exists with the given key & modifier mask then call the
--- binds function with `object` as the first argument.
-function hit(binds, mods, key, ...)
+-- binds function with `arg` as the first argument.
+function hit(binds, mods, key, buffer, enable_buffer, arg)
     -- Filter modifers table
     local mods = filter_mods(mods, #key == 1)
-    for _, k in ipairs(binds) do
-        if k.key == key and util.table.isclone(k.mods, mods) then
-            k.func(unpack(arg))
+
+    if (not buffer or not enable_buffer) or #mods ~= 0 or #key ~= 1 then
+        if match_key(binds, mods, key, arg) then
+            return true
+        end
+    end
+
+    if not enable_buffer or #mods ~= 0 then
+        return false
+
+    elseif #key == 1 then
+        buffer = (buffer or "") .. key
+        if match_buf(binds, buffer, arg) then
             return true
         end
     end
-    return false
+
+    if buffer then
+        return true, buffer:sub(1, 10)
+    end
+    return true
 end
diff --git a/lib/util.lua b/lib/util.lua
index da10b0b..d7c2f04 100644
--- a/lib/util.lua
+++ b/lib/util.lua
@@ -127,4 +127,16 @@ function table.isclone(a, b)
     return true
 end
 
+-- Remove an element at a given position (or key) in a table and return the
+-- value that was in that position.
+function table.pop(t, k)
+    local v = t[k]
+    if type(k) == "number" then
+        table.remove(t, k)
+    else
+        t[k] = nil
+    end
+    return v
+end
+
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/rc.lua b/rc.lua
dissimilarity index 72%
index 94c269c..bdd8cf5 100755
--- a/rc.lua
+++ b/rc.lua
@@ -1,331 +1,488 @@
-#!./luakit -c
-
-require("math")
-require("mode")
-require("bind")
-
--- Widget construction aliases
-function eventbox() return widget{type="eventbox"} end
-function hbox()     return widget{type="hbox"}     end
-function label()    return widget{type="label"}    end
-function notebook() return widget{type="notebook"} end
-function vbox()     return widget{type="vbox"}     end
-function webview()  return widget{type="webview"}  end
-function window()   return widget{type="window"}   end
-function entry()    return widget{type="entry"}    end
-
--- Keep a list of windows and data objects
-windows = {}
-
--- Widget type-specific default settings
-widget.add_signal("new", function(w)
-    w:add_signal("init", function(w)
-        if w.type == "window" then
-            -- Call the quit function if this was the last window left
-            w:add_signal("destroy", function ()
-                if #luakit.windows == 0 then luakit.quit() end
-            end)
-        elseif w.type == "label" or w.type == "entry" then
-            w.font = "monospace normal 9"
-        end
-    end)
-end)
-
--- Returns a nice window title
-function mktitle(view)
-    if not view:get_prop("title") and not view.uri then return "luakit" end
-    return (view:get_prop("title") or "luakit") .. " - " .. (view.uri or "about:blank")
-end
-
--- Returns true if the given view is the currently active view
-function iscurrent(nbook, view)
-    return nbook:current() == nbook:indexof(view)
-end
-
-function mktabcount(nbook, i)
-    return string.format("[%d/%d]", i or nbook:current(), nbook:count())
-end
-
--- Returns a vim-like scroll indicator
-function scroll_parse(view)
-    val, max = view:get_vscroll()
-    if max == 0 then
-        return "All"
-    elseif val == 0 then
-        return "Top"
-    elseif val == max then
-        return "Bot"
-    else
-        return string.format("%2d%%", (val/max) * 100)
-    end
-end
-
-function autohide(nbook, n)
-    if not n then n = nbook:count() end
-    if n == 1 then
-        nbook.show_tabs = false
-    else
-        nbook.show_tabs = true
-    end
-end
-
-function progress_update(w, view, p)
-    if not p then p = view:get_prop("progress") end
-    if not view:loading() or p == 1 then
-        w.sbar.loaded:hide()
-    else
-        w.sbar.loaded:show()
-        w.sbar.loaded.text = string.format("(%d%%)", p * 100)
-    end
-end
-
-function new_tab(w, uri)
-    view = webview()
-    w.tabs:append(view)
-    autohide(w.tabs)
-
-    -- Attach webview signals
-    view:add_signal("title-changed", function (v)
-        w.tabs:set_title(v, v:get_prop("title") or "(Untitled)")
-        if iscurrent(w.tabs, v) then
-            w.win.title = mktitle(v)
-        end
-    end)
-
-    view:add_signal("property::uri", function(v)
-        if not w.tabs:get_title(v) then
-            w.tabs:set_title(v, v.uri or "about:blank")
-        end
-
-        if iscurrent(w.tabs, v) then
-            w.sbar.uri.text = v.uri or "about:blank"
-        end
-    end)
-
-    view:add_signal("key-press", function ()
-        -- Prevent keys from hitting the webview widget if not in insert mode
-        if mode.get(w.win) ~= "insert" then return true end
-    end)
-
-    view:add_signal("load-start", function (v)
-        if iscurrent(w.tabs, v) then
-            progress_update(w, v, 0)
-            mode(w.win)
-        end
-    end)
-    view:add_signal("progress-update", function (v)
-        if iscurrent(w.tabs, v) then progress_update(w, v) end
-    end)
-
-    view:add_signal("expose", function(v)
-        if iscurrent(w.tabs, v) then
-            w.sbar.scroll.text = scroll_parse(v)
-        end
-    end)
-
-    -- Navigate to uri
-    view.uri = uri
-
-    return view
-end
-
-function parse_scroll(current, max, value)
-    if type(value) == "string" then
-        -- Match absolute "20px"
-        if string.match(value, "^%d+px$") then
-            value = tonumber(string.match(value, "^(%d+)px$"))
-        -- Match absolute "20%"
-        elseif string.match(value, "^%d%%$") then
-            value = math.floor(max * (tonumber(string.match(value, "^(%d+)%%$")) / 100))
-        -- Match relative "+20px" or "-20px"
-        elseif string.match(value, "^[\-\+]%d+px") then
-            value = current + tonumber(string.match(value, "^([\-\+]%d+)px"))
-        -- Match relative "+20%" or "-20%"
-        elseif string.match(value, "^[\-\+]%d+%%$") then
-            value = math.floor(current + (max * (tonumber(string.match(value, "^([\-\+]%d+)%%$")) / 100)))
-        else
-            value = nil
-        end
-    elseif type(value) ~= "number" then
-        value = nil
-    end
-    return value
-end
-
-function vscroll(view, value)
-    local current, max = view:get_vscroll()
-    value = parse_scroll(current, max, value)
-    view:set_vscroll(value)
-end
-
-function hscroll(view, value)
-    local current, max = view:get_hscroll()
-    value = parse_scroll(current, max, value)
-    view:set_hscroll(value)
-end
-
--- Add key bindings to be used across all windows
-modebinds = {
-    all = {
-        bind.key({}, "Escape",  function(w) mode(w.win) end),
-    },
-    normal = {
-        bind.key({}, "i",       function (w) mode(w.win, "insert") end),
-        bind.key({}, ":",       function (w) mode(w.win, "command") end),
-
-        bind.key({}, "h",       function (w, v) hscroll(v, "-20px") end),
-        bind.key({}, "j",       function (w, v) vscroll(v, "+20px") end),
-        bind.key({}, "k",       function (w, v) vscroll(v, "-20px") end),
-        bind.key({}, "l",       function (w, v) hscroll(v, "+20px") end),
-        bind.key({}, "Left",    function (w, v) hscroll(v, "-20px") end),
-        bind.key({}, "Down",    function (w, v) vscroll(v, "+20px") end),
-        bind.key({}, "Up",      function (w, v) vscroll(v, "-20px") end),
-        bind.key({}, "Right",   function (w, v) hscroll(v, "+20px") end),
-    },
-    command = { },
-    insert = { },
-}
-
--- Construct new window
-function new_window(uris)
-    -- Widget & state variables
-    local w = {
-        win = window(),
-        layout = vbox(),
-        tabs = notebook(),
-        -- Status bar widgets
-        sbar = {
-            layout = hbox(),
-            ebox = eventbox(),
-            uri = label(),
-            loaded = label(),
-            sep = label(),
-            rlayout = hbox(),
-            rebox = eventbox(),
-            tabi = label(),
-            scroll = label(),
-        },
-        -- Input bar widgets
-        ibar = {
-            layout = hbox(),
-            ebox = eventbox(),
-            prompt = label(),
-            input = entry(),
-        },
-    }
-
-    -- Pack widgets
-    w.win:set_child(w.layout)
-    w.sbar.ebox:set_child(w.sbar.layout)
-    w.layout:pack_start(w.tabs, true, true, 0)
-    w.sbar.layout:pack_start(w.sbar.uri, false, false, 0)
-    w.sbar.layout:pack_start(w.sbar.loaded, false, false, 0)
-    w.sbar.layout:pack_start(w.sbar.sep, true, true, 0)
-
-    -- Put the right-most labels in something backgroundable
-    w.sbar.rlayout:pack_start(w.sbar.tabi, false, false, 0)
-    w.sbar.rlayout:pack_start(w.sbar.scroll, false, false, 2)
-    w.sbar.rebox:set_child(w.sbar.rlayout)
-
-    w.sbar.layout:pack_start(w.sbar.rebox, false, false, 0)
-    w.layout:pack_start(w.sbar.ebox, false, false, 0)
-
-    -- Pack input bar
-    w.ibar.layout:pack_start(w.ibar.prompt, false, false, 0)
-    w.ibar.layout:pack_start(w.ibar.input, true, true, 0)
-    w.ibar.ebox:set_child(w.ibar.layout)
-    w.layout:pack_start(w.ibar.ebox, false, false, 0)
-
-    w.sbar.uri.fg = "#fff"
-    w.sbar.uri.selectable = true
-    w.sbar.loaded.fg = "#888"
-    w.sbar.loaded:hide()
-    w.sbar.rebox.bg = "#000"
-    w.sbar.scroll.fg = "#fff"
-    w.sbar.scroll.text = "All"
-    w.sbar.tabi.text = "[0/0]"
-    w.sbar.tabi.fg = "#fff"
-    w.sbar.ebox.bg = "#000"
-
-    w.ibar.input.show_frame = false
-    w.ibar.input.bg = "#fff"
-    w.ibar.input.fg = "#000"
-
-    w.ibar.ebox.bg = "#fff"
-    w.ibar.prompt.text = "Hello"
-    w.ibar.prompt.fg = "#000"
-
-    -- Attach notebook signals
-    w.tabs:add_signal("page-added", function(nbook, view, idx)
-        w.sbar.tabi.text = mktabcount(nbook)
-    end)
-    w.tabs:add_signal("switch-page", function(nbook, view, idx)
-        w.sbar.tabi.text = mktabcount(nbook, idx)
-        w.sbar.uri.text = view.uri or "about:blank"
-        w.win.title = mktitle(view)
-        progress_update(w, view)
-        autohide(nbook)
-    end)
-
-    w.win:add_signal("key-press", function(win, mods, key)
-        -- Current webview
-        local view = w.tabs:atindex(w.tabs:current())
-
-        -- Try mode specific binds
-        local binds = modebinds[mode.get(win)]
-        if binds and #binds then
-            if bind.hit(binds, mods, key, w, view) then return true end
-        end
-
-        -- Now try binds in the "all" mode
-        binds = modebinds.all
-        if binds and #binds then
-            if bind.hit(binds, mods, key, w, view) then return true end
-        end
-    end)
-
-    -- Mode specific actions
-    w.win:add_signal("mode-changed", function(win, mode)
-        if mode == "normal" then
-            w.ibar.prompt.text = ""
-            w.ibar.prompt:show()
-            w.ibar.input:hide()
-            w.ibar.input.text = ""
-        elseif mode == "insert" then
-            w.ibar.input:hide()
-            w.ibar.input.text = ""
-            w.ibar.prompt.text = "-- INSERT --"
-            w.ibar.prompt:show()
-        elseif mode == "command" then
-            w.ibar.prompt:hide()
-            w.ibar.prompt.text = ""
-            w.ibar.input.text = ":"
-            w.ibar.input:show()
-            w.ibar.input:focus()
-            w.ibar.input:set_position(-1)
-        end
-    end)
-
-    w.ibar.input:add_signal("changed", function()
-        if mode.get(w.win) == "command" and not string.match(w.ibar.input.text, "^:") then
-            mode(w.win)
-        end
-    end)
-
-    -- Populate notebook
-    for _, uri in ipairs(uris) do
-        new_tab(w, uri)
-    end
-
-    -- Make sure something is loaded
-    if w.tabs:count() == 0 then
-        new_tab(w, "http://github.com/mason-larobina/luakit")
-    end
-
-    -- Set initial mode
-    mode(w.win)
-
-    return w
-end
-
-new_window(uris)
+-- Luakit configuration file, more information at http://luakit.org/
+
+require("math")
+require("mode")
+require("bind")
+
+-- Widget construction aliases
+function eventbox() return widget{type="eventbox"} end
+function hbox()     return widget{type="hbox"}     end
+function label()    return widget{type="label"}    end
+function notebook() return widget{type="notebook"} end
+function vbox()     return widget{type="vbox"}     end
+function webview()  return widget{type="webview"}  end
+function window()   return widget{type="window"}   end
+function entry()    return widget{type="entry"}    end
+
+-- Variable definitions
+HOMEPAGE    = "http://github.com/mason-larobina/luakit"
+SCROLL_STEP = 20
+
+-- Luakit theme
+theme = theme or {
+    -- Generic settings
+    font = "monospace normal 9",
+    fg   = "#fff",
+    bg   = "#000",
+
+    -- Slightly specific settings
+    statusbar_fg = "#fff",
+    statusbar_bg = "#000",
+    inputbar_fg  = "#000",
+    inputbar_bg  = "#fff",
+
+    -- Specific settings
+    loaded_fg    = "#888",
+}
+
+widget.add_signal("new", function(wi)
+    wi:add_signal("init", function(wi)
+        if wi.type == "window" then
+            wi:add_signal("destroy", function ()
+                -- Call the quit function if this was the last window left
+                if #luakit.windows == 0 then luakit.quit() end
+            end)
+        end
+    end)
+end)
+
+-- Add key bindings to be used across all windows
+mode_binds = {
+    all = {
+        bind.key({},          "Escape",   function (w) w:set_mode() end),
+        bind.key({"Control"}, "[",        function (w) w:set_mode() end),
+    },
+    normal = {
+        bind.key({},          "i",        function (w) w:set_mode("insert")  end),
+        bind.key({},          ":",        function (w) w:set_mode("command") end),
+
+        bind.key({},          "h",        function (w) w:scroll_horiz("-"..SCROLL_STEP.."px") end),
+        bind.key({},          "j",        function (w) w:scroll_vert ("+"..SCROLL_STEP.."px") end),
+        bind.key({},          "k",        function (w) w:scroll_vert ("-"..SCROLL_STEP.."px") end),
+        bind.key({},          "l",        function (w) w:scroll_horiz("+"..SCROLL_STEP.."px") end),
+        bind.key({},          "Left",     function (w) w:scroll_horiz("-"..SCROLL_STEP.."px") end),
+        bind.key({},          "Down",     function (w) w:scroll_vert ("+"..SCROLL_STEP.."px") end),
+        bind.key({},          "Up",       function (w) w:scroll_vert ("-"..SCROLL_STEP.."px") end),
+        bind.key({},          "Right",    function (w) w:scroll_horiz("+"..SCROLL_STEP.."px") end),
+
+        bind.buf("^[0-9]*H$",             function (w, b) w:back   (tonumber(string.match(b, "^(%d*)H$") or 1)) end),
+        bind.buf("^[0-9]*L$",             function (w, b) w:forward(tonumber(string.match(b, "^(%d*)L$") or 1)) end),
+
+        bind.buf("^gg$",                  function (w) w:scroll_vert("0%")   end),
+        bind.buf("^G$",                   function (w) w:scroll_vert("100%") end),
+
+        bind.buf("^[0-9]*gT$",            function (w, b) w:prev_tab(tonumber(string.match(b, "^(%d*)gT$") or 1)) end),
+        bind.buf("^[0-9]*gt$",            function (w, b) w:next_tab(tonumber(string.match(b, "^(%d*)gt$") or 1)) end),
+
+        bind.buf("^[\-\+]?[0-9]+[%%|G]$", function (w, b) w:scroll_vert(string.match(b, "^([\-\+]?%d+)[%%G]$") .. "%") end),
+
+        bind.buf("^gH$",                  function (w) w:new_tab(HOMEPAGE) end),
+        bind.buf("^gh$",                  function (w) w:go(HOMEPAGE) end),
+
+        bind.buf("^ZZ$",                  function (w) luakit.quit() end),
+    },
+    command = { },
+    insert = { },
+}
+
+function apply_theme(w)
+    local s, i, fg, bg, font = w.sbar, w.ibar, theme.fg, theme.bg, theme.font
+    -- Set foregrounds
+    for wi, v in pairs({
+        [s.l.uri]    = theme.uri_fg    or theme.statusbar_fg or fg,
+        [s.l.loaded] = theme.loaded_fg or theme.statusbar_fg or fg,
+        [s.r.buf]    = theme.buf_fg    or theme.statusbar_fg or fg,
+        [s.r.tabi]   = theme.tabi_fg   or theme.statusbar_fg or fg,
+        [s.r.scroll] = theme.scroll_fg or theme.statusbar_fg or fg,
+        [i.prompt]   = theme.prompt_fg or theme.inputbar_fg  or fg,
+        [i.input]    = theme.input_fg  or theme.inputbar_fg  or fg,
+    }) do wi.fg = v end
+
+    -- Set backgrounds
+    for wi, v in pairs({
+        [s.l.ebox]   = theme.statusbar_bg or bg,
+        [s.r.ebox]   = theme.statusbar_bg or bg,
+        [s.ebox]     = theme.statusbar_bg or bg,
+        [i.ebox]     = theme.inputbar_bg  or bg,
+        [i.input]    = theme.input_bg     or theme.inputbar_bg or bg,
+    }) do wi.bg = v end
+
+    -- Set fonts
+    for wi, v in pairs({
+        [s.l.uri]    = theme.uri_font    or theme.statusbar_font or font,
+        [s.l.loaded] = theme.loaded_font or theme.statusbar_font or font,
+        [s.r.buf]    = theme.buf_font    or theme.statusbar_font or font,
+        [s.r.tabi]   = theme.tabi_font   or theme.statusbar_font or font,
+        [s.r.scroll] = theme.scroll_font or theme.statusbar_font or font,
+        [i.prompt]   = theme.prompt_font or theme.inputbar_font or font,
+        [i.input]    = theme.input_font  or theme.inputbar_font or font,
+    }) do wi.font = v end
+end
+
+-- Build and pack window widgets
+function build_window()
+    -- Create a table for widgets and state variables for a window
+    local w = {
+        win    = window(),
+        layout = vbox(),
+        tabs   = notebook(),
+        -- Status bar widgets
+        sbar = {
+            layout = hbox(),
+            ebox   = eventbox(),
+            -- Left aligned widgets
+            l = {
+                layout = hbox(),
+                ebox   = eventbox(),
+                uri    = label(),
+                loaded = label(),
+            },
+            -- Fills space between the left and right aligned widgets
+            filler = label(),
+            -- Right aligned widgets
+            r = {
+                layout = hbox(),
+                ebox   = eventbox(),
+                buf    = label(),
+                tabi   = label(),
+                scroll = label(),
+            },
+        },
+        -- Input bar widgets
+        ibar = {
+            layout  = hbox(),
+            ebox    = eventbox(),
+            prompt  = label(),
+            input   = entry(),
+        },
+    }
+
+    -- Assemble window
+    w.win:set_child(w.layout)
+    w.layout:pack_start(w.tabs, true, true, 0)
+
+    -- Pack left-aligned statusbar elements
+    local l = w.sbar.l
+    l.layout:pack_start(l.uri,    false, false, 0)
+    l.layout:pack_start(l.loaded, false, false, 0)
+    l.ebox:set_child(l.layout)
+
+    -- Pack right-aligned statusbar elements
+    local r = w.sbar.r
+    r.layout:pack_start(r.buf,    false, false, 0)
+    r.layout:pack_start(r.tabi,   false, false, 0)
+    r.layout:pack_start(r.scroll, false, false, 0)
+    r.ebox:set_child(r.layout)
+
+    -- Pack status bar elements
+    local s = w.sbar
+    s.layout:pack_start(l.ebox,   false, false, 0)
+    s.layout:pack_start(s.filler, true,  true,  0)
+    s.layout:pack_start(r.ebox,   false, false, 0)
+    s.ebox:set_child(s.layout)
+    w.layout:pack_start(s.ebox,   false, false, 0)
+
+    -- Pack input bar
+    local i = w.ibar
+    i.layout:pack_start(i.prompt, false, false, 0)
+    i.layout:pack_start(i.input,  true,  true,  0)
+    i.ebox:set_child(i.layout)
+    w.layout:pack_start(i.ebox,    false, false, 0)
+
+    apply_theme(w)
+
+    -- Other settings
+    i.input.show_frame = false
+    l.loaded:hide()
+    l.uri.selectable = true
+    r.scroll.text = "All"
+    r.tabi.text = "[0/0]"
+
+    return w
+end
+
+function attach_window_signals(w)
+    -- Attach notebook widget signals
+    w.tabs:add_signal("page-added", function(nbook, view, idx)
+        w:update_tab_count(idx)
+    end)
+
+    w.tabs:add_signal("switch-page", function(nbook, view, idx)
+        w:update_tab_count(idx)
+        w:update_win_title(view)
+        w:update_uri(view)
+        w:update_progress(view)
+        w:update_tab_hide()
+    end)
+
+    -- Attach window widget signals
+    w.win:add_signal("key-press", function(win, mods, key)
+        if w:hit(mods, key) then
+            return true
+        end
+    end)
+
+    w.win:add_signal("mode-changed", function(win, mode)
+        w:update_binds(mode)
+
+        if mode == "normal" then
+            w.ibar.prompt.text = ""
+            w.ibar.prompt:show()
+            w.ibar.input:hide()
+            w.ibar.input.text = ""
+        elseif mode == "insert" then
+            w.ibar.input:hide()
+            w.ibar.input.text = ""
+            w.ibar.prompt.text = "-- INSERT --"
+            w.ibar.prompt:show()
+        elseif mode == "command" then
+            w.ibar.prompt:hide()
+            w.ibar.prompt.text = ""
+            w.ibar.input.text = ":"
+            w.ibar.input:show()
+            w.ibar.input:focus()
+            w.ibar.input:set_position(-1)
+        end
+    end)
+
+    -- Attach inputbar widget signals
+    w.ibar.input:add_signal("changed", function()
+        -- Auto-exit "command" mode if you backspace or delete the ":"
+        -- character at the start of the input box when in "command" mode.
+        if w:is_mode("command") and not string.match(w.ibar.input.text, "^:") then
+            w:set_mode()
+        end
+    end)
+end
+
+-- Attach signal handlers to a new tab's webview
+function attach_webview_signals(w, view)
+    view:add_signal("title-changed", function (v)
+        w:update_tab_title(v)
+        if w:is_current(v) then
+            w:update_win_title(v)
+        end
+    end)
+
+    view:add_signal("property::uri", function(v)
+        w:update_tab_title(v)
+        if w:is_current(v) then
+            w:update_uri(v)
+        end
+    end)
+
+    view:add_signal("key-press", function ()
+        -- Only allow key press events to hit the webview if the user is in
+        -- "insert" mode.
+        if not w:is_mode("insert") then
+            return true
+        end
+    end)
+
+    view:add_signal("load-start", function (v)
+        if w:is_current(v) then
+            w:update_progress(v, 0)
+            w:set_mode()
+        end
+    end)
+
+    view:add_signal("progress-update", function (v)
+        if w:is_current(v) then
+            w:update_progress(v)
+        end
+    end)
+
+    view:add_signal("expose", function(v)
+        if w:is_current(v) then
+            w:update_scroll(v)
+        end
+    end)
+end
+
+
+-- Parses scroll amounts of the form:
+--   Relative: "+20%", "-20%", "+20px", "-20px"
+--   Absolute: 20, "20%", "20px"
+-- And returns an absolute value.
+function parse_scroll(current, max, value)
+    if string.match(value, "^%d+px$") then
+        return tonumber(string.match(value, "^(%d+)px$"))
+    elseif string.match(value, "^%d+%%$") then
+        return math.ceil(max * (tonumber(string.match(value, "^(%d+)%%$")) / 100))
+    elseif string.match(value, "^[\-\+]%d+px") then
+        return current + tonumber(string.match(value, "^([\-\+]%d+)px"))
+    elseif string.match(value, "^[\-\+]%d+%%$") then
+        return math.ceil(current + (max * (tonumber(string.match(value, "^([\-\+]%d+)%%$")) / 100)))
+    else
+        print("E: unable to parse scroll amount:", value)
+    end
+end
+
+-- Helper functions which operate on a windows widget structure
+window_helpers = {
+    -- Return the widget in the currently active tab
+    get_current = function(w)       return w.tabs:atindex(w.tabs:current())       end,
+    -- Check if given widget is the widget in the currently active tab
+    is_current  = function(w, wi)   return w.tabs:indexof(wi) == w.tabs:current() end,
+
+    -- Wrappers around the mode plugin
+    set_mode    = function(w, name)    mode.set(w.win, name)                              end,
+    get_mode    = function(w)          return mode.get(w.win)                             end,
+    is_mode     = function(w, name)    return name == w:get_mode()                        end,
+    is_any_mode = function(w, t, name) return util.table.hasitem(t, name or w:get_mode()) end,
+
+    navigate = function(w, uri, view)
+        (view or w:get_current()).uri = uri
+    end,
+
+    new_tab = function(w, uri)
+        local view = webview()
+        w.tabs:append(view)
+        w:update_tab_hide()
+        attach_webview_signals(w, view)
+        if uri then view.uri = uri end
+        w:update_tab_count()
+    end,
+
+    -- Wrapper around the bind plugin's hit method
+    hit = function (w, mods, key)
+        local caught, newbuf = bind.hit(w.binds or {}, mods, key, w.buffer, w:is_mode("normal"), w)
+        w.buffer = newbuf
+        w:update_buf()
+        return caught
+    end,
+
+    -- Webview scroll functions
+    scroll_vert = function(w, value, view)
+        if not view then view = w:get_current() end
+        local cur, max = view:get_scroll_vert()
+        if type(value) == "string" then
+            value = parse_scroll(cur, max, value)
+        end
+        view:set_scroll_vert(value)
+    end,
+    scroll_horiz = function(w, value)
+        if not view then view = w:get_current() end
+        local cur, max = view:get_scroll_horiz()
+        if type(value) == "string" then
+            value = parse_scroll(cur, max, value)
+        end
+        view:set_scroll_horiz(value)
+    end,
+
+
+    -- Tab traversing functions
+    next_tab = function(w, n)
+        w.tabs:switch((((n or 1) + w.tabs:current() -1) % w.tabs:count()) + 1)
+    end,
+    prev_tab = function(w, n)
+        w.tabs:switch(((w.tabs:current() - (n or 1) -1) % w.tabs:count()) + 1)
+    end,
+    goto_tab = function(w, n)
+        w.tabs:switch(n)
+    end,
+
+    -- History traversing functions
+    back = function(w, n, view)
+        (view or w:get_current()):go_back(n or 1)
+    end,
+    forward = function(w, n, view)
+        (view or w:get_current()):go_forward(n or 1)
+    end,
+
+    -- GUI content update functions
+    update_tab_count = function (w, i, t)
+        w.sbar.r.tabi.text = string.format("[%d/%d]", i or w.tabs:current(), t or w.tabs:count())
+    end,
+
+    update_tab_title = function (w, view, title)
+        w.tabs:set_title(view, title or view:get_prop("title") or view.uri or "(Untitled)")
+    end,
+
+    update_win_title = function (w, view)
+        if not view then view = w:get_current() end
+        local title = view:get_prop("title")
+        local uri = view.uri
+        if not title and not uri then return "luakit" end
+        return (title or "luakit") .. " - " .. (uri or "about:blank")
+    end,
+
+    update_uri = function (w, view, uri)
+        if not view then view = w:get_current() end
+        w.sbar.l.uri.text = (uri or view.uri or "about:blank")
+    end,
+
+    update_progress = function (w, view, p)
+        if not view then view = w:get_current() end
+        if not p then p = view:get_prop("progress") end
+        if not view:loading() or p == 1 then
+            w.sbar.l.loaded:hide()
+        else
+            w.sbar.l.loaded:show()
+            w.sbar.l.loaded.text = string.format("(%d%%)", p * 100)
+        end
+    end,
+
+    update_scroll = function (w, view)
+        if not view then view = w:get_current() end
+        local val, max = view:get_scroll_vert()
+        if max == 0 then val = "All"
+        elseif val == 0 then val = "Top"
+        elseif val == max then val = "Bot"
+        else val = string.format("%2d%%", (val/max) * 100)
+        end
+        w.sbar.r.scroll.text = val
+    end,
+
+    update_tab_hide = function (w, n)
+        if not n then n = w.tabs:count() end
+        w.tabs.show_tabs = (n ~= 1)
+    end,
+
+    update_buf = function (w)
+        if w.buffer then
+            w.sbar.r.buf.text = string.format(" %-3s", w.buffer)
+            w.sbar.r.buf:show()
+        else
+            w.sbar.r.buf:hide()
+        end
+    end,
+
+    update_binds = function (w, mode)
+        -- Generate the list of binds for this mode + all
+        w.binds = util.table.clone(mode_binds[mode])
+        for _, b in ipairs(mode_binds["all"]) do
+            table.insert(w.binds, b)
+        end
+        -- Clear & hide buffer
+        w.buffer = nil
+        w:update_buf()
+    end,
+}
+
+-- Create new window
+function new_window(uris)
+    local w = build_window()
+
+    -- Pack the window table full of the common helper functions
+    for k, v in pairs(window_helpers) do w[k] = v end
+
+    attach_window_signals(w)
+
+    -- Populate notebook with tabs
+    for _, uri in ipairs(uris or {}) do
+        w:new_tab(uri)
+    end
+
+    -- Make sure something is loaded
+    if w.tabs:count() == 0 then
+        w:new_tab(HOMEPAGE)
+    end
+
+    -- Set initial mode
+    w:set_mode()
+
+    return w
+end
+
+new_window(uris)
-- 
2.11.4.GIT