Merge branch 'master' into fix/134

Author: andydotxyz

cmd/fyneterm/main.go

@@ -5,6 +5,7 @@ import (
 	"flag"
 	"image/color"
 	"os"
+	"path/filepath"
 	"runtime"
 
 	"fyne.io/fyne/v2/storage"
@@ -113,18 +114,27 @@ func newTerminalWindow(a fyne.App, debug bool) fyne.Window {
 		img.FillMode = ff.BackgroundFill
 		img.Refresh()
 	}
-	wd, err := os.Getwd()
-	if err == nil {
-		setDir(wd)
+
+	t := terminal.New()
+	t.SetDebug(debug)
+	if len(os.Args) >= 2 {
+		s, err := filepath.Abs(os.Args[1])
+		if err == nil {
+			t.SetStartDir(s)
+			setDir(s)
+		}
+	} else {
+		wd, err := os.Getwd()
+		if err == nil {
+			setDir(wd)
+		}
 	}
 
 	a.Settings().AddListener(func(s fyne.Settings) {
 		bg.FillColor = theme.Color(theme.ColorNameBackground)
 		bg.Refresh()
 	})
 
-	t := terminal.New()
-	t.SetDebug(debug)
 	setupListener(t, w)
 	sizeOverride := container.NewThemeOverride(container.NewStack(bg, img, t), th)
 	w.SetContent(sizeOverride)

go.mod

@@ -3,7 +3,7 @@ module github.com/fyne-io/terminal
 go 1.19
 
 require (
-	fyne.io/fyne/v2 v2.7.1-0.20251030181611-4bc1d5fd5b88
+	fyne.io/fyne/v2 v2.7.1-0.20251105193630-e5ef0983771f
 	github.com/ActiveState/termtest/conpty v0.5.0
 	github.com/creack/pty v1.1.21
 	github.com/fyshos/fancyfs v0.0.0-20250930151016-696fe12cefc6

go.sum

@@ -1,5 +1,7 @@
-fyne.io/fyne/v2 v2.7.1-0.20251030181611-4bc1d5fd5b88 h1:z/Egg/TPFUoTyB/peOdaEmgjcwQOqPy3Aju2UQvzwpA=
-fyne.io/fyne/v2 v2.7.1-0.20251030181611-4bc1d5fd5b88/go.mod h1:xClVlrhxl7D+LT+BWYmcrW4Nf+dJTvkhnPgji7spAwE=
+fyne.io/fyne/v2 v2.7.0 h1:GvZSpE3X0liU/fqstInVvRsaboIVpIWQ4/sfjDGIGGQ=
+fyne.io/fyne/v2 v2.7.0/go.mod h1:xClVlrhxl7D+LT+BWYmcrW4Nf+dJTvkhnPgji7spAwE=
+fyne.io/fyne/v2 v2.7.1-0.20251105193630-e5ef0983771f h1:auI30rQbwHL8s4tLhre/RwUWw/OT2+oTuhEp+GBl6LU=
+fyne.io/fyne/v2 v2.7.1-0.20251105193630-e5ef0983771f/go.mod h1:xo+SRRY+GLd0bNX/g8/FdXZ5Xlltobi1BA4VSNiEzpE=
 fyne.io/systray v1.11.1-0.20250603113521-ca66a66d8b58 h1:eA5/u2XRd8OUkoMqEv3IBlFYSruNlXD8bRHDiqm0VNI=
 fyne.io/systray v1.11.1-0.20250603113521-ca66a66d8b58/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
 github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8=

input.go

@@ -192,28 +192,30 @@ func (t *Terminal) TypedShortcut(s fyne.Shortcut) {
 		t.ShortcutHandler.TypedShortcut(s)
 	} else {
 		// we need to override the default ctrl-X/C/V/A for non-mac and do it ourselves
-
-		if ct, ok := s.(*fyne.ShortcutCut); ok {
-			if ct.Secondary {
+  	switch sh := cts.(type) {
+		case *fyne.ShortcutCut:
+			if sh.Secondary {
 				// shift+del - cut is no-op
 			} else {
 				_, _ = t.in.Write([]byte{0x18})
 			}
-		} else if cp, ok := s.(*fyne.ShortcutCopy); ok {
-			if cp.Secondary {
+		case *fyne.ShortcutCopy:
+			if sh.Secondary {
 				t.copySelectedText(fyne.CurrentApp().Clipboard()) // ctrl+ins
 			} else {
 				_, _ = t.in.Write([]byte{0x3})
 			}
-		} else if ps, ok := s.(*fyne.ShortcutPaste); ok {
-			if ps.Secondary {
+		case *fyne.ShortcutPaste:
+			if sh.Secondary {
 				t.pasteText(fyne.CurrentApp().Clipboard(), true) // shift+ins
 			} else {
 				_, _ = t.in.Write([]byte{0x16})
 			}
-		} else if _, ok := s.(*fyne.ShortcutUndo); ok {
+		case *fyne.ShortcutUndo:
 			_, _ = t.in.Write([]byte{0x1a})
-		} else if _, ok := s.(*fyne.ShortcutSelectAll); ok {
+		case *fyne.ShortcutRedo:
+			_, _ = t.in.Write([]byte{0x19})
+		case *fyne.ShortcutSelectAll:
 			_, _ = t.in.Write([]byte{0x1})
 		}
 	}

term.go

@@ -404,7 +404,11 @@ func (t *Terminal) run() {
 
 // RunLocalShell starts the terminal by loading a shell and starting to process the input/output.
 func (t *Terminal) RunLocalShell() error {
-	t.config.PWD, _ = os.Getwd()
+	if t.startDir != "" {
+		t.config.PWD = t.startDir
+	} else {
+		t.config.PWD, _ = os.Getwd()
+	}
 	for t.config.Columns == 0 { // don't load the TTY until our output is configured
 		time.Sleep(time.Millisecond * 50)
 	}
@@ -420,7 +424,11 @@ func (t *Terminal) RunLocalShell() error {
 
 // RunWithConnection starts the terminal by connecting to an external resource like an SSH connection.
 func (t *Terminal) RunWithConnection(in io.WriteCloser, out io.Reader) error {
-	t.config.PWD, _ = os.Getwd()
+	if t.startDir != "" {
+		t.config.PWD = t.startDir
+	} else {
+		t.config.PWD, _ = os.Getwd()
+	}
 	for t.config.Columns == 0 { // don't load the TTY until our output is configured
 		time.Sleep(time.Millisecond * 50)
 	}

term_unix.go

@@ -40,6 +40,7 @@ func (t *Terminal) startPTY() (io.WriteCloser, io.Reader, io.Closer, error) {
 	c.Dir = t.startingDir()
 	c.Env = env
 	t.cmd = c
+	t.config.PWD = c.Dir
 
 	go func() {
 		for {