minor changes
This commit is contained in:
@@ -76,7 +76,7 @@ event:register("cm_max", "cm_quit", "cm_exit", "cm_enter")
|
|||||||
--
|
--
|
||||||
event.keyboard = object {_init = { "key_code", "key_name", "key_meta" }, type = event.ev_keyboard}
|
event.keyboard = object {_init = { "key_code", "key_name", "key_meta" }, type = event.ev_keyboard}
|
||||||
|
|
||||||
event.mouse = object {_init = { "bstate", "x", "y", "id" }, type = event.ev_mouse}
|
event.mouse = object {_init = { "btn_code", "x", "y", "btn_name" }, type = event.ev_mouse}
|
||||||
|
|
||||||
-- define command event
|
-- define command event
|
||||||
event.command = object {_init = { "command", "extra" }, type = event.ev_command}
|
event.command = object {_init = { "command", "extra" }, type = event.ev_command}
|
||||||
|
@@ -46,7 +46,7 @@ function program:init(name, argv)
|
|||||||
|
|
||||||
-- init mouse support
|
-- init mouse support
|
||||||
if curses.KEY_MOUSE then
|
if curses.KEY_MOUSE then
|
||||||
curses.mousemask(curses.BUTTON1_PRESSED)
|
curses.mousemask(curses.ALL_MOUSE_EVENTS)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- to filter characters being output to the screen
|
-- to filter characters being output to the screen
|
||||||
@@ -141,8 +141,15 @@ function program:event()
|
|||||||
local key_code, key_name, key_meta = self:_input_key()
|
local key_code, key_name, key_meta = self:_input_key()
|
||||||
if key_code then
|
if key_code then
|
||||||
if curses.KEY_MOUSE and key_code == curses.KEY_MOUSE then
|
if curses.KEY_MOUSE and key_code == curses.KEY_MOUSE then
|
||||||
local s, x, y, z, id = curses.getmouse()
|
local s, x, y = curses.getmouse()
|
||||||
return event.mouse{s, x, y, id}
|
local name
|
||||||
|
for n, v in pairs(curses) do
|
||||||
|
if v == s and n:match('BUTTON') then
|
||||||
|
name = n or name
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return event.mouse{s, x, y, name}
|
||||||
end
|
end
|
||||||
return event.keyboard{key_code, key_name, key_meta}
|
return event.keyboard{key_code, key_name, key_meta}
|
||||||
end
|
end
|
||||||
|
@@ -78,7 +78,7 @@ function demo:on_event(e)
|
|||||||
self:teste():text_set('tp: ' ..
|
self:teste():text_set('tp: ' ..
|
||||||
tostring(e.type) ..
|
tostring(e.type) ..
|
||||||
'; name: ' ..
|
'; name: ' ..
|
||||||
tostring(e.key_name or e.bstate) ..
|
tostring(e.key_name or e.btn_name) ..
|
||||||
'; code: ' ..
|
'; code: ' ..
|
||||||
tostring(e.key_code or e.x) ..
|
tostring(e.key_code or e.x) ..
|
||||||
'; meta: ' ..
|
'; meta: ' ..
|
||||||
|
Reference in New Issue
Block a user