Makefile

@@ -22,7 +22,7 @@ install: install-bin install-man install-desktop clean
 
 .PHONY: install-man
 install-man: bombadillo.1
-	gzip -c ./bombadillo.1 > ./bombadillo.1.gz
+	gzip -k ./bombadillo.1
 	install -d ${DESTDIR}${MAN1DIR}
 	install -m 0644 ./bombadillo.1.gz ${DESTDIR}${MAN1DIR}
 

bombadillo.1

@@ -111,10 +111,6 @@ Reload the current page (does not destroy forward history).
 Quick navigation to the first 10 links on a page. The 0 key will navigate to the link numbered '10', all other numbers navigate to their matching link number.
 .TP
 .B
-U
-Move up a level in the current url path. \fI/mydir/mysubdir/myfile.txt\fP would become \fI/mydir/mysubdir/\fP, and so on.
-.TP
-.B
 u
 Scroll up an amount corresponding to 75% of your terminal window height in the current document.
 .TP
@@ -257,10 +253,6 @@ homeurl
 The url that \fBbombadillo\fP navigates to when the program loads or when the \fIhome\fP or \fIh\fP LINE COMMAND is issued. This should be a valid url. If a scheme/protocol is not included, gopher will be assumed.
 .TP
 .B
-maxwidth
-The number of characters at which lines should be wrapped. If this is bigger than the available terminal width, the full width of the terminal will be used. If a non-integer or an integer less than 10 is given, a default value will be used.
-.TP
-.B
 savelocation
 The path to the directory that \fBbombadillo\fP should write files to. This must be a valid filepath for the system, must be a directory, and must already exist.
 .TP

