Improved error messages + nwm opacity/resizing

monitor/mwm.lua

@@ -12,8 +12,7 @@ local term       = _G.term
 local window     = _G.window
 
 local function syntax()
-	printError('Syntax:')
+	error('Syntax:\nmwm [--config=filename] [monitor]')
-	error('mwm [--config=filename] [monitor]')
 end
 
 local args        = Util.parse(...)

neural/apis/glasses.lua

@@ -12,31 +12,32 @@ local device = _G.device
 
 local Glasses = { }
 
+local palette = {
+	['0'] = 0xF0F0F000,
+	['1'] = 0xF2B23300,
+	['2'] = 0xE57FD800,
+	['3'] = 0x99B2F200,
+	['4'] = 0xDEDE6C00,
+	['5'] = 0x7FCC1900,
+	['6'] = 0xF2B2CC00,
+	['7'] = 0x4C4C4C00,
+	['8'] = 0x99999900,
+	['9'] = 0x4C99B200,
+	['a'] = 0xB266E500,
+	['b'] = 0x3366CC00,
+	['c'] = 0x7F664C00,
+	['d'] = 0x57A64E00,
+	['e'] = 0xCC4C4C00,
+	['f'] = 0x19191900,
+}
+
 function Glasses.getPalette(opacity)
-	local pal = {
-		['0'] = 0xF0F0F000,
-		['1'] = 0xF2B23300,
-		['2'] = 0xE57FD800,
-		['3'] = 0x99B2F200,
-		['4'] = 0xDEDE6C00,
-		['5'] = 0x7FCC1900,
-		['6'] = 0xF2B2CC00,
-		['7'] = 0x4C4C4C00,
-		['8'] = 0x99999900,
-		['9'] = 0x4C99B200,
-		['a'] = 0xB266E500,
-		['b'] = 0x3366CC00,
-		['c'] = 0x7F664C00,
-		['d'] = 0x57A64E00,
-		['e'] = 0xCC4C4C00,
-		['f'] = 0x19191900,
-	}
 	if opacity then
-		for k,v in pairs(pal) do
+		for k,v in pairs(palette) do
-			pal[k] = v + opacity
+			palette[k] = v + opacity
 		end
 	end
-	return pal
+	return palette
 end
 
 function Glasses.create(args)
@@ -54,7 +55,7 @@ function Glasses.create(args)
 	local canvas = glasses.canvas()
 	local _, cy = 1, 1
 	local lines = { }
-	local pal = Glasses.getPalette(opts.opacity)
+	local pal = palette -- Glasses.getPalette(opts.opacity)
 
 	local pos = { x = opts.x * xs, y = opts.y * ys }
 
@@ -83,9 +84,11 @@ function Glasses.create(args)
 		blit = function(text, fg, bg)
 			for x = 1, #text do
 				local ln = lines[cy]
-				ln.bg[x].setColor(pal[bg:sub(x, x)])
+				if ln and x <= opts.width then
-				ln.text[x].setColor(pal[fg:sub(x, x)])
+					ln.bg[x].setColor(pal[bg:sub(x, x)] + opts.opacity)
-				ln.text[x].setText(text:sub(x, x))
+					ln.text[x].setColor(pal[fg:sub(x, x)] + opts.opacity)
+					ln.text[x].setText(text:sub(x, x))
+				end
 			end
 		end,
 		setCursorPos = function(_, y)
@@ -110,6 +113,13 @@ function Glasses.create(args)
 	function gterm.getTextScale()
 		return opts.scale
 	end
+	function gterm.getOpacity()
+		return opts.opacity
+	end
+	function gterm.setOpacity(opacity)
+		opts.opacity = opacity
+		gterm.redraw()
+	end
 	function gterm.move(x, y)
 		if opts.x ~= x or opts.y ~= y then
 			opts.x, opts.y = x, y
@@ -117,10 +127,21 @@ function Glasses.create(args)
 			group.setPosition(pos.x, pos.y)
 		end
 	end
