mirror of
https://github.com/koreader/koreader
synced 2024-11-18 03:25:46 +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.
53 lines
1.7 KiB
Lua
53 lines
1.7 KiB
Lua
local ffi = require("ffi")
|
|
local logger = require("logger")
|
|
local MessageQueue = require("ui/message/messagequeue")
|
|
local _ = require("ffi/zeromq_h")
|
|
local czmq = ffi.load("libs/libczmq.so.1")
|
|
local filemq = ffi.load("libs/libfmq.so.1")
|
|
|
|
local FileMessageQueue = MessageQueue:extend{
|
|
client = nil,
|
|
server = nil,
|
|
}
|
|
|
|
function FileMessageQueue:init()
|
|
if self.client ~= nil then
|
|
self.fmq_recv = filemq.fmq_client_recv
|
|
self.filemq = self.client
|
|
self.poller = czmq.zpoller_new(filemq.fmq_client_handle(self.client), nil)
|
|
elseif self.server ~= nil then
|
|
--- @todo currently fmq_server_recv API is not available
|
|
--self.fmq_recv = filemq.fmq_server_recv
|
|
self.filemq = self.server
|
|
--- @todo currently fmq_server_handle API is not available
|
|
--self.poller = czmq.zpoller_new(filemq.fmq_server_handle(self.server), nil)
|
|
end
|
|
end
|
|
|
|
function FileMessageQueue:stop()
|
|
if self.client ~= nil then
|
|
logger.dbg("stop filemq client")
|
|
filemq.fmq_client_destroy(ffi.new('fmq_client_t *[1]', self.client))
|
|
end
|
|
if self.server ~= nil then
|
|
logger.dbg("stop filemq server")
|
|
filemq.fmq_server_destroy(ffi.new('fmq_server_t *[1]', self.server))
|
|
end
|
|
if self.poller ~= nil then
|
|
czmq.zpoller_destroy(ffi.new('zpoller_t *[1]', self.poller))
|
|
end
|
|
end
|
|
|
|
function FileMessageQueue:waitEvent()
|
|
if not self.poller then return end
|
|
if czmq.zpoller_wait(self.poller, 0) ~= nil then
|
|
local msg = self.fmq_recv(self.filemq)
|
|
if msg ~= nil then
|
|
table.insert(self.messages, msg)
|
|
end
|
|
end
|
|
return self:handleZMsgs(self.messages)
|
|
end
|
|
|
|
return FileMessageQueue
|