len0rd/suit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better require regexps for submodules

Browse source
This commit is contained in:
Matthias Richter 2012-02-21 14:52:30 +01:00
parent 77674a4830
commit a094675a49
8 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
button.lua
View file

@ -1,4 +1,4 @@
local core = require((...):match("^(.+)%.[^%.]+") .. '.core') local core = require((...):match("(.-)[^%.]+$") .. 'core')
-- the widget -- the widget
return function(title, x,y, w,h, draw) return function(title, x,y, w,h, draw)

2
checkbox.lua
View file

@ -1,4 +1,4 @@
local core = require((...):match("^(.+)%.[^%.]+") .. '.core') local core = require((...):match("(.-)[^%.]+$") .. 'core')
return function(info, x,y, w,h, draw) return function(info, x,y, w,h, draw)
local id = core.generateID() local id = core.generateID()

4
core.lua
View file

@ -1,5 +1,6 @@
-- state -- state
local context = {maxid = 0} local context = {maxid = 0}
local draw_items = {n = 0}
local NO_WIDGET = function()end local NO_WIDGET = function()end
local function generateID() local function generateID()
@ -87,7 +88,6 @@ local function save_unpack(t, i)
return t[i], save_unpack(t, i+1) return t[i], save_unpack(t, i+1)
end end
local draw_items = {n = 0}
local function registerDraw(id, f, ...) local function registerDraw(id, f, ...)
assert(type(f) == 'function' or (getmetatable(f) or {}).__call, assert(type(f) == 'function' or (getmetatable(f) or {}).__call,
'Drawing function is not a callable type!') 'Drawing function is not a callable type!')
@ -141,7 +141,7 @@ return {
hasKeyFocus = hasKeyFocus, hasKeyFocus = hasKeyFocus,
makeTabable = makeTabable, makeTabable = makeTabable,
style = require((...):match("^(.+)%.[^%.]+") .. '.style-default'), style = require((...):match("(.-)[^%.]+$") .. '.style-default'),
color = color, color = color,
registerDraw = registerDraw, registerDraw = registerDraw,
draw = draw, draw = draw,

2
init.lua
View file

@ -1,4 +1,4 @@
local BASE = (...) .. '.' local BASE = ((...):match('(.+)%.') or ...) .. '.'
return { return {
core = require(BASE .. 'core'), core = require(BASE .. 'core'),

3
input.lua
View file

@ -1,4 +1,4 @@
local core = require((...):match("^(.+)%.[^%.]+") .. '.core') local core = require((...):match("(.-)[^%.]+$") .. 'core')
return function(info, x,y,w,h, draw) return function(info, x,y,w,h, draw)
info.text = info.text or "" info.text = info.text or ""
@ -10,6 +10,7 @@ return function(info, x,y,w,h, draw)
if core.isActive(id) then core.setKeyFocus(id) end if core.isActive(id) then core.setKeyFocus(id) end
core.registerDraw(id, draw or core.style.Input, info.text, info.cursor, x,y,w,h) core.registerDraw(id, draw or core.style.Input, info.text, info.cursor, x,y,w,h)
if not core.hasKeyFocus(id) then return false end
local changed = false local changed = false
-- editing -- editing

2
label.lua
View file

@ -1,4 +1,4 @@
local core = require((...):match("^(.+)%.[^%.]+") .. '.core') local core = require((...):match("(.-)[^%.]+$") .. 'core')
return function(text, x,y,w,h,align, draw) return function(text, x,y,w,h,align, draw)
local id = core.generateID() local id = core.generateID()

2
slider.lua
View file

@ -1,4 +1,4 @@
local core = require((...):match("^(.+)%.[^%.]+") .. '.core') local core = require((...):match("(.-)[^%.]+$") .. 'core')
return function(info, x,y,w,h, draw) return function(info, x,y,w,h, draw)
assert(type(info) == 'table' and info.value, "Incomplete slider value info") assert(type(info) == 'table' and info.value, "Incomplete slider value info")

2
slider2d.lua
View file

@ -1,4 +1,4 @@
local core = require((...):match("^(.+)%.[^%.]+") .. '.core') local core = require((...):match("(.-)[^%.]+$") .. 'core')
return function(info, x,y,w,h, draw) return function(info, x,y,w,h, draw)
assert(type(info) == 'table' and type(info.value) == "table", "Incomplete slider value info") assert(type(info) == 'table' and type(info.value) == "table", "Incomplete slider value info")