2022-05-18 03:41:42 +01:00
|
|
|
local utf8 = require 'utf8'
|
2022-05-23 02:12:23 +01:00
|
|
|
|
|
|
|
require 'app'
|
2022-05-23 02:27:48 +01:00
|
|
|
require 'test'
|
2022-05-23 02:12:23 +01:00
|
|
|
|
2022-05-02 16:20:30 +01:00
|
|
|
require 'keychord'
|
2022-05-18 05:18:17 +01:00
|
|
|
require 'file'
|
2022-05-11 05:17:50 +01:00
|
|
|
require 'button'
|
2022-05-18 04:29:08 +01:00
|
|
|
local Text = require 'text'
|
2022-05-18 03:41:42 +01:00
|
|
|
local Drawing = require 'drawing'
|
2022-05-18 05:18:17 +01:00
|
|
|
local geom = require 'geom'
|
|
|
|
require 'help'
|
|
|
|
require 'icons'
|
2022-05-02 16:20:30 +01:00
|
|
|
|
2022-05-25 20:59:12 +01:00
|
|
|
-- run in both tests and a real run
|
|
|
|
function App.initialize_globals()
|
2022-05-17 06:20:58 +01:00
|
|
|
-- a line is either text or a drawing
|
|
|
|
-- a text is a table with:
|
2022-05-29 15:56:55 +01:00
|
|
|
-- mode = 'text',
|
|
|
|
-- string data,
|
|
|
|
-- a (y) coord in pixels (updated while painting screen),
|
|
|
|
-- some cached data that's blown away and recomputed when data changes:
|
|
|
|
-- fragments: snippets of rendered love.graphics.Text, guaranteed to not wrap
|
|
|
|
-- screen_line_starting_pos: optional array of grapheme indices if it wraps over more than one screen line
|
2022-05-14 21:08:33 +01:00
|
|
|
-- a drawing is a table with:
|
2022-05-17 06:20:58 +01:00
|
|
|
-- mode = 'drawing'
|
|
|
|
-- a (y) coord in pixels (updated while painting screen),
|
2022-05-14 21:08:33 +01:00
|
|
|
-- a (h)eight,
|
|
|
|
-- an array of points, and
|
|
|
|
-- an array of shapes
|
|
|
|
-- a shape is a table containing:
|
|
|
|
-- a mode
|
|
|
|
-- an array points for mode 'freehand' (raw x,y coords; freehand drawings don't pollute the points array of a drawing)
|
|
|
|
-- an array vertices for mode 'polygon', 'rectangle', 'square'
|
|
|
|
-- p1, p2 for mode 'line'
|
|
|
|
-- p1, p2, arrow-mode for mode 'arrow-line'
|
2022-05-16 06:04:20 +01:00
|
|
|
-- center, radius for mode 'circle'
|
|
|
|
-- center, radius, start_angle, end_angle for mode 'arc'
|
2022-05-14 21:08:33 +01:00
|
|
|
-- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide
|
|
|
|
-- The field names are carefully chosen so that switching modes in midstream
|
|
|
|
-- remembers previously entered points where that makes sense.
|
|
|
|
--
|
|
|
|
-- Open question: how to maintain Sketchpad-style constraints? Answer for now:
|
|
|
|
-- we don't. Constraints operate only for the duration of a drawing operation.
|
|
|
|
-- We'll continue to persist them just to keep the option open to continue
|
|
|
|
-- solving for them. But for now, this is a program to create static drawings
|
|
|
|
-- once, and read them passively thereafter.
|
2022-05-18 03:27:54 +01:00
|
|
|
Lines = {{mode='text', data=''}}
|
2022-05-22 00:24:07 +01:00
|
|
|
|
|
|
|
-- Lines can be too long to fit on screen, in which case they _wrap_ into
|
|
|
|
-- multiple _screen lines_.
|
|
|
|
--
|
|
|
|
-- Therefore, any potential location for the cursor can be described in two ways:
|
|
|
|
-- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units)
|
|
|
|
-- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line.
|
|
|
|
--
|
|
|
|
-- Most of the time we'll only persist positions in schema 1, translating to
|
|
|
|
-- schema 2 when that's convenient.
|
|
|
|
Screen_top1 = {line=1, pos=1} -- position of start of screen line at top of screen
|
2022-05-28 07:35:01 +01:00
|
|
|
Cursor1 = {line=1, pos=1} -- position of cursor
|
2022-05-22 00:24:07 +01:00
|
|
|
Screen_bottom1 = {line=1, pos=1} -- position of start of screen line at bottom of screen
|
2022-05-14 21:08:33 +01:00
|
|
|
|
2022-05-29 16:12:47 +01:00
|
|
|
Selection1 = {}
|
|
|
|
|
2022-05-20 13:41:25 +01:00
|
|
|
Cursor_x, Cursor_y = 0, 0 -- in pixels
|
|
|
|
|
2022-05-18 05:18:17 +01:00
|
|
|
Current_drawing_mode = 'line'
|
|
|
|
Previous_drawing_mode = nil
|
2022-05-14 21:08:33 +01:00
|
|
|
|
2022-05-18 03:33:35 +01:00
|
|
|
Zoom = 1.5
|
2022-05-17 07:01:01 +01:00
|
|
|
|
2022-05-21 04:09:59 +01:00
|
|
|
Filename = love.filesystem.getUserDirectory()..'/lines.txt'
|
2022-05-15 22:00:49 +01:00
|
|
|
|
2022-05-25 20:59:12 +01:00
|
|
|
end -- App.initialize_globals
|
|
|
|
|
|
|
|
function App.initialize(arg)
|
|
|
|
love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
|
|
|
|
love.keyboard.setKeyRepeat(true)
|
|
|
|
|
|
|
|
-- maximize window
|
|
|
|
love.window.setMode(0, 0) -- maximize
|
|
|
|
App.screen.width, App.screen.height = love.window.getMode()
|
|
|
|
-- shrink slightly to account for window decoration
|
|
|
|
App.screen.width = App.screen.width-100
|
|
|
|
App.screen.height = App.screen.height-100
|
|
|
|
love.window.setMode(App.screen.width, App.screen.height)
|
|
|
|
--? App.screen.width = 120
|
|
|
|
--? App.screen.height = 200
|
|
|
|
--? love.window.setMode(App.screen.width, App.screen.height)
|
|
|
|
|
2022-05-25 21:35:32 +01:00
|
|
|
-- maximum width available to either text or drawings, in pixels
|
|
|
|
Line_width = math.floor(App.screen.width/2/40)*40
|
|
|
|
--? Line_width = 100
|
|
|
|
|
2022-05-23 21:18:34 +01:00
|
|
|
-- still in App.initialize
|
2022-05-16 23:08:49 +01:00
|
|
|
if #arg > 0 then
|
2022-05-18 03:33:35 +01:00
|
|
|
Filename = arg[1]
|
2022-05-16 23:08:49 +01:00
|
|
|
end
|
2022-05-18 03:33:35 +01:00
|
|
|
Lines = load_from_disk(Filename)
|
2022-05-18 03:27:54 +01:00
|
|
|
for i,line in ipairs(Lines) do
|
2022-05-18 03:15:12 +01:00
|
|
|
if line.mode == 'text' then
|
2022-05-22 00:24:07 +01:00
|
|
|
Cursor1.line = i
|
2022-05-19 02:18:34 +01:00
|
|
|
break
|
2022-05-18 03:15:12 +01:00
|
|
|
end
|
|
|
|
end
|
2022-05-18 03:33:35 +01:00
|
|
|
love.window.setTitle('Text with Lines - '..Filename)
|
2022-05-23 02:27:48 +01:00
|
|
|
|
2022-05-23 21:18:34 +01:00
|
|
|
end -- App.initialize
|
2022-05-02 05:55:57 +01:00
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.filedropped(file)
|
2022-05-18 03:33:35 +01:00
|
|
|
Filename = file:getFilename()
|
2022-05-16 23:26:22 +01:00
|
|
|
file:open('r')
|
2022-05-18 03:27:54 +01:00
|
|
|
Lines = load_from_file(file)
|
2022-05-17 02:44:17 +01:00
|
|
|
file:close()
|
2022-05-18 03:27:54 +01:00
|
|
|
for i,line in ipairs(Lines) do
|
2022-05-18 03:15:12 +01:00
|
|
|
if line.mode == 'text' then
|
2022-05-22 00:24:07 +01:00
|
|
|
Cursor1.line = i
|
2022-05-19 02:18:34 +01:00
|
|
|
break
|
2022-05-18 03:15:12 +01:00
|
|
|
end
|
|
|
|
end
|
2022-05-18 03:33:35 +01:00
|
|
|
love.window.setTitle('Text with Lines - '..Filename)
|
2022-05-16 23:26:22 +01:00
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.draw()
|
2022-05-18 07:24:46 +01:00
|
|
|
Button_handlers = {}
|
2022-05-02 05:55:57 +01:00
|
|
|
love.graphics.setColor(1, 1, 1)
|
2022-05-23 02:45:21 +01:00
|
|
|
love.graphics.rectangle('fill', 0, 0, App.screen.width-1, App.screen.height-1)
|
2022-05-02 05:55:57 +01:00
|
|
|
love.graphics.setColor(0, 0, 0)
|
2022-05-19 01:22:04 +01:00
|
|
|
for line_index,line in ipairs(Lines) do
|
|
|
|
line.y = nil
|
|
|
|
end
|
2022-05-25 23:00:13 +01:00
|
|
|
assert(Screen_top1.line < Cursor1.line or (Screen_top1.line == Cursor1.line and Screen_top1.pos <= Cursor1.pos))
|
2022-05-19 13:52:16 +01:00
|
|
|
local y = 15
|
2022-05-24 07:00:07 +01:00
|
|
|
--? print('== draw')
|
2022-05-18 03:48:12 +01:00
|
|
|
for line_index,line in ipairs(Lines) do
|
2022-05-24 07:00:07 +01:00
|
|
|
--? print('draw:', y, line_index, line)
|
2022-05-23 02:45:21 +01:00
|
|
|
if y + math.floor(15*Zoom) > App.screen.height then break end
|
2022-05-23 18:56:39 +01:00
|
|
|
--? print('a')
|
2022-05-22 00:24:07 +01:00
|
|
|
if line_index >= Screen_top1.line then
|
|
|
|
Screen_bottom1.line = line_index
|
2022-05-19 01:22:04 +01:00
|
|
|
if line.mode == 'text' and line.data == '' then
|
2022-05-19 13:52:16 +01:00
|
|
|
line.y = y
|
2022-05-19 01:22:04 +01:00
|
|
|
button('draw', {x=4,y=y+4, w=12,h=12, color={1,1,0},
|
|
|
|
icon = icon.insert_drawing,
|
|
|
|
onpress1 = function()
|
|
|
|
table.insert(Lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})
|
2022-05-22 00:24:07 +01:00
|
|
|
if Cursor1.line >= line_index then
|
|
|
|
Cursor1.line = Cursor1.line+1
|
2022-05-19 01:22:04 +01:00
|
|
|
end
|
|
|
|
end})
|
2022-05-22 00:24:07 +01:00
|
|
|
if line_index == Cursor1.line then
|
2022-05-20 13:40:42 +01:00
|
|
|
Text.draw_cursor(25, y)
|
2022-05-19 01:22:04 +01:00
|
|
|
end
|
2022-05-19 16:23:25 +01:00
|
|
|
y = y + math.floor(15*Zoom) -- text height
|
2022-05-19 01:22:04 +01:00
|
|
|
elseif line.mode == 'drawing' then
|
2022-05-19 13:52:16 +01:00
|
|
|
y = y+10 -- padding
|
|
|
|
line.y = y
|
2022-05-19 13:41:04 +01:00
|
|
|
Drawing.draw(line)
|
2022-05-19 13:52:16 +01:00
|
|
|
y = y + Drawing.pixels(line.h) + 10 -- padding
|
2022-05-19 01:22:04 +01:00
|
|
|
else
|
2022-05-24 07:00:07 +01:00
|
|
|
--? print('text')
|
2022-05-19 13:52:16 +01:00
|
|
|
line.y = y
|
2022-05-22 04:52:44 +01:00
|
|
|
y, Screen_bottom1.pos = Text.draw(line, Line_width, line_index)
|
2022-05-19 16:23:25 +01:00
|
|
|
y = y + math.floor(15*Zoom) -- text height
|
2022-05-24 07:00:07 +01:00
|
|
|
--? print('=> y', y)
|
2022-05-19 01:22:04 +01:00
|
|
|
end
|
2022-05-11 05:17:50 +01:00
|
|
|
end
|
2022-05-02 05:55:57 +01:00
|
|
|
end
|
2022-05-22 04:52:44 +01:00
|
|
|
--? print('screen bottom: '..tostring(Screen_bottom1.pos)..' in '..tostring(Lines[Screen_bottom1.line].data))
|
2022-05-20 01:29:14 +01:00
|
|
|
--? os.exit(1)
|
2022-05-02 05:55:57 +01:00
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.update(dt)
|
2022-05-18 07:16:08 +01:00
|
|
|
Drawing.update(dt)
|
2022-05-11 05:17:50 +01:00
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.mousepressed(x,y, mouse_button)
|
2022-05-18 07:18:56 +01:00
|
|
|
propagate_to_button_handlers(x,y, mouse_button)
|
2022-05-17 06:28:34 +01:00
|
|
|
|
2022-05-18 03:48:12 +01:00
|
|
|
for line_index,line in ipairs(Lines) do
|
2022-05-17 06:42:54 +01:00
|
|
|
if line.mode == 'text' then
|
2022-05-18 06:53:09 +01:00
|
|
|
if Text.in_line(line, x,y) then
|
2022-05-29 16:12:47 +01:00
|
|
|
if love.keyboard.isDown('lshift') or love.keyboard.isDown('rshift') then
|
|
|
|
if Selection1.line == nil then
|
|
|
|
Selection1 = {line=Cursor1.line, pos=Cursor1.pos}
|
|
|
|
end
|
|
|
|
else
|
|
|
|
if Selection1.line then
|
|
|
|
Selection1 = {}
|
|
|
|
end
|
|
|
|
end
|
2022-05-20 06:07:12 +01:00
|
|
|
Text.move_cursor(line_index, line, x, y)
|
2022-05-17 06:42:54 +01:00
|
|
|
end
|
|
|
|
elseif line.mode == 'drawing' then
|
2022-05-18 06:53:09 +01:00
|
|
|
if Drawing.in_drawing(line, x, y) then
|
|
|
|
Drawing.mouse_pressed(line, x,y, button)
|
2022-05-17 06:28:34 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2022-05-12 05:57:36 +01:00
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.mousereleased(x,y, button)
|
2022-05-18 06:55:45 +01:00
|
|
|
Drawing.mouse_released(x,y, button)
|
2022-05-14 21:08:33 +01:00
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.textinput(t)
|
2022-05-21 22:03:06 +01:00
|
|
|
if Current_drawing_mode == 'name' then
|
|
|
|
local drawing = Lines.current
|
|
|
|
local p = drawing.points[drawing.pending.target_point]
|
|
|
|
p.name = p.name..t
|
|
|
|
else
|
|
|
|
Text.textinput(t)
|
|
|
|
end
|
|
|
|
save_to_disk(Lines, Filename)
|
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.keychord_pressed(chord)
|
2022-05-18 06:36:10 +01:00
|
|
|
if love.mouse.isDown('1') or chord:sub(1,2) == 'C-' then
|
|
|
|
Drawing.keychord_pressed(chord)
|
2022-05-18 07:23:26 +01:00
|
|
|
elseif chord == 'escape' and love.mouse.isDown('1') then
|
|
|
|
local drawing = Drawing.current_drawing()
|
|
|
|
if drawing then
|
|
|
|
drawing.pending = {}
|
|
|
|
end
|
2022-05-21 22:22:34 +01:00
|
|
|
elseif chord == 'escape' and not love.mouse.isDown('1') then
|
|
|
|
for _,line in ipairs(Lines) do
|
|
|
|
if line.mode == 'drawing' then
|
|
|
|
line.show_help = false
|
|
|
|
end
|
|
|
|
end
|
2022-05-21 22:03:06 +01:00
|
|
|
elseif Current_drawing_mode == 'name' then
|
|
|
|
if chord == 'return' then
|
|
|
|
Current_drawing_mode = Previous_drawing_mode
|
|
|
|
Previous_drawing_mode = nil
|
|
|
|
else
|
|
|
|
local drawing = Lines.current
|
|
|
|
local p = drawing.points[drawing.pending.target_point]
|
|
|
|
if chord == 'escape' then
|
|
|
|
p.name = nil
|
|
|
|
elseif chord == 'backspace' then
|
|
|
|
local len = utf8.len(p.name)
|
|
|
|
local byte_offset = utf8.offset(p.name, len-1)
|
|
|
|
p.name = string.sub(p.name, 1, byte_offset)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
save_to_disk(Lines, Filename)
|
2022-05-18 06:36:10 +01:00
|
|
|
else
|
|
|
|
Text.keychord_pressed(chord)
|
2022-05-12 06:29:21 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2022-05-23 02:27:48 +01:00
|
|
|
function App.keyreleased(key, scancode)
|
2022-05-02 16:20:30 +01:00
|
|
|
end
|