Skip to content

term wrapping and sh tab completion fixes #1737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 6, 2016
+23 −31
Merged

term wrapping and sh tab completion fixes #1737

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9233e5
term wrapping and sh tab completion fixes
payonel Apr 4, 2016
a547319
don't crash on number keys of tables in tab complete in lua prompt
payonel Apr 5, 2016
17ca9d5
fix filter for term.read, dobreak via options, and onTouch for floati…
payonel Apr 5, 2016
8adc771
fix hint cache sometimes being lost during tab completion
payonel Apr 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix hint cache sometimes being lost during tab completion 
The issue fixed is that the hint cache was being cleared far too often, including for key-up events. The fix is to only clear the cache on related events such as clipboard and key-down (but restore cache for tab keydown).
@payonel
payonel committed Apr 6, 2016
commit 8adc7716f83ebed0fd65259182dfabb24efe9790
7 changes: 4 additions & 3 deletions src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua
View file
Original file line number Diff line number Diff line change
@@ -231,14 +231,15 @@ function term.readKeyboard(ops)
while true do
local name, address, char, code = term.internal.pull(input)
local c = nil
hints.cache=char==9 and hints.cache or nil
local backup_cache = hints.cache
if name =="interrupted" then draw("^C\n",true) return ""
elseif name=="touch" or name=="drag" then term.internal.onTouch(input,char,code)
elseif name=="clipboard" then c=char
elseif name=="clipboard" then c=char hints.cache = nil
elseif name=="key_down" then
hints.cache = nil
local ctrl = kb.isControlDown(address)
if ctrl and code == keys.d then return
elseif char==9 then term.internal.tab(input,hints)
elseif char==9 then hints.cache = backup_cache term.internal.tab(input,hints)
elseif char==13 and filter(input) then
input:move(math.huge)
if db ~= false then draw("\n") end