From a78cd82dcdea71fbeb15a6b938780a11077a167c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 1 Feb 2025 11:42:31 -0600 Subject: [PATCH] GPL 3.0 --- Makefile | 9 +++------ checkbox.go | 3 +++ color.go | 3 +++ debug.go | 3 +++ dropdown.go | 3 +++ eventBindings.go | 6 ++++-- eventGocui.go | 3 ++- eventMouse.go | 1 + eventMouseClick.go | 3 +++ find.go | 3 +++ help.go | 3 +++ init.go | 3 +++ log.go | 3 +++ place.go | 3 +++ plugin.go | 3 +++ size.go | 3 +++ stdoutFakefile.go | 3 +++ stdoutShow.go | 4 ++++ structs.go | 3 +++ tree.go | 3 +++ treeAdd.go | 3 +++ treeDraw.go | 3 +++ treeWidget.go | 3 +++ view.go | 3 +++ window.go | 3 +++ 25 files changed, 74 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 853c4ff..becff5b 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ VERSION = $(shell git describe --tags) BUILDTIME = $(shell date +%Y.%m.%d) -all: clean gocui.so +all: gocui.so @#ldd gocui.so gocui.so: goimports GO111MODULE=off go build -v -work -buildmode=plugin -o gocui.so \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" -install: clean +install: go build -buildmode=plugin -o ~/go/lib/gocui-${VERSION}.so \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" cd ~/go/lib && ln -f -s gocui-${VERSION}.so gocui.so @@ -44,8 +44,5 @@ redomod: GO111MODULE= go mod init GO111MODULE= go mod tidy -view: - autogenpb --proto view.proto - -view.pb.go: view.proto +proto: autogenpb --proto view.proto diff --git a/checkbox.go b/checkbox.go index dac5e2e..6851949 100644 --- a/checkbox.go +++ b/checkbox.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/color.go b/color.go index dd26bb4..af9df99 100644 --- a/color.go +++ b/color.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main // information about how terminfo works diff --git a/debug.go b/debug.go index 3951147..e572f98 100644 --- a/debug.go +++ b/debug.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/dropdown.go b/dropdown.go index f40f25d..8e34ec4 100644 --- a/dropdown.go +++ b/dropdown.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/eventBindings.go b/eventBindings.go index 330c255..1f86e1e 100644 --- a/eventBindings.go +++ b/eventBindings.go @@ -1,5 +1,6 @@ // Copyright 2017-2025 WIT.COM Inc. All rights reserved. -// Use of this source code is (now) governed by the GPL 3.0 +// Use of this source code is governed by the GPL 3.0 + package main @@ -68,10 +69,11 @@ func theNotsure(g *gocui.Gui, v *gocui.View) error { w, h := g.MousePosition() for _, tk := range findByXY(w, h) { if tk.WidgetType == widget.Stdout { + log.Log(GOCUI, fmt.Sprintf("findByXY() '2' key %-8s wId=%4d at (%3d,%3d) %s", tk.WidgetType, tk.node.WidgetId, w, h, tk.node.String())) log.Info("skipping stdout") continue } - log.Log(GOCUI, fmt.Sprintf("findByXY() 'f' key %-8s wId=%4d at (%3d,%3d) %s", tk.WidgetType, tk.node.WidgetId, w, h, tk.node.String())) + log.Log(GOCUI, fmt.Sprintf("findByXY() HIDDING %-8s wId=%4d at (%3d,%3d) %s", tk.WidgetType, tk.node.WidgetId, w, h, tk.node.String())) tk.Hide() } return nil diff --git a/eventGocui.go b/eventGocui.go index 39a4892..ef51f9e 100644 --- a/eventGocui.go +++ b/eventGocui.go @@ -1,5 +1,6 @@ // Copyright 2017-2025 WIT.COM Inc. All rights reserved. -// Use of this source code is (now) governed by the GPL 3.0 +// Use of this source code is governed by the GPL 3.0 + // Copyright 2014 The gocui Authors. All rights reserved. // Use of this source code is governed by a BSD-style diff --git a/eventMouse.go b/eventMouse.go index 3a5e0a6..e88ee7e 100644 --- a/eventMouse.go +++ b/eventMouse.go @@ -1,6 +1,7 @@ // Copyright 2017-2025 WIT.COM Inc. All rights reserved. // Use of this source code is governed by the GPL 3.0 + // NOTE: our code is under the GPL, not BSD // note by jcarr@wit.com in 2025: this is one of the coolest diff --git a/eventMouseClick.go b/eventMouseClick.go index 07235e4..f96c144 100644 --- a/eventMouseClick.go +++ b/eventMouseClick.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/find.go b/find.go index f94da20..3f33b78 100644 --- a/find.go +++ b/find.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/help.go b/help.go index 2c8dd7c..10ae31c 100644 --- a/help.go +++ b/help.go @@ -1,4 +1,7 @@ // Copyright 2014 The gocui Authors. All rights reserved. +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. diff --git a/init.go b/init.go index 9b9f152..2d85f94 100644 --- a/init.go +++ b/init.go @@ -1,4 +1,7 @@ //gjcarro:pjcarrlugin +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + // Copyright 2014 The gocui Authors. All rights reserved. // Use of this source code is governed by a BSD-style diff --git a/log.go b/log.go index 03f9e21..ec2723e 100644 --- a/log.go +++ b/log.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main /* diff --git a/place.go b/place.go index be0a145..0dd7568 100644 --- a/place.go +++ b/place.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/plugin.go b/plugin.go index 8e95065..469a606 100644 --- a/plugin.go +++ b/plugin.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/size.go b/size.go index cc09118..8c58ce4 100644 --- a/size.go +++ b/size.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/stdoutFakefile.go b/stdoutFakefile.go index 5c54762..21e3d49 100644 --- a/stdoutFakefile.go +++ b/stdoutFakefile.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/stdoutShow.go b/stdoutShow.go index 4950e68..1b27b2c 100644 --- a/stdoutShow.go +++ b/stdoutShow.go @@ -1,3 +1,7 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + + package main import ( diff --git a/structs.go b/structs.go index 826682e..f126dd7 100644 --- a/structs.go +++ b/structs.go @@ -1,4 +1,7 @@ // LICENSE: same as the go language itself +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + // Copyright 2023 WIT.COM // all structures and variables are local (aka lowercase) diff --git a/tree.go b/tree.go index 4b6e23b..1ead288 100644 --- a/tree.go +++ b/tree.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main /* diff --git a/treeAdd.go b/treeAdd.go index ea6103e..d69f714 100644 --- a/treeAdd.go +++ b/treeAdd.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/treeDraw.go b/treeDraw.go index 5b92d9e..5fa991c 100644 --- a/treeDraw.go +++ b/treeDraw.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/treeWidget.go b/treeWidget.go index 6f41dfd..6fd09f5 100644 --- a/treeWidget.go +++ b/treeWidget.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/view.go b/view.go index 6de283c..5bc7b33 100644 --- a/view.go +++ b/view.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import ( diff --git a/window.go b/window.go index 5e1b6ec..217f777 100644 --- a/window.go +++ b/window.go @@ -1,3 +1,6 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + package main import (