mirrors/ldd-CC
1
0
Fork 0
mirror of https://github.com/LDDestroier/CC/ synced 2025-07-06 12:02:54 +00:00
Code Issues Releases Wiki Activity

Added pausable os.clock()

Browse Source
This commit is contained in:
LDDestroier 2019-06-21 01:04:31 -04:00 committed by GitHub
parent 566590a298
commit 26dcaa960b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
workspace.lua
View File

@ -714,6 +714,8 @@ local newInstance = function(x, y, program, initialStart)
program = program or config.defaultProgram, program = program or config.defaultProgram,
window = window, window = window,
timer = {}, timer = {},
clockMod = 0,
lastClock = 0,
extraEvents = {}, extraEvents = {},
paused = false paused = false
} }
@ -938,6 +940,9 @@ local main = function()
os.cancelTimer = function(id) os.cancelTimer = function(id)
instances[y][x].timer[id] = nil instances[y][x].timer[id] = nil
end end
os.clock = function()
return oldOSreplace.clock() + instances[y][x].clockMod
end
end end
-- timer for instance timers and window scrolling -- timer for instance timers and window scrolling
@ -978,6 +983,11 @@ local main = function()
enteringCommand = true enteringCommand = true
doDrawWorkspaceIndicator = instances[focus[2]][focus[1]].paused and 2 or 3 doDrawWorkspaceIndicator = instances[focus[2]][focus[1]].paused and 2 or 3
wID = os.startTimer(workspaceIndicatorDuration) wID = os.startTimer(workspaceIndicatorDuration)
if instances[focus[2]][focus[1]].paused then
instances[focus[2]][focus[1]].lastClock = os.clock() + instances[focus[2]][focus[1]].clockMod
else
instances[focus[2]][focus[1]].clockMod = instances[focus[2]][focus[1]].lastClock - os.clock()
end
end end
end end
if keysDown[keys.left] then if keysDown[keys.left] then
@ -1101,6 +1111,7 @@ local main = function()
oldOSreplace.startTimer = os.startTimer oldOSreplace.startTimer = os.startTimer
oldOSreplace.cancelTimer = os.cancelTimer oldOSreplace.cancelTimer = os.cancelTimer
oldOSreplace.clock = os.clock
for y = gridMinY, gridHeight do for y = gridMinY, gridHeight do
if instances[y] then if instances[y] then
@ -1134,6 +1145,7 @@ local main = function()
os.startTimer = oldOSreplace.startTimer os.startTimer = oldOSreplace.startTimer
os.cancelTimer = oldOSreplace.cancelTimer os.cancelTimer = oldOSreplace.cancelTimer
os.clock = oldOSreplace.clock
end end
lddterm.selectedWindow = instances[focus[2]][focus[1]].window.layer lddterm.selectedWindow = instances[focus[2]][focus[1]].window.layer