From d9b8a04841f8e6daee49265b16e8c4efd712a886 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Fri, 2 Sep 2016 09:40:08 -0400 Subject: [PATCH 1/5] Add support for primary clipboard --- cmd/micro/actions.go | 33 +++++++++++++++++++-------------- cmd/micro/bindings.go | 1 + cmd/micro/messenger.go | 2 +- cmd/micro/micro.go | 2 +- cmd/micro/view.go | 18 ++++++++++++++++++ 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/cmd/micro/actions.go b/cmd/micro/actions.go index e1b66c90..1d99b219 100644 --- a/cmd/micro/actions.go +++ b/cmd/micro/actions.go @@ -845,7 +845,7 @@ func (v *View) Copy(usePlugin bool) bool { } if v.Cursor.HasSelection() { - clipboard.WriteAll(v.Cursor.GetSelection()) + clipboard.WriteAll(v.Cursor.GetSelection(), "clipboard") v.freshClip = true messenger.Message("Copied selection") } @@ -868,10 +868,10 @@ func (v *View) CutLine(usePlugin bool) bool { } if v.freshClip == true { if v.Cursor.HasSelection() { - if clip, err := clipboard.ReadAll(); err != nil { + if clip, err := clipboard.ReadAll("clipboard"); err != nil { messenger.Error(err) } else { - clipboard.WriteAll(clip + v.Cursor.GetSelection()) + clipboard.WriteAll(clip+v.Cursor.GetSelection(), "clipboard") } } } else if time.Since(v.lastCutTime)/time.Second > 10*time.Second || v.freshClip == false { @@ -896,7 +896,7 @@ func (v *View) Cut(usePlugin bool) bool { } if v.Cursor.HasSelection() { - clipboard.WriteAll(v.Cursor.GetSelection()) + clipboard.WriteAll(v.Cursor.GetSelection(), "clipboard") v.Cursor.DeleteSelection() v.Cursor.ResetSelection() v.freshClip = true @@ -955,18 +955,23 @@ func (v *View) Paste(usePlugin bool) bool { return false } - leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y)) + clip, _ := clipboard.ReadAll("clipboard") + v.paste(clip) - if v.Cursor.HasSelection() { - v.Cursor.DeleteSelection() - v.Cursor.ResetSelection() + if usePlugin { + return PostActionCall("Paste", v) } - clip, _ := clipboard.ReadAll() - clip = strings.Replace(clip, "\n", "\n"+leadingWS, -1) - v.Buf.Insert(v.Cursor.Loc, clip) - v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf) - v.freshClip = false - messenger.Message("Pasted clipboard") + return true +} + +// PastePrimary pastes from the primary clipboard (only use on linux) +func (v *View) PastePrimary(usePlugin bool) bool { + if usePlugin && !PreActionCall("Paste", v) { + return false + } + + clip, _ := clipboard.ReadAll("primary") + v.paste(clip) if usePlugin { return PostActionCall("Paste", v) diff --git a/cmd/micro/bindings.go b/cmd/micro/bindings.go index 5172c698..0506ab36 100644 --- a/cmd/micro/bindings.go +++ b/cmd/micro/bindings.go @@ -55,6 +55,7 @@ var bindingActions = map[string]func(*View, bool) bool{ "IndentSelection": (*View).IndentSelection, "OutdentSelection": (*View).OutdentSelection, "Paste": (*View).Paste, + "PastePrimary": (*View).PastePrimary, "SelectAll": (*View).SelectAll, "OpenFile": (*View).OpenFile, "Start": (*View).Start, diff --git a/cmd/micro/messenger.go b/cmd/micro/messenger.go index b57d7ff1..be82a081 100644 --- a/cmd/micro/messenger.go +++ b/cmd/micro/messenger.go @@ -287,7 +287,7 @@ func (m *Messenger) HandleEvent(event tcell.Event, history []string) { m.cursorx-- } case tcell.KeyCtrlV: - clip, _ := clipboard.ReadAll() + clip, _ := clipboard.ReadAll("clipboard") m.response = Insert(m.response, m.cursorx, clip) m.cursorx += Count(clip) case tcell.KeyRune: diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index 8ee384b9..7ecd5a5f 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -353,7 +353,7 @@ func main() { // we copy it to the clipboard. // Often error messages are displayed down there so it can be useful to easily // copy the message - clipboard.WriteAll(messenger.message) + clipboard.WriteAll(messenger.message, "primary") continue } diff --git a/cmd/micro/view.go b/cmd/micro/view.go index 28d59d12..95f75424 100644 --- a/cmd/micro/view.go +++ b/cmd/micro/view.go @@ -145,6 +145,20 @@ func (v *View) ToggleTabbar() { } } +func (v *View) paste(clip string) { + leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y)) + + if v.Cursor.HasSelection() { + v.Cursor.DeleteSelection() + v.Cursor.ResetSelection() + } + clip = strings.Replace(clip, "\n", "\n"+leadingWS, -1) + v.Buf.Insert(v.Cursor.Loc, clip) + v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf) + v.freshClip = false + messenger.Message("Pasted clipboard") +} + // ScrollUp scrolls the view up n lines (if possible) func (v *View) ScrollUp(n int) { // Try to scroll by n but if it would overflow, scroll by 1 @@ -414,6 +428,10 @@ func (v *View) HandleEvent(event tcell.Event) { v.Cursor.CurSelection[1] = v.Cursor.Loc } } + case tcell.Button2: + // Middle mouse button was clicked, + // We should paste primary + v.PastePrimary(true) case tcell.ButtonNone: // Mouse event with no click if !v.mouseReleased { From 89c34ed8b31fa261fa0826a8d806b9f534983023 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Fri, 2 Sep 2016 10:44:32 -0400 Subject: [PATCH 2/5] Copy to primary clipboard on mouse selection --- cmd/micro/view.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmd/micro/view.go b/cmd/micro/view.go index 95f75424..d35f89b9 100644 --- a/cmd/micro/view.go +++ b/cmd/micro/view.go @@ -1,11 +1,13 @@ package main import ( + "runtime" "strconv" "strings" "time" "github.com/mattn/go-runewidth" + "github.com/zyedidia/clipboard" "github.com/zyedidia/tcell" ) @@ -446,6 +448,10 @@ 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.mouseReleased = true } From 6721ec8e7dc04d074661882186d72652cd2e5c34 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Sun, 4 Sep 2016 21:19:14 -0400 Subject: [PATCH 3/5] Copy to primary clipboard for any change in selection --- cmd/micro/actions.go | 20 +++++++-------- cmd/micro/cursor.go | 58 ++++++++++++++++++++++++++++---------------- cmd/micro/search.go | 4 +-- cmd/micro/view.go | 14 +++-------- 4 files changed, 53 insertions(+), 43 deletions(-) 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 } From c71e816e372c6ec6603e4d0dd762ca343274c44c Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Sun, 4 Sep 2016 21:28:40 -0400 Subject: [PATCH 4/5] Fix recursive function --- cmd/micro/cursor.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/micro/cursor.go b/cmd/micro/cursor.go index c3754099..76c9d5b6 100644 --- a/cmd/micro/cursor.go +++ b/cmd/micro/cursor.go @@ -37,14 +37,14 @@ func (c *Cursor) ResetSelection() { // SetSelectionStart sets the start of the selection func (c *Cursor) SetSelectionStart(pos Loc) { - c.SetSelectionStart(pos) + c.CurSelection[0] = 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) + c.CurSelection[1] = pos // Copy to primary clipboard for linux clipboard.WriteAll(c.GetSelection(), "primary") } From 2041e12eba7a271edd7d2eb856f9a30bb3c00fad Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Mon, 5 Sep 2016 08:36:30 -0400 Subject: [PATCH 5/5] Fix some issues with mouse selection copying --- cmd/micro/cursor.go | 14 +++++++++----- cmd/micro/view.go | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/micro/cursor.go b/cmd/micro/cursor.go index 76c9d5b6..c6eb92ae 100644 --- a/cmd/micro/cursor.go +++ b/cmd/micro/cursor.go @@ -31,22 +31,26 @@ func (c *Cursor) Goto(b Cursor) { // ResetSelection resets the user's selection func (c *Cursor) ResetSelection() { - c.SetSelectionStart(c.buf.Start()) - c.SetSelectionEnd(c.buf.Start()) + c.CurSelection[0] = c.buf.Start() + c.CurSelection[1] = c.buf.Start() } // SetSelectionStart sets the start of the selection func (c *Cursor) SetSelectionStart(pos Loc) { c.CurSelection[0] = pos // Copy to primary clipboard for linux - clipboard.WriteAll(c.GetSelection(), "primary") + if c.HasSelection() { + clipboard.WriteAll(c.GetSelection(), "primary") + } } // SetSelectionEnd sets the end of the selection func (c *Cursor) SetSelectionEnd(pos Loc) { c.CurSelection[1] = pos // Copy to primary clipboard for linux - clipboard.WriteAll(c.GetSelection(), "primary") + if c.HasSelection() { + clipboard.WriteAll(c.GetSelection(), "primary") + } } // HasSelection returns whether or not the user has selected anything @@ -59,7 +63,7 @@ func (c *Cursor) DeleteSelection() { if c.CurSelection[0].GreaterThan(c.CurSelection[1]) { c.buf.Remove(c.CurSelection[1], c.CurSelection[0]) c.Loc = c.CurSelection[1] - } else if c.GetSelection() == "" { + } else if !c.HasSelection() { return } else { c.buf.Remove(c.CurSelection[0], c.CurSelection[1]) diff --git a/cmd/micro/view.go b/cmd/micro/view.go index 996ac8bd..d1d3c810 100644 --- a/cmd/micro/view.go +++ b/cmd/micro/view.go @@ -414,8 +414,8 @@ func (v *View) HandleEvent(event tcell.Event) { v.lastClickTime = time.Now() v.Cursor.OrigSelection[0] = v.Cursor.Loc - v.Cursor.SetSelectionStart(v.Cursor.Loc) - v.Cursor.SetSelectionEnd(v.Cursor.Loc) + v.Cursor.CurSelection[0] = v.Cursor.Loc + v.Cursor.CurSelection[1] = v.Cursor.Loc } v.mouseReleased = false } else if !v.mouseReleased {