Make mouse option global option

Fixes #816
This commit is contained in:
Zachary Yedidia
2017-09-21 17:10:53 -04:00
parent 6229a0579f
commit cb75531818
3 changed files with 12 additions and 13 deletions

View File

@@ -188,10 +188,6 @@ func NewBuffer(reader io.Reader, size int64, path string) *Buffer {
file.Close() file.Close()
} }
if b.Settings["mouse"].(bool) {
screen.EnableMouse()
}
if !b.Settings["fastdirty"].(bool) { if !b.Settings["fastdirty"].(bool) {
b.origHash = md5.Sum([]byte(b.String())) b.origHash = md5.Sum([]byte(b.String()))
} }

View File

@@ -202,6 +202,10 @@ func InitScreen() {
os.Setenv("TERM", oldTerm) os.Setenv("TERM", oldTerm)
} }
if GetGlobalOption("mouse").(bool) {
screen.EnableMouse()
}
screen.SetStyle(defStyle) screen.SetStyle(defStyle)
} }

View File

@@ -243,7 +243,6 @@ func DefaultLocalSettings() map[string]interface{} {
"filetype": "Unknown", "filetype": "Unknown",
"ignorecase": false, "ignorecase": false,
"indentchar": " ", "indentchar": " ",
"mouse": true,
"rmtrailingws": false, "rmtrailingws": false,
"ruler": true, "ruler": true,
"savecursor": false, "savecursor": false,
@@ -318,6 +317,14 @@ func SetOption(option, value string) error {
} }
} }
if option == "mouse" {
if !nativeValue.(bool) {
screen.DisableMouse()
} else {
screen.EnableMouse()
}
}
if _, ok := CurView().Buf.Settings[option]; ok { if _, ok := CurView().Buf.Settings[option]; ok {
for _, tab := range tabs { for _, tab := range tabs {
for _, view := range tab.views { for _, view := range tab.views {
@@ -405,14 +412,6 @@ func SetLocalOption(option, value string, view *View) error {
} }
} }
if option == "mouse" {
if !nativeValue.(bool) {
screen.DisableMouse()
} else {
screen.EnableMouse()
}
}
return nil return nil
} }