+	function gterm.reposition2(x, y, w, h)
+		opts.x, opts.y = x, y
+		opts.width, opts.height = w, h
+		pos = { x = opts.x * xs, y = opts.y * ys }
+		local g = canvas.addGroup(pos)
+		init(g)
+		group.remove()
+		group = g
+		gterm.reposition(1, 1, w, h)
+		gterm.redraw()
+	end
 
-	gterm.name = opts.name
+	--gterm.name = opts.name
-	gterm.side = opts.name
+	--gterm.side = opts.name
-	gterm.type = 'glasses'
+	--gterm.type = 'glasses'
 
 	return gterm
 end

neural/apis/interface.lua

@@ -17,12 +17,14 @@ function Neural.assertModules(modules)
 
 	for _, m in pairs(modules) do
 		if not Neural.hasModule(m) then
-			print('Required:')
+			local t = { }
+			table.insert(t, 'Required:')
 			for _, v in pairs(modules) do
-				print(' * ' .. (modules[v] or v))
+				table.insert(t, ' * ' .. (modules[v] or v))
 			end
-			print('')
+			table.insert(t, '')
-			error('Missing: ' .. (all[m] or m))
+			table.insert(t, 'Missing: ' .. (all[m] or m))
+			error(table.concat(t, '\n'))
 		end
 	end
 end

neural/elytraFly.lua

@@ -11,11 +11,12 @@ local parallel = _G.parallel
 local STARTUP_FILE = 'usr/autorun/fly.lua'
 
 if not modules.launch or not modules.getMetaOwner then
-	print([[Required:
+	error([[Required:
-* Kinetic augment
+ * Kinetic augment
-* Entity sensor
+ * Entity sensor
-* Introspection module]])
+ * Introspection module
-	error('missing required item')
+
+Missing required item]])
 end
 
 if not fs.exists(STARTUP_FILE) then

neural/nwm.lua

@@ -8,13 +8,14 @@
 
 local Config  = require('opus.config')
 local Glasses = require('neural.glasses')
-local UI      = require('opus.ui')
 local Util    = require('opus.util')
 
+local colors  = _G.colors
 local device  = _G.device
 local fs      = _G.fs
 local kernel  = _G.kernel
 local shell   = _ENV.shell
+local term    = _G.term
 local window  = _G.window
 
 local config = Config.load('nwm', { session = { } })
@@ -22,10 +23,9 @@ local config = Config.load('nwm', { session = { } })
 -- TODO: figure out how to better support scaling
 local scale = .5
 local xs, ys = 6 * scale, 9 * scale
-local dragging
+local dragging, resizing
 local canvas = device['plethora:glasses'].canvas()
 local cw, ch = canvas.getSize()
-local opacity = 127
 
 local multishell = Util.shallowCopy(_ENV.multishell)
 _ENV.multishell = multishell
@@ -40,7 +40,6 @@ local events = {
 }
 
 local function hook(e, eventData)
-	local current = kernel.getFocused()
 	local x = math.floor(eventData[2] / xs)
 	local y = math.floor(eventData[3] / ys)
 	local clicked
@@ -61,37 +60,78 @@ local function hook(e, eventData)
 		return
 	end
 
+	if resizing then
+		if e == 'glasses_up' then
+			resizing.group.remove()
+			if resizing.dx then
+				resizing.tab.wmargs.x = resizing.dx
+				resizing.tab.wmargs.y = resizing.dy
+				resizing.tab.wmargs.width = resizing.dw
+				resizing.tab.wmargs.height = resizing.dh
+				resizing.tab.gwindow.reposition2(resizing.dx, resizing.dy, resizing.dw, resizing.dh)
+				resizing.tab:resume('term_resize')
+
+				resizing.tab.titleBar.reposition2(resizing.dx, resizing.dy - 1, resizing.dw, 1)
+				resizing.tab.titleBar:draw(resizing.tab.title)
+				Config.update('nwm', config)
+			end
+			resizing = nil
+
+		elseif e == 'glasses_drag' then
+			local dx = x - resizing.ax
+			local dy = y - resizing.ay
+
+			resizing.dx = resizing.tab.wmargs.x
+			resizing.dy = math.min(resizing.tab.wmargs.y + dy, resizing.tab.wmargs.y + resizing.tab.wmargs.height - 4)
+			resizing.dw = math.max(resizing.tab.wmargs.width + dx, 8)
+			resizing.dh = math.max(resizing.tab.wmargs.height - dy, 4)
+
+			resizing.group.setPosition((resizing.dx + 1) * xs, resizing.dy * ys)
+			resizing.group.setSize(resizing.dw * xs, (resizing.dh + 1) * ys)
+		end
+		return
+	end
+
 	for _,tab in ipairs(kernel.routines) do
 		if tab.gwindow then
 			local wx, wy = tab.gwindow.getPosition()
 			local ww, wh = tab.gwindow.getSize()
 
