diff --git a/builder/builder.lua b/builder/builder.lua index 48a38a8..a41677f 100644 --- a/builder/builder.lua +++ b/builder/builder.lua @@ -597,7 +597,7 @@ local startPage = UI.Page { throttle = UI.Throttle { }, accelerators = { x = 'test', - q = 'quit' + [ 'control-q' ] = 'quit' } } diff --git a/common/Appstore.lua b/common/Appstore.lua index 09dd35d..a94c93f 100644 --- a/common/Appstore.lua +++ b/common/Appstore.lua @@ -189,7 +189,7 @@ local appPage = UI.Page { }, notification = UI.Notification(), accelerators = { - q = 'back', + [ 'control-q' ] = 'back', backspace = 'back', }, } @@ -307,7 +307,7 @@ local categoryPage = UI.Page { statusBar = UI.StatusBar(), accelerators = { l = 'lua', - q = 'quit', + [ 'control-q' ] = 'quit', }, } diff --git a/common/Devices.lua b/common/Devices.lua index ec50550..57ac8fe 100644 --- a/common/Devices.lua +++ b/common/Devices.lua @@ -23,7 +23,7 @@ local peripheralsPage = UI.Page { values = 'Select peripheral', }, accelerators = { - q = 'quit', + [ 'control-q' ] = 'quit', }, } @@ -78,7 +78,7 @@ local methodsPage = UI.Page { status = 'q to return', }, accelerators = { - q = 'back', + [ 'control-q' ] = 'back', backspace = 'back', }, } diff --git a/common/Events.lua b/common/Events.lua index 6e00514..72ec233 100644 --- a/common/Events.lua +++ b/common/Events.lua @@ -33,7 +33,7 @@ local page = UI.Page { p = 'toggle', r = 'reset', c = 'clear', - q = 'quit', + [ 'control-q' ] = 'quit', }, filtered = { }, } diff --git a/common/Turtles.lua b/common/Turtles.lua index b5e78ce..c9a3d7b 100644 --- a/common/Turtles.lua +++ b/common/Turtles.lua @@ -137,7 +137,7 @@ local page = UI.Page { }, notification = UI.Notification(), accelerators = { - q = 'quit', + [ 'control-q' ] = 'quit', }, } diff --git a/common/autorun/common.lua b/common/autorun/common.lua index fc4e2bb..2c9b53e 100644 --- a/common/autorun/common.lua +++ b/common/autorun/common.lua @@ -6,5 +6,3 @@ end _ENV.shell.setCompletionFunction("packages/common/edit.lua", c) _ENV.shell.setCompletionFunction("packages/common/hexedit.lua", c) - -fs.mount('packages/common/hexedit.lua', 'urlfs', 'https://pastebin.com/raw/Ds9ajsp4') diff --git a/common/edit.lua b/common/edit.lua index ecb911d..f74bdb6 100644 --- a/common/edit.lua +++ b/common/edit.lua @@ -2,7 +2,6 @@ local input = require('opus.input') local colors = _G.colors local fs = _G.fs -local keys = _G.keys local multishell = _ENV.multishell local os = _G.os local shell = _ENV.shell @@ -48,28 +47,6 @@ local mark = { } local searchPattern local undo = { chain = { }, pointer = 0 } local complete = { } -local clipboard - --- do we need a clipboard shim -if not multishell or not _G.kernel then -- is this OpusOS ? - if _G.clipboard then -- has it been installed already - clipboard = _G.clipboard - else - clipboard = { } - - function clipboard.setData(data) - clipboard.data = data - end - - function clipboard.getText() - if clipboard.data then - return tostring(clipboard.data) - end - end - - _G.clipboard = clipboard - end -end local color = { textColor = '0', @@ -145,7 +122,7 @@ local keyMapping = { -- copy/paste [ 'control-x' ] = 'cut', [ 'control-c' ] = 'copy', - [ 'control-shift-paste' ] = 'paste_internal', +-- [ 'control-shift-paste' ] = 'paste_internal', -- file [ 'control-s' ] = 'save', @@ -1038,11 +1015,7 @@ local __actions = { copy_marked = function() local text = actions.copyText(mark.x, mark.y, mark.ex, mark.ey) - if clipboard then - clipboard.setData(text) - else - os.queueEvent('clipboard_copy', text) - end + os.queueEvent('clipboard_copy', text) setStatus('shift-^v to paste') end, @@ -1072,12 +1045,6 @@ local __actions = { end end, - paste_internal = function() - if clipboard then - actions.paste(clipboard.getText()) - end - end, - go_to = function(cx, cy) y = math.min(math.max(cy, 1), #tLines) x = math.min(math.max(cx, 1), #tLines[y] + 1) diff --git a/common/etc/fstab b/common/etc/fstab new file mode 100644 index 0000000..53d8ee8 --- /dev/null +++ b/common/etc/fstab @@ -0,0 +1,2 @@ +packages/common/ascii.lua urlfs http://pastebin.com/raw/u3kcnyjd +packages/common/hexedit.lua urlfs https://pastebin.com/raw/Ds9ajsp4 \ No newline at end of file diff --git a/ignore/Script.lua b/ignore/Script.lua index 94dfb7d..10b6266 100644 --- a/ignore/Script.lua +++ b/ignore/Script.lua @@ -188,7 +188,7 @@ local mainPage = UI.Page({ autospace = true, }), accelerators = { - q = 'quit', + [ 'control-q' ] = 'quit', }, }) diff --git a/ignore/shapes.lua b/ignore/shapes.lua index 74751d2..d863f6a 100644 --- a/ignore/shapes.lua +++ b/ignore/shapes.lua @@ -52,7 +52,7 @@ local page = UI.Page { first = UI.Button { x = 2, y = 11, text = 'First', event = 'firstCoord' }, cancel = UI.Button { x = 2, y = -3, text = 'Abort', event = 'cancel' }, begin = UI.Button { x = -8, y = -3, text = 'Begin', event = 'begin' }, - accelerators = { q = 'quit' }, + accelerators = { [ 'control-q' ] = 'quit' }, notification = UI.Notification(), statusBar = UI.StatusBar(), } diff --git a/milo/MiloRemote.lua b/milo/MiloRemote.lua index 09bb855..27aecd5 100644 --- a/milo/MiloRemote.lua +++ b/milo/MiloRemote.lua @@ -106,8 +106,7 @@ local page = UI.Page { [ 'control-e' ] = 'eject', [ 'control-s' ] = 'eject_stack', [ 'control-a' ] = 'eject_all', - - q = 'quit', + [ 'control-q' ] = 'quit', }, items = { }, } diff --git a/milo/core/listing.lua b/milo/core/listing.lua index c44526e..2a6eeea 100644 --- a/milo/core/listing.lua +++ b/milo/core/listing.lua @@ -107,7 +107,7 @@ local page = UI.Page { [ 'control-m' ] = 'network', - q = 'quit', + [ 'control-q' ] = 'quit', }, allItems = { } } diff --git a/miners/scanningMiner.lua b/miners/scanningMiner.lua index fa73f16..8c002de 100644 --- a/miners/scanningMiner.lua +++ b/miners/scanningMiner.lua @@ -112,7 +112,7 @@ local page = UI.Page { }, }, accelerators = { - q = 'cancel', + [ 'control-q' ] = 'cancel', } } diff --git a/neural/Scanner.lua b/neural/Scanner.lua index 041783c..11edab2 100644 --- a/neural/Scanner.lua +++ b/neural/Scanner.lua @@ -44,7 +44,7 @@ local page = UI.Page { sortColumn = 'displayName', }, accelerators = { - q = 'quit', + [ 'control-q' ] = 'quit', }, detail = UI.SlideOut { menuBar = UI.MenuBar { diff --git a/neural/Sensor.lua b/neural/Sensor.lua index ec50092..7dc726e 100644 --- a/neural/Sensor.lua +++ b/neural/Sensor.lua @@ -45,7 +45,7 @@ local page = UI.Page { }, }, accelerators = { - q = 'quit', + [ 'control-q' ] = 'quit', }, }, }