Commit Graph

1816 Commits

Author SHA1 Message Date
Kartik K. Agaram
f3f9ee270c Merge template-live-editor 2024-06-11 13:26:23 -07:00
Kartik K. Agaram
68c22094e0 Merge text0 2024-06-11 12:54:49 -07:00
Kartik K. Agaram
f2d1295356 Merge text.love 2024-06-11 12:42:15 -07:00
Kartik K. Agaram
62d8911c9e comment out debug prints while fixing merge conflicts 2024-06-11 12:33:30 -07:00
Kartik K. Agaram
262c078133 Merge lines.love 2024-06-11 12:13:18 -07:00
Kartik K. Agaram
55f5c2d696 crap, fix some final changes in the source editor 2024-06-11 11:10:34 -07:00
Kartik K. Agaram
7aa43d1d2d comment 2024-06-11 10:49:56 -07:00
Kartik K. Agaram
85b09772ba whitespace 2024-06-11 10:49:34 -07:00
Kartik K. Agaram
69c88da98c stop caching starty
This is quite useful because I used to have a long list of places in
which to invalidate the cache.
2024-06-11 10:37:58 -07:00
Kartik K. Agaram
f2299cb422 stop caching screen_bottom1
I'm not sure this is very useful. I had an initial idea to stop using
screen_bottom1 in final_text_loc_on_screen, by starting from screen_top1
rather than screen_bottom1. But that changes the direction in which we
scan for the text line in situations where there is somehow no text on
screen (something that should never happen but I have zero confidence in
that).

Still, it doesn't seem like a bad thing to drastically reduce the
lifetime of some derived state.

Really what I need to do is throw this whole UX out and allow the cursor
to be on a drawing as a whole. So up arrow or left arrow below a drawing
would focus the whole drawing in a red border, and another up arrow and
left arrow would skip the drawing and continue upward. I think that
change to the UX will eliminate a whole class of special cases in the
code.
2024-06-11 07:02:46 -07:00
Kartik K. Agaram
19615eade0 bugfix in source editor: don't clear selection on M-arrow 2024-06-09 20:38:53 -07:00
Kartik K. Agaram
9b5a78d3c5 bugfix in source editor 2024-06-09 20:35:50 -07:00
Kartik K. Agaram
9501f01ca0 fix a crash involving mouse and drawings
Thanks Alex Schroeder for reporting this crash. The scenario:
  * Edit a file like say this repo's Readme.
  * The second line is empty and there's a '+' to insert a drawing.
    Click on that.
  * Resize the window so just the first line of text and the drawing are
    visible.
  * Close the window.
  * Reopen lines.love, it will reopen the same file.
  * Click on the left margin to the left of the drawing.

Before this commit these steps yielded the following crash:

  Error: bad argument #1 to 'len' (string expected, got nil)
  text.lua:626: in function 'pos_at_end_of_screen_line'
  edit.lua:298: in function 'mouse_press'

There were two distinct problems here:

1. State.screen_bottom1 is not required to point to a text line, it
   could just as well be a drawing. I have been sloppy in handling that.
