Merge pull request #121 from guywithnose/lockWindowSize

Add an option to disable client window resizes
This commit is contained in:
Iwasaki Yudai 2017-01-07 15:31:35 -08:00 committed by GitHub
commit c91fef051b
3 changed files with 18 additions and 2 deletions

View File

@ -70,6 +70,8 @@ type Options struct {
CloseSignal int `hcl:"close_signal"` CloseSignal int `hcl:"close_signal"`
Preferences HtermPrefernces `hcl:"preferences"` Preferences HtermPrefernces `hcl:"preferences"`
RawPreferences map[string]interface{} `hcl:"preferences"` RawPreferences map[string]interface{} `hcl:"preferences"`
Width int `hcl:"width"`
Height int `hcl:"height"`
} }
var Version = "0.0.13" var Version = "0.0.13"
@ -95,6 +97,8 @@ var DefaultOptions = Options{
Once: false, Once: false,
CloseSignal: 1, // syscall.SIGHUP CloseSignal: 1, // syscall.SIGHUP
Preferences: HtermPrefernces{}, Preferences: HtermPrefernces{},
Width: 0,
Height: 0,
} }
func New(command []string, options *Options) (*App, error) { func New(command []string, options *Options) (*App, error) {

View File

@ -197,14 +197,24 @@ func (context *clientContext) processReceive() {
return 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 { window := struct {
row uint16 row uint16
col uint16 col uint16
x uint16 x uint16
y uint16 y uint16
}{ }{
uint16(args.Rows), rows,
uint16(args.Columns), columns,
0, 0,
0, 0,
} }

View File

@ -37,6 +37,8 @@ func main() {
flag{"once", "", "Accept only one client and exit on disconnection"}, 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{"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{"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{ mappingHint := map[string]string{