From 571c618cfb8f5482c164c83a873750eeeb49937f Mon Sep 17 00:00:00 2001 From: kebufu <31839741+kebufu@users.noreply.github.com> Date: Sat, 16 Jan 2021 21:37:52 +0800 Subject: [PATCH 1/2] support video ram buffer. --- .../assets/opencomputers/loot/openos/bin/edit.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua index 8ee9b2a34d..2872e2f8c6 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua @@ -33,6 +33,12 @@ elseif not fs.exists(filename) and readonly then return 1 end +local cursorX,cursorY=term.getCursor() +local resX,resY=gpu.getResolution() +local buff=gpu.allocateBuffer(resX,resY) +gpu.setActiveBuffer(0) +gpu.bitblt(1,1,1,resX,resY,0,1,1) + local function loadConfig() -- Try to load user settings. local env = {} @@ -51,7 +57,7 @@ local function loadConfig() pageUp = {{"pageUp"}}, pageDown = {{"pageDown"}}, - backspace = {{"back"}, {"shift", "back"}}, + backspace = {{"back"}}, delete = {{"delete"}}, deleteLine = {{"control", "delete"}, {"shift", "delete"}}, newline = {{"enter"}}, @@ -718,5 +724,7 @@ while running do end end -term.clear() +gpu.bitblt(0,1,1,resX,resY,1,1,1) +gpu.freeBuffer(buff) +term.setCursor(cursorX,cursorY) term.setCursorBlink(true) From 24f1af488b0a1a98559a4d040941eda08b2126ce Mon Sep 17 00:00:00 2001 From: Minecraftku_hei <31839741+mckuhei@users.noreply.github.com> Date: Fri, 8 Oct 2021 21:26:14 +0800 Subject: [PATCH 2/2] bug fix. --- .../resources/assets/opencomputers/loot/openos/bin/edit.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua index 2872e2f8c6..5fe59dc02e 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua @@ -37,7 +37,7 @@ local cursorX,cursorY=term.getCursor() local resX,resY=gpu.getResolution() local buff=gpu.allocateBuffer(resX,resY) gpu.setActiveBuffer(0) -gpu.bitblt(1,1,1,resX,resY,0,1,1) +gpu.bitblt(buff,1,1,resX,resY,0,1,1) local function loadConfig() -- Try to load user settings. @@ -57,7 +57,7 @@ local function loadConfig() pageUp = {{"pageUp"}}, pageDown = {{"pageDown"}}, - backspace = {{"back"}}, + backspace = {{"back"}, {"shift", "back"}}, delete = {{"delete"}}, deleteLine = {{"control", "delete"}, {"shift", "delete"}}, newline = {{"enter"}}, @@ -724,7 +724,7 @@ while running do end end -gpu.bitblt(0,1,1,resX,resY,1,1,1) +gpu.bitblt(0,1,1,resX,resY,buff,1,1) gpu.freeBuffer(buff) term.setCursor(cursorX,cursorY) term.setCursorBlink(true)