Skip to content

Commit

Permalink
Merge pull request #121 from guywithnose/lockWindowSize
Browse files Browse the repository at this point in the history
Add an option to disable client window resizes
  • Loading branch information
yudai authored Jan 7, 2017
2 parents ddbaa98 + 8fd09cd commit c91fef0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
4 changes: 4 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ type Options struct {
CloseSignal int `hcl:"close_signal"`
Preferences HtermPrefernces `hcl:"preferences"`
RawPreferences map[string]interface{} `hcl:"preferences"`
Width int `hcl:"width"`
Height int `hcl:"height"`
}

var Version = "0.0.13"
Expand All @@ -95,6 +97,8 @@ var DefaultOptions = Options{
Once: false,
CloseSignal: 1, // syscall.SIGHUP
Preferences: HtermPrefernces{},
Width: 0,
Height: 0,
}

func New(command []string, options *Options) (*App, error) {
Expand Down
14 changes: 12 additions & 2 deletions app/client_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,24 @@ func (context *clientContext) processReceive() {
return
}

rows := uint16(context.app.options.Height)
if rows == 0 {
rows = uint16(args.Rows)
}

columns := uint16(context.app.options.Width)
if columns == 0 {
columns = uint16(args.Columns)
}

window := struct {
row uint16
col uint16
x uint16
y uint16
}{
uint16(args.Rows),
uint16(args.Columns),
rows,
columns,
0,
0,
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ func main() {
flag{"once", "", "Accept only one client and exit on disconnection"},
flag{"permit-arguments", "", "Permit clients to send command line arguments in URL (e.g. http://example.com:8080/?arg=AAA&arg=BBB)"},
flag{"close-signal", "", "Signal sent to the command process when gotty close it (default: SIGHUP)"},
flag{"width", "", "Static width of the screen, 0(default) means dynamically resize"},
flag{"height", "", "Static height of the screen, 0(default) means dynamically resize"},
}

mappingHint := map[string]string{
Expand Down

0 comments on commit c91fef0

Please sign in to comment.