-			if x >= wx and x <= wx + ww and y > wy and y < wy + wh then
+			if x >= wx and x <= wx + ww and y > wy and y <= wy + wh then
 				clicked = tab
 				x = x - wx
 				y = y - wy
 				break
-			elseif e == 'glasses_click' and x >= wx and x <= wx + ww and y == wy then
+			elseif x >= wx and x <= wx + ww and y == wy then
-				if x == wx + ww - 1 then
+				if e == 'glasses_click' then
-					multishell.terminate(tab.uid)
+					if x == wx + ww - 1 then
-				else
+						multishell.terminate(tab.uid)
-					dragging = { tab = tab, ax = x, ay = y, wx = wx, wy = wy }
+					elseif x == wx + ww - 3 then
+						local pos = { x = (tab.wmargs.x + 1) * xs, y = tab.wmargs.y * ys }
+						resizing = { tab = tab, ax = x, ay = y }
+						resizing.group = canvas.addRectangle(pos.x, pos.y, tab.wmargs.width * xs, (tab.wmargs.height + 1) * ys, 0xF0F0F04F)
+					else
+						dragging = { tab = tab, ax = x, ay = y, wx = wx, wy = wy }
+					end
+					return
+				elseif e == 'glasses_scroll' then
+					tab.wmargs.opacity = Util.clamp(tab.wmargs.opacity - (eventData[1] * 5), 0, 255)
+					Config.update('nwm', config)
+					tab.gwindow.setOpacity(tab.wmargs.opacity)
 				end
-				return
 			end
 		end
 	end
 
 	if clicked then
+		local current = kernel.getFocused()
 		if clicked ~= current then
 			clicked.gwindow.raise()
+			clicked.titleBar.raise()
 			kernel.raise(clicked.uid)
 		end
 
-		kernel.event(events[e], {
+		clicked:resume(events[e], eventData[1], x, y)
-			eventData[1], x, y, clicked.gwindow.side,
-		})
-
 	end
 	return true
 end
@@ -103,7 +143,7 @@ function multishell.openTab(env, tab)
 			y = math.random(1, ch - 19 + 1),
 			width = 51,
 			height = 19,
-			opacity = opacity,
+			opacity = 192,
 			path = tab.path,
 			args = tab.args,
 		}
@@ -125,24 +165,28 @@ function multishell.openTab(env, tab)
 
 	local wmargs = tab.wmargs
 
-	local titleBar = Glasses.create({
-		x = wmargs.x,
-		y = wmargs.y - 1,
-		height = 1,
-		width = wmargs.width,
-		opacity = wmargs.opacity,
-	})
-	titleBar.canvas:clear('yellow')
-	titleBar.canvas:write(1, 1, ' ' .. fs.getName(tab.path), nil, 'black')
-	titleBar.canvas:write(wmargs.width - 2, 1, ' x ', nil, 'black')
-	titleBar.redraw()
-
 	if not tab.title and tab.path then
 		tab.title = fs.getName(tab.path):match('([^%.]+)')
 	end
 	tab.hidden = true
 	tab.title = tab.title or 'untitled'
 
