Vim mode experimental

.gitignore

@@ -7,8 +7,10 @@ interfacer/vendor
 interfacer/dist
 interfacer/interfacer
 interfacer/browsh
+interfacer/debug
 webextension.go
 webext/node_modules
 webext/dist/*
+webext/manifest.json~
 dist
 *.xpi

README.md

@@ -67,12 +67,12 @@ with symlinks. Anyway, to install the dependencies use: `dep ensure` inside the
 
 Then the ideal setup for development is:
   * have Webpack watch the JS code so that it rebuilds automatically:
-    `webpack --watch`
+    `webext> webpack --watch`
   * run the CLI client without giving it the responsibility to launch Firefox:
     `go run ./interfacer/src/main.go --firefox.use-existing --debug`
   * have Mozilla's handy `web-ext` tool run Firefox and reinstall the
     webextension everytime webpack rebuilds it: (in `webext/dist`)
-    `web-ext run --verbose`
+    `webext/dist> web-ext run --verbose`
 
 For generic Linux systems you can follow [this guide](https://github.com/browsh-org/browsh/blob/master/contrib/setup_linux_build_environment.md) on how to setup a build environment, that you may be able to adapt for other systems as well.
 

interfacer/Gopkg.toml

@@ -29,6 +29,10 @@
   name = "github.com/NYTimes/gziphandler"
   version = "1.0.1"
 
+[[constraint]]
+  name = "github.com/atotto/clipboard"
+  version = "0.1.1"
+
 [[constraint]]
   name = "github.com/gdamore/tcell"
   version = "1.1.0"

interfacer/src/browsh/browsh.go

@@ -3,6 +3,7 @@ package browsh
 import (
 	"encoding/base64"
 	"fmt"
+	"time"
 	"io/ioutil"
 	"net/url"
 	"os"
@@ -23,7 +24,7 @@ import (
 
 var (
 	logo = `
-////  ////
+ ////  ////
  / /   / /
  //    //
  //    //    ,,,,,,,,
@@ -72,7 +73,7 @@ func Log(msg string) {
 		}
 		defer f.Close()
 
-		msg = msg + "\n"
+		msg = time.Now().Format("01-02T15:04:05.999 ") + msg + "\n"
 		if _, wErr := f.WriteString(msg); wErr != nil {
 			Shutdown(wErr)
 		}
@@ -155,6 +156,7 @@ func TTYStart(injectedScreen tcell.Screen) {
 	Log("Starting Browsh CLI client")
 	go readStdin()
 	startWebSocketServer()
+	setupLinkHints()
 }
 
 func toInt(char string) int {
@@ -181,6 +183,12 @@ func ttyEntry() {
 		// from tcell.
 		os.Setenv("TERM", "xterm-truecolor")
 	}
+	// This is for getting the clipboard (github.com/atotto/clipboard) to work
+	// with the applications xsel and xclip on systems with an X display server.
+	if os.Getenv("DISPLAY") == "" {
+		os.Setenv("DISPLAY", ":0")
+	}
+
 	realScreen, err := tcell.NewScreen()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)

interfacer/src/browsh/comms.go

@@ -62,7 +62,7 @@ func webSocketReader(ws *websocket.Conn) {
 				triggerSocketWriterClose()
 				return
 			}
-			Shutdown(err)
+			Shutdown(errors.New(err.Error()))
 		}
 	}
 }
@@ -88,8 +88,10 @@ func handleWebextensionCommand(message []byte) {
 		}
 	case "/screenshot":
 		saveScreenshot(parts[1])
+	case "/link_hints":
+		parseJSONLinkHints(strings.Join(parts[1:], ","))
 	default:
-		Log("WEBEXT: " + string(message))
+		Log("IGNORE " + string(message))
 	}
 }
 
@@ -128,7 +130,7 @@ func webSocketWriter(ws *websocket.Conn) {
 	defer ws.Close()
 	for {
 		message = <-stdinChannel
-		Log(fmt.Sprintf("TTY sending: %s", message))
+		// chatty Log(fmt.Sprintf("TTY sending: %s", message))
 		if err := ws.WriteMessage(websocket.TextMessage, []byte(message)); err != nil {
 			if err == websocket.ErrCloseSent {
 				Log("Socket writer detected that the browser closed the websocket")

interfacer/src/browsh/config.go

@@ -73,6 +73,66 @@ func getFirefoxProfilePath() string {
 func setDefaults() {
 	// Temporary experimental configurable keybindings
 	viper.SetDefault("tty.keys.next-tab", []string{"\u001c", "28", "2"})
+
+	// Vim commands
+	vimKeyMap["normal gg"] = "scrollToTop"
+	vimKeyMap["normal G"] = "scrollToBottom"
+	vimKeyMap["normal j"] = "scrollDown"
+	vimKeyMap["normal k"] = "scrollUp"
+	vimKeyMap["normal h"] = "scrollLeft"
+	vimKeyMap["normal l"] = "scrollRight"
+	vimKeyMap["normal d"] = "scrollHalfPageDown"
+	vimKeyMap["normal <C-d>"] = "scrollHalfPageDown"
+	vimKeyMap["normal u"] = "scrollHalfPageUp"
+	vimKeyMap["normal <C-u>"] = "scrollHalfPageUp"
+	vimKeyMap["normal e"] = "editURL"
+	vimKeyMap["normal ge"] = "editURL"
+	vimKeyMap["normal gE"] = "editURLInNewTab"
+	vimKeyMap["normal H"] = "historyBack"
+	vimKeyMap["normal L"] = "historyForward"
+	vimKeyMap["normal J"] = "prevTab"
+	vimKeyMap["normal K"] = "nextTab"
+	vimKeyMap["normal r"] = "reload"
+	vimKeyMap["normal xx"] = "removeTab"
+	vimKeyMap["normal X"] = "restoreTab"
+	vimKeyMap["normal t"] = "newTab"
+	vimKeyMap["normal T"] = "searchForTab"
+	vimKeyMap["normal /"] = "findMode"
+	vimKeyMap["normal n"] = "findNext"
+	vimKeyMap["normal N"] = "findPrevious"
+	vimKeyMap["normal g0"] = "firstTab"
+	vimKeyMap["normal g$"] = "lastTab"
+	vimKeyMap["normal gu"] = "urlUp"
+	vimKeyMap["normal gU"] = "urlRoot"
+	vimKeyMap["normal <<"] = "moveTabLeft"
+	vimKeyMap["normal >>"] = "moveTabRight"
+	vimKeyMap["normal ^"] = "previouslyVisitedTab"
+	vimKeyMap["normal m"] = "makeMark"
+	vimKeyMap["normal '"] = "gotoMark"
+	vimKeyMap["normal i"] = "insertMode"
+	vimKeyMap["normal I"] = "insertModeHard"
+	vimKeyMap["normal yy"] = "copyURL"
+	vimKeyMap["normal p"] = "openClipboardURL"
+	vimKeyMap["normal P"] = "openClipboardURLInNewTab"
+	vimKeyMap["normal gi"] = "focusFirstTextInput"
+	vimKeyMap["normal f"] = "openLinkInCurrentTab"
+	vimKeyMap["normal F"] = "openLinkInNewTab"
+	vimKeyMap["normal <M-f>"] = "openMultipleLinksInNewTab"
+	vimKeyMap["normal yf"] = "copyLinkURL"
+	vimKeyMap["normal [["] = "followLinkLabeledPrevious"
+	vimKeyMap["normal ]]"] = "followLinkLabeledNext"
+	vimKeyMap["normal yt"] = "duplicateTab"
+	vimKeyMap["normal v"] = "visualMode"
+	vimKeyMap["normal ?"] = "viewHelp"
+	vimKeyMap["caret v"] = "visualMode"
+	vimKeyMap["caret h"] = "moveCaretLeft"
+	vimKeyMap["caret l"] = "moveCaretRight"
+	vimKeyMap["caret j"] = "moveCaretDown"
+	vimKeyMap["caret k"] = "moveCaretUp"
+	vimKeyMap["caret <Enter>"] = "clickAtCaretPosition"
+	vimKeyMap["visual c"] = "caretMode"
+	vimKeyMap["visual o"] = "swapVisualModeCursorPosition"
+	vimKeyMap["visual y"] = "copyVisualModeSelection"
 }
 
 func loadConfig() {

interfacer/src/browsh/firefox.go

@@ -81,7 +81,7 @@ func startHeadlessFirefox() {
 	}
 	in := bufio.NewScanner(stdout)
 	for in.Scan() {
-		Log("FF-CONSOLE: " + in.Text())
+		Log("start headless FF-CONSOLE: " + in.Text())
 	}
 }
 
@@ -179,7 +179,7 @@ func startWERFirefox() {
 			strings.Contains(in.Text(), "dbus") {
 			continue
 		}
-		Log("FF-CONSOLE: " + in.Text())
+		Log("start WER FF-CONSOLE: " + in.Text())
 	}
 	Log("WER Firefox unexpectedly closed")
 }

interfacer/src/browsh/frame_builder.go

@@ -89,6 +89,14 @@ func (f *frame) buildFrameText(incoming incomingFrameText) {
 	if !f.isIncomingFrameTextValid(incoming) {
 		return
 	}
+
+	var s = "/frame_text ";
+	for _,c := range incoming.Text {
+		if c != "" {
+			s = s + c
+		}
+	}
+	Log(s)
 	f.updateInputBoxes(incoming)
 	f.populateFrameText(incoming)
 }
@@ -160,9 +168,9 @@ func (f *frame) updateInputBoxes(incoming incomingFrameText) {
 		inputBox := f.inputBoxes[incomingInputBox.ID]
 		inputBox.X = incomingInputBox.X
 		// TODO: Why do we have to add the 1 to the y coord??
-		inputBox.Y = (incomingInputBox.Y + 1) / 2
+		inputBox.Y = (incomingInputBox.Y + 0) / 2
 		inputBox.Width = incomingInputBox.Width
-		inputBox.Height = incomingInputBox.Height / 2
+		inputBox.Height = (incomingInputBox.Height / 2) + 1
 		inputBox.FgColour = incomingInputBox.FgColour
 		inputBox.TagName = incomingInputBox.TagName
 		inputBox.Type = incomingInputBox.Type
@@ -312,7 +320,7 @@ func (f *frame) maybeFocusInputBox(x, y int) {
 		left := inputBox.X
 		right := inputBox.X + inputBox.Width
 		if x >= left && x < right && y >= top && y < bottom {
-			urlBarFocus(false)
+			URLBarFocus(false)
 			inputBox.isActive = true
 			activeInputBox = inputBox
 		}

interfacer/src/browsh/input_box.go

@@ -12,7 +12,7 @@ var activeInputBox *inputBox
 // A box into which you can enter text. Generally will be forwarded to a standard
 // HTML input box in the real browser.
 //
-// Note that tcell alreay has some ready-made code in its 'views' concept for
+// Note that tcell already has some ready-made code in its 'views' concept for
 // dealing with input areas. However, at the time of writing it wasn't well documented,
 // so it was unclear how easy it would be to integrate the requirements of Browsh's
 // input boxes - namely overlaying them onto the existing graphics and having them
@@ -181,7 +181,7 @@ func (i *inputBox) handleEnterKey(modifier tcell.ModMask) {
 		} else {
 			sendMessageToWebExtension("/url_bar," + string(i.text))
 		}
-		urlBarFocus(false)
+		URLBarFocus(false)
 	}
 	if i.isMultiLine() && modifier != tcell.ModAlt {
 		i.cursorInsertRune([]rune("\n")[0])
@@ -237,6 +237,9 @@ func handleInputBoxInput(ev *tcell.EventKey) {
 	case tcell.KeyEnter:
 		activeInputBox.removeSelectedText()
 		activeInputBox.handleEnterKey(ev.Modifiers())
+	case tcell.KeyEscape:
+		activeInputBox.isActive = false
+		activeInputBox = nil
 	case tcell.KeyRune:
 		activeInputBox.removeSelectedText()
 		activeInputBox.cursorInsertRune(ev.Rune())

interfacer/src/browsh/input_multiline.go

@@ -28,7 +28,9 @@ func (m *multiLine) convert() []rune {
 		}
 		if m.isInsideWord() {
 			// TODO: This sometimes causes a panic :/
-			m.currentWordish += m.currentCharacter
+			if m.currentCharacter != "" {
+			  m.currentWordish += m.currentCharacter
+		        }
 		} else {
 			m.addWhitespace()
 		}