2. The bug was partially masked (the need to close and reopen the
   window) by a second bug: inserting a drawing was not invalidating the
   cache I save of starty coordinates for each line. (I've inserted and
   deleted starty invalidations a few times in the past, but it looks
   like I'd never had one in this particular location edit.draw before.)

How did these issues get missed for years?
  - Even though I use lines.love on a daily basis, it turns out I don't
    actually create line drawings all that often.
  - When I do, I'm still living in files that are mostly text with only
    an occasional drawing.
  - I keep my windows fairly large.

Between these 3 patterns, the odds of running into a drawing as the
first or bottom-most line on the screen were fairly small. And then I
had to interact with it. I suspect I tend to interact with drawings
after centering them vertically.

---

Bug #1 in particular has some interesting past history.

* Near the start of the project, when I implemented line-wrapping I
  started saving screen_bottom, the bottom-most line displayed on
  screen. I did this so I could scroll down easily just by assigning
  `screen_top = screen_bottom`. (On the other hand, scrolling up still
  required some work. I should perhaps get rid of it and just compute
  scrolls from scratch each time.)

* Also near the start of the project, I supported selecting text by a
  complex state machine spanning keypress, mouse press and mouse
  release:
    mouse click (press and immediate release) moves cursor
    mouse drag (press and much later release) creates selection
    shift-click selects from current cursor to click location
    shift-movement creates/grows a selection

* On 2023-06-01, inscript reported a bug. Opening a window with just a
  little bit of text (lots of unused space in the window), selecting all
  the text and then clicking below all the text would crash the editor.

  To fix this I added code at the bottom of edit.mouse_press which
  computed the final visible line+pos location and used that in the
  cursor-move/text-selection state machine. It did this computation
  based on.. screen_bottom. But I didn't notice that screen_bottom could
  be a drawing (which has no pos). This commit's bug/regression was
  created.

* On 2023-09-20, Matt Wynne encountered a crash which got me to realize
  I need code at the bottom of edit.mouse_release symmetric to the code
  at the bottom of edit.mouse_press. I still didn't notice that
  screen_bottom could be a drawing.

So in fixing inscript's bug report, I introduced (at least) 2
regressions, because I either had no idea or quickly forgot that
screen_bottom could point at a drawing.

While I created regressions, the underlying mental bug feels new. I just
never focused on the fact that screen_bottom could point at a drawing.

This past history makes me suspicious of my mouse_press/mouse_release
code. I think I'm going to get rid of screen_bottom entirely as a
concept. I'll still have to be careful though about the remaining
locations and which of them are allowed to point at drawings:

  - cursor and selection are not allowed to point at drawings
  - screen_top and screen_bottom are allowed to point at drawings

I sometimes copy between these 4 location variables. Auditing shows no
gaps where cursor could ever end up pointing at a drawing. It's just
when I started using screen_bottom for a whole new purpose (in
the mouse_press/release state machine) that I went wrong.

I should also try getting rid of starty entirely. Is it _really_ needed
for a responsive editor? I think I introduced it back when I didn't know
what I was doing with LÖVE and was profligately creating text objects
willy-nilly just to compute widths.

Getting rid of these two fairly global bits of mutable state will
hopefully make lines much more robust when the next person tries it out
in 6 months :-/ X-(

Thanks everyone for the conversation around this bug:
  https://merveilles.town/@akkartik/112567862542495637

---

Bug #2 has some complexity as well, and might lead to some follow-on
cleanup.

When I click on the button to insert a new drawing, the mouse_release
hook triggers and moves the cursor below the new drawing. This is
desirable, but I'd never noticed this happy accident. It stops working
when I invalidate starty for all lines (which gets recomputed and cached
for all visible lines on every frame).

Fixing this caused a couple of unit tests start crashing for 2 reasons
that required their own minor fixes:

  - My emulated mouse press and release didn't have an intervening
    frame and so mouse_release no longer receives starty. Now I've added
    a call to edit.draw() between press and release.

    This might actually bite someone for real someday, if they're
    running on a slow computer or something like that. I've tried to
    click really fast but I can't seem to put mouse_press and release in
    the same frame (assuming 30 frames per second)

  - My tests' window dimensions often violate my constraint that the
    screen always have one line of text for showing the cursor. They're
    unrealistically small or have a really wide aspect ratio (width 2x
    of height). I suspect lines.love will itself crash in those
    situations, but hopefully they're unrealistic. Hmm, I wonder what
    would happen if someone maximized in a 16:9 screen, that's almost
    2x.. Anyways, I've cleaned a couple of tests up, but might need to
    fix up others at some point. I'd have to rejigger all my brittle
    line-wrapping tests if I modify the screen width :-/ X-(
2024-06-09 13:17:55 -07:00
Kartik K. Agaram
91966e6b2a Merge template-live-editor 2024-05-20 00:18:40 -07:00
Kartik K. Agaram
fcccbebe39 Merge text0 2024-05-19 23:52:40 -07:00
Kartik K. Agaram
48b5d7fb48 Merge text.love 2024-05-19 23:45:00 -07:00
Kartik K. Agaram
a244738b01 Merge lines.love 2024-05-19 23:30:56 -07:00
Kartik K. Agaram
3e0cb2ed10 document recent handlers 2024-05-19 23:13:52 -07:00
Kartik K. Agaram
c622737166 Merge lines.love 2024-05-19 23:11:27 -07:00
Kartik K. Agaram
8219db2bcd mousefocus handler 2024-05-19 22:41:52 -07:00
Kartik K. Agaram
b6102d0489 mousemoved handler 2024-05-19 22:40:27 -07:00
Kartik K. Agaram
6ec8086a43 Merge template-live-editor 2024-03-10 22:40:48 -07:00
Kartik K. Agaram
8d3bfa6ba0 stop recommending the terminal
Freewheeling apps have been stable for many months now.
2024-03-10 22:25:28 -07:00
Kartik K. Agaram
9866f306d2 Merge template-live-editor 2024-03-10 21:53:55 -07:00
Kartik K. Agaram
01efe059a3 Merge text0 2024-03-10 21:41:24 -07:00
Kartik K. Agaram
b281b3ddf4 Merge text.love 2024-03-10 21:40:10 -07:00
Kartik K. Agaram
732ae69382 Merge lines.love 2024-03-10 21:36:01 -07:00
Kartik K. Agaram
093da1e7f8 add a mirror and reorg mirrors 2024-03-10 20:15:46 -07:00
Kartik K. Agaram
2ffdd7adbd Merge template-live-editor 2024-02-16 21:39:13 -08:00
Kartik K. Agaram
ff0d64390c Merge text0 2024-02-16 21:33:22 -08:00
Kartik K. Agaram
5fd7f01fab Merge text.love 2024-02-16 21:32:40 -08:00
Kartik K. Agaram
28aac52235 Merge lines.love 2024-02-16 21:28:08 -08:00
Kartik K. Agaram
219ee11686 ensure tapping on editor brings up soft keyboard 2024-02-16 21:16:29 -08:00
Kartik K. Agaram
07eefda816 Merge template-live-editor 2024-02-08 03:08:40 -08:00
Kartik K. Agaram
7740beab74 Merge text0 2024-02-08 02:58:10 -08:00
Kartik K. Agaram
58c01172d3 Merge text.love 2024-02-08 02:57:30 -08:00
Kartik K. Agaram
6b33c9e223 Merge lines.love 2024-02-08 02:52:55 -08:00
Kartik K. Agaram
4e9298dda1 bugfix in cursor positioning
scenario:
- create a long wrapping line
- tap past end of first screen line

Before this commit the cursor would be positioned not quite at the end
of the screen line but one character before. In effect there was no way
to position cursor at end of a wrapping line.

I'm not sure how this bug has lasted so long. It was introduced in
commit 8d3adfa36 back in June 2022, which was itself billed as a bugfix
for "clicking past end of screen line". But when I go back to it this
bug exists even back then. How did I miss it?! I wrote a test back then
-- and the test was wrong, has always been wrong.
2024-02-08 02:37:12 -08:00
Kartik K. Agaram
869459993f Merge template-live-editor 2024-02-04 17:59:34 -08:00
Kartik K. Agaram
e3124760b1 Merge text0 2024-02-04 17:45:48 -08:00
Kartik K. Agaram
01a13715d7 Merge text.love 2024-02-04 17:43:28 -08:00
Kartik K. Agaram
77e1b57446 Merge lines.love 2024-02-04 17:36:01 -08:00
Kartik K. Agaram
1dbd734abb fix yet another place 2024-02-04 17:19:39 -08:00
Kartik K. Agaram
95be13f9db more realism in one more helper 2024-02-04 17:15:35 -08:00
Kartik K. Agaram
83722db5e4 bugfix: don't clear selection on M-arrow
We now treat all arrow chords as cursor movement.

Many thanks to Ryan Kessler (https://tone.support) for reporting this
issue.
2024-02-04 09:31:36 -08:00
Kartik K. Agaram
1d1a829d5b more carefully pass the 'key' arg around 2024-02-04 09:30:48 -08:00
Kartik K. Agaram
13ee987dce Merge template-live-editor 2024-01-31 15:39:38 -08:00
Kartik K. Agaram
0477988406 new mirror 2024-01-30 23:43:15 -08:00
Kartik K. Agaram
f46819ce99 Merge template-live-editor 2024-01-15 03:33:50 -08:00
Kartik K. Agaram
83881938f5 Merge text0 2024-01-15 02:33:22 -08:00