diff options
Diffstat (limited to 'apps/plugins/lua/include_lua')
| -rw-r--r-- | apps/plugins/lua/include_lua/blit.lua | 2 | ||||
| -rw-r--r-- | apps/plugins/lua/include_lua/color.lua | 31 | ||||
| -rw-r--r-- | apps/plugins/lua/include_lua/draw.lua | 229 | ||||
| -rw-r--r-- | apps/plugins/lua/include_lua/image.lua | 117 | ||||
| -rw-r--r-- | apps/plugins/lua/include_lua/lcd.lua | 24 | ||||
| -rw-r--r-- | apps/plugins/lua/include_lua/print.lua | 80 |
6 files changed, 207 insertions, 276 deletions
diff --git a/apps/plugins/lua/include_lua/blit.lua b/apps/plugins/lua/include_lua/blit.lua index 6c5ea377e4..3505ae4943 100644 --- a/apps/plugins/lua/include_lua/blit.lua +++ b/apps/plugins/lua/include_lua/blit.lua @@ -36,7 +36,7 @@ if not rb.lcd_framebuffer then rb.splash(rb.HZ, "No Support!") return nil end local _blit ={} do - _blit.CUSTOM = 0xFF --user defined blit function func(dst_val, x, y, src_val, x, y) + _blit.CUSTOM = nil --user defined blit function func(dst_val, x, y, src_val, x, y) _blit.BCOPY = 0x0 --copy (use :copy() instead it is slightly faster _blit.BOR = 0x1 --OR source and dest pixels _blit.BXOR = 0x2 --XOR source and dest pixels diff --git a/apps/plugins/lua/include_lua/color.lua b/apps/plugins/lua/include_lua/color.lua index ed2e4f865e..fd321edd9d 100644 --- a/apps/plugins/lua/include_lua/color.lua +++ b/apps/plugins/lua/include_lua/color.lua @@ -49,17 +49,9 @@ local _clr = {} do maxstate = (bit.lshift(1, 24) - 1) end - local function init(v) - return v or 0 - end - -- clamps value to >= min and <= max rolls over to opposite local function clamp_roll(val, min, max) - if min > max then - local swap = min - min, max = max, swap - end - + -- Warning doesn't check if min < max if val < min then val = max elseif val > max then @@ -72,12 +64,12 @@ local _clr = {} do -- sets color -- monochrome / greyscale use 'set' -- color targets 'r,b,g' -- on monochrome/ greyscale targets: -- '-1' sets the highest 'color' state & 0 is the minimum 'color' state - local function clrset(set, r, g, b) + _clr.set = function(set, r, g, b) local color = set or 0 if IS_COLOR_TARGET then - if (r ~= _NIL or g ~= _NIL or b ~= _NIL) then - r, g, b = init(r), init(g), init(b) + if (r or g or b) then + r, g, b = (r or 0), (g or 0), (b or 0) color = rb.lcd_rgbpack(r, g, b) end end @@ -86,21 +78,21 @@ local _clr = {} do end -- clrset -- de/increments current color by 'inc' -- optionally color targets by 'r,g,b' - local function clrinc(current, inc, r, g, b) + _clr.inc = function(current, inc, r, g, b) local color = 0 current = current or color inc = inc or 1 if IS_COLOR_TARGET then local ru, gu, bu = rb.lcd_rgbunpack(current); - if (r ~= _NIL or g ~= _NIL or b ~= _NIL) then - r, g, b = init(r), init(g), init(b) + if (r or g or b) then + r, g, b = (r or 0), (g or 0), (b or 0) ru = ru + r; gu = gu + g; bu = bu + b - color = rb.lcd_rgbpack(ru, gu, bu) else - ru = ru + inc; gu = gu + inc; bu = bu + inc - color = rb.lcd_rgbpack(ru, gu, bu) + ru = ru + inc; gu = gu + inc; bu = bu + inc end + + color = rb.lcd_rgbpack(ru, gu, bu) else color = current + inc end @@ -108,9 +100,6 @@ local _clr = {} do return clamp_roll(color, 0, maxstate) end -- clrinc - -- expose functions to the outside through _clr table - _clr.set = clrset - _clr.inc = clrinc end -- color functions return _clr diff --git a/apps/plugins/lua/include_lua/draw.lua b/apps/plugins/lua/include_lua/draw.lua index 4409ab7838..7b239339ff 100644 --- a/apps/plugins/lua/include_lua/draw.lua +++ b/apps/plugins/lua/include_lua/draw.lua @@ -52,35 +52,39 @@ if not rb.lcd_framebuffer then rb.splash(rb.HZ, "No Support!") return nil end local _draw = {} do + local rocklib_image = getmetatable(rb.lcd_framebuffer()) + setmetatable(_draw, rocklib_image) + -- Internal Constants local _LCD = rb.lcd_framebuffer() local LCD_W, LCD_H = rb.LCD_WIDTH, rb.LCD_HEIGHT local BSAND = 8 -- blits color to dst if src <> 0 local _NIL = nil -- nil placeholder - local function set_viewport(vp) - if not vp then rb.set_viewport() return end - if rb.LCD_DEPTH == 2 then -- invert 2-bit screens - --vp.drawmode = bit.bxor(vp.drawmode, 4) - vp.fg_pattern = 3 - vp.fg_pattern - vp.bg_pattern = 3 - vp.bg_pattern - end - rb.set_viewport(vp) - end + local _abs = math.abs + local _clear = rocklib_image.clear + local _copy = rocklib_image.copy + local _ellipse = rocklib_image.ellipse + local _get = rocklib_image.get + local _line = rocklib_image.line + local _marshal = rocklib_image.marshal + local _min = math.min + local _newimg = rb.new_image + local _points = rocklib_image.points -- line - local function line(img, x1, y1, x2, y2, color, bClip) - img:line(x1, y1, x2, y2, color, bClip) + _draw.line = function(img, x1, y1, x2, y2, color, bClip) + _line(img, x1, y1, x2, y2, color, bClip) end -- horizontal line; x, y define start point; length in horizontal direction local function hline(img, x, y , length, color, bClip) - img:line(x, y, x + length, _NIL, color, bClip) + _line(img, x, y, x + length, _NIL, color, bClip) end -- vertical line; x, y define start point; length in vertical direction local function vline(img, x, y , length, color, bClip) - img:line(x, y, _NIL, y + length, color, bClip) + _line(img, x, y, _NIL, y + length, color, bClip) end -- draws a non-filled figure based on points in t-points @@ -100,7 +104,7 @@ local _draw = {} do local pt2 = t_points[i + 1] or pt_first_last-- first and last point - img:line(pt1[1] + x, pt1[2] + y, pt2[1]+x, pt2[2]+y, color, bClip) + _line(img, pt1[1] + x, pt1[2] + y, pt2[1] + x, pt2[2] + y, color, bClip) end end @@ -109,90 +113,80 @@ local _draw = {} do local function rect(img, x, y, width, height, color, bClip) if width == 0 or height == 0 then return end - local ppt = {{0, 0}, {width, 0}, {width, height}, {0, height}} - polyline(img, x, y, ppt, color, true, bClip) - --[[ - vline(img, x, y, height, color, bClip); - vline(img, x + width, y, height, color, bClip); - hline(img, x, y, width, color, bClip); - hline(img, x, y + height, width, color, bClip);]] + polyline(img, x, y, {{0, 0}, {width, 0}, {width, height}, {0, height}}, color, true, bClip) + end -- filled rect, fillcolor is color if left empty - local function rect_filled(img, x, y, width, height, color, fillcolor, bClip) + _draw.rect_filled = function(img, x, y, width, height, color, fillcolor, bClip) if width == 0 or height == 0 then return end if not fillcolor then - img:clear(color, x, y, x + width, y + height, bClip) + _clear(img, color, x, y, x + width, y + height, bClip) else - img:clear(fillcolor, x, y, x + width, y + height, bClip) + _clear(img, fillcolor, x, y, x + width, y + height, bClip) rect(img, x, y, width, height, color, bClip) end end -- circle cx,cy define center point - local function circle(img, cx, cy, radius, color, bClip) + _draw.circle = function(img, cx, cy, radius, color, bClip) local r = radius - img:ellipse(cx - r, cy - r, cx + r, cy + r, color, _NIL, bClip) + _ellipse(img, cx - r, cy - r, cx + r, cy + r, color, _NIL, bClip) end -- filled circle cx,cy define center, fillcolor is color if left empty - local function circle_filled(img, cx, cy, radius, color, fillcolor, bClip) + _draw.circle_filled = function(img, cx, cy, radius, color, fillcolor, bClip) fillcolor = fillcolor or color local r = radius - img:ellipse(cx - r, cy - r, cx + r, cy + r, color, fillcolor, bClip) + _ellipse(img, cx - r, cy - r, cx + r, cy + r, color, fillcolor, bClip) end -- ellipse that fits into defined rect - local function ellipse_rect(img, x1, y1, x2, y2, color, bClip) - img:ellipse(x1, y1, x2, y2, color, _NIL, bClip) + _draw.ellipse_rect = function(img, x1, y1, x2, y2, color, bClip) + _ellipse(img, x1, y1, x2, y2, color, _NIL, bClip) end --ellipse that fits into defined rect, fillcolor is color if left empty - local function ellipse_rect_filled(img, x1, y1, x2, y2, color, fillcolor, bClip) + _draw.ellipse_rect_filled = function(img, x1, y1, x2, y2, color, fillcolor, bClip) if not fillcolor then fillcolor = color end - img:ellipse(x1, y1, x2, y2, color, fillcolor, bClip) + _ellipse(img, x1, y1, x2, y2, color, fillcolor, bClip) end -- ellipse cx, cy define center point; a, b the major/minor axis - local function ellipse(img, cx, cy, a, b, color, bClip) - img:ellipse(cx - a, cy - b, cx + a, cy + b, color, _NIL, bClip) + _draw.ellipse = function(img, cx, cy, a, b, color, bClip) + _ellipse(img, cx - a, cy - b, cx + a, cy + b, color, _NIL, bClip) end -- filled ellipse cx, cy define center point; a, b the major/minor axis -- fillcolor is color if left empty - local function ellipse_filled(img, cx, cy, a, b, color, fillcolor, bClip) + _draw.ellipse_filled = function(img, cx, cy, a, b, color, fillcolor, bClip) if not fillcolor then fillcolor = color end - img:ellipse(cx - a, cy - b, cx + a, cy + b, color, fillcolor, bClip) + _ellipse(img, cx - a, cy - b, cx + a, cy + b, color, fillcolor, bClip) end -- rounded rectangle local function rounded_rect(img, x, y, w, h, radius, color, bClip) local c_img - - local function blit(dx, dy, sx, sy, ox, oy) - img:copy(c_img, dx, dy, sx, sy, ox, oy, bClip, BSAND, color) - end - if w == 0 or h == 0 then return end -- limit the radius of the circle otherwise it will overtake the rect - radius = math.min(w / 2, radius) - radius = math.min(h / 2, radius) + radius = _min(w / 2, radius) + radius = _min(h / 2, radius) local r = radius - c_img = rb.new_image(r * 2 + 1, r * 2 + 1) - c_img:clear(0) - circle(c_img, r + 1, r + 1, r, 0xFFFFFF) + c_img = _newimg(r * 2 + 1, r * 2 + 1) + _clear(c_img, 0) + _ellipse(c_img, 1, 1, 1 + r + r, 1 + r + r, 0x1, _NIL, bClip) -- copy 4 pieces of circle to their respective corners - blit(x, y, _NIL, _NIL, r + 1, r + 1) --TL - blit(x + w - r - 2, y, r, _NIL, r + 1, r + 1) --TR - blit(x , y + h - r - 2, _NIL, r, r + 1, _NIL) --BL - blit(x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1)--BR + _copy(img, c_img, x, y, _NIL, _NIL, r + 1, r + 1, bClip, BSAND, color) --TL + _copy(img, c_img, x + w - r - 2, y, r, _NIL, r + 1, r + 1, bClip, BSAND, color) --TR + _copy(img, c_img, x , y + h - r - 2, _NIL, r, r + 1, _NIL, bClip, BSAND, color) --BL + _copy(img, c_img, x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1, bClip, BSAND, color)--BR c_img = _NIL vline(img, x, y + r, h - r * 2, color, bClip); @@ -202,38 +196,34 @@ local _draw = {} do end -- rounded rectangle fillcolor is color if left empty - local function rounded_rect_filled(img, x, y, w, h, radius, color, fillcolor, bClip) + _draw.rounded_rect_filled = function(img, x, y, w, h, radius, color, fillcolor, bClip) local c_img - local function blit(dx, dy, sx, sy, ox, oy) - img:copy(c_img, dx, dy, sx, sy, ox, oy, bClip, BSAND, fillcolor) - end - if w == 0 or h == 0 then return end if not fillcolor then fillcolor = color end -- limit the radius of the circle otherwise it will overtake the rect - radius = math.min(w / 2, radius) - radius = math.min(h / 2, radius) + radius = _min(w / 2, radius) + radius = _min(h / 2, radius) local r = radius - c_img = rb.new_image(r * 2 + 1, r * 2 + 1) - c_img:clear(0) - circle_filled(c_img, r + 1, r + 1, r, fillcolor) + c_img = _newimg(r * 2 + 1, r * 2 + 1) + _clear(c_img, 0) + _ellipse(c_img, 1, 1, 1 + r + r, 1 + r + r, 0x1, 0x1, bClip) -- copy 4 pieces of circle to their respective corners - blit(x, y, _NIL, _NIL, r + 1, r + 1) --TL - blit(x + w - r - 2, y, r, _NIL, r + 1, r + 1) --TR - blit(x, y + h - r - 2, _NIL, r, r + 1, _NIL) --BL - blit(x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1) --BR + _copy(img, c_img, x, y, _NIL, _NIL, r + 1, r + 1, bClip, BSAND, fillcolor) --TL + _copy(img, c_img, x + w - r - 2, y, r, _NIL, r + 1, r + 1, bClip, BSAND, fillcolor) --TR + _copy(img, c_img, x, y + h - r - 2, _NIL, r, r + 1, _NIL, bClip, BSAND, fillcolor) --BL + _copy(img, c_img, x + w - r - 2, y + h - r - 2, r, r, r + 1, r + 1, bClip, BSAND, fillcolor) --BR c_img = _NIL -- finish filling areas circles didn't cover - img:clear(fillcolor, x + r, y, x + w - r, y + h - 1, bClip) - img:clear(fillcolor, x, y + r, x + r, y + h - r, bClip) - img:clear(fillcolor, x + w - r, y + r, x + w - 1, y + h - r - 1, bClip) + _clear(img, fillcolor, x + r, y, x + w - r, y + h - 1, bClip) + _clear(img, fillcolor, x, y + r, x + r, y + h - r, bClip) + _clear(img, fillcolor, x + w - r, y + r, x + w - 1, y + h - r - 1, bClip) if fillcolor ~= color then rounded_rect(img, x, y, w, h, r, color, bClip) @@ -241,23 +231,23 @@ local _draw = {} do end -- draws an image at xy coord in dest image - local function image(dst, src, x, y, bClip) + _draw.image = function(dst, src, x, y, bClip) if not src then --make sure an image was passed, otherwise bail rb.splash(rb.HZ, "No Image!") return _NIL end - dst:copy(src, x, y, 1, 1, _NIL, _NIL, bClip) + _copy(dst, src, x, y, 1, 1, _NIL, _NIL, bClip) end -- floods an area of targetclr with fillclr x, y specifies the start seed - function flood_fill(img, x, y, targetclr, fillclr) + _draw.flood_fill = function(img, x, y, targetclr, fillclr) -- scanline 4-way flood algorithm -- ^ -- <--------x---> -- v -- check that target color doesn't = fill and the first point is target color - if targetclr == fillclr or targetclr ~= img:get(x,y, true) then return end + if targetclr == fillclr or targetclr ~= _get(img, x, y, true) then return end local max_w = img:width() local max_h = img:height() @@ -271,21 +261,20 @@ local _draw = {} do -- y coordinates are in even indices local qtail = 0 - local iter_n; -- North iteration - local iter_s; -- South iteration local function check_ns(val, x, y) if targetclr == val then - if targetclr == iter_n() then + y = y - 1 + if targetclr == _get(img, x, y, true) then -- north qtail = qtail + 2 qpt[qtail - 1] = x - qpt[qtail] = (y - 1) + qpt[qtail] = y end - - if targetclr == iter_s() then + y = y + 2 + if targetclr == _get(img, x, y, true) then -- south qtail = qtail + 2 qpt[qtail - 1] = x - qpt[qtail] = (y + 1) + qpt[qtail] = y end return fillclr end @@ -293,17 +282,12 @@ local _draw = {} do end local function seed_pt(x, y) - -- will never hit max_w * max_h^2 but make sure not to end early - for qhead = 2, max_w * max_h * max_w * max_h, 2 do - - if targetclr == img:get(x, y, true) then - iter_n = img:points(x, y - 1, 1, y - 1) - iter_s = img:points(x, y + 1, 1, y + 1) - img:marshal(x, y, 1, y, _NIL, _NIL, true, check_ns) + -- should never hit max but make sure not to end early + for qhead = 2, 0x40000000, 2 do - iter_n = img:points(x + 1, y - 1, max_w, y - 1) - iter_s = img:points(x + 1, y + 1, max_w, y + 1) - img:marshal(x + 1, y, max_w, y, _NIL, _NIL, true, check_ns) + if targetclr == _get(img, x, y, true) then + _marshal(img, x, y, 1, y, _NIL, _NIL, true, check_ns) -- west + _marshal(img, x + 1, y, max_w, y, _NIL, _NIL, true, check_ns) -- east end x = qpt[qhead - 1] @@ -320,7 +304,7 @@ local _draw = {} do end -- flood_fill -- draws a closed figure based on points in t_points - local function polygon(img, x, y, t_points, color, fillcolor, bClip) + _draw.polygon = function(img, x, y, t_points, color, fillcolor, bClip) if #t_points < 2 then error("not enough points", 3) end if fillcolor then @@ -335,35 +319,41 @@ local _draw = {} do if pt[2] < y_min then y_min = pt[2] end if pt[2] > y_max then y_max = pt[2] end end - w = math.abs(x_max) + math.abs(x_min) - h = math.abs(y_max) + math.abs(y_min) + w = _abs(x_max) + _abs(x_min) + h = _abs(y_max) + _abs(y_min) x_min = x_min - 2 -- leave a border to use flood_fill y_min = y_min - 2 - local fill_img = rb.new_image(w + 3, h + 3) - fill_img:clear(0xFFFFFF) + local fill_img = _newimg(w + 3, h + 3) + _clear(fill_img, 0x1) for i = 1, #t_points, 1 do local pt1 = t_points[i] local pt2 = t_points[i + 1] or t_points[1]-- first and last point - fill_img:line(pt1[1] - x_min, pt1[2] - y_min, + _line(fill_img, pt1[1] - x_min, pt1[2] - y_min, pt2[1]- x_min, pt2[2] - y_min, 0) end - flood_fill(fill_img, fill_img:width(), fill_img:height() , 1, 0) - img:copy(fill_img, x - 1, y - 1, _NIL, _NIL, _NIL, _NIL, bClip, BSAND, fillcolor) + _draw.flood_fill(fill_img, fill_img:width(), fill_img:height() , 0x1, 0x0) + _copy(img, fill_img, x - 1, y - 1, _NIL, _NIL, _NIL, _NIL, bClip, BSAND, fillcolor) end polyline(img, x, y, t_points, color, true, bClip) end -- draw text onto image if width/height are supplied text is centered - local function text(img, x, y, width, height, font, color, text) + _draw.text = function(img, x, y, width, height, font, color, text) font = font or rb.FONT_UI local opts = {x = 0, y = 0, width = LCD_W - 1, height = LCD_H - 1, - font = font, drawmode = 3, fg_pattern = 0xFFFFFF, bg_pattern = 0} - set_viewport(opts) + font = font, drawmode = 3, fg_pattern = 0x1, bg_pattern = 0} + + if rb.LCD_DEPTH == 2 then -- invert 2-bit screens + --vp.drawmode = bit.bxor(vp.drawmode, 4) + vp.fg_pattern = 3 - vp.fg_pattern + vp.bg_pattern = 3 - vp.bg_pattern + end + rb.set_viewport(opts) local res, w, h = rb.font_getstringsize(text, font) @@ -380,8 +370,8 @@ local _draw = {} do end -- make a copy of the current screen for later - local screen_img = rb.new_image(LCD_W, LCD_H) - screen_img:copy(_LCD) + local screen_img = _newimg(LCD_W, LCD_H) + _copy(screen_img, _LCD) -- check if the screen buffer is supplied image if so set img to the copy if img == _LCD then @@ -391,10 +381,6 @@ local _draw = {} do -- we will be printing the text to the screen then blitting into img rb.lcd_clear_display() - local function blit(dx, dy) - img:copy(_LCD, dx, dy, _NIL, _NIL, _NIL, _NIL, false, BSAND, color) - end - if w > LCD_W then -- text is too long for the screen do it in chunks local l = 1 local resp, wp, hp @@ -417,7 +403,7 @@ local _draw = {} do end -- using the mask we made blit color into img - blit(x + width, y + height) + _copy(img, _LCD, x + width, y + height, _NIL, _NIL, _NIL, _NIL, false, BSAND, color) x = x + wp rb.lcd_clear_display() lenr = text:len() @@ -426,43 +412,20 @@ local _draw = {} do rb.lcd_putsxy(0, 0, text) -- using the mask we made blit color into img - blit(x + width, y + height) + _copy(img, _LCD, x + width, y + height, _NIL, _NIL, _NIL, _NIL, false, BSAND, color) end - _LCD:copy(screen_img) -- restore screen - set_viewport() -- set viewport default + _copy(_LCD, screen_img) -- restore screen + rb.set_viewport() -- set viewport default return res, w, h end - -- expose functions to the outside through _draw table - _draw.image = image - _draw.text = text - _draw.line = line + -- expose internal functions to the outside through _draw table _draw.hline = hline _draw.vline = vline - _draw.polygon = polygon _draw.polyline = polyline _draw.rect = rect - _draw.circle = circle - _draw.ellipse = ellipse - _draw.flood_fill = flood_fill - _draw.ellipse_rect = ellipse_rect _draw.rounded_rect = rounded_rect - -- filled functions use color as fillcolor if fillcolor is left empty... - _draw.rect_filled = rect_filled - _draw.circle_filled = circle_filled - _draw.ellipse_filled = ellipse_filled - _draw.ellipse_rect_filled = ellipse_rect_filled - _draw.rounded_rect_filled = rounded_rect_filled - - -- adds the above _draw functions into the metatable for RLI_IMAGE - local ex = getmetatable(rb.lcd_framebuffer()) - for k, v in pairs(_draw) do - if ex[k] == _NIL then - ex[k] = v - end - end - end -- _draw functions return _draw diff --git a/apps/plugins/lua/include_lua/image.lua b/apps/plugins/lua/include_lua/image.lua index c8d7aad9dd..2b2a1ce19f 100644 --- a/apps/plugins/lua/include_lua/image.lua +++ b/apps/plugins/lua/include_lua/image.lua @@ -65,35 +65,43 @@ if not rb.lcd_framebuffer then rb.splash(rb.HZ, "No Support!") return nil end local _img = {} do + local rocklib_image = getmetatable(rb.lcd_framebuffer()) + setmetatable(_img, rocklib_image) + -- internal constants local _NIL = nil -- _NIL placeholder local _math = require("math_ex") -- math functions needed local LCD_W, LCD_H = rb.LCD_WIDTH, rb.LCD_HEIGHT + local _copy = rocklib_image.copy + local _get = rocklib_image.get + local _marshal = rocklib_image.marshal + local _points = rocklib_image.points + -- returns new image -of- img sized to fit w/h tiling to fit if needed - local function tile(img, w, h) + _img.tile = function(img, w, h) local hs , ws = img:height(), img:width() local t_img = rb.new_image(w, h) - for x = 1, w, ws do t_img:copy(img, x, 1, 1, 1) end - for y = hs, h, hs do t_img:copy(t_img, 1, y, 1, 1, w, hs) end + for x = 1, w, ws do _copy(t_img, img, x, 1, 1, 1) end + for y = hs, h, hs do _copy(t_img, t_img, 1, y, 1, 1, w, hs) end return t_img end -- resizes src to size of dst - local function resize(dst, src) + _img.resize = function(dst, src) -- simple nearest neighbor resize derived from rockbox - pluginlib_bmp.c -- pretty rough results highly recommend building one more suited.. local dw, dh = dst:width(), dst:height() - local xstep = (bit.lshift(src:width(),8) / (dw)) + 1 - local ystep = (bit.lshift(src:height(),8) / (dh)) + local xstep = (bit.lshift(src:width(), 8) / (dw)) + 1 + local ystep = (bit.lshift(src:height(), 8) / (dh)) local xpos, ypos = 0, 0 local src_x, src_y -- walk the dest get src pixel - function rsz_trans(val, x, y) + local function rsz_trans(val, x, y) if x == 1 then src_y = bit.rshift(ypos,8) + 1 xpos = xstep - bit.rshift(xstep,4) + 1 @@ -101,14 +109,14 @@ local _img = {} do end src_x = bit.rshift(xpos,8) + 1 xpos = xpos + xstep - return (src:get(src_x, src_y, true) or 0) + return (_get(src, src_x, src_y, true) or 0) end --/* (dst*, [x1, y1, x2, y2, dx, dy, clip, function]) */ - dst:marshal(1, 1, dw, dh, _NIL, _NIL, false, rsz_trans) + _marshal(dst, 1, 1, dw, dh, _NIL, _NIL, false, rsz_trans) end -- returns new image -of- img rotated in whole degrees 0 - 360 - local function rotate(img, degrees) + _img.rotate = function(img, degrees) -- we do this backwards as if dest was the unrotated object degrees = 360 - degrees local c, s = _math.d_cos(degrees), _math.d_sin(degrees) @@ -133,7 +141,7 @@ local _img = {} do |_____| |_______| |_______| ]] -- walk the dest get translated src pixel, oversamples src to fill gaps - function rot_trans(val, x, y) + local function rot_trans(val, x, y) -- move center x/y to the origin local xtran = x - d_xctr; local ytran = y - d_yctr; @@ -142,68 +150,56 @@ local _img = {} do local yrot = ((xtran * s) + (ytran * c)) / 10000 + s_yctr local xrot = ((xtran * c) - (ytran * s)) / 10000 + s_xctr -- upper left of src image back to origin, copy src pixel - return img:get(xrot, yrot, true) or 0 + return _get(img, xrot, yrot, true) or 0 end - r_img:marshal(1, 1, dw, dh, _NIL, _NIL, false, rot_trans) + _marshal(r_img, 1, 1, dw, dh, _NIL, _NIL, false, rot_trans) return r_img end -- saves img to file: name - local function save(img, name) + _img.save = function(img, name) -- bmp saving derived from rockbox - screendump.c -- bitdepth is limited by the device -- eg. device displays greyscale, rgb images are saved greyscale local file - + local bbuffer = {} -- concat buffer for s_bytes local fbuffer = {} -- concat buffer for file writes, reused - local function dump_fbuffer(thresh) - if #fbuffer >= thresh then - file:write(table.concat(fbuffer)) - for i=1, #fbuffer do fbuffer[i] = _NIL end -- reuse table - end - end - local function s_bytesLE(bits, value) -- bits must be multiples of 8 (sizeof byte) local byte - local result = "" - for b = 1, bit.rshift(bits, 3) do + local nbytes = bit.rshift(bits, 3) + for b = 1, nbytes do if value > 0 then byte = value % 256 value = (value - byte) / 256 - result = result .. string.char(byte) else - result = result .. string.char(0) + byte = 0 end + bbuffer[b] = string.char(byte) end - return result + return table.concat(bbuffer, _NIL, 1, nbytes) end local function s_bytesBE(bits, value) -- bits must be multiples of 8 (sizeof byte) local byte - local result = "" - for b = 1, bit.rshift(bits, 3) do + local nbytes = bit.rshift(bits, 3) + for b = nbytes, 1, -1 do if value > 0 then byte = value % 256 value = (value - byte) / 256 - result = string.char(byte) .. result else - result = string.char(0) .. result + byte = 0 end + bbuffer[b] = string.char(byte) end - return result - end - - local function c_cmp(color, shift) - -- [RR][GG][BB] - return bit.band(bit.rshift(color, shift), 0xFF) + return table.concat(bbuffer, _NIL, 1, nbytes) end - local cmp = {["r"] = function(c) return c_cmp(c, 16) end, - ["g"] = function(c) return c_cmp(c, 08) end, - ["b"] = function(c) return c_cmp(c, 00) end} + local cmp = {["r"] = function(c) return bit.band(bit.rshift(c, 16), 0xFF) end, + ["g"] = function(c) return bit.band(bit.rshift(c, 08), 0xFF) end, + ["b"] = function(c) return bit.band(c, 0xFF) end} local function bmp_color(color) return s_bytesLE(8, cmp.b(color)).. @@ -314,7 +310,8 @@ local _img = {} do end end - dump_fbuffer(0) -- write the header to the file now + file:write(table.concat(fbuffer))-- write the header to the file now + for i=1, #fbuffer do fbuffer[i] = _NIL end -- reuse table local imgdata = fbuffer -- pad rows to a multiple of 4 bytes @@ -327,18 +324,23 @@ local _img = {} do end -- Bitmap lines start at bottom unless biHeight is negative - for point in img:points(1, h, w + bytesleft, 1) do + for point in _points(img, 1, h, w + bytesleft, 1) do imgdata[#imgdata + 1] = fs_bytes_E(bpp, point or 0) - dump_fbuffer(31) -- buffered write, increase # for performance - end - dump_fbuffer(0) --write leftovers to file + if #fbuffer >= 31 then -- buffered write, increase # for performance + file:write(table.concat(fbuffer)) + for i=1, #fbuffer do fbuffer[i] = _NIL end -- reuse table + end + + end + file:write(table.concat(fbuffer)) --write leftovers to file + fbuffer = _NIL file:close() end -- save(img, name) --searches an image for target color - local function search(img, x1, y1, x2, y2, targetclr, variation, stepx, stepy) + _img.search = function(img, x1, y1, x2, y2, targetclr, variation, stepx, stepy) if variation > 128 then variation = 128 end if variation < -128 then variation = -128 end @@ -352,7 +354,7 @@ local _img = {} do targetl = swap end - for point, x, y in img:points(x1, y1, x2, y2, stepx, stepy) do + for point, x, y in _points(img, x1, y1, x2, y2, stepx, stepy) do if point >= targetl and point <= targeth then return point, x, y end @@ -362,12 +364,12 @@ local _img = {} do --[[ we won't be extending these into RLI_IMAGE]] -- creates a new rbimage size w x h - local function new(w, h) + _img.new = function(w, h) return rb.new_image(w, h) end -- returns new image -of- file: name (_NIL if error) - local function load(name) + _img.load = function(name) return rb.read_bmp_file("/" .. name) end @@ -381,23 +383,6 @@ local _img = {} do _img.RLI_INFO_DEPTH = 0x6 _img.RLI_INFO_FORMAT = 0x7 _img.RLI_INFO_ADDRESS = 0x8 - - -- expose functions to the outside through _img table - _img.save = save - _img.search = search - _img.rotate = rotate - _img.resize = resize - _img.tile = tile - - -- adds the above _img functions into the metatable for RLI_IMAGE - local ex = getmetatable(rb.lcd_framebuffer()) - for k, v in pairs(_img) do - if ex[k] == _NIL then ex[k] = v end - end - -- not exposed through RLI_IMAGE - _img.new = new - _img.load = load - end -- _img functions return _img diff --git a/apps/plugins/lua/include_lua/lcd.lua b/apps/plugins/lua/include_lua/lcd.lua index e0a3c5895a..f4bb0db695 100644 --- a/apps/plugins/lua/include_lua/lcd.lua +++ b/apps/plugins/lua/include_lua/lcd.lua @@ -51,7 +51,6 @@ local _lcd = {} do --internal constants local _NIL = nil -- _NIL placeholder - local LCD_W, LCD_H = rb.LCD_WIDTH, rb.LCD_HEIGHT -- clamps value to >= min and <= max local function clamp(val, min, max) @@ -65,21 +64,21 @@ local _lcd = {} do end -- return a copy of lcd screen - local function duplicate(t, screen_img) + _lcd.duplicate = function(t, screen_img) screen_img = screen_img or rb.new_image() screen_img:copy(rb.lcd_framebuffer()) return screen_img end -- updates screen in specified rectangle - local function update_rect(t, x, y, w, h) + _lcd.update_rect = function(t, x, y, w, h) rb.lcd_update_rect(x - 1, y - 1, - clamp(x + w, 1, LCD_W) - 1, - clamp(y + h, 1, LCD_H) - 1) + clamp(x + w, 1, rb.LCD_WIDTH) - 1, + clamp(y + h, 1, rb.LCD_HEIGHT) - 1) end -- clears lcd, optional.. ([color, x1, y1, x2, y2, clip]) - local function clear(t, clr, ...) + _lcd.clear = function(t, clr, ...) rb.lcd_scroll_stop() --rb really doesn't like bg change while scroll if clr == _NIL and ... == _NIL then rb.lcd_clear_display() @@ -89,7 +88,7 @@ local _lcd = {} do end -- loads an image to the screen - local function image(t, src, x, y) + _lcd.image = function(t, src, x, y) if not src then --make sure an image was passed, otherwise bail rb.splash(rb.HZ, "No Image!") return _NIL @@ -98,19 +97,19 @@ local _lcd = {} do end -- Formattable version of splash - local function splashf(t, timeout, ...) + _lcd.splashf = function(t, timeout, ...) rb.splash(timeout, string.format(...)) end -- Gets size of text - local function text_extent(t, msg, font) + _lcd.text_extent = function(t, msg, font) font = font or rb.FONT_UI return rb.font_getstringsize(msg, font) end -- Sets viewport size - local function set_viewport(t, vp) + _lcd.set_viewport = function(t, vp) if not vp then rb.set_viewport() return end if rb.LCD_DEPTH == 2 then -- invert 2-bit screens --vp.drawmode = bit.bxor(vp.drawmode, 4) @@ -133,14 +132,17 @@ local _lcd = {} do end --expose functions to the outside through _lcd table +--[[ _lcd.text_extent = text_extent _lcd.set_viewport = set_viewport _lcd.duplicate = duplicate - _lcd.update = rb.lcd_update + _lcd.update = _update _lcd.update_rect = update_rect _lcd.clear = clear _lcd.splashf = splashf _lcd.image = image +]] + _lcd.update = rb.lcd_update _lcd.DEPTH = rb.LCD_DEPTH _lcd.W = rb.LCD_WIDTH _lcd.H = rb.LCD_HEIGHT diff --git a/apps/plugins/lua/include_lua/print.lua b/apps/plugins/lua/include_lua/print.lua index 9b21dafb9d..3a11e7c3dc 100644 --- a/apps/plugins/lua/include_lua/print.lua +++ b/apps/plugins/lua/include_lua/print.lua @@ -49,13 +49,12 @@ local _print = {} do local _NIL = nil -- _NIL placeholder local _LCD = rb.lcd_framebuffer() - local LCD_W, LCD_H = rb.LCD_WIDTH, rb.LCD_HEIGHT local WHITE = _clr.set(-1, 255, 255, 255) local BLACK = _clr.set(0, 0, 0, 0) local DRMODE_SOLID = 3 local col_buf, s_lines = {}, {} local _p_opts = _NIL - + local tabstring = string.rep(" ", 2) -- print internal helper functions -------------------------------------------------------------------------------- -- clamps value to >= min and <= max @@ -69,46 +68,20 @@ local _print = {} do return max end - -- updates screen in specified rectangle - local function update_rect(x, y, w, h) - rb.lcd_update_rect(x - 1, y - 1, - clamp(x + w, 1, LCD_W) - 1, - clamp(y + h, 1, LCD_H) - 1) - end - -- Gets size of text local function text_extent(msg, font) - font = font or rb.FONT_UI -- res, w, h - return rb.font_getstringsize(msg, font) - end - - -- Sets viewport size - local function set_viewport(vp) - if not vp then rb.set_viewport() return end - - if rb.LCD_DEPTH == 2 then -- invert 2-bit screens - --vp.drawmode = bit.bxor(vp.drawmode, 4) - vp.fg_pattern = 3 - vp.fg_pattern - vp.bg_pattern = 3 - vp.bg_pattern - end - rb.set_viewport(vp) - end - - -- shallow copy of table - function table_clone(t) - local copy = {} - for k, v in pairs(t) do - copy[k] = v - end - return copy + return rb.font_getstringsize(msg, font or rb.FONT_UI) end -- Updates a single line on the screen local function update_line(enabled, opts, line, h) if enabled ~= true then return end local o = opts or _p_opts - update_rect(o.x, o.y + line * h + 1, o.width, h) + -- updates screen in specified rectangle + rb.lcd_update_rect(o.x - 1, o.y + line * h, + clamp(o.x + o.width, 1, rb.LCD_WIDTH) - 1, + clamp(o.y + line * h + 1 + h, 1, rb.LCD_HEIGHT) - 1) end -- Clears a single line on the screen @@ -129,22 +102,23 @@ local _print = {} do local function col_buf_insert(msg, line, _p_opts) --if _p_opts.line <= 1 then col_buf = {} end if not col_buf[line] then - table.insert(col_buf, line, msg) end + table.insert(col_buf, line, msg) + end end - --replaces / strips escape characters + --replaces / strips tab characters local function check_escapes(o, msg) +--[[ --for replacing a variety of escapes local tabsz = 2 local tabstr = string.rep(" ", tabsz) - local function repl(esc) local ret = "" if esc:sub(1,1) == "\t" then ret = string.rep(tabstr, esc:len()) end return ret end - msg = msg:gsub("(%c+)", repl) - +]] + msg = msg:gsub("\t", tabstring) local res, w, h = text_extent(msg, o.font) return w, h, msg end @@ -154,8 +128,8 @@ local _print = {} do local function set_defaults() _p_opts = { x = 1, y = 1, - width = LCD_W - 1, - height = LCD_H - 1, + width = rb.LCD_WIDTH - 1, + height = rb.LCD_HEIGHT - 1, font = rb.FONT_UI, drawmode = DRMODE_SOLID, fg_pattern = WHITE, @@ -178,7 +152,15 @@ local _print = {} do -- if bByRef is _NIL or false then a copy is returned local function get_settings(bByRef) _p_opts = _p_opts or set_defaults() - if not bByRef then return table_clone(_p_opts) end + if not bByRef then + -- shallow copy of table + local copy = {} + for k, v in pairs(_p_opts) do + copy[k] = v + end + return copy + end + return _p_opts end @@ -216,7 +198,16 @@ local _print = {} do -- alternative selection method --msg = "> " .. msg end - set_viewport(o) + + if not o then rb.set_viewport() return end + + if rb.LCD_DEPTH == 2 then -- invert 2-bit screens + o.fg_pattern = 3 - o.fg_pattern + o.bg_pattern = 3 - o.bg_pattern + end + + rb.set_viewport(o) + o = _NIL end @@ -251,8 +242,8 @@ local _print = {} do -- sets print area local function set_area(x, y, w, h) local o = get_settings(true) - o.x, o.y = clamp(x, 1, LCD_W), clamp(y, 1, LCD_H) - o.width, o.height = clamp(w, 1, LCD_W - o.x), clamp(h, 1, LCD_H - o.y) + o.x, o.y = clamp(x, 1, rb.LCD_WIDTH), clamp(y, 1, rb.LCD_HEIGHT) + o.width, o.height = clamp(w, 1, rb.LCD_WIDTH - o.x), clamp(h, 1, rb.LCD_HEIGHT - o.y) o.max_line = max_lines(_p_opts) clear() @@ -312,6 +303,7 @@ local _print = {} do local o = get_settings(true) local w, h, msg local line = o.line - 1 -- rb is 0-based lua is 1-based + if not (...) or (...) == "\n" then -- handles blank line / single '\n' local res, w, h = text_extent(" ", o.font) |