Skip to content

Commit fce5adb

Browse files
committed
Merge remote-tracking branch 'upstream/main' into jq/add-telnet-server
# Conflicts: # README.md # gambaterm/colors.py # gambaterm/ssh.py # uv.lock
2 parents c4b2ef8 + 173c5d2 commit fce5adb

3 files changed

Lines changed: 156 additions & 2 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Optional arguments:
9696
SSH server
9797
----------
9898

99-
It is possible to serve the emulation through SSH. Clients must use a terminal that supports the [kitty keyboard protocol](https://sw.kovidgoyal.net/kitty/keyboard-protocol/), or use X11 forwarding (`ssh -X`) as a fallback. Use `gambaterm-ssh --help` for more information. 24-bit color is always assumed over SSH. Audio is not available over SSH.
99+
It is possible to serve the emulation through SSH. Clients with terminals supporting the [kitty keyboard protocol](https://sw.kovidgoyal.net/kitty/keyboard-protocol/) can send input directly without X11 forwarding. Otherwise, X11 forwarding (`ssh -X`) can be used as a fallback. Use `gambaterm-ssh --help` for more information. 24-bit color is always assumed over SSH. Audio is not available over SSH.
100100

101101
```shell
102102
$ gambaterm-ssh --password 123 myrom.gbc
@@ -105,7 +105,7 @@ $ gambaterm-ssh --password 123 --bind 0.0.0.0 --port 8022 myrom.gbc # Listen on
105105

106106
Connect with ssh client:
107107

108-
``shell
108+
```shell
109109
ssh localhost -p 8022
110110
```
111111

pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ dependencies = [
3737
"telnetlib3>=4.0.1,<5",
3838
]
3939

40+
[dependency-groups]
41+
dev = [
42+
"pytest>=9.0.2",
43+
]
44+
4045
[project.optional-dependencies]
4146
controller-support = ["pygame>=1.9.5,<2.0.0"]
4247

0 commit comments

Comments
 (0)