Make every widget a keyboard widget

Signed-off-by: Chris Cummer <chriscummer@me.com>

app/wtf_app.go

@@ -22,8 +22,8 @@ type WtfApp struct {
 	config         *config.Config
 	configFilePath string
 	display        *Display
-	ghUser         *support.GitHubUser
 	focusTracker   FocusTracker
+	ghUser         *support.GitHubUser
 	pages          *tview.Pages
 	validator      *ModuleValidator
 	widgets        []wtf.Wtfable

modules/azuredevops/widget.go

@@ -21,7 +21,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
 		settings:   settings,
 	}
 

modules/bamboohr/widget.go

@@ -21,7 +21,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/buildkite/keyboard.go

@@ -1,5 +1,5 @@
 package buildkite
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 }

modules/buildkite/widget.go

@@ -7,12 +7,7 @@ import (
 	"github.com/wtfutil/wtf/view"
 )
 
-const HelpText = `
- Keyboard commands for Buildkite:
-`
-
 type Widget struct {
-	view.KeyboardWidget
 	view.TextWidget
 	settings *Settings
 
@@ -22,13 +17,11 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
-		settings:       settings,
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
+		settings:   settings,
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.View.SetScrollable(true)
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/cds/favorites/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next workflow")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous workflow")

modules/cds/favorites/widget.go

