From: Kostis Karantias <kkarantias@gmail.com>
To: ~taiite/public-inbox@lists.sr.ht
Cc: Kostis Karantias <kkarantias@gmail.com>
Subject: [PATCH senpai 4/4] Make nick list width configurable
Date: Mon,  9 Nov 2020 19:16:34 +0200
Message-Id: <20201109171634.12110-4-kkarantias@gmail.com>
In-Reply-To: <20201109171634.12110-1-kkarantias@gmail.com>
References: <20201109171634.12110-1-kkarantias@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

---
 app.go           |  1 +
 config.go        | 12 ++++++++----
 doc/senpai.5.scd |  3 +++
 ui/ui.go         | 23 +++++++++++------------
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app.go b/app.go
index 856043d..0b97e01 100644
--- a/app.go
+++ b/app.go
@@ -38,6 +38,7 @@ func NewApp(cfg Config) (app *App, err error) {
 	app.win, err =3D ui.New(ui.Config{
 		NickColWidth: cfg.NickColWidth,
 		ChanColWidth: cfg.ChanColWidth,
+		NickListWidth: cfg.NickListWidth,
 		AutoComplete: func(cursorIdx int, text []rune) []ui.Completion {
 			return app.completions(cursorIdx, text)
 		},
diff --git a/config.go b/config.go
index 2515e57..6e8fb07 100644
--- a/config.go
+++ b/config.go
@@ -13,10 +13,11 @@ type Config struct {
 	User     string
 	Password *string
=20
-	Highlights   []string
-	OnHighlight  string `yaml:"on-highlight"`
-	NickColWidth int    `yaml:"nick-column-width"`
-	ChanColWidth int    `yaml:"chan-column-width"`
+	Highlights    []string
+	OnHighlight   string   `yaml:"on-highlight"`
+	NickColWidth  int      `yaml:"nick-column-width"`
+	ChanColWidth  int      `yaml:"chan-column-width"`
+	NickListWidth int      `yaml:"nick-list-width"`
=20
 	Debug bool
 }
@@ -29,6 +30,9 @@ func ParseConfig(buf []byte) (cfg Config, err error) {
 	if cfg.ChanColWidth <=3D 0 {
 		cfg.ChanColWidth =3D 16
 	}
+	if cfg.NickListWidth <=3D 0 {
+		cfg.NickListWidth =3D 16
+	}
 	return
 }
=20
diff --git a/doc/senpai.5.scd b/doc/senpai.5.scd
index 5c79060..6fe3edf 100644
--- a/doc/senpai.5.scd
+++ b/doc/senpai.5.scd
@@ -61,6 +61,9 @@ Some settings are required, the others are optional.
 *chan-column-width*
 	The number of cell that the column for channels occupies.  By default, =
16.
=20
+*nick-list-width*
+	The number of cells that the nick list occupies.  By default, 16.
+
 # EXAMPLES
=20
 A minimal configuration file to connect to freenode as "Guest123456":
diff --git a/ui/ui.go b/ui/ui.go
index 457f41d..6aef320 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -8,12 +8,11 @@ import (
 	"git.sr.ht/~taiite/senpai/irc"
 )
=20
-const nickListColWidth =3D 15
-
 type Config struct {
-	NickColWidth int
-	ChanColWidth int
-	AutoComplete func(cursorIdx int, text []rune) []Completion
+	NickColWidth  int
+	ChanColWidth  int
+	NickListWidth int
+	AutoComplete  func(cursorIdx int, text []rune) []Completion
 }
=20
 type UI struct {
@@ -207,18 +206,18 @@ func (ui *UI) InputEnter() (content string) {
 	return ui.e.Flush()
 }
=20
-func (ui *UI) nickListColWidth() int {
+func (ui *UI) nickListWidth() int {
 	// TODO: also check for /query buffers when we get support
 	if !ui.bs.IsAtHome() {
-		return nickListColWidth
+		return ui.config.NickListWidth
 	}
 	return 0
 }
=20
 func (ui *UI) Resize() {
 	w, h :=3D ui.screen.Size()
-	ui.e.Resize(w - 9 - ui.config.ChanColWidth - ui.config.NickColWidth - u=
i.nickListColWidth())
-	ui.bs.ResizeTimeline(w-ui.config.ChanColWidth - ui.nickListColWidth(), =
h-2, ui.config.NickColWidth)
+	ui.e.Resize(w - 9 - ui.config.ChanColWidth - ui.config.NickColWidth - u=
i.nickListWidth())
+	ui.bs.ResizeTimeline(w-ui.config.ChanColWidth - ui.nickListWidth(), h-2=
, ui.config.NickColWidth)
 }
=20
 func (ui *UI) Draw() {
@@ -229,10 +228,10 @@ func (ui *UI) Draw() {
=20
 	ui.bs.DrawTimeline(ui.screen, ui.config.ChanColWidth, 0, ui.config.Nick=
ColWidth)
 	ui.bs.DrawVerticalBufferList(ui.screen, 0, 0, ui.config.ChanColWidth, h=
)
-	if ui.nickListColWidth() > 0 {
-		ui.bs.DrawVerticalNickList(ui.screen, w-ui.nickListColWidth(), 0, ui.n=
ickListColWidth(), h)
+	if ui.nickListWidth() > 0 {
+		ui.bs.DrawVerticalNickList(ui.screen, w-ui.nickListWidth(), 0, ui.nick=
ListWidth(), h)
 	}
-	ui.drawStatusBar(ui.config.ChanColWidth, h-2, w-ui.config.ChanColWidth-=
ui.nickListColWidth())
+	ui.drawStatusBar(ui.config.ChanColWidth, h-2, w-ui.config.ChanColWidth-=
ui.nickListWidth())
=20
 	for x :=3D ui.config.ChanColWidth; x < 9+ui.config.ChanColWidth+ui.conf=
ig.NickColWidth; x++ {
 		ui.screen.SetContent(x, h-1, ' ', nil, tcell.StyleDefault)
--=20
2.29.2