akkartik
/
text.love
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge lines.love

This commit is contained in:
Kartik K. Agaram 2023-04-08 22:57:01 -07:00
parent 7e242db523 25e7eb99a9
commit b3a3321cd6
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source_text.lua
View File

@ -18,12 +18,12 @@ function Text.draw(State, line_index, y, startpos, hide_cursor)
local pos = line_cache.screen_line_starting_pos[i] local pos = line_cache.screen_line_starting_pos[i]
if pos < startpos then if pos < startpos then
-- render nothing -- render nothing
--? print('skipping', f) --? print('skipping', screen_line)
else else
final_screen_line_starting_pos = pos final_screen_line_starting_pos = pos
local f = Text.screen_line(line, line_cache, i) local screen_line = Text.screen_line(line, line_cache, i)
--? print('text.draw:', f, 'at', line_index,pos, 'after', x,y) --? print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
local frag_len = utf8.len(f) local frag_len = utf8.len(screen_line)
-- render any link decorations -- render any link decorations
for _,link_offsets in ipairs(line_cache.link_offsets) do for _,link_offsets in ipairs(line_cache.link_offsets) do
local s,e,filename = unpack(link_offsets) local s,e,filename = unpack(link_offsets)
@ -44,8 +44,13 @@ function Text.draw(State, line_index, y, startpos, hide_cursor)
local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len) local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
Text.draw_highlight(State, line, State.left,y, pos, lo,hi) Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
end end
select_color(f) -- render colorized text
App.screen.print(f, State.left,y) local x = State.left
for frag in screen_line:gmatch('%S*%s*') do
select_color(frag)
App.screen.print(frag, x,y)
x = x+App.width(frag)
end
-- render cursor if necessary -- render cursor if necessary
if not hide_cursor and line_index == State.cursor1.line then if not hide_cursor and line_index == State.cursor1.line then
if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
@ -56,7 +61,7 @@ function Text.draw(State, line_index, y, startpos, hide_cursor)
love.graphics.print(State.search_term, State.left+lo_px,y) love.graphics.print(State.search_term, State.left+lo_px,y)
end end
elseif Focus == 'edit' then elseif Focus == 'edit' then
Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y) Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
end end
end end
end end

11
text.lua
View File

@ -17,19 +17,18 @@ function Text.draw(State, line_index, y, startpos)
local pos = line_cache.screen_line_starting_pos[i] local pos = line_cache.screen_line_starting_pos[i]
if pos < startpos then if pos < startpos then
-- render nothing -- render nothing
--? print('skipping', f)
else else
final_screen_line_starting_pos = pos final_screen_line_starting_pos = pos
local f = Text.screen_line(line, line_cache, i) local screen_line = Text.screen_line(line, line_cache, i)
--? print('text.draw:', f, 'at', line_index,pos, 'after', x,y) --? print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
local frag_len = utf8.len(f) local frag_len = utf8.len(screen_line)
-- render fragment -- render fragment
if State.selection1.line then if State.selection1.line then
local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len) local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
Text.draw_highlight(State, line, State.left,y, pos, lo,hi) Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
end end
App.color(Text_color) App.color(Text_color)
App.screen.print(f, State.left,y) App.screen.print(screen_line, State.left,y)
-- render cursor if necessary -- render cursor if necessary
if line_index == State.cursor1.line then if line_index == State.cursor1.line then
if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
@ -40,7 +39,7 @@ function Text.draw(State, line_index, y, startpos)
love.graphics.print(State.search_term, State.left+lo_px,y) love.graphics.print(State.search_term, State.left+lo_px,y)
end end
else else
Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y) Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
end end
end end
end end