Improve editor event handling

The editor now always handles the externally set input handlers first.
This was changed due to incorrect values being returned from the input
handler, which in turn caused the upcoming draw to be skipped. While
this didn't cause any critical problems, it made the UI feel laggy at
times. Technically certain editor shortcuts could now be overwritten
from outside, but if the user choses to do so, we shall not care.

Author: Bios-Marcel

ui/editor.go

@@ -407,8 +407,14 @@ func NewEditor() *Editor {
 	editor.buffer.Cursor.SetSelectionEnd(editor.buffer.End())
 
 	editor.internalTextView.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		// TODO: This entire chunk could be cleaned up by assigning handlers to each event type,
-		// e.g. event.trigger()
+		inputCapture := editor.inputCapture
+		if inputCapture != nil {
+			event = inputCapture(event)
+			if event == nil {
+				return nil
+			}
+		}
+
 		if shortcuts.MoveCursorLeft.Equals(event) {
 			editor.MoveCursorLeft()
 		} else if shortcuts.ExpandSelectionToLeft.Equals(event) {
@@ -462,12 +468,8 @@ func NewEditor() *Editor {
 			return nil
 		} else if shortcuts.InputNewLine.Equals(event) {
 			editor.InsertCharacter('\n')
-		} else if shortcuts.SendMessage.Equals(event) && editor.inputCapture != nil {
-			return editor.inputCapture(event)
-		} else if (editor.inputCapture == nil || editor.inputCapture(event) != nil) && event.Rune() != 0 {
+		} else if event.Rune() != 0 {
 			editor.InsertCharacter(event.Rune())
-		} else {
-			return event
 		}
 
 		editor.TriggerHeightRequestIfNecessary()

ui/window.go

@@ -631,9 +631,7 @@ func NewWindow(doRestart chan bool, app *tview.Application, session *discordgo.S
 		return autocompleteValues
 	})
 
-	captureFunc := func(event *tcell.EventKey) *tcell.EventKey {
-		messageToSend := window.messageInput.GetText()
-
+	window.messageInput.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 		if event.Modifiers() == tcell.ModCtrl {
 			if event.Key() == tcell.KeyUp {
 				window.chatView.internalTextView.ScrollUp()
@@ -685,13 +683,16 @@ func NewWindow(doRestart chan bool, app *tview.Application, session *discordgo.S
 		}
 
 		//When you are already typing a message, you probably don't want to risk loosing it.
-		if event.Key() == tcell.KeyUp && (messageToSend == "" || window.editingMessageID != nil) {
-			messageToEdit := chooseNextMessageToEdit(len(window.chatView.data)-1, -1, func(i int) int { return i - 1 })
-			if messageToEdit != nil {
-				window.startEditingMessage(messageToEdit)
-			}
+		if event.Key() == tcell.KeyUp {
+			messageToSend := window.messageInput.GetText()
+			if messageToSend == "" || window.editingMessageID != nil {
+				messageToEdit := chooseNextMessageToEdit(len(window.chatView.data)-1, -1, func(i int) int { return i - 1 })
+				if messageToEdit != nil {
+					window.startEditingMessage(messageToEdit)
+				}
 
-			return nil
+				return nil
+			}
 		}
 
 		if event.Key() == tcell.KeyDown && window.editingMessageID != nil {
@@ -744,15 +745,15 @@ func NewWindow(doRestart chan bool, app *tview.Application, session *discordgo.S
 			window.insertNewLineAtCursor()
 			return nil
 		} else if shortcuts.SendMessage.Equals(event) {
+			messageToSend := window.messageInput.GetText()
 			if window.selectedChannel != nil {
 				window.TrySendMessage(window.selectedChannel, messageToSend)
 			}
 			return nil
 		}
 
 		return event
-	}
-	window.messageInput.SetInputCapture(captureFunc)
+	})
 
 	//FIXME Buffering might just be retarded, as the event handlers are launched in separate routines either way.
 	messageInputChan := make(chan *discordgo.Message)
@@ -2420,8 +2421,10 @@ func (window *Window) startEditingMessage(message *discordgo.Message) {
 }
 
 func (window *Window) exitMessageEditMode() {
-	window.exitMessageEditModeAndKeepText()
-	window.messageInput.SetText("")
+	if window.editingMessageID != nil {
+		window.exitMessageEditModeAndKeepText()
+		window.messageInput.SetText("")
+	}
 }
 
 func (window *Window) exitMessageEditModeAndKeepText() {