Replace tilde characters with home directory when saving and loading files

config/config.yml

@@ -5,5 +5,6 @@ selected_style_fallback: "default-fallback" # Style for 8-color capable terminal
 # Other
 show_top_menu: true
 show_line_index: true
+extend_line_index: false # Extend line index to the bottom of the screen
 buffer_info_message: "File: %f Cursor: (%x, %y, %p) Chars: %c"
 tab_indentation: 4 # Length of tab characters

src/buffer.go

@@ -98,6 +98,16 @@ func (buffer *Buffer) Load() error {
 		return nil
 	}
 
+	// Replace tilde with home directory
+	if strings.HasPrefix(buffer.filename, "~/") {
+		homedir, err := os.UserHomeDir()
+		if err != nil {
+			return err
+		}
+
+		buffer.filename = filepath.Join(homedir, buffer.filename[2:])
+	}
+
 	content, err := os.ReadFile(buffer.filename)
 	if err != nil {
 		return err
@@ -113,6 +123,16 @@ func (buffer *Buffer) Save() error {
 		return nil
 	}
 
+	// Replace tilde with home directory
+	if strings.HasPrefix(buffer.filename, "~/") {
+		homedir, err := os.UserHomeDir()
+		if err != nil {
+			return err
+		}
+
+		buffer.filename = filepath.Join(homedir, buffer.filename[2:])
+	}
+
 	// Append new line character at end of buffer contents if not present
 	if buffer.Contents[len(buffer.Contents)-1] != '\n' {
 		buffer.Contents += "\n"
@@ -164,6 +184,70 @@ func (buffer *Buffer) GetSelectedText() string {
 	}
 }
 
+func (buffer *Buffer) CopyText() (string, int) {
+	if buffer.Selection == nil {
+		// Copy line
+		copiedText := ""
+
+		// Add current letter to copied text
+		if buffer.CursorPos < len(buffer.Contents) {
+			copiedText = string(buffer.Contents[buffer.CursorPos])
+		}
+
+		// Find end of line
+		for i := buffer.CursorPos + 1; i < len(buffer.Contents); i++ {
+			currentLetter := buffer.Contents[i]
+
+			copiedText += string(currentLetter)
+			if currentLetter == '\n' {
+				break
+			}
+		}
+
+		// Find start of line
+		for i := buffer.CursorPos - 1; i >= 0; i-- {
+			currentLetter := buffer.Contents[i]
+			if currentLetter != '\n' {
+				copiedText = string(currentLetter) + copiedText
+			} else {
+				break
+			}
+		}
+
+		return copiedText, 0
+	} else {
+		// Copy selection
+		return buffer.GetSelectedText(), 1
+	}
+}
+
+func (buffer *Buffer) PasteText(window *Window, text string) {
+	str := buffer.Contents
+
+	// Remove selected text
+	if buffer.Selection != nil {
+		edge1, edge2 := buffer.GetSelectionEdges()
+		if edge2 == len(buffer.Contents) {
+			edge2 = len(buffer.Contents) - 1
+		}
+
+		str = str[:edge1] + str[edge2+1:]
+		buffer.Contents = str
+		window.SetCursorPos(edge1)
+		buffer.Selection = nil
+	}
+
+	index := buffer.CursorPos
+
+	if index == len(str) {
+		str += text
+	} else {
+		str = str[:index] + text + str[index:]
+	}
+	buffer.Contents = str
+	window.SetCursorPos(buffer.CursorPos + len(text))
+}
+
 func GetOpenFileBuffer(filename string) *Buffer {
 	// Replace tilde with home directory
 	if filename != "~" && strings.HasPrefix(filename, "~/") {

src/command.go

@@ -21,14 +21,16 @@ func initCommands() {
 	copyCmd := Command{
 		cmd: "copy",
 		run: func(window *Window, args ...string) {
-			if window.CurrentBuffer.Selection == nil {
-				// Copy line
-				_, line := window.GetCursorPos2D()
-				window.Clipboard = strings.SplitAfter(window.CurrentBuffer.Contents, "\n")[line]
+			// Copy text from buffer
+			copiedText, copyingMethod := window.CurrentBuffer.CopyText()
+
+			// Put copied text to clipboard
+			window.Clipboard = copiedText
+
+			// Send appropriate message depending on copying method
+			if copyingMethod == 0 {
 				PrintMessage(window, "Copied line to clipboard.")
 			} else {
-				// Copy selection
-				window.Clipboard = window.CurrentBuffer.GetSelectedText()
 				PrintMessage(window, "Copied selection to clipboard.")
 			}
 		},
@@ -37,16 +39,10 @@ func initCommands() {
 	pasteCmd := Command{
 		cmd: "paste",
 		run: func(window *Window, args ...string) {
-			str := window.CurrentBuffer.Contents
-			index := window.CurrentBuffer.CursorPos
-
-			if index == len(str) {
-				str += window.Clipboard
-			} else {
-				str = str[:index] + window.Clipboard + str[index:]
+			if window.Clipboard != "" {
+				window.CurrentBuffer.PasteText(window, window.Clipboard)
+				PrintMessage(window, "Pasted text to buffer.")
 			}
-			window.CurrentBuffer.Contents = str
-			window.SetCursorPos(window.CurrentBuffer.CursorPos + len(window.Clipboard))
 		},
 	}
 

src/config.go

@@ -12,6 +12,7 @@ type TyperConfig struct {
 	FallbackStyle     string `yaml:"fallback_style,omitempty"`
 	ShowTopMenu       bool   `yaml:"show_top_menu,omitempty"`
 	ShowLineIndex     bool   `yaml:"show_line_index,omitempty"`
+	ExtendLineIndex   bool   `yaml:"extend_line_index,omitempty"`
 	BufferInfoMessage string `yaml:"buffer_info_message,omitempty"`
 	TabIndentation    int    `yaml:"tab_indentation,omitempty"`
 }
@@ -24,6 +25,7 @@ func readConfig() {
 		FallbackStyle:     "default-fallback",
 		ShowTopMenu:       true,
 		ShowLineIndex:     true,
+		ExtendLineIndex:   false,
 		BufferInfoMessage: "File: %f Cursor: (%x, %y, %p) Chars: %c",
 		TabIndentation:    4,
 	}

src/line_index.go

@@ -12,16 +12,22 @@ func drawLineIndex(window *Window) {
 
 	lineIndexStyle := tcell.StyleDefault.Background(CurrentStyle.LineIndexBg).Foreground(CurrentStyle.LineIndexFg)
 
-	_, sizeY := screen.Size()
-
-	y := 0
-	if window.ShowTopMenu {
-		y = 1
-	}
-
 	lineIndexSize := getLineIndexSize(window)
 
-	for lineIndex := 1 + buffer.OffsetY; lineIndex <= strings.Count(buffer.Contents, "\n")+1 && lineIndex < sizeY+buffer.OffsetY; lineIndex++ {
+	_, bufferY1, _, bufferY2 := window.GetTextAreaDimensions()
+
+	lineIndex := 1 + buffer.OffsetY
+	for y := bufferY1; y <= bufferY2; y++ {
+		if lineIndex > strings.Count(buffer.Contents, "\n")+1 {
+			if Config.ExtendLineIndex {
+				for x := 0; x < lineIndexSize; x++ {
+					screen.SetContent(x, y, ' ', nil, lineIndexStyle)
+				}
+				continue
+			} else {
+				break
+			}
+		}
 
 		for x := 0; x < lineIndexSize; x++ {
 			screen.SetContent(x, y, ' ', nil, lineIndexStyle)
@@ -30,7 +36,8 @@ func drawLineIndex(window *Window) {
 		text := strconv.Itoa(lineIndex)
 
 		drawText(screen, lineIndexSize-len(text)-1, y, lineIndexSize, y, lineIndexStyle, text)
-		y++
+
+		lineIndex++
 	}
 }
 

src/main.go

@@ -40,6 +40,7 @@ func main() {
 
 	for window.screen != nil {
 		window.Draw()
+		window.ProcessEvents()
 	}
 
 }

src/window.go

@@ -126,7 +126,9 @@ func (window *Window) Draw() {
 
 	// Update screen
 	window.screen.Show()
+}
 
+func (window *Window) ProcessEvents() {
 	// Poll event
 	ev := window.screen.PollEvent()
 
@@ -136,13 +138,13 @@ func (window *Window) Draw() {
 		window.screen.Sync()
 		window.SyncBufferOffset()
 	case *tcell.EventMouse:
-		window.mouseInput(ev)
+		window.handleMouseInput(ev)
 	case *tcell.EventKey:
-		window.input(ev)
+		window.handleKeyInput(ev)
 	}
 }
 
-func (window *Window) input(ev *tcell.EventKey) {
+func (window *Window) handleKeyInput(ev *tcell.EventKey) {
 	if ev.Key() == tcell.KeyRight { // Navigation Keys
 		if window.CursorMode == CursorModeBuffer {
 			// Get original cursor position
@@ -515,7 +517,7 @@ func (window *Window) input(ev *tcell.EventKey) {
 	}
 }
 
-func (window *Window) mouseInput(ev *tcell.EventMouse) {
+func (window *Window) handleMouseInput(ev *tcell.EventMouse) {
 	mouseX, mouseY := ev.Position()
 
 	// Left click was pressed