mirror of https://github.com/liamg/aminal.git
Fix merge issues in develop (#257)
* Fix merge issues in develop * Add -timeout to go test The tests are timing out on TravisCI for some reason so a timeout has been added so that `go test` will dump out the goroutine stack traces when the tests are stuck. * gui.Close now wakes up main loop Without this, otherwise successful tests in main_test.go hang. * Use a longer timeout in case CI infrastructure is slow * Fix various gofmt issues Not sure how some of these crept in.
This commit is contained in:
Menno Finlay-Smits
rrrooommmaaa
parent
8f183ba440
commit
44233f384e
2
Makefile
2
Makefile
|
|
@ -13,7 +13,7 @@ build:
|
|||
|
||||
.PHONY: test
|
||||
test:
|
||||
go test -v ./...
|
||||
go test -v -timeout=8m ./...
|
||||
go vet -v
|
||||
|
||||
.PHONY: check-gofmt
|
||||
|
|
|
|||
|
|
@ -874,7 +874,7 @@ func (buffer *Buffer) Clear() {
|
|||
}
|
||||
|
||||
func (buffer *Buffer) ReallyClear() {
|
||||
defer buffer.emitDisplayChange()
|
||||
defer buffer.dirty.Notify()
|
||||
buffer.lines = []Line{}
|
||||
buffer.terminalState.SetScrollOffset(0)
|
||||
buffer.SetPosition(0, 0)
|
||||
|
|
|
|||
|
|
@ -326,6 +326,7 @@ func (gui *GUI) getTermSize() (uint, uint) {
|
|||
|
||||
func (gui *GUI) Close() {
|
||||
gui.window.SetShouldClose(true)
|
||||
glfw.PostEmptyEvent() // wake up main loop so it notices close request
|
||||
}
|
||||
|
||||
func (gui *GUI) Render() error {
|
||||
|
|
@ -436,7 +437,7 @@ func (gui *GUI) Render() error {
|
|||
go gui.waker(stop)
|
||||
|
||||
for !gui.window.ShouldClose() {
|
||||
gui.redraw()
|
||||
gui.redraw(true)
|
||||
|
||||
if gui.showDebugInfo {
|
||||
gui.textbox(2, 2, fmt.Sprintf(`Cursor: %d,%d
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ func (gui *GUI) updateSelectionMode(mods glfw.ModifierKey) {
|
|||
}
|
||||
if gui.selectionRegionMode != mode {
|
||||
gui.selectionRegionMode = mode
|
||||
gui.terminal.SetDirty()
|
||||
gui.terminal.NotifyDirty()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ func New(pty platform.Pty, logger *zap.SugaredLogger, config *config.Config) *Te
|
|||
ShowCursor: true,
|
||||
},
|
||||
platformDependentSettings: pty.GetPlatformDependentSettings(),
|
||||
dirty: newNotifier(),
|
||||
dirty: newNotifier(),
|
||||
}
|
||||
t.buffers = []*buffer.Buffer{
|
||||
buffer.NewBuffer(t.terminalState, t.dirty),
|
||||
|
|
@ -436,12 +436,3 @@ func (terminal *Terminal) Lock() {
|
|||
func (terminal *Terminal) Unlock() {
|
||||
terminal.lock.Unlock()
|
||||
}
|
||||
|
||||
// SetDirtyLocked sets dirty flag locking the terminal to prevent data race warnings
|
||||
// @todo remove when switching to event-driven architecture
|
||||
func (terminal *Terminal) SetDirtyLocked() {
|
||||
terminal.Lock()
|
||||
defer terminal.Unlock()
|
||||
|
||||
terminal.SetDirty()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@ package main
|
|||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"golang.org/x/sys/windows/registry"
|
||||
"os"
|
||||
"os/user"
|
||||
"strings"
|
||||
"path/filepath"
|
||||
"github.com/liamg/aminal/windows/winutil"
|
||||
"github.com/liamg/aminal/generated-src/installer/data"
|
||||
"text/template"
|
||||
"io/ioutil"
|
||||
"os/exec"
|
||||
"syscall"
|
||||
"flag"
|
||||
"github.com/liamg/aminal/generated-src/installer/data"
|
||||
"github.com/liamg/aminal/windows/winutil"
|
||||
"golang.org/x/sys/windows/registry"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
"os/user"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"syscall"
|
||||
"text/template"
|
||||
)
|
||||
|
||||
const Version = "VERSION"
|
||||
|
|
@ -116,7 +116,7 @@ func createRegistryKeysForUninstaller(installDir string, isUserInstall bool) {
|
|||
func updateVersionInRegistry(isUserInstall bool) {
|
||||
regRoot := getRegistryRoot(isUserInstall)
|
||||
updateKey := `Software\Aminal\Update\Clients\` + ProductId
|
||||
writeRegStr(regRoot, updateKey, "pv", Version + ".0")
|
||||
writeRegStr(regRoot, updateKey, "pv", Version+".0")
|
||||
writeRegStr(regRoot, updateKey, "name", "Aminal")
|
||||
}
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ func getRegistryRoot(isUserInstall bool) registry.Key {
|
|||
}
|
||||
|
||||
func writeRegStr(regRoot registry.Key, keyPath string, valueName string, value string) {
|
||||
const mode = registry.WRITE|registry.WOW64_32KEY
|
||||
const mode = registry.WRITE | registry.WOW64_32KEY
|
||||
key, _, err := registry.CreateKey(regRoot, keyPath, mode)
|
||||
check(err)
|
||||
defer key.Close()
|
||||
|
|
@ -154,7 +154,7 @@ func getStartMenuDir(isUserInstall bool) string {
|
|||
|
||||
func createShortcut(linkPath, targetPath string) {
|
||||
type Shortcut struct {
|
||||
LinkPath string
|
||||
LinkPath string
|
||||
TargetPath string
|
||||
}
|
||||
tmpl := template.New("createLnk.vbs")
|
||||
|
|
@ -215,4 +215,4 @@ func check(e error) {
|
|||
if e != nil {
|
||||
panic(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ package main
|
|||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/liamg/aminal/windows/winutil"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
|
|
@ -26,12 +27,11 @@ import (
|
|||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"github.com/liamg/aminal/windows/winutil"
|
||||
)
|
||||
|
||||
type Version struct {
|
||||
number [3]int
|
||||
name string
|
||||
name string
|
||||
}
|
||||
type Versions []Version
|
||||
|
||||
|
|
@ -121,4 +121,4 @@ func check(e error) {
|
|||
if e != nil {
|
||||
panic(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ func GetExecutablePath() (string, error) {
|
|||
return "", e1
|
||||
}
|
||||
return string(utf16.Decode(b[0:n])), nil
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue