Commit Graph

1162 Commits

Author SHA1 Message Date
Kartik K. Agaram 9932a02868 search.lua looks right 2024-06-23 10:21:47 -07:00
Kartik K. Agaram 5fe5704f2a I think text.lua is right now 2024-06-23 09:38:01 -07:00
Kartik K. Agaram 83739e323c fix up left/right motions 2024-06-23 09:29:49 -07:00
Kartik K. Agaram 4b864de4c7 Text.down now looks right 2024-06-23 08:49:14 -07:00
Kartik K. Agaram 4881ea8d26 strip off all debug prints 2024-06-23 08:30:34 -07:00
Kartik K. Agaram eddc4791d1 up/down/pageup/pagedown now seem to work reliably
I'm falling back into my old patterns of not caring too much how ugly
the code looks, but recent experience is teaching me to mistrust this
tendency. My resolution this time is to continue spending time polishing
the code even after the app seems to be working fine. Don't wait for
bugs to let yourself think the code is shit.
2024-06-23 08:26:14 -07:00
Kartik K. Agaram 0a464648f3 handle drawing at cursor on up arrow 2024-06-22 21:53:54 -07:00
Kartik K. Agaram cd534bad22 eliminate Drawing.current_drawing()
Use the cursor everywhere.
2024-06-22 21:30:14 -07:00
Kartik K. Agaram 10ed08e53b more thorough testing of drawings; mostly working 2024-06-22 19:20:30 -07:00
Kartik K. Agaram 9f37781f07 eliminate squirrely state State.lines.current_drawing
Now we truly have only one cursor.
2024-06-22 19:09:01 -07:00
Kartik K. Agaram 29c83c6175 eliminate squirrely state State.current_drawing_index
Since we now use State.cursor.line for this, the cursor can now move on
a drawing (when we start a drawing operation).

Lots of places still crash when they encounter a drawing cursor, though.
Like arrow keys or other sorts of navigation.
2024-06-22 17:34:53 -07:00
Kartik K. Agaram a4ca53d571 reorganize a squirrely bit of state 2024-06-22 17:16:46 -07:00
Kartik K. Agaram ee1db64aea get rid of some validation that cursor is always a text line
We now permit the cursor to be in a drawing, but we don't actually ever
set the cursor to a drawing yet.

To accomplish this I ended up undoing the whole loc1 field when the
cursor is on a text line.

The assumption that the cursor is a text line is still sprinkled all
over. Hopefully the string `mode='text'` marks all the spots.
2024-06-22 17:09:20 -07:00
Kartik K. Agaram fdd7add0f0 get rid of 'run' indirection 2024-06-22 16:21:03 -07:00
Kartik K. Agaram 700e5041a8 get rid of initialize_globals; fix a few calls to shift_down 2024-06-22 11:38:52 -07:00
Kartik K. Agaram 136929c15b bugfix: C-f esc 2024-06-22 11:38:52 -07:00
Kartik K. Agaram 2082d49bcf streamline version checking and active keys
In ripping out the source editor I also removed the ability to recover
from an unsupported version on a best-effort basis. Now the error
message matches that scenario.
2024-06-22 11:37:58 -07:00
Kartik K. Agaram d780bb0175 insert a mode into locations 2024-06-21 21:05:51 -07:00
Kartik K. Agaram d41f64b8ff rename cursor1 to cursor 2024-06-21 19:01:54 -07:00
Kartik K. Agaram e39c952b5e rename screen_top1 to screen_top 2024-06-21 19:01:16 -07:00
Kartik K. Agaram e411c45ded fixup! rip out all unit tests 2024-06-19 21:53:57 -07:00
Kartik K. Agaram 3416e066a7 switch to standard names for a bunch of stuff 2024-06-19 21:49:39 -07:00
Kartik K. Agaram 04d9c6c28c rip out logging 2024-06-19 20:59:13 -07:00
Kartik K. Agaram 60620d3d54 rip out all unit tests 2024-06-19 20:58:16 -07:00
Kartik K. Agaram 13cd957bcd rip out Current_app 2024-06-19 20:52:24 -07:00
Kartik K. Agaram cee9dd477f use idiomatic 'require' 2024-06-19 20:45:59 -07:00
Kartik K. Agaram ccfdce9738 rip out source editor 2024-06-19 20:43:22 -07:00
Kartik K. Agaram db3ba0b7e1 new fork: a smaller, tighter text editor
Start by delete my ancient profiling tools.
2024-06-19 20:42:53 -07:00
Kartik K. Agaram 2fdb6fa729 update a stale comment 2024-06-16 05:20:05 -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 3e0cb2ed10 document recent handlers 2024-05-19 23:13:52 -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 093da1e7f8 add a mirror and reorg mirrors 2024-03-10 20:15:46 -07:00
Kartik K. Agaram 219ee11686 ensure tapping on editor brings up soft keyboard 2024-02-16 21:16:29 -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 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 95d88a8298 use editor state font for width calculations 2024-01-12 05:23:06 -08:00
Kartik K. Agaram 4121613fc6 don't save settings on error in source editor 2024-01-12 03:51:34 -08:00
Kartik K. Agaram 5d4fd4aa93 fix still more issues with the previous scenario
- source editor always expects relative paths
- refresh mocked data

There's still one issue after this: the font size saved in the config
file is the one we use in tests. More broadly, Editor_state is
completely wrong.

Ideally I'd just not save any settings for the source editor if the
tests fail.
2024-01-12 03:35:22 -08:00