From: Zachary Yedidia Date: Mon, 5 Sep 2016 01:19:14 +0000 (-0400) Subject: Copy to primary clipboard for any change in selection X-Git-Tag: v1.0.3~6^2~2 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6721ec8e7dc04d074661882186d72652cd2e5c34;p=micro.git Copy to primary clipboard for any change in selection --- diff --git a/cmd/micro/actions.go b/cmd/micro/actions.go index 1d99b219..db523d23 100644 --- a/cmd/micro/actions.go +++ b/cmd/micro/actions.go @@ -596,21 +596,21 @@ func (v *View) IndentSelection(usePlugin bool) bool { v.Buf.Insert(Loc{0, i}, Spaces(tabsize)) if i == start { if v.Cursor.CurSelection[0].X > 0 { - v.Cursor.CurSelection[0] = v.Cursor.CurSelection[0].Move(tabsize, v.Buf) + v.Cursor.SetSelectionStart(v.Cursor.CurSelection[0].Move(tabsize, v.Buf)) } } if i == end { - v.Cursor.CurSelection[1] = Loc{endX + tabsize + 1, end} + v.Cursor.SetSelectionEnd(Loc{endX + tabsize + 1, end}) } } else { v.Buf.Insert(Loc{0, i}, "\t") if i == start { if v.Cursor.CurSelection[0].X > 0 { - v.Cursor.CurSelection[0] = v.Cursor.CurSelection[0].Move(1, v.Buf) + v.Cursor.SetSelectionStart(v.Cursor.CurSelection[0].Move(1, v.Buf)) } } if i == end { - v.Cursor.CurSelection[1] = Loc{endX + 2, end} + v.Cursor.SetSelectionEnd(Loc{endX + 2, end}) } } } @@ -645,22 +645,22 @@ func (v *View) OutdentSelection(usePlugin bool) bool { v.Buf.Remove(Loc{0, i}, Loc{1, i}) if i == start { if v.Cursor.CurSelection[0].X > 0 { - v.Cursor.CurSelection[0] = v.Cursor.CurSelection[0].Move(-1, v.Buf) + v.Cursor.SetSelectionStart(v.Cursor.CurSelection[0].Move(-1, v.Buf)) } } if i == end { - v.Cursor.CurSelection[1] = Loc{endX - j, end} + v.Cursor.SetSelectionEnd(Loc{endX - j, end}) } } } else { v.Buf.Remove(Loc{0, i}, Loc{1, i}) if i == start { if v.Cursor.CurSelection[0].X > 0 { - v.Cursor.CurSelection[0] = v.Cursor.CurSelection[0].Move(-1, v.Buf) + v.Cursor.SetSelectionStart(v.Cursor.CurSelection[0].Move(-1, v.Buf)) } } if i == end { - v.Cursor.CurSelection[1] = Loc{endX, end} + v.Cursor.SetSelectionEnd(Loc{endX, end}) } } } @@ -985,8 +985,8 @@ func (v *View) SelectAll(usePlugin bool) bool { return false } - v.Cursor.CurSelection[0] = v.Buf.Start() - v.Cursor.CurSelection[1] = v.Buf.End() + v.Cursor.SetSelectionStart(v.Buf.Start()) + v.Cursor.SetSelectionEnd(v.Buf.End()) // Put the cursor at the beginning v.Cursor.X = 0 v.Cursor.Y = 0 diff --git a/cmd/micro/cursor.go b/cmd/micro/cursor.go index cd1a1657..c3754099 100644 --- a/cmd/micro/cursor.go +++ b/cmd/micro/cursor.go @@ -1,5 +1,7 @@ package main +import "github.com/zyedidia/clipboard" + // The Cursor struct stores the location of the cursor in the view // The complicated part about the cursor is storing its location. // The cursor must be displayed at an x, y location, but since the buffer @@ -29,8 +31,22 @@ func (c *Cursor) Goto(b Cursor) { // ResetSelection resets the user's selection func (c *Cursor) ResetSelection() { - c.CurSelection[0] = c.buf.Start() - c.CurSelection[1] = c.buf.Start() + c.SetSelectionStart(c.buf.Start()) + c.SetSelectionEnd(c.buf.Start()) +} + +// SetSelectionStart sets the start of the selection +func (c *Cursor) SetSelectionStart(pos Loc) { + c.SetSelectionStart(pos) + // Copy to primary clipboard for linux + clipboard.WriteAll(c.GetSelection(), "primary") +} + +// SetSelectionEnd sets the end of the selection +func (c *Cursor) SetSelectionEnd(pos Loc) { + c.SetSelectionEnd(pos) + // Copy to primary clipboard for linux + clipboard.WriteAll(c.GetSelection(), "primary") } // HasSelection returns whether or not the user has selected anything @@ -62,12 +78,12 @@ func (c *Cursor) GetSelection() string { // SelectLine selects the current line func (c *Cursor) SelectLine() { c.Start() - c.CurSelection[0] = c.Loc + c.SetSelectionStart(c.Loc) c.End() if c.buf.NumLines-1 > c.Y { - c.CurSelection[1] = c.Loc.Move(1, c.buf) + c.SetSelectionEnd(c.Loc.Move(1, c.buf)) } else { - c.CurSelection[1] = c.Loc + c.SetSelectionEnd(c.Loc) } c.OrigSelection = c.CurSelection @@ -77,13 +93,13 @@ func (c *Cursor) SelectLine() { func (c *Cursor) AddLineToSelection() { if c.Loc.LessThan(c.OrigSelection[0]) { c.Start() - c.CurSelection[0] = c.Loc - c.CurSelection[1] = c.OrigSelection[1] + c.SetSelectionStart(c.Loc) + c.SetSelectionEnd(c.OrigSelection[1]) } if c.Loc.GreaterThan(c.OrigSelection[1]) { c.End() - c.CurSelection[1] = c.Loc.Move(1, c.buf) - c.CurSelection[0] = c.OrigSelection[0] + c.SetSelectionEnd(c.Loc.Move(1, c.buf)) + c.SetSelectionStart(c.OrigSelection[0]) } if c.Loc.LessThan(c.OrigSelection[1]) && c.Loc.GreaterThan(c.OrigSelection[0]) { @@ -98,8 +114,8 @@ func (c *Cursor) SelectWord() { } if !IsWordChar(string(c.RuneUnder(c.X))) { - c.CurSelection[0] = c.Loc - c.CurSelection[1] = c.Loc.Move(1, c.buf) + c.SetSelectionStart(c.Loc) + c.SetSelectionEnd(c.Loc.Move(1, c.buf)) c.OrigSelection = c.CurSelection return } @@ -110,14 +126,14 @@ func (c *Cursor) SelectWord() { backward-- } - c.CurSelection[0] = Loc{backward, c.Y} + c.SetSelectionStart(Loc{backward, c.Y}) c.OrigSelection[0] = c.CurSelection[0] for forward < Count(c.buf.Line(c.Y))-1 && IsWordChar(string(c.RuneUnder(forward+1))) { forward++ } - c.CurSelection[1] = Loc{forward, c.Y}.Move(1, c.buf) + c.SetSelectionEnd(Loc{forward, c.Y}.Move(1, c.buf)) c.OrigSelection[1] = c.CurSelection[1] c.Loc = c.CurSelection[1] } @@ -136,8 +152,8 @@ func (c *Cursor) AddWordToSelection() { backward-- } - c.CurSelection[0] = Loc{backward, c.Y} - c.CurSelection[1] = c.OrigSelection[1] + c.SetSelectionStart(Loc{backward, c.Y}) + c.SetSelectionEnd(c.OrigSelection[1]) } if c.Loc.GreaterThan(c.OrigSelection[1]) { @@ -147,8 +163,8 @@ func (c *Cursor) AddWordToSelection() { forward++ } - c.CurSelection[1] = Loc{forward, c.Y}.Move(1, c.buf) - c.CurSelection[0] = c.OrigSelection[0] + c.SetSelectionEnd(Loc{forward, c.Y}.Move(1, c.buf)) + c.SetSelectionStart(c.OrigSelection[0]) } c.Loc = c.CurSelection[1] @@ -157,11 +173,11 @@ func (c *Cursor) AddWordToSelection() { // SelectTo selects from the current cursor location to the given location func (c *Cursor) SelectTo(loc Loc) { if loc.GreaterThan(c.OrigSelection[0]) { - c.CurSelection[0] = c.OrigSelection[0] - c.CurSelection[1] = loc + c.SetSelectionStart(c.OrigSelection[0]) + c.SetSelectionEnd(loc) } else { - c.CurSelection[0] = loc - c.CurSelection[1] = c.OrigSelection[0] + c.SetSelectionStart(loc) + c.SetSelectionEnd(c.OrigSelection[0]) } } diff --git a/cmd/micro/search.go b/cmd/micro/search.go index f7fa8e82..96618471 100644 --- a/cmd/micro/search.go +++ b/cmd/micro/search.go @@ -125,8 +125,8 @@ func Search(searchStr string, v *View, down bool) { return } - v.Cursor.CurSelection[0] = FromCharPos(charPos+runePos(match[0], str), v.Buf) - v.Cursor.CurSelection[1] = FromCharPos(charPos+runePos(match[1], str), v.Buf) + v.Cursor.SetSelectionStart(FromCharPos(charPos+runePos(match[0], str), v.Buf)) + v.Cursor.SetSelectionEnd(FromCharPos(charPos+runePos(match[1], str), v.Buf)) v.Cursor.Loc = v.Cursor.CurSelection[1] if v.Relocate() { v.matches = Match(v) diff --git a/cmd/micro/view.go b/cmd/micro/view.go index d35f89b9..996ac8bd 100644 --- a/cmd/micro/view.go +++ b/cmd/micro/view.go @@ -1,13 +1,11 @@ package main import ( - "runtime" "strconv" "strings" "time" "github.com/mattn/go-runewidth" - "github.com/zyedidia/clipboard" "github.com/zyedidia/tcell" ) @@ -416,8 +414,8 @@ func (v *View) HandleEvent(event tcell.Event) { v.lastClickTime = time.Now() v.Cursor.OrigSelection[0] = v.Cursor.Loc - v.Cursor.CurSelection[0] = v.Cursor.Loc - v.Cursor.CurSelection[1] = v.Cursor.Loc + v.Cursor.SetSelectionStart(v.Cursor.Loc) + v.Cursor.SetSelectionEnd(v.Cursor.Loc) } v.mouseReleased = false } else if !v.mouseReleased { @@ -427,7 +425,7 @@ func (v *View) HandleEvent(event tcell.Event) { } else if v.doubleClick { v.Cursor.AddWordToSelection() } else { - v.Cursor.CurSelection[1] = v.Cursor.Loc + v.Cursor.SetSelectionEnd(v.Cursor.Loc) } } case tcell.Button2: @@ -447,11 +445,7 @@ func (v *View) HandleEvent(event tcell.Event) { if !v.doubleClick && !v.tripleClick { v.MoveToMouseClick(x, y) - v.Cursor.CurSelection[1] = v.Cursor.Loc - - if runtime.GOOS != "windows" && runtime.GOOS != "darwin" { - clipboard.WriteAll(v.Cursor.GetSelection(), "primary") - } + v.Cursor.SetSelectionEnd(v.Cursor.Loc) } v.mouseReleased = true }