This commit is contained in:
Liam Galvin 2018-10-21 15:11:10 +01:00
parent 8dfb770f87
commit cf2aef96e4
9 changed files with 24 additions and 25 deletions

View File

@ -17,7 +17,7 @@ jobs:
#### expecting it in the form of #### expecting it in the form of
#### /go/src/github.com/circleci/go-tool #### /go/src/github.com/circleci/go-tool
#### /go/src/bitbucket.org/circleci/go-tool #### /go/src/bitbucket.org/circleci/go-tool
working_directory: /go/src/github.com/liamg/raft working_directory: /go/src/github.com/liamg/aminal
steps: steps:
- checkout - checkout

2
.gitignore vendored
View File

@ -1 +1 @@
raft aminal

View File

@ -1,17 +1,17 @@
# RAFT - Golang Terminal Emulator # Aminal - Golang Terminal Emulator
[![CircleCI](https://circleci.com/gh/liamg/raft/tree/master.svg?style=svg)](https://circleci.com/gh/liamg/raft/tree/master) [![CircleCI](https://circleci.com/gh/liamg/aminal/tree/master.svg?style=svg)](https://circleci.com/gh/liamg/aminal/tree/master)
Raft is a modern terminal emulator utilising OpenGL. So far the terminal is very much incomplete, but we're getting there! Aminal is a modern terminal emulator utilising OpenGL. So far the terminal is very much incomplete, but we're getting there!
![Example screenshot](demo.png) ![Example screenshot](demo.png)
The project is experimental at the moment, so you probably won't want to rely on Raft as your main terminal for a while. The project is experimental at the moment, so you probably won't want to rely on Aminal as your main terminal for a while.
Ensure you have your latest graphics card drivers installed before use. Ensure you have your latest graphics card drivers installed before use.
## Help Rename This Project! ## Help Rename This Project!
We're currently looking for a new name! Please add suggestions [here](https://github.com/liamg/raft/issues/2). We're currently looking for a new name! Please add suggestions [here](https://github.com/liamg/aminal/issues/2).
## Aims ## Aims
@ -80,7 +80,7 @@ We're currently looking for a new name! Please add suggestions [here](https://gi
## Configuration ## Configuration
Raft looks for a config file in `~/.raft.toml`, and will write one there the first time it runs, if it doesn't already exist. Aminal looks for a config file in `~/.aminal.toml`, and will write one there the first time it runs, if it doesn't already exist.
You can ignore the config and use defaults by specifying `--ignore-config` as a CLI flag. You can ignore the config and use defaults by specifying `--ignore-config` as a CLI flag.

View File

@ -7,13 +7,13 @@ import (
"time" "time"
"github.com/gobuffalo/packr" "github.com/gobuffalo/packr"
"github.com/liamg/raft/glfont" "github.com/liamg/aminal/glfont"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
"github.com/liamg/raft/buffer" "github.com/liamg/aminal/buffer"
"github.com/liamg/raft/config" "github.com/liamg/aminal/config"
"github.com/liamg/raft/terminal" "github.com/liamg/aminal/terminal"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -5,7 +5,7 @@ import (
"math" "math"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
"github.com/liamg/raft/terminal" "github.com/liamg/aminal/terminal"
) )
func (gui *GUI) mouseButtonCallback(w *glfw.Window, button glfw.MouseButton, action glfw.Action, mod glfw.ModifierKey) { func (gui *GUI) mouseButtonCallback(w *glfw.Window, button glfw.MouseButton, action glfw.Action, mod glfw.ModifierKey) {

View File

@ -4,9 +4,9 @@ import (
"math" "math"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/liamg/raft/buffer" "github.com/liamg/aminal/buffer"
"github.com/liamg/raft/config" "github.com/liamg/aminal/config"
"github.com/liamg/raft/glfont" "github.com/liamg/aminal/glfont"
) )
type OpenGLRenderer struct { type OpenGLRenderer struct {

11
main.go
View File

@ -9,10 +9,10 @@ import (
"syscall" "syscall"
"github.com/kr/pty" "github.com/kr/pty"
"github.com/liamg/aminal/config"
"github.com/liamg/aminal/gui"
"github.com/liamg/aminal/terminal"
"github.com/riywo/loginshell" "github.com/riywo/loginshell"
"github.com/liamg/raft/config"
"github.com/liamg/raft/gui"
"github.com/liamg/raft/terminal"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -41,8 +41,7 @@ func loadConfigFile() *config.Config {
} }
places := []string{ places := []string{
//fmt.Sprintf("%s/.config/raft.yml", home), fmt.Sprintf("%s/.aminal.toml", home),
fmt.Sprintf("%s/.raft.toml", home),
} }
for _, place := range places { for _, place := range places {
@ -58,7 +57,7 @@ func loadConfigFile() *config.Config {
if b, err := config.DefaultConfig.Encode(); err != nil { if b, err := config.DefaultConfig.Encode(); err != nil {
fmt.Printf("Failed to encode config file: %s\n", err) fmt.Printf("Failed to encode config file: %s\n", err)
} else { } else {
if err := ioutil.WriteFile(fmt.Sprintf("%s/.raft.toml", home), b, 0644); err != nil { if err := ioutil.WriteFile(fmt.Sprintf("%s/.aminal.toml", home), b, 0644); err != nil {
fmt.Printf("Failed to encode config file: %s\n", err) fmt.Printf("Failed to encode config file: %s\n", err)
} }
} }

View File

@ -3,7 +3,7 @@ package terminal
import ( import (
"fmt" "fmt"
"github.com/liamg/raft/buffer" "github.com/liamg/aminal/buffer"
) )
func sgrSequenceHandler(params []string, intermediate string, terminal *Terminal) error { func sgrSequenceHandler(params []string, intermediate string, terminal *Terminal) error {

View File

@ -10,8 +10,8 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/liamg/raft/buffer" "github.com/liamg/aminal/buffer"
"github.com/liamg/raft/config" "github.com/liamg/aminal/config"
"go.uber.org/zap" "go.uber.org/zap"
) )