Merge pull request #45 from liamg/zsh-fix

Fix for zsh

config.go

@@ -18,6 +18,7 @@ func getConfig() *config.Config {
 
 	conf := loadConfigFile()
 
+	flag.StringVar(&conf.Shell, "shell", conf.Shell, "Specify the shell to use")
 	flag.BoolVar(&conf.DebugMode, "debug", conf.DebugMode, "Enable debug logging")
 	flag.BoolVar(&conf.Slomo, "slomo", conf.Slomo, "Render in slow motion (useful for debugging)")
 	flag.BoolVar(&conf.Rendering.AlwaysRepaint, "always-repaint", conf.Rendering.AlwaysRepaint, "Always repaint the window, even when no changes have occurred")

config/config.go

@@ -11,6 +11,7 @@ type Config struct {
 	Rendering    RenderingConfig `toml:"rendering"`
 	Slomo        bool            `toml:"slomo"`
 	ColourScheme ColourScheme    `toml:"colours"`
+	Shell        string          `toml:"shell"`
 }
 
 type RenderingConfig struct {

gui/input.go

@@ -55,6 +55,26 @@ func (gui *GUI) key(w *glfw.Window, key glfw.Key, scancode int, action glfw.Acti
 				gui.logger.Debugf("Sending CTRL^C")
 				gui.terminal.Write([]byte{0x3}) // send EOT
 				return
+			case glfw.KeyD:
+				gui.logger.Debugf("Sending CTRL^D")
+				gui.terminal.Write([]byte{0x4}) // send EOT
+				return
+			case glfw.KeyH:
+				gui.logger.Debugf("Sending CTRL^H")
+				gui.terminal.Write([]byte{0x08})
+				return
+			case glfw.KeyJ:
+				gui.logger.Debugf("Sending CTRL^J")
+				gui.terminal.Write([]byte{0x0a})
+				return
+			case glfw.KeyM:
+				gui.logger.Debugf("Sending CTRL^M")
+				gui.terminal.Write([]byte{0x0d})
+				return
+			case glfw.KeyX:
+				gui.logger.Debugf("Sending CTRL^X")
+				gui.terminal.Write([]byte{0x18})
+				return
 			}
 		case modsPressed(mods, glfw.ModAlt, glfw.ModShift):
 			modStr = "4"
@@ -199,6 +219,10 @@ func (gui *GUI) key(w *glfw.Window, key glfw.Key, scancode int, action glfw.Acti
 				})
 			}
 		case glfw.KeyEnter:
+			gui.terminal.Write([]byte{
+				0x0d,
+			})
+		case glfw.KeyKPEnter:
 			if gui.terminal.IsApplicationCursorKeysModeEnabled() {
 				gui.terminal.Write([]byte{
 					0x1b,
@@ -206,7 +230,9 @@ func (gui *GUI) key(w *glfw.Window, key glfw.Key, scancode int, action glfw.Acti
 					'M',
 				})
 			} else {
-				gui.terminal.Write([]byte{0x0d})
+				gui.terminal.Write([]byte{
+					0x0d,
+				})
 			}
 		case glfw.KeyBackspace:
 			gui.terminal.Write([]byte{0x08})

main.go

@@ -33,6 +33,10 @@ func main() {
 		logger.Fatalf("Failed to ascertain your shell: %s", err)
 	}
 
+	if conf.Shell != "" {
+		shellStr = conf.Shell
+	}
+
 	os.Setenv("TERM", "xterm-256color") // contraversial! easier than installing terminfo everywhere, but obviously going to be slightly different to xterm functionality, so we'll see...
 	os.Setenv("COLORTERM", "truecolor")
 

terminal/csi.go

@@ -395,7 +395,7 @@ func csiEraseInDisplayHandler(params []string, intermediate string, terminal *Te
 		terminal.ActiveBuffer().EraseDisplayFromCursor()
 	case "1":
 		terminal.ActiveBuffer().EraseDisplayToCursor()
-	case "2":
+	case "2", "3":
 		terminal.ActiveBuffer().EraseDisplay()
 	default:
 		return fmt.Errorf("Unsupported ED: CSI %s J", n)