bookmarks.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (

client.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
@@ -88,7 +73,7 @@ func (c *client) Draw() {
 	screen.WriteString("\033[0m")
 	screen.WriteString(c.TopBar.Render(c.Width, c.Options["theme"]))
 	screen.WriteString("\n")
-	pageContent := c.PageState.Render(c.Height, c.Width-1, getMaxWidth(c.Options), (c.Options["theme"] == "color"))
+	pageContent := c.PageState.Render(c.Height, c.Width-1, (c.Options["theme"] == "color"))
 	var re *regexp.Regexp
 	if c.Options["theme"] == "inverse" {
 		screen.WriteString("\033[7m")
@@ -161,47 +146,42 @@ func (c *client) TakeControlInput() {
 
 	switch input {
 	case '1', '2', '3', '4', '5', '6', '7', '8', '9', '0':
-		// Quick link
 		if input == '0' {
 			c.goToLink("10")
 		} else {
 			c.goToLink(string(input))
 		}
 	case 'j':
-		// Scroll down one line
+		// scroll down one line
 		c.ClearMessage()
 		c.Scroll(1)
 	case 'k':
-		// Scroll up one line
+		// scroll up one line
 		c.ClearMessage()
 		c.Scroll(-1)
 	case 'q':
-		// Quit
+		// quit bombadillo
 		cui.Exit(0, "")
 	case 'g':
-		// Scroll to top
+		// scroll to top
 		c.ClearMessage()
 		c.Scroll(-len(c.PageState.History[c.PageState.Position].WrappedContent))
 	case 'G':
-		// Scroll to bottom
+		// scroll to bottom
 		c.ClearMessage()
 		c.Scroll(len(c.PageState.History[c.PageState.Position].WrappedContent))
 	case 'd':
-		// Scroll down 75%
+		// scroll down 75%
 		c.ClearMessage()
 		distance := c.Height - c.Height/4
 		c.Scroll(distance)
 	case 'u':
-		// Scroll up 75%
+		// scroll up 75%
 		c.ClearMessage()
 		distance := c.Height - c.Height/4
 		c.Scroll(-distance)
-	case 'U':
-		// Move up a directory for the current host
-		url := c.PageState.History[c.PageState.Position].Location.Full
-		c.Visit(UpOneDir(url))
 	case 'b', 'h':
-		// Go back
+		// go back
 		c.ClearMessage()
 		err := c.PageState.NavigateHistory(-1)
 		if err != nil {
@@ -213,7 +193,6 @@ func (c *client) TakeControlInput() {
 			c.Draw()
 		}
 	case 'R':
-		// Refresh the current page
 		c.ClearMessage()
 		err := c.ReloadPage()
 		if err != nil {
@@ -223,11 +202,11 @@ func (c *client) TakeControlInput() {
 			c.Draw()
 		}
 	case 'B':
-		// Toggle the bookmark browser
+		// open the bookmarks browser
 		c.BookMarks.ToggleOpen()
 		c.Draw()
 	case 'f', 'l':
-		// Go forward
+		// go forward
 		c.ClearMessage()
 		err := c.PageState.NavigateHistory(1)
 		if err != nil {
@@ -239,7 +218,7 @@ func (c *client) TakeControlInput() {
 			c.Draw()
 		}
 	case '\t':
-		// Toggle bookmark browser focus
+		// Toggle bookmark browser focus on/off
 		c.BookMarks.ToggleFocused()
 		c.Draw()
 	case 'n':
@@ -279,7 +258,7 @@ func (c *client) TakeControlInput() {
 		}
 		err = c.NextSearchItem(0)
 		if err != nil {
-			c.PageState.History[c.PageState.Position].WrapContent(c.Width-1,getMaxWidth(c.Options),(c.Options["theme"] == "color"))
+			c.PageState.History[c.PageState.Position].WrapContent(c.Width-1,(c.Options["theme"] == "color"))
 			c.Draw()
 		}
 	case ':', ' ':
@@ -1009,7 +988,7 @@ func (c *client) handleGopher(u Url) {
 		} else {
 			pg.FileType = "text"
 		}
-		pg.WrapContent(c.Width-1, getMaxWidth(c.Options), (c.Options["theme"] == "color"))
+		pg.WrapContent(c.Width-1, (c.Options["theme"] == "color"))
 		c.PageState.Add(pg)
 		c.SetPercentRead()
 		c.ClearMessage()
@@ -1036,7 +1015,7 @@ func (c *client) handleGemini(u Url) {
 			u.Mime = capsule.MimeMin
 			pg := MakePage(u, capsule.Content, capsule.Links)
 			pg.FileType = capsule.MimeMaj
-			pg.WrapContent(c.Width-1, getMaxWidth(c.Options), (c.Options["theme"] == "color"))
+			pg.WrapContent(c.Width-1, (c.Options["theme"] == "color"))
 			c.PageState.Add(pg)
 			c.SetPercentRead()
 			c.ClearMessage()
@@ -1102,7 +1081,7 @@ func (c *client) handleLocal(u Url) {
 	if ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" {
 		pg.FileType = "image"
 	}
-	pg.WrapContent(c.Width-1, getMaxWidth(c.Options), (c.Options["theme"] == "color"))
+	pg.WrapContent(c.Width-1, (c.Options["theme"] == "color"))
 	c.PageState.Add(pg)
 	c.SetPercentRead()
 	c.ClearMessage()
@@ -1118,7 +1097,7 @@ func (c *client) handleFinger(u Url) {
 		return
 	}
 	pg := MakePage(u, content, []string{})
-	pg.WrapContent(c.Width-1, getMaxWidth(c.Options), (c.Options["theme"] == "color"))
+	pg.WrapContent(c.Width-1, (c.Options["theme"] == "color"))
 	c.PageState.Add(pg)
 	c.SetPercentRead()
 	c.ClearMessage()
@@ -1138,7 +1117,7 @@ func (c *client) handleWeb(u Url) {
 				return
 			}
 			pg := MakePage(u, page.Content, page.Links)
-			pg.WrapContent(c.Width-1, getMaxWidth(c.Options), (c.Options["theme"] == "color"))
+			pg.WrapContent(c.Width-1, (c.Options["theme"] == "color"))
 			c.PageState.Add(pg)
 			c.SetPercentRead()
 			c.ClearMessage()
@@ -1279,16 +1258,3 @@ func updateTimeouts(timeoutString string) error {
 
 	return nil
 }
-
-// getMaxWidth looks through the given options map and will safely return a max width to render
-// if the option is missing or malformed, it will default to 100.  A sane minimum of 10 is enforced.
-func getMaxWidth(options map[string]string) int {
-	out, err := strconv.Atoi(options["maxwidth"])
-	if err != nil {
-		out = 100
-	}
-	if out < 10 {
-		out = 10
-	}
-	return out
-}

cmdparse/lexer.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package cmdparse
 
 import (

cmdparse/parser.go

@@ -1,19 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 package cmdparse
 
 import (

config/lexer.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package config
 
 import (

config/parser.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package config
 
 import (

cui/cui.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package cui
 
 import (

defaults.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
@@ -71,7 +56,6 @@ var defaultOptions = map[string]string{
 	"theme":          "normal", // "normal", "inverted", "color"
 	"timeout":        "15",     // connection timeout for gopher/gemini in seconds
 	"webmode":        "none",   // "none", "gui", "lynx", "w3m", "elinks"
-	"maxwidth":       "100",
 }
 
 // homePath will return the path to your home directory as a string

finger/finger.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package finger
 
 import (

footbar.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (

gemini/gemini.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package gemini
 
 import (

gopher/gopher.go

@@ -1,19 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 // Contains the building blocks of a gopher client: history, url, and view.
 // History handles the browsing session and view represents individual
 // text based resources, the url represents a parsed url.

headbar.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (

help.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 // ERRS maps commands to their syntax error message

http/http_render.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package http
 
 import (

http/open_browser_darwin.go

@@ -1,19 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 // This will build for osx without a build tag based on the filename
 
 package http

http/open_browser_other.go

@@ -1,21 +1,5 @@
 // +build !darwin,!windows
 
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 package http
 
 import (

http/open_browser_windows.go

@@ -1,19 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 // This will only build for windows based on the filename
 // no build tag required
 package http

local/local.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package local
 
 import (

main.go

@@ -3,21 +3,21 @@ package main
 // Bombadillo is an internet client for the terminal of unix or
 // unix-like systems.
 //
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+// Copyright (C) 2019 Brian Evans
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import (
 	"flag"
 	"fmt"

page.go

@@ -1,25 +1,10 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
 	"fmt"
 	"strings"
+
 	"tildegit.org/sloum/bombadillo/tdiv"
-	"unicode"
 )
 
 //------------------------------------------------\\
@@ -80,12 +65,12 @@ func (p *Page) RenderImage(width int) {
 // width and updates the WrappedContent
 // of the Page struct width a string slice
 // of the wrapped data
-func (p *Page) WrapContent(width, maxWidth int, color bool) {
+func (p *Page) WrapContent(width int, color bool) {
 	if p.FileType == "image" {
 		p.RenderImage(width)
 		return
 	}
-	width = min(width, maxWidth)
+	width = min(width, 100)
 	counter := 0
 	spacer := ""
 	var content strings.Builder
@@ -98,10 +83,7 @@ func (p *Page) WrapContent(width, maxWidth int, color bool) {
 	} else if strings.HasSuffix(p.Location.Mime, "gemini") { //gemini document
 		spacer = "      "
 	}
-
-	runeArr := []rune(p.RawContent)
-	for i := 0; i < len(runeArr); i++ {
-		ch := runeArr[i]
+	for _, ch := range []rune(p.RawContent) {
 		if escape {
 			if color {
 				esc.WriteRune(ch)
@@ -127,7 +109,7 @@ func (p *Page) WrapContent(width, maxWidth int, color bool) {
 				counter = 0
 			}
 		} else if ch == '\r' || ch == '\v' || ch == '\b' || ch == '\f' || ch == '\a' {
-			// Get rid of control characters we don't want
+			// Get rid of control characters we dont want
 			continue
 		} else if ch == 27 {
 			if p.Location.Scheme == "local" {
@@ -143,24 +125,9 @@ func (p *Page) WrapContent(width, maxWidth int, color bool) {
 			}
 			continue
 		} else {
-			// peek forward to see if we can render the word without going over
-			j := i
-			for ; j < len(runeArr) && !unicode.IsSpace(runeArr[j]); j++ {
-				if counter+(j-i) > width+1 {
-					break
-				}
-			}
-
-			// if we can render the rest of the word, write the next letter. else, skip to the next line.
-			// TODO(raidancampbell): optimize this to write out the whole word, this will involve referencing the
-			// above special cases
-			if counter+(j-i) <= width+1 && !(j == i && counter == width+1) {
+			if counter <= width {
 				content.WriteRune(ch)
 				counter++
-			} else if ch == ' ' || ch == '\t' {
-				// we want to wrap and write this char, but it's a space. eat it to prevent the next line from
-				// having a leading whitespace because of our wrapping
-				counter++
 			} else {
 				content.WriteRune('\n')
 				counter = 0

page_test.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
@@ -35,9 +20,8 @@ func Test_WrapContent_Wrapped_Line_Length(t *testing.T) {
 		Color          bool
 	}
 	type args struct {
-		width    int
-		maxWidth int
-		color    bool
+		width int
+		color bool
 	}
 
 	// create a Url for use by the MakePage function
@@ -57,56 +41,22 @@ func Test_WrapContent_Wrapped_Line_Length(t *testing.T) {
 				"",
 			},
 			args{
-				10,
 				10,
 				false,
 			},
 		},
 		{
-			"multiple words should wrap at the right point",
-			"01 345 789 123456789 123456789 123456789 123456789\n",
-			[]string{
-				"01 345 789",
-				"123456789 ",
-				"123456789 ",
-				"123456789 ",
-				"123456789",
-				"",
-			},
-			args{
-				10,
-				10,
-				false,
-			},
-		},
-		{
-			"Long line wrapped to 10 columns, leading spaces omitted when wrapping",
+			"Long line wrapped to 10 columns",
 			"0123456789 123456789 123456789 123456789 123456789\n",
 			[]string{
 				"0123456789",
-				"123456789 ",
-				"123456789 ",
-				"123456789 ",
-				"123456789",
+				" 123456789",
+				" 123456789",
+				" 123456789",
+				" 123456789",
 				"",
 			},
 			args{
-				10,
-				10,
-				false,
-			},
-		},
-		{
-			"Intentional leading spaces aren't trimmed",
-			"01 345\n 789 123456789\n",
-			[]string{
-				"01 345",
-				" 789 ",
-				"123456789",
-				"",
-			},
-			args{
-				10,
 				10,
 				false,
 			},
@@ -127,7 +77,6 @@ func Test_WrapContent_Wrapped_Line_Length(t *testing.T) {
 				"",
 			},
 			args{
-				10,
 				10,
 				false,
 			},
@@ -136,7 +85,7 @@ func Test_WrapContent_Wrapped_Line_Length(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			p := MakePage(url, tt.input, []string{""})
-			p.WrapContent(tt.args.width-1, tt.args.maxWidth, tt.args.color)
+			p.WrapContent(tt.args.width-1, tt.args.color)
 			if !reflect.DeepEqual(p.WrappedContent, tt.expects) {
 				t.Errorf("Test failed - %s\nexpects %s\nactual  %s", tt.name, tt.expects, p.WrappedContent)
 			}

pages.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
@@ -75,7 +60,7 @@ func (p *Pages) Add(pg Page) {
 
 // Render wraps the content for the current page and returns
 // the page content as a string slice
-func (p *Pages) Render(termHeight, termWidth, maxWidth int, color bool) []string {
+func (p *Pages) Render(termHeight, termWidth int, color bool) []string {
 	if p.Length < 1 {
 		return make([]string, 0)
 	}
@@ -83,7 +68,7 @@ func (p *Pages) Render(termHeight, termWidth, maxWidth int, color bool) []string
 	prev := len(p.History[p.Position].WrappedContent)
 
 	if termWidth != p.History[p.Position].WrapWidth || p.History[p.Position].Color != color {
-		p.History[p.Position].WrapContent(termWidth, maxWidth, color)
+		p.History[p.Position].WrapContent(termWidth, color)
 	}
 
 	now := len(p.History[p.Position].WrappedContent)

tdiv/tdiv.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package tdiv
 
 import (

telnet/telnet.go

@@ -1,19 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 // Package telnet provides a function that starts a telnet session in a subprocess.
 package telnet
 

termios/consts_linux.go

@@ -1,21 +1,5 @@
 // +build linux
 
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 package termios
 
 import "syscall"

termios/consts_nonlinux.go

@@ -1,21 +1,5 @@
 // +build !linux
 
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 package termios
 
 import "syscall"

termios/termios.go

@@ -1,18 +1,3 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package termios
 
 import (

url.go

@@ -1,24 +1,8 @@
-/*
-* Copyright (C) 2022 Brian Evans
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 3 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
 	"fmt"
 	"os/user"
-	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -161,24 +145,6 @@ func MakeUrl(u string) (Url, error) {
 	return out, nil
 }
 
-func UpOneDir(u string) string {
-	url, err := MakeUrl(u)
-	if len(url.Resource) < 1 || err != nil {
-		return u
-	}
-	if strings.HasSuffix(url.Resource, "/") {
-		url.Resource = url.Resource[:len(url.Resource)-1]
-	}
-	url.Resource, _ = path.Split(url.Resource)
-	if url.Scheme == "gopher" {
-		url.Mime = "1"
-	}
-
-	url.Full = url.Scheme + "://" + url.Host + ":" + url.Port + "/" + url.Mime + url.Resource
-
-	return url.Full
-}
-
 func parseFinger(u string) (Url, error) {
 	var out Url
 	out.Scheme = "finger"