@@ -14,7 +14,6 @@ import (
 // Widget define wtf widget to register widget later
 type Widget struct {
 	view.MultiSourceWidget
-	view.KeyboardWidget
 	view.TextWidget
 
 	workflows []sdk.Workflow
@@ -30,16 +29,14 @@ type Widget struct {
 // NewWidget creates a new instance of the widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "workflow", "workflows"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
 	widget.View.SetRegions(true)
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetDisplayFunction(widget.display)
 
 	widget.Unselect()
@@ -110,11 +107,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-// HelpText displays the widgets controls
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) buildWorkflowsCollection() []sdk.Workflow {

modules/cds/queue/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next workflow")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous workflow")

modules/cds/queue/widget.go

@@ -14,7 +14,6 @@ import (
 // Widget define wtf widget to register widget later
 type Widget struct {
 	view.MultiSourceWidget
-	view.KeyboardWidget
 	view.TextWidget
 
 	filters []string
@@ -30,16 +29,14 @@ type Widget struct {
 // NewWidget creates a new instance of the widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "workflow", "workflows"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
 	widget.View.SetRegions(true)
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetDisplayFunction(widget.display)
 
 	widget.Unselect()
@@ -111,11 +108,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-// HelpText displays the widgets controls
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) currentFilter() string {

modules/cds/status/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next line")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous line")

modules/cds/status/widget.go

@@ -14,7 +14,6 @@ import (
 // Widget define wtf widget to register widget later
 type Widget struct {
 	view.MultiSourceWidget
-	view.KeyboardWidget
 	view.TextWidget
 
 	filters []string
@@ -30,16 +29,14 @@ type Widget struct {
 // NewWidget creates a new instance of the widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "workflow", "workflows"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
 	widget.View.SetRegions(true)
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetDisplayFunction(widget.display)
 
 	widget.Unselect()
@@ -111,11 +108,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-// HelpText displays the widgets controls
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) openWorkflow() {

modules/circleci/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 		Client:     NewClient(settings.apiKey),
 
 		settings: settings,

modules/clocks/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		app:        app,
 		settings:   settings,

modules/cmdrunner/widget.go

@@ -29,7 +29,7 @@ type Widget struct {
 // NewWidget creates a new instance of the widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 		buffer:   &bytes.Buffer{},

modules/cryptoexchanges/bittrex/widget.go

@@ -31,7 +31,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings:    settings,
 		summaryList: summaryList{},

modules/cryptoexchanges/blockfolio/widget.go

@@ -20,7 +20,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		device_token: settings.deviceToken,
 		settings:     settings,

modules/cryptoexchanges/cryptolive/widget.go

@@ -22,7 +22,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		priceWidget:   price.NewWidget(settings.priceSettings),
 		toplistWidget: toplist.NewWidget(settings.toplistSettings),

modules/datadog/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/datadog/widget.go

@@ -10,7 +10,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	monitors []datadog.Monitor
@@ -20,15 +19,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 
@@ -66,10 +63,6 @@ func (widget *Widget) Render() {
 	widget.Redraw(widget.content)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) content() (string, string, bool) {

modules/devto/keyboard.go

@@ -3,7 +3,7 @@ package devto
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("d", widget.Next, "Select next item")
 	widget.SetKeyboardChar("a", widget.Prev, "Select previous item")

modules/devto/widget.go

@@ -12,8 +12,8 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
+
 	articles []devto.ListedArticle
 	settings *Settings
 	err      error
@@ -21,8 +21,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
@@ -30,7 +29,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.SetRenderFunction(widget.Render)
 	widget.View.SetScrollable(true)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/digitalclock/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 // NewWidget creates a new widget using settings
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		app:      app,
 		settings: settings,

modules/digitalocean/keyboard.go

@@ -3,7 +3,7 @@ package digitalocean
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("?", widget.showInfo, "Show info about the selected droplet")
 

modules/digitalocean/widget.go

@@ -30,7 +30,6 @@ func (t *tokenSource) Token() (*oauth2.Token, error) {
 
 // Widget is the container for droplet data
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	app      *tview.Application
@@ -45,8 +44,7 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		app:      app,
 		pages:    pages,
@@ -54,7 +52,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.View.SetScrollable(true)
 
@@ -79,11 +76,6 @@ func (widget *Widget) Fetch() error {
 	return err
 }
 
-// HelpText returns the help text for this widget
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 // Next selects the next item in the list
 func (widget *Widget) Next() {
 	widget.ScrollableWidget.Next()

modules/docker/widget.go

@@ -18,7 +18,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
 		settings:   settings,
 	}
 

modules/exchangerates/widget.go

@@ -20,7 +20,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}

modules/feedreader/keyboard.go

@@ -3,7 +3,7 @@ package feedreader
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/feedreader/widget.go

@@ -28,7 +28,6 @@ type FeedItem struct {
 
 // Widget is the container for RSS and Atom data
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	stories  []*FeedItem
@@ -66,8 +65,7 @@ func getShowText(feedItem *FeedItem, showType ShowType) string {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		parser:   gofeed.NewParser(),
 		settings: settings,
@@ -76,7 +74,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/finnhub/widget.go

@@ -19,8 +19,8 @@ type Widget struct {
 // NewWidget ..
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
 		Client:     NewClient(settings.symbols, settings.apiKey),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/football/widget.go

@@ -38,6 +38,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	var widget Widget
+
 	leagueId, err := getLeague(settings.league)
 	if err != nil {
 		widget = Widget{
@@ -45,14 +46,17 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 			Client:   NewClient(settings.apiKey),
 			settings: settings,
 		}
+
 		return &widget
 	}
+
 	widget = Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
 		Client:     NewClient(settings.apiKey),
 		League:     leagueId,
 		settings:   settings,
 	}
+
 	return &widget
 }
 

modules/gcal/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		app:      app,
 		settings: settings,

modules/gerrit/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("h", widget.prevProject, "Select previous project")
 	widget.SetKeyboardChar("l", widget.nextProject, "Select next project")

modules/gerrit/widget.go

@@ -13,7 +13,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.TextWidget
 
 	gerrit *glb.Client
@@ -32,8 +31,7 @@ var (
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		Idx: 0,
 
@@ -41,7 +39,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 
@@ -92,10 +89,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) nextProject() {

modules/git/keyboard.go

@@ -3,7 +3,7 @@ package git
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")

modules/git/settings.go

@@ -36,7 +36,3 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
 func (widget *Widget) ConfigText() string {
 	return utils.HelpFromInterface(Settings{})
 }
-
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}

modules/git/widget.go

@@ -18,7 +18,6 @@ const (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -31,9 +30,8 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "repository", "repositories"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		app:      app,
 		pages:    pages,
@@ -41,7 +39,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.SetDisplayFunction(widget.display)
 

modules/github/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/github/widget.go

@@ -12,7 +12,6 @@ import (
 // Widget define wtf widget to register widget later
 type Widget struct {
 	view.MultiSourceWidget
-	view.KeyboardWidget
 	view.TextWidget
 
 	GithubRepos []*Repo
@@ -26,9 +25,8 @@ type Widget struct {
 // NewWidget creates a new instance of the widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "repository", "repositories"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
@@ -37,7 +35,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget.initializeKeyboardControls()
 	widget.View.SetRegions(true)
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetDisplayFunction(widget.display)
 
 	widget.Unselect()
@@ -103,11 +100,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-// HelpText displays the widgets controls
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) buildRepoCollection(repoData []string) []*Repo {

modules/gitlab/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/gitlab/widget.go

@@ -15,7 +15,6 @@ type ContentItem struct {
 
 type Widget struct {
 	view.MultiSourceWidget
-	view.KeyboardWidget
 	view.TextWidget
 
 	GitlabProjects []*GitlabProject
@@ -34,9 +33,8 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	context, err := newContext(settings)
 
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "repository", "repositories"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		context:  context,
 		settings: settings,
@@ -48,7 +46,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget.initializeKeyboardControls()
 	widget.View.SetRegions(true)
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetDisplayFunction(widget.display)
 
 	widget.Unselect()
@@ -73,10 +70,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 // SetItemCount sets the amount of PRs RRs and other PRs throughout the widgets display creation
 func (widget *Widget) SetItemCount(items int) {
 	widget.maxItems = items

modules/gitlabtodo/widget.go

@@ -10,7 +10,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	todos        []*gitlab.Todo
@@ -21,8 +20,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
@@ -31,7 +29,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/gitter/keyboard.go

@@ -3,7 +3,7 @@ package gitter
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/gitter/widget.go

@@ -10,7 +10,6 @@ import (
 
 // A Widget represents a Gitter widget
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	messages []Message
@@ -20,15 +19,13 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Refresh)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 
@@ -65,10 +62,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) display() {

modules/googleanalytics/widget.go

@@ -13,7 +13,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/grafana/widget.go

@@ -10,7 +10,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.TextWidget
 
 	Client   *Client
@@ -23,8 +22,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		Client:   NewClient(settings),
 		Selected: -1,
@@ -34,7 +32,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget.initializeKeyboardControls()
 	widget.View.SetRegions(true)
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 
@@ -91,10 +88,6 @@ func (widget *Widget) Unselect() {
 
 /* -------------------- Unexported Functions -------------------- */
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 func (widget *Widget) openAlert() {
 	currentSelection := widget.View.GetHighlights()
 	if widget.Selected >= 0 && currentSelection[0] != "" {

modules/gspreadsheets/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/hackernews/keyboard.go

@@ -3,7 +3,7 @@ package hackernews
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/hackernews/widget.go

@@ -11,7 +11,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	stories  []Story
@@ -21,15 +20,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/hibp/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := &Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/ipaddresses/ipapi/widget.go

@@ -38,7 +38,7 @@ type ipinfo struct {
 // NewWidget constructor
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/ipaddresses/ipinfo/widget.go

@@ -32,7 +32,7 @@ type ipinfo struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/jenkins/keyboard.go

@@ -3,7 +3,7 @@ package jenkins
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/jenkins/widget.go

@@ -10,7 +10,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	settings *Settings
@@ -20,15 +19,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/jira/keyboard.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/jira/widget.go

@@ -9,7 +9,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	result   *SearchResult
@@ -19,15 +18,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/kubernetes/widget.go

@@ -25,7 +25,7 @@ type Widget struct {
 // NewWidget creates a new instance of the widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		objects:    settings.objects,
 		title:      settings.title,

modules/logger/widget.go

@@ -24,7 +24,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		app:      app,
 		filePath: log.LogFilePath(),

modules/mercurial/keyboard.go

@@ -3,7 +3,7 @@ package mercurial
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")

modules/mercurial/widget.go

@@ -15,7 +15,6 @@ const (
 
 // A Widget represents a Mercurial widget
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -28,9 +27,8 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "repository", "repositories"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		app:      app,
 		pages:    pages,
@@ -40,7 +38,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.SetDisplayFunction(widget.display)
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 
@@ -82,10 +79,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) addCheckoutButton(form *tview.Form, fctn func()) {

modules/nbascore/keyboard.go

@@ -3,7 +3,7 @@ package nbascore
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("l", widget.next, "Select next item")
 	widget.SetKeyboardChar("h", widget.prev, "Select previous item")

modules/nbascore/widget.go

@@ -17,7 +17,6 @@ var offset = 0
 
 // A Widget represents an NBA Score  widget
 type Widget struct {
-	view.KeyboardWidget
 	view.TextWidget
 
 	language string
@@ -27,14 +26,12 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.View.SetScrollable(true)
 
@@ -47,10 +44,6 @@ func (widget *Widget) Refresh() {
 	widget.Redraw(widget.nbascore)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 func (widget *Widget) nbascore() (string, string, bool) {
 	title := widget.CommonSettings().Title
 	cur := time.Now().AddDate(0, 0, offset) // Go back/forward offset days

modules/newrelic/widget.go

@@ -9,7 +9,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -20,15 +19,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "applicationID", "applicationIDs"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	for _, id := range utils.ToInts(widget.settings.applicationIDs) {
 		widget.Clients = append(widget.Clients, NewClient(widget.settings.apiKey, id))
@@ -53,10 +50,6 @@ func (widget *Widget) Refresh() {
 
 /* -------------------- Unexported Functions -------------------- */
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) currentData() *Client2 {

modules/opsgenie/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/pagerduty/widget.go

@@ -25,7 +25,7 @@ type Widget struct {
 // NewWidget creates and returns an instance of PagerDuty widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/pihole/keyboard.go

@@ -1,7 +1,7 @@
 package pihole
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("d", widget.disable, "disable Pi-hole")
 	widget.SetKeyboardChar("e", widget.enable, "enable Pi-hole")

modules/pihole/widget.go

@@ -8,7 +8,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -19,13 +18,11 @@ type Widget struct {
 //func NewWidget(app *tview.Application, settings *Settings) *Widget {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
-		settings:       settings,
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
+		settings:   settings,
 	}
 
 	widget.settings.common.RefreshInterval = 30
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.initializeKeyboardControls()
 	widget.SetDisplayFunction(widget.Refresh)
 	widget.View.SetWordWrap(true)
@@ -46,10 +43,6 @@ func (widget *Widget) Refresh() {
 	widget.Redraw(widget.content)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) content() (string, string, bool) {

modules/pocket/keyboard.go

@@ -3,8 +3,8 @@ package pocket
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
-	widget.InitializeCommonControls(widget.Refresh)
 	widget.SetKeyboardChar("a", widget.toggleLink, "Toggle Link")
 	widget.SetKeyboardChar("t", widget.toggleView, "Toggle view (links ,archived links)")
 	widget.SetKeyboardKey(tcell.KeyDown, widget.Next, "Select Next Link")

modules/pocket/widget.go

@@ -14,7 +14,6 @@ import (
 
 type Widget struct {
 	view.ScrollableWidget
-	view.KeyboardWidget
 
 	settings     *Settings
 	client       *Client
@@ -24,15 +23,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, nil, settings.common),
 		settings:         settings,
 		client:           NewClient(settings.consumerKey, "http://localhost"),
 		archivedView:     false,
 	}
 
 	widget.CommonSettings()
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetRenderFunction(widget.Render)
 	widget.View.SetScrollable(true)
 	widget.View.SetRegions(true)

modules/power/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		Battery: NewBattery(),
 

modules/rollbar/keyboard.go

@@ -3,7 +3,7 @@ package rollbar
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/rollbar/widget.go

@@ -10,7 +10,6 @@ import (
 
 // A Widget represents a Rollbar widget
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	items    *Result
@@ -21,15 +20,13 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/security/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/spacex/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := &Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 		settings:   settings,
 	}
 	return widget

modules/spotify/keyboard.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("l", widget.next, "Select next item")
 	widget.SetKeyboardChar("h", widget.previous, "Select previous item")

modules/spotify/widget.go

@@ -11,7 +11,6 @@ import (
 
 // A Widget represents a Spotify widget
 type Widget struct {
-	view.KeyboardWidget
 	view.TextWidget
 
 	client   spotigopher.SpotifyClient
@@ -22,8 +21,7 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
 
 		Info:   spotigopher.Info{},
 		client: spotigopher.NewClient(),
@@ -34,7 +32,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.settings.common.RefreshInterval = 5
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.View.SetWrap(true)
 	widget.View.SetWordWrap(true)
@@ -54,10 +51,6 @@ func (w *Widget) Refresh() {
 	w.Redraw(w.createOutput)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 func (w *Widget) createOutput() (string, string, bool) {
 	var content string
 	err := w.refreshSpotifyInfos()

modules/spotifyweb/keyboard.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("h", widget.selectPrevious, "Select previous item")
 	widget.SetKeyboardChar("l", widget.selectNext, "Select next item")

modules/spotifyweb/widget.go

@@ -32,7 +32,6 @@ type Info struct {
 
 // Widget is the struct used by all WTF widgets to transfer to the main widget controller
 type Widget struct {
-	view.KeyboardWidget
 	view.TextWidget
 
 	Info
@@ -72,8 +71,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	var playerState *spotify.PlayerState
 
 	widget := Widget{
-		KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
-		TextWidget:     view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, pages, settings.common),
 
 		Info: Info{},
 
@@ -124,7 +122,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.settings.common.RefreshInterval = 5
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.View.SetWrap(true)
 	widget.View.SetWordWrap(true)
@@ -165,10 +162,6 @@ func (w *Widget) Refresh() {
 	w.Redraw(w.createOutput)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 func (w *Widget) createOutput() (string, string, bool) {
 	var output string
 

modules/status/widget.go

@@ -15,7 +15,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		CurrentIcon: 0,
 

modules/subreddit/keyboard.go

@@ -3,7 +3,7 @@ package subreddit
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/subreddit/widget.go

@@ -9,7 +9,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	settings *Settings
@@ -19,15 +18,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/system/widget.go

@@ -21,7 +21,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, date, version string, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		Date: date,
 

modules/textfile/keyboard.go

@@ -6,7 +6,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(nil)
+	widget.InitializeRefreshKeyboardControl(nil)
 
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next file")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous file")

modules/textfile/widget.go

@@ -22,7 +22,6 @@ const (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -32,9 +31,8 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "filePath", "filePaths"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
@@ -43,7 +41,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.settings.common.RefreshInterval = 0
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.SetDisplayFunction(widget.Refresh)
 	widget.View.SetWordWrap(true)
@@ -64,10 +61,6 @@ func (widget *Widget) Refresh() {
 	widget.Redraw(widget.content)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) content() (string, string, bool) {

modules/todo/keyboard.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/todo/widget.go

@@ -22,7 +22,6 @@ const (
 
 // A Widget represents a Todo widget
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	app      *tview.Application
@@ -35,8 +34,7 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		app:      app,
 		settings: settings,
@@ -48,7 +46,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.init()
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.View.SetRegions(true)
 	widget.View.SetScrollable(true)
@@ -61,11 +58,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 /* -------------------- Exported Functions -------------------- */
 
-// HelpText returns the help text for this widget
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 // SelectedItem returns the currently-selected checklist item or nil if no item is selected
 func (widget *Widget) SelectedItem() *checklist.ChecklistItem {
 	var selectedItem *checklist.ChecklistItem

modules/todo_plus/keyboard.go

@@ -3,7 +3,7 @@ package todo_plus
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("d", widget.Delete, "Delete item")
 	widget.SetKeyboardChar("j", widget.Prev, "Select previous item")

modules/todo_plus/widget.go

@@ -10,7 +10,6 @@ import (
 
 // A Widget represents a Todoist widget
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.ScrollableWidget
 
@@ -22,9 +21,8 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "project", "projects"),
-		ScrollableWidget:  view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget:  view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
@@ -35,7 +33,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget.SetRenderFunction(widget.display)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.SetDisplayFunction(widget.display)
 
 	widget.KeyboardWidget.SetView(widget.View)
@@ -83,10 +80,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 func (widget *Widget) NextSource() {
 	widget.MultiSourceWidget.NextSource()
 	widget.Selected = widget.CurrentProject().Index

modules/transmission/keyboard.go

@@ -3,7 +3,7 @@ package transmission
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(nil)
+	widget.InitializeRefreshKeyboardControl(nil)
 
 	widget.SetKeyboardChar("j", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("k", widget.Next, "Select next item")

modules/transmission/widget.go

@@ -11,7 +11,6 @@ import (
 
 // Widget is the container for transmission data
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	client   *transmissionrpc.Client
@@ -24,15 +23,13 @@ type Widget struct {
 // NewWidget creates a new instance of a widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.display)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 
@@ -88,11 +85,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-// HelpText returns the help text for this widget
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 // Next selects the next item in the list
 func (widget *Widget) Next() {
 	widget.ScrollableWidget.Next()

modules/travisci/keyboard.go

@@ -3,7 +3,7 @@ package travisci
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/travisci/widget.go

@@ -10,7 +10,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	builds   *Builds
@@ -20,15 +19,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/twitch/keyboard.go

@@ -3,7 +3,7 @@ package twitch
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")

modules/twitch/widget.go

@@ -11,7 +11,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	settings   *Settings
@@ -30,15 +29,13 @@ type Stream struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 		settings:         settings,
 		twitch:           NewClient(settings.clientId),
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 	widget.KeyboardWidget.SetView(widget.View)
 
 	return widget

modules/twitter/keyboard.go

@@ -6,7 +6,7 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")

modules/twitter/widget.go

@@ -12,7 +12,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -23,16 +22,14 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "screenName", "screenNames"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		idx:      0,
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.SetDisplayFunction(widget.Refresh)
 
@@ -54,10 +51,6 @@ func (widget *Widget) Refresh() {
 	widget.Redraw(widget.content)
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) content() (string, string, bool) {

modules/twitterstats/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		client:   NewClient(settings),
 		settings: settings,

modules/unknown/widget.go

@@ -15,7 +15,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/uptimerobot/widget.go

@@ -14,7 +14,6 @@ import (
 )
 
 type Widget struct {
-	view.KeyboardWidget
 	view.ScrollableWidget
 
 	monitors []Monitor
@@ -24,15 +23,13 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := &Widget{
-		KeyboardWidget:   view.NewKeyboardWidget(app, pages, settings.common),
-		ScrollableWidget: view.NewScrollableWidget(app, settings.common),
+		ScrollableWidget: view.NewScrollableWidget(app, pages, settings.common),
 
 		settings: settings,
 	}
 
 	widget.SetRenderFunction(widget.Render)
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.KeyboardWidget.SetView(widget.View)
 

modules/victorops/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 // NewWidget creates a new widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 		settings:   settings,
 	}
 

modules/weatherservices/arpansagovau/widget.go

@@ -9,6 +9,7 @@ import (
 
 type Widget struct {
 	view.TextWidget
+
 	location  *location
 	lastError error
 	settings  *Settings
@@ -17,10 +18,11 @@ type Widget struct {
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	locationData, err := GetLocationData(settings.city)
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
-		location:   locationData,
-		lastError:  err,
-		settings:   settings,
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
+
+		location:  locationData,
+		lastError: err,
+		settings:  settings,
 	}
 
 	widget.View.SetWrap(true)
@@ -42,7 +44,6 @@ func (widget *Widget) content() (string, string, bool) {
 }
 
 func (widget *Widget) Refresh() {
-
 	widget.Redraw(widget.content)
 }