~sircmpwn/aerc

Allow fields in compose widget to be clicked v1 PROPOSED

Thanks!

To git.sr.ht:~sircmpwn/aerc
   8a84830..3338dce  master -> master
I forgot to mention that this is meant to address ticket #299.

On Tue, 05 Nov 2019 at 08:43 PM, Greg Anders wrote:
> When the mouse is enabled, clicking on a header field switches focus to
> that field (likewise for the terminal).
> ---
> widgets/compose.go | 34 ++++++++++++++++++++++++++++++++--
> 1 file changed, 32 insertions(+), 2 deletions(-)
> 
> diff --git a/widgets/compose.go b/widgets/compose.go
> index 22c58da..b9f0932 100644
> --- a/widgets/compose.go
> +++ b/widgets/compose.go
> @@ -289,6 +289,16 @@ func (c *Composer) Event(event tcell.Event) bool {
> return false
> }
> 
> +func (c *Composer) MouseEvent(localX int, localY int, event tcell.Event) {
> +	c.grid.MouseEvent(localX, localY, event)
> +	for _, e := range c.focusable {
> +		he, ok := e.(*headerEditor)
> +		if ok && he.focused {
> +			c.FocusEditor(he)
> +		}
> +	}
> +}
> +
> func (c *Composer) Focus(focus bool) {
> c.focusable[c.focused].Focus(focus)
> }
> @@ -544,6 +554,18 @@ func (c *Composer) resetReview() {
> }
> }
> 
> +func (c *Composer) termEvent(event tcell.Event) bool {
> +	switch event := event.(type) {
> +	case *tcell.EventMouse:
> +		switch event.Buttons() {
> +		case tcell.Button1:
> +			c.FocusTerminal()
> +			return true
> +		}
> +	}
> +	return false
> +}
> +
> func (c *Composer) termClosed(err error) {
> c.grid.RemoveChild(c.editor)
> c.review = newReviewMessage(c, err)
> @@ -572,6 +594,7 @@ func (c *Composer) ShowTerminal() {
> }
> editor := exec.Command("/bin/sh", "-c", editorName+" "+c.email.Name())
> c.editor, _ = NewTerminal(editor) // TODO: handle error
> +	c.editor.OnEvent = c.termEvent
> c.editor.OnClose = c.termClosed
> c.grid.AddChild(c.editor).At(1, 0)
> c.focusable = append(c.focusable, c.editor)
> @@ -665,8 +688,9 @@ func (c *Composer) reloadEmail() error {
> }
> 
> type headerEditor struct {
> -	name  string
> -	input *ui.TextInput
> +	name    string
> +	focused bool
> +	input   *ui.TextInput
> }
> 
> func newHeaderEditor(name string, value string) *headerEditor {
> @@ -687,6 +711,11 @@ func (he *headerEditor) Draw(ctx *ui.Context) {
> func (he *headerEditor) MouseEvent(localX int, localY int, event tcell.Event) {
> switch event := event.(type) {
> case *tcell.EventMouse:
> +		switch event.Buttons() {
> +		case tcell.Button1:
> +			he.focused = true
> +		}
> +
> width := runewidth.StringWidth(he.name + " ")
> if localX >= width {
> he.input.MouseEvent(localX-width, localY, event)
> @@ -705,6 +734,7 @@ func (he *headerEditor) OnInvalidate(fn func(ui.Drawable)) {
> }
> 
> func (he *headerEditor) Focus(focused bool) {
> +	he.focused = focused
> he.input.Focus(focused)
> }
> 
> -- 
> 2.24.0
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~sircmpwn/aerc/patches/8984/mbox | git am -3
Learn more about email & git

[PATCH] Allow fields in compose widget to be clicked Export this patch

When the mouse is enabled, clicking on a header field switches focus to
that field (likewise for the terminal).
---
 widgets/compose.go | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/widgets/compose.go b/widgets/compose.go
index 22c58da..b9f0932 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -289,6 +289,16 @@ func (c *Composer) Event(event tcell.Event) bool {
 	return false
 }
 
+func (c *Composer) MouseEvent(localX int, localY int, event tcell.Event) {
+	c.grid.MouseEvent(localX, localY, event)
+	for _, e := range c.focusable {
+		he, ok := e.(*headerEditor)
+		if ok && he.focused {
+			c.FocusEditor(he)
+		}
+	}
+}
+
 func (c *Composer) Focus(focus bool) {
 	c.focusable[c.focused].Focus(focus)
 }
@@ -544,6 +554,18 @@ func (c *Composer) resetReview() {
 	}
 }
 
+func (c *Composer) termEvent(event tcell.Event) bool {
+	switch event := event.(type) {
+	case *tcell.EventMouse:
+		switch event.Buttons() {
+		case tcell.Button1:
+			c.FocusTerminal()
+			return true
+		}
+	}
+	return false
+}
+
 func (c *Composer) termClosed(err error) {
 	c.grid.RemoveChild(c.editor)
 	c.review = newReviewMessage(c, err)
@@ -572,6 +594,7 @@ func (c *Composer) ShowTerminal() {
 	}
 	editor := exec.Command("/bin/sh", "-c", editorName+" "+c.email.Name())
 	c.editor, _ = NewTerminal(editor) // TODO: handle error
+	c.editor.OnEvent = c.termEvent
 	c.editor.OnClose = c.termClosed
 	c.grid.AddChild(c.editor).At(1, 0)
 	c.focusable = append(c.focusable, c.editor)
@@ -665,8 +688,9 @@ func (c *Composer) reloadEmail() error {
 }
 
 type headerEditor struct {
-	name  string
-	input *ui.TextInput
+	name    string
+	focused bool
+	input   *ui.TextInput
 }
 
 func newHeaderEditor(name string, value string) *headerEditor {
@@ -687,6 +711,11 @@ func (he *headerEditor) Draw(ctx *ui.Context) {
 func (he *headerEditor) MouseEvent(localX int, localY int, event tcell.Event) {
 	switch event := event.(type) {
 	case *tcell.EventMouse:
+		switch event.Buttons() {
+		case tcell.Button1:
+			he.focused = true
+		}
+
 		width := runewidth.StringWidth(he.name + " ")
 		if localX >= width {
 			he.input.MouseEvent(localX-width, localY, event)
@@ -705,6 +734,7 @@ func (he *headerEditor) OnInvalidate(fn func(ui.Drawable)) {
 }
 
 func (he *headerEditor) Focus(focused bool) {
+	he.focused = focused
 	he.input.Focus(focused)
 }
 
-- 
2.24.0
Thanks!

To git.sr.ht:~sircmpwn/aerc
   8a84830..3338dce  master -> master
I forgot to mention that this is meant to address ticket #299.

On Tue, 05 Nov 2019 at 08:43 PM, Greg Anders wrote:
> When the mouse is enabled, clicking on a header field switches focus to
> that field (likewise for the terminal).
> ---
> widgets/compose.go | 34 ++++++++++++++++++++++++++++++++--
> 1 file changed, 32 insertions(+), 2 deletions(-)
> 
> diff --git a/widgets/compose.go b/widgets/compose.go
> index 22c58da..b9f0932 100644
> --- a/widgets/compose.go
> +++ b/widgets/compose.go
> @@ -289,6 +289,16 @@ func (c *Composer) Event(event tcell.Event) bool {
> return false
> }
> 
> +func (c *Composer) MouseEvent(localX int, localY int, event tcell.Event) {
> +	c.grid.MouseEvent(localX, localY, event)
> +	for _, e := range c.focusable {
> +		he, ok := e.(*headerEditor)
> +		if ok && he.focused {
> +			c.FocusEditor(he)
> +		}
> +	}
> +}
> +
> func (c *Composer) Focus(focus bool) {
> c.focusable[c.focused].Focus(focus)
> }
> @@ -544,6 +554,18 @@ func (c *Composer) resetReview() {
> }
> }
> 
> +func (c *Composer) termEvent(event tcell.Event) bool {
> +	switch event := event.(type) {
> +	case *tcell.EventMouse:
> +		switch event.Buttons() {
> +		case tcell.Button1:
> +			c.FocusTerminal()
> +			return true
> +		}
> +	}
> +	return false
> +}
> +
> func (c *Composer) termClosed(err error) {
> c.grid.RemoveChild(c.editor)
> c.review = newReviewMessage(c, err)
> @@ -572,6 +594,7 @@ func (c *Composer) ShowTerminal() {
> }
> editor := exec.Command("/bin/sh", "-c", editorName+" "+c.email.Name())
> c.editor, _ = NewTerminal(editor) // TODO: handle error
> +	c.editor.OnEvent = c.termEvent
> c.editor.OnClose = c.termClosed
> c.grid.AddChild(c.editor).At(1, 0)
> c.focusable = append(c.focusable, c.editor)
> @@ -665,8 +688,9 @@ func (c *Composer) reloadEmail() error {
> }
> 
> type headerEditor struct {
> -	name  string
> -	input *ui.TextInput
> +	name    string
> +	focused bool
> +	input   *ui.TextInput
> }
> 
> func newHeaderEditor(name string, value string) *headerEditor {
> @@ -687,6 +711,11 @@ func (he *headerEditor) Draw(ctx *ui.Context) {
> func (he *headerEditor) MouseEvent(localX int, localY int, event tcell.Event) {
> switch event := event.(type) {
> case *tcell.EventMouse:
> +		switch event.Buttons() {
> +		case tcell.Button1:
> +			he.focused = true
> +		}
> +
> width := runewidth.StringWidth(he.name + " ")
> if localX >= width {
> he.input.MouseEvent(localX-width, localY, event)
> @@ -705,6 +734,7 @@ func (he *headerEditor) OnInvalidate(fn func(ui.Drawable)) {
> }
> 
> func (he *headerEditor) Focus(focused bool) {
> +	he.focused = focused
> he.input.Focus(focused)
> }
> 
> -- 
> 2.24.0
View this thread in the archives