Merge pull request #25 from koki-develop/feature/size-setting

Author: koki-develop

README.ja.md

@@ -280,6 +280,8 @@ actions:
 - [`defaultSpeed`](#defaultspeed) - デフォルトの入力速度。
 - [`browserBin`](#browserbin) - ブラウザの実行可能なバイナリへのパス。
 - [`skipPauseBeforeQuit`](#skippausebeforequit) - 終了前の一時停止をスキップ。
+- [`width`](#width) - ウィンドウの幅。
+- [`height`](#height) - ウィンドウの高さ。
 
 #### `loginCommand`
 
@@ -346,6 +348,26 @@ settings:
   skipPauseBeforeQuit: true
 ```
 
+#### `width`
+
+ウィンドウの幅。
+
+```yaml
+# e.g.
+settings:
+  width: 1600
+```
+
+#### `height`
+
+ウィンドウの高さ。
+
+```yaml
+# e.g.
+settings:
+  height: 800
+```
+
 ## :book: サンプル
 
 それ以外のサンプルについては [`examples/`](./examples/) ディレクトリを参照してください。

README.md

@@ -283,6 +283,8 @@ Available settings:
 - [`defaultSpeed`](#defaultspeed) - Default interval between key typing.
 - [`browserBin`](#browserbin) - Path to executable browser binary.
 - [`skipPauseBeforeQuit`](#skippausebeforequit) - Skip pause before quitting.
+- [`width`](#width) - Window width.
+- [`height`](#height) - Window height.
 
 #### `loginCommand`
 
@@ -349,6 +351,26 @@ settings:
   skipPauseBeforeQuit: true
 ```
 
+#### `width`
+
+Window width.
+
+```yaml
+# e.g.
+settings:
+  width: 1600
+```
+
+#### `height`
+
+Window height.
+
+```yaml
+# e.g.
+settings:
+  height: 800
+```
+
 ## :book: Examples
 
 For more examples see the [`examples/`](./examples/) directory.

pkg/config/config_test.go

@@ -28,6 +28,8 @@ actions:
 					DefaultSpeed:        10,
 					BrowserBin:          nil,
 					SkipPauseBeforeQuit: false,
+					Width:               nil,
+					Height:              nil,
 				},
 				Actions: []Action{
 					&PauseAction{},
@@ -45,6 +47,8 @@ settings:
   defaultSpeed: 200
   browserBin: BROWSER_BIN
   skipPauseBeforeQuit: true
+  width: 1600
+  height: 800
 actions:
   - pause
 `,
@@ -56,6 +60,8 @@ actions:
 					DefaultSpeed:        200,
 					BrowserBin:          util.String("BROWSER_BIN"),
 					SkipPauseBeforeQuit: true,
+					Width:               util.Int(1600),
+					Height:              util.Int(800),
 				},
 				Actions: []Action{
 					&PauseAction{},
@@ -90,6 +96,8 @@ actions:
 					DefaultSpeed:        10,
 					BrowserBin:          nil,
 					SkipPauseBeforeQuit: false,
+					Width:               nil,
+					Height:              nil,
 				},
 				Actions: []Action{
 					&TypeAction{Type: "Hello", Count: 1, Speed: 10},
@@ -166,6 +174,8 @@ func TestDecodeMap(t *testing.T) {
 					DefaultSpeed:        10,
 					BrowserBin:          nil,
 					SkipPauseBeforeQuit: false,
+					Width:               nil,
+					Height:              nil,
 				},
 				Actions: []Action{
 					&PauseAction{},
@@ -182,6 +192,8 @@ func TestDecodeMap(t *testing.T) {
 					"defaultSpeed":        200,
 					"browserBin":          "BROWSER_BIN",
 					"skipPauseBeforeQuit": true,
+					"width":               1600,
+					"height":              800,
 				},
 				"actions": []interface{}{"pause"},
 			},
@@ -193,6 +205,8 @@ func TestDecodeMap(t *testing.T) {
 					DefaultSpeed:        200,
 					BrowserBin:          util.String("BROWSER_BIN"),
 					SkipPauseBeforeQuit: true,
+					Width:               util.Int(1600),
+					Height:              util.Int(800),
 				},
 				Actions: []Action{
 					&PauseAction{},
@@ -221,6 +235,8 @@ func TestDecodeMap(t *testing.T) {
 					FontFamily:   nil,
 					DefaultSpeed: 10,
 					BrowserBin:   nil,
+					Width:        nil,
+					Height:       nil,
 				},
 				Actions: []Action{
 					&TypeAction{Type: "Hello", Count: 1, Speed: 10},

pkg/config/settings.go

@@ -13,6 +13,8 @@ type Settings struct {
 	DefaultSpeed        int      `mapstructure:"defaultSpeed"`
 	BrowserBin          *string  `mapstructure:"browserBin"`
 	SkipPauseBeforeQuit bool     `mapstructure:"skipPauseBeforeQuit"`
+	Width               *int     `mapstructure:"width"`
+	Height              *int     `mapstructre:"height"`
 }
 
 var settingsFields = []string{
@@ -22,6 +24,8 @@ var settingsFields = []string{
 	"defaultSpeed",
 	"browserBin",
 	"skipPauseBeforeQuit",
+	"width",
+	"height",
 }
 
 func DecodeSettings(m map[string]interface{}) (*Settings, error) {
@@ -32,6 +36,8 @@ func DecodeSettings(m map[string]interface{}) (*Settings, error) {
 		DefaultSpeed:        10,
 		BrowserBin:          nil,
 		SkipPauseBeforeQuit: false,
+		Width:               nil,
+		Height:              nil,
 	}
 	if m == nil {
 		return &stgs, nil

pkg/config/settings_test.go

@@ -23,6 +23,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -35,6 +37,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -49,6 +53,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -63,6 +69,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -77,6 +85,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -91,6 +101,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        200,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -105,6 +117,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          util.String("BROWSER_BIN"),
 				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              nil,
 			},
 			false,
 		},
@@ -119,6 +133,40 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        10,
 				BrowserBin:          nil,
 				SkipPauseBeforeQuit: true,
+				Width:               nil,
+				Height:              nil,
+			},
+			false,
+		},
+		{
+			map[string]interface{}{
+				"width": 2000,
+			},
+			&Settings{
+				LoginCommand:        []string{"bash", "--login"},
+				FontSize:            22,
+				FontFamily:          nil,
+				DefaultSpeed:        10,
+				BrowserBin:          nil,
+				SkipPauseBeforeQuit: false,
+				Width:               util.Int(2000),
+				Height:              nil,
+			},
+			false,
+		},
+		{
+			map[string]interface{}{
+				"height": 1000,
+			},
+			&Settings{
+				LoginCommand:        []string{"bash", "--login"},
+				FontSize:            22,
+				FontFamily:          nil,
+				DefaultSpeed:        10,
+				BrowserBin:          nil,
+				SkipPauseBeforeQuit: false,
+				Width:               nil,
+				Height:              util.Int(1000),
 			},
 			false,
 		},
@@ -130,6 +178,8 @@ func TestDecodeSettings(t *testing.T) {
 				"defaultSpeed":        200,
 				"browserBin":          "BROWSER_BIN",
 				"skipPauseBeforeQuit": true,
+				"width":               2000,
+				"height":              1000,
 			},
 			&Settings{
 				LoginCommand:        []string{"zsh", "--login"},
@@ -138,6 +188,8 @@ func TestDecodeSettings(t *testing.T) {
 				DefaultSpeed:        200,
 				BrowserBin:          util.String("BROWSER_BIN"),
 				SkipPauseBeforeQuit: true,
+				Width:               util.Int(2000),
+				Height:              util.Int(1000),
 			},
 			false,
 		},
@@ -156,6 +208,8 @@ func TestDecodeSettings(t *testing.T) {
 				"defaultSpeed":        200,
 				"browserBin":          "BROWSER_BIN",
 				"skipPauseBeforeQuit": true,
+				"width":               2000,
+				"height":              1000,
 				"a":                   "A",
 			},
 			nil,

pkg/ui/update.go

@@ -8,6 +8,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/go-rod/rod"
 	"github.com/go-rod/rod/lib/input"
+	"github.com/go-rod/rod/lib/proto"
 	"github.com/koki-develop/clive/pkg/browser"
 	"github.com/koki-develop/clive/pkg/config"
 	"github.com/koki-develop/clive/pkg/ttyd"
@@ -126,6 +127,13 @@ func (m *Model) openPage() (*rod.Page, error) {
 }
 
 func (m *Model) setupPage(page *rod.Page) error {
+	// window size
+	if m.config.Settings.Width != nil || m.config.Settings.Height != nil {
+		if err := page.SetWindow(&proto.BrowserBounds{Width: m.config.Settings.Width, Height: m.config.Settings.Height}); err != nil {
+			return err
+		}
+	}
+
 	// font family
 	if m.config.Settings.FontFamily != nil {
 		if _, err := page.Eval(fmt.Sprintf("() => term.options.fontFamily = '%s'", *m.config.Settings.FontFamily)); err != nil {

pkg/util/int.go

@@ -12,3 +12,7 @@ func Max(x, y int) int {
 func Digits(n int) int {
 	return len(strconv.Itoa(n))
 }
+
+func Int(v int) *int {
+	return &v
+}

pkg/util/int_test.go

@@ -81,3 +81,8 @@ func TestDigits(t *testing.T) {
 		})
 	}
 }
+
+func TestInt(t *testing.T) {
+	i := 1
+	assert.Equal(t, &i, Int(i))
+}