Fix merge issues in develop

buffer/buffer.go

@@ -874,7 +874,7 @@ func (buffer *Buffer) Clear() {
 }
 
 func (buffer *Buffer) ReallyClear() {
-	defer buffer.emitDisplayChange()
+	defer buffer.dirty.Notify()
 	buffer.lines = []Line{}
 	buffer.terminalState.SetScrollOffset(0)
 	buffer.SetPosition(0, 0)

gui/gui.go

@@ -436,7 +436,7 @@ func (gui *GUI) Render() error {
 	go gui.waker(stop)
 
 	for !gui.window.ShouldClose() {
-		gui.redraw()
+		gui.redraw(true)
 
 		if gui.showDebugInfo {
 			gui.textbox(2, 2, fmt.Sprintf(`Cursor:      %d,%d

gui/input.go

@@ -52,7 +52,7 @@ func (gui *GUI) updateSelectionMode(mods glfw.ModifierKey) {
 	}
 	if gui.selectionRegionMode != mode {
 		gui.selectionRegionMode = mode
-		gui.terminal.SetDirty()
+		gui.terminal.NotifyDirty()
 	}
 }
 

terminal/terminal.go

@@ -436,12 +436,3 @@ func (terminal *Terminal) Lock() {
 func (terminal *Terminal) Unlock() {
 	terminal.lock.Unlock()
 }
-
-// SetDirtyLocked sets dirty flag locking the terminal to prevent data race warnings
-// @todo remove when switching to event-driven architecture
-func (terminal *Terminal) SetDirtyLocked() {
-	terminal.Lock()
-	defer terminal.Unlock()
-
-	terminal.SetDirty()
-}