diff --git a/apps/telnet.lua b/apps/telnet.lua index 4d8e395..8829ae2 100644 --- a/apps/telnet.lua +++ b/apps/telnet.lua @@ -46,13 +46,12 @@ process:newThread('telnet_read', function() ct[v.f](unpack(v.args)) end end - print('telnet_read exiting') end) ct.clear() ct.setCursorPos(1, 1) -local filter = Util.invert({ +local filter = Util.transpose({ 'char', 'paste', 'key', 'key_up', 'mouse_scroll', 'mouse_click', 'mouse_drag', }) diff --git a/sys/apis/ui.lua b/sys/apis/ui.lua index a838bcb..8a80ce5 100644 --- a/sys/apis/ui.lua +++ b/sys/apis/ui.lua @@ -3323,7 +3323,7 @@ end UI:loadTheme('config/ui.theme') if os.getVersion() >= 1.79 then - UI:loadTheme('config/ext.theme') + UI:loadTheme('sys/etc/ext.theme') end UI:setDefaultDevice(UI.Device({ device = term.current() })) diff --git a/sys/apis/util.lua b/sys/apis/util.lua index 6dd4a85..28457b8 100644 --- a/sys/apis/util.lua +++ b/sys/apis/util.lua @@ -118,14 +118,6 @@ function Util.keys(t) return keys end -function Util.invert(t) - local nt = { } - for k,v in pairs(t) do - nt[v] = k - end - return nt -end - function Util.merge(obj, args) if args then for k,v in pairs(args) do diff --git a/sys/etc/ext.theme b/sys/etc/ext.theme new file mode 100644 index 0000000..665fdee --- /dev/null +++ b/sys/etc/ext.theme @@ -0,0 +1,15 @@ +{ + ScrollingGrid = { + lineChar = '|', + sliderChar = '\127', + upArrowChar = '\30', + downArrowChar = '\31', + }, + Button = { + focusIndicator = '\183', + }, + Grid = { + focusIndicator = '\183', + inverseSortIndicator = '\24', + }, +}