mirror of
https://github.com/koreader/koreader
synced 2024-11-13 19:11:25 +00:00
fadee1f5dc
Basically: * Use `extend` for class definitions * Use `new` for object instantiations That includes some minor code cleanups along the way: * Updated `Widget`'s docs to make the semantics clearer. * Removed `should_restrict_JIT` (it's been dead code since https://github.com/koreader/android-luajit-launcher/pull/283) * Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass). * Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events. * Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier. * Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references. * ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak). * Terminal: Make sure the shell is killed on plugin teardown. * InputText: Fix Home/End/Del physical keys to behave sensibly. * InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...). * OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of. * ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed! * Kobo: Minor code cleanups.
85 lines
2.3 KiB
Lua
85 lines
2.3 KiB
Lua
local ffi = require("ffi")
|
|
local Event = require("ui/event")
|
|
local logger = require("logger")
|
|
|
|
local _ = require("ffi/zeromq_h")
|
|
local czmq = ffi.load("libs/libczmq.so.1")
|
|
|
|
local MessageQueue = {}
|
|
|
|
function MessageQueue:extend(subclass_prototype)
|
|
local o = subclass_prototype or {}
|
|
setmetatable(o, self)
|
|
self.__index = self
|
|
return o
|
|
end
|
|
|
|
function MessageQueue:new(o)
|
|
o = self:extend(o)
|
|
if o.init then o:init() end
|
|
self.messages = {}
|
|
return o
|
|
end
|
|
|
|
function MessageQueue:init()
|
|
end
|
|
|
|
function MessageQueue:start()
|
|
end
|
|
|
|
function MessageQueue:stop()
|
|
end
|
|
|
|
function MessageQueue:waitEvent()
|
|
end
|
|
|
|
function MessageQueue:handleZMsgs(messages)
|
|
local function drop_message()
|
|
if czmq.zmsg_size(messages[1]) == 0 then
|
|
czmq.zmsg_destroy(ffi.new('zmsg_t *[1]', messages[1]))
|
|
table.remove(messages, 1)
|
|
end
|
|
end
|
|
local function pop_string()
|
|
local str_p = czmq.zmsg_popstr(messages[1])
|
|
local res = ffi.string(str_p)
|
|
czmq.zstr_free(ffi.new('char *[1]', str_p))
|
|
drop_message()
|
|
return res
|
|
end
|
|
local function pop_header()
|
|
local header = {}
|
|
local frame = czmq.zmsg_pop(messages[1])
|
|
if frame ~= nil then
|
|
local hash = czmq.zhash_unpack(frame)
|
|
czmq.zframe_destroy(ffi.new('zframe_t *[1]', frame))
|
|
if hash ~= nil then
|
|
local value, key = czmq.zhash_first(hash), czmq.zhash_cursor(hash)
|
|
while value ~= nil and key ~= nil do
|
|
header[ffi.string(key)] = ffi.string(value)
|
|
value, key = czmq.zhash_next(hash), czmq.zhash_cursor(hash)
|
|
end
|
|
czmq.zhash_destroy(ffi.new('zhash_t *[1]', hash))
|
|
end
|
|
end
|
|
drop_message()
|
|
return header
|
|
end
|
|
if #messages == 0 then return end
|
|
local command = pop_string()
|
|
logger.dbg("ØMQ message", command)
|
|
if command == "ENTER" then
|
|
local id = pop_string()
|
|
local name = pop_string()
|
|
local header = pop_header()
|
|
local endpoint = pop_string()
|
|
return Event:new("ZyreEnter", id, name, header, endpoint)
|
|
elseif command == "DELIVER" then
|
|
local filename = pop_string()
|
|
local fullname = pop_string()
|
|
return Event:new("FileDeliver", filename, fullname)
|
|
end
|
|
end
|
|
|
|
return MessageQueue
|