From c340e6d48da8889b10a1b69e614a5bfb04be7eec Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Sun, 21 Aug 2016 14:40:39 -0700 Subject: [PATCH] Add gruvbox colorscheme --- cmd/micro/colorscheme.go | 2 +- cmd/micro/micro.go | 5 ++--- cmd/micro/runtime.go | 23 +++++++++++++++++++++++ runtime/colorschemes/gruvbox.micro | 15 +++++++++++++++ 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 runtime/colorschemes/gruvbox.micro diff --git a/cmd/micro/colorscheme.go b/cmd/micro/colorscheme.go index e57fabeb..7c9ad1e4 100644 --- a/cmd/micro/colorscheme.go +++ b/cmd/micro/colorscheme.go @@ -15,7 +15,7 @@ type Colorscheme map[string]tcell.Style // The current colorscheme var colorscheme Colorscheme -var preInstalledColors = []string{"default", "solarized", "solarized-tc", "atom-dark-tc", "monokai"} +var preInstalledColors = []string{"default", "solarized", "solarized-tc", "atom-dark-tc", "monokai", "gruvbox"} // InitColorscheme picks and initializes the colorscheme when micro starts func InitColorscheme() { diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index 354fcc4a..85b9fa1a 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -289,6 +289,8 @@ func main() { }() for { + // Display everything + RedrawAll() var event tcell.Event @@ -341,8 +343,5 @@ func main() { // Send it to the view CurView().HandleEvent(event) } - - // Display everything - RedrawAll() } } diff --git a/cmd/micro/runtime.go b/cmd/micro/runtime.go index 224ffbf9..a9886866 100644 --- a/cmd/micro/runtime.go +++ b/cmd/micro/runtime.go @@ -3,6 +3,7 @@ // runtime/README.md // runtime/colorschemes/atom-dark-tc.micro // runtime/colorschemes/default.micro +// runtime/colorschemes/gruvbox.micro // runtime/colorschemes/monokai.micro // runtime/colorschemes/solarized-tc.micro // runtime/colorschemes/solarized.micro @@ -231,6 +232,26 @@ func runtimeColorschemesDefaultMicro() (*asset, error) { return a, nil } +var _runtimeColorschemesGruvboxMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x74\x90\xc1\x6a\x86\x40\x0c\x84\xef\x7d\x8a\x90\xf3\x6f\xe9\x46\x45\xfa\x38\xfe\x6e\x2c\x4b\xd7\x44\xb2\xf1\xd0\xb7\x2f\x8b\x50\x2a\xeb\x7f\x0b\x7c\x93\x64\x66\x16\xcd\x6a\x5d\x4e\xf2\x0d\x91\xd7\xf9\xc8\x0e\x48\xd4\x3f\xa8\x1f\xf1\xed\x1f\x5c\x74\xdb\x58\x2a\x1c\xee\xa0\x14\x9f\x2b\x0d\xd3\xf8\x92\xbe\x17\xb7\x24\x5f\x80\x61\xa0\x46\x94\x22\x8b\xa7\x35\xb1\x01\x86\x8f\xcf\x86\x17\x9f\x9d\x4f\x07\x81\x86\x06\xef\xc6\xbb\xe9\x02\x38\xb5\xa7\xfd\x67\x67\x40\x0a\xed\x56\xd9\x79\x49\x73\xae\xb6\xdb\xb5\x43\x22\x5b\x4e\xc2\x11\xf0\x6f\x86\x3b\x6f\x6c\xa6\x06\x48\xfd\xf8\x08\x34\x5c\x7f\x6b\x54\xc0\xa7\xe6\x08\x77\xad\xd6\x93\x9d\x1c\xdb\xb3\xc6\x3e\x9b\x9d\xae\xdd\x1d\x66\x2c\xde\x5d\x84\xa7\xdb\x46\x58\xce\xb9\x66\xad\xf0\x37\x00\x00\xff\xff\xa7\x0e\xc1\xad\xda\x01\x00\x00") + +func runtimeColorschemesGruvboxMicroBytes() ([]byte, error) { + return bindataRead( + _runtimeColorschemesGruvboxMicro, + "runtime/colorschemes/gruvbox.micro", + ) +} + +func runtimeColorschemesGruvboxMicro() (*asset, error) { + bytes, err := runtimeColorschemesGruvboxMicroBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "runtime/colorschemes/gruvbox.micro", size: 474, mode: os.FileMode(420), modTime: time.Unix(1471813912, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _runtimeColorschemesMonokaiMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x84\x92\xc1\x6e\xf3\x20\x10\x84\xef\xff\x53\x20\xb8\xc6\xbf\x1a\x92\x60\xe7\x98\x34\xe6\x3d\x08\x6c\x52\x54\x02\xd6\x02\xaa\xfa\xf6\xd5\xa6\x8e\xd4\x48\xd4\xf5\x5e\x2c\xf9\xf3\x30\x3b\x83\x4d\x21\x61\x17\x7c\x7c\x67\x0e\x2e\xa6\x86\xc2\xb8\xd0\x83\x1e\xb4\x5c\x09\x39\xd0\xf0\x7f\x3f\x20\x9b\x6e\x37\x88\x04\xf5\xbb\x7e\xbd\x1b\x9b\x90\x77\x10\x8b\xbf\x78\x40\xc6\x85\x52\xa7\xfd\xa8\x7f\x11\x8b\xb9\x98\xbb\xda\x61\x1c\xd6\x7a\x99\xfa\x9f\x0b\xfa\x78\x65\x5c\x8c\xea\x74\xec\xb7\x4d\x38\x17\x53\x60\x76\xa8\xf7\x52\xf5\xed\x35\x26\x84\x09\x93\x65\x5c\xbc\x1e\xb7\xc7\xb5\x6a\x42\xe5\x73\x82\xe5\x05\xf2\x04\xd6\x9b\x40\xfe\xd5\x28\x65\x3b\x8d\x1a\x1d\x60\xf0\x11\x1c\xe3\xe2\xb4\xd9\xa8\xa1\xed\x09\x10\x13\x32\x7e\x4e\xc1\xb1\x45\x5b\xc9\xa5\x07\xb6\x20\x47\x49\xd4\x4c\xe7\x32\x3e\x7f\x5f\xcd\xcd\x3e\x97\x15\xa9\xad\xce\xbe\x19\x6a\x6b\xf7\x42\xd3\x14\x24\xa9\x2e\xd6\xdb\xf9\x5e\xeb\xe1\xfe\xac\xc4\x46\xd2\x3c\x17\x56\x11\x49\xb2\xfd\x43\x43\xf9\x5a\x4b\x01\xec\xe6\x00\x96\x76\x9f\xc9\x0f\x83\xf1\xcf\xab\x60\x2b\xe6\xef\x77\x4a\xe0\xe1\xf3\x2b\x00\x00\xff\xff\x70\x26\xad\xf1\xf1\x02\x00\x00") func runtimeColorschemesMonokaiMicroBytes() ([]byte, error) { @@ -2306,6 +2327,7 @@ var _bindata = map[string]func() (*asset, error){ "runtime/README.md": runtimeReadmeMd, "runtime/colorschemes/atom-dark-tc.micro": runtimeColorschemesAtomDarkTcMicro, "runtime/colorschemes/default.micro": runtimeColorschemesDefaultMicro, + "runtime/colorschemes/gruvbox.micro": runtimeColorschemesGruvboxMicro, "runtime/colorschemes/monokai.micro": runtimeColorschemesMonokaiMicro, "runtime/colorschemes/solarized-tc.micro": runtimeColorschemesSolarizedTcMicro, "runtime/colorschemes/solarized.micro": runtimeColorschemesSolarizedMicro, @@ -2454,6 +2476,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ "colorschemes": &bintree{nil, map[string]*bintree{ "atom-dark-tc.micro": &bintree{runtimeColorschemesAtomDarkTcMicro, map[string]*bintree{}}, "default.micro": &bintree{runtimeColorschemesDefaultMicro, map[string]*bintree{}}, + "gruvbox.micro": &bintree{runtimeColorschemesGruvboxMicro, map[string]*bintree{}}, "monokai.micro": &bintree{runtimeColorschemesMonokaiMicro, map[string]*bintree{}}, "solarized-tc.micro": &bintree{runtimeColorschemesSolarizedTcMicro, map[string]*bintree{}}, "solarized.micro": &bintree{runtimeColorschemesSolarizedMicro, map[string]*bintree{}}, diff --git a/runtime/colorschemes/gruvbox.micro b/runtime/colorschemes/gruvbox.micro new file mode 100644 index 00000000..0c1ee9cb --- /dev/null +++ b/runtime/colorschemes/gruvbox.micro @@ -0,0 +1,15 @@ +color-link default "223,235" +color-link comment "243,235" +color-link constant "175,235" +color-link constant.string "142,235" +color-link identifier "109,235" +color-link statement "124,235" +color-link preproc "72,235" +color-link type "214,235" +color-link special "172,235" +color-link underlined "underline 109,235" +color-link error "235,124" +color-link todo "bold 223,235" +color-link line-number "243,237" +color-link current-line-number "172,237" +color-link cursor-line "237"