+	local titleBar = Glasses.create({
+		x = wmargs.x,
+		y = wmargs.y - 1,
+		height = 1,
+		width = wmargs.width,
+		opacity = 160,
+	})
+	titleBar.routine = tab
+	function titleBar:draw(title)
+		titleBar.canvas:clear('yellow')
+		titleBar.canvas:write(1, 1, ' ' .. title, nil, 'black')
+		titleBar.canvas:write(self.routine.wmargs.width - 4, 1, ' + x ', nil, 'black')
+		titleBar.redraw()
+	end
+	titleBar:draw(tab.title)
+
 	local w, h = device.terminal.getSize()
 	tab.window = window.create(device.terminal, 1, 2, w, h - 1, false)
 	tab.gwindow = Glasses.create(wmargs)
@@ -163,89 +207,10 @@ function multishell.setTitle(tabId, title)
 	local tab = kernel.find(tabId)
 	if tab then
 		tab.title = title
-		tab.titleBar.canvas:clear('yellow')
+		tab.titleBar:draw(title)
-		tab.titleBar.canvas:write(1, 1, ' ' .. title, nil, 'black')
-		tab.titleBar.canvas:write(tab.wmargs.width - 2, 1, ' x ', nil, 'black')
-		tab.titleBar.redraw()
 	end
 end
 
-UI:setPage(UI.Page {
-	form = UI.Form {
-		values = {
-			x = 1, y = 25, width = 51, height = 19,
-			opacity = 255,
-		},
-		UI.TextEntry {
-			formKey = 'run', formLabel = 'Run', required = true,
-		},
-		UI.Slider {
-			min = 0, max = 255,
-			formLabel = 'Opacity', formKey = 'opacity', formIndex = 3,
-			labelWidth = 3,
-			transform = math.floor,
-			eventHandler = function(self, event)
-				if event.type == 'slider_update' then
-					opacity = event.value
-				end
-				return UI.Slider.eventHandler(self, event)
-			end,
-		},
-		UI.Text {
-			x = 10, y = 5,
-			textColor = 'yellow',
-			value = ' x       y'
-		},
-		UI.TextEntry {
-			x = 10, y = 6, width = 7, limit = 3,
-			transform = 'number',
-			formKey = 'x', required = true,
-		},
-		UI.TextEntry {
-			x = 18, y = 6, width = 7, limit = 4,
-			transform = 'number',
-			formKey = 'y', required = true,
-		},
-		UI.Text {
-			x = 10, y = 8,
-			textColor = 'yellow',
-			value = ' width   height'
-		},
-		UI.TextEntry {
-			x = 10, y = 9, width = 7, limit = 4,
-			transform = 'number',
-			formKey = 'width', required = true,
-		},
-		UI.TextEntry {
-			x = 18, y = 9, width = 7, limit = 4,
-			transform = 'number',
-			formKey = 'height', required = true,
-		},
-	},
-	notification = UI.Notification { },
-	eventHandler = function(self, event)
-		if event.type == 'form_complete' then
-			local opts = Util.shallowCopy(event.values)
-			local words = Util.split(opts.run, '(.-) ')
-			words[1] = shell.resolveProgram(words[1])
-			if not words[1] then
-				self.notification:error('Invalid program')
-			else
-				opts.path = 'sys/apps/shell.lua'
-				opts.args = table.concat(words, ' ')
-				table.insert(config.session, opts)
-				Config.update('nwm', config)
-				multishell.openTab(_ENV, { wmargs = opts })
-				self.notification:success('Started program')
-			end
-
-		elseif event.type == 'form_cancel' then
-			UI:quit()
-		end
-		return UI.Page.eventHandler(self, event)
-	end,
-})
-
 local hookEvents = Util.keys(events)
 kernel.hook(hookEvents, hook)
 
@@ -253,6 +218,22 @@ for _,v in pairs(config.session) do
 	multishell.openTab(_ENV, { wmargs = v })
 end
 
-UI:start()
+term.setBackgroundColor(colors.black)
+term.setTextColor(colors.white)
+term.clear()
+print('Scroll on a titlebar adjusts opacity\n')
+print('Run a program')
+pcall(function()
+	while true do
+		_G.write('> ')
+		local p = _G.read(nil, nil, shell.complete)
+		if p and #Util.trim(p) > 0 then
+			multishell.openTab(_ENV, {
+				path = 'sys/apps/shell.lua',
+				args = { p },
+			})
+		end
+	end
+end)
 
 kernel.unhook(hookEvents, hook)