akkartik
/
sokoban.love
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
980 Commits 1 Branch 0 Tags 4.3 MiB
Commit Graph

388 Commits

Author SHA1 Message Date
Kartik K. Agaram e0f750913f Merge lines.love 2022-09-05 12:47:27 -07:00
Kartik K. Agaram 5ab541f160 . 2022-09-05 12:38:11 -07:00
Kartik K. Agaram 528c64d690 support drawings in the source editor 2022-09-05 11:29:39 -07:00
Kartik K. Agaram a92ded7f49 Merge lines.love 2022-09-03 17:24:30 -07:00
Kartik K. Agaram c6f88dccfa set window title within each app 
The main app shows the file being edited, but the programming environment does not.
 2022-09-03 17:20:11 -07:00
Kartik K. Agaram 21efba975d Merge lines.love 2022-09-03 17:15:25 -07:00
Kartik K. Agaram 17fa0ec9e7 bugfix: window title 2022-09-03 14:51:52 -07:00
Kartik K. Agaram e1c5a42f31 editing source code from within the app 
integrated from pong.love via text.love:
  https://merveilles.town/@akkartik/108933336531898243
 2022-09-03 14:13:22 -07:00
Kartik K. Agaram 42762ce062 editing source code from within the app 
integrated from pong.love: https://merveilles.town/@akkartik/108933336531898243
 2022-09-03 13:58:30 -07:00
Kartik K. Agaram 89081a8a78 Merge lines.love 2022-08-24 13:34:10 -07:00
Kartik K. Agaram ce31b74b10 infrastructure for caching LÖVE text objects 2022-08-24 13:27:04 -07:00
Kartik K. Agaram d011c0ce32 Merge lines.love 2022-08-23 13:25:55 -07:00
Kartik K. Agaram 8057f3e8fe stop putting button state in a global 
Symptom: a test (test_click_to_create_drawing) started randomly failing
after I inserted a `return` 2 commits ago.

Cause: my tests call edit.draw, but button handlers only get cleared in
app.draw. So my tests weren't clearing button handlers, and every call
to edit.draw was accumulating states. Still unclear why those were going
to different state objects after the `return`, but anyway. I'm not going
to understand every last thing that happens when things go wrong, just
guarantee they can't go wrong. And the way to do that is to decentralize
button handlers to each state that receives them.

The State object in buttons.lua doesn't have to be Editor_state. It just
has to be some table that provides a Schelling Point for shared state.
 2022-08-23 10:59:58 -07:00
Kartik K. Agaram e2077858f7 Merge lines.love 
Bring forks up to date.
 2022-08-21 14:36:21 -07:00
Kartik K. Agaram 61eb87b03c correct a comment 
We no longer have undo history directly in globals.
 2022-08-21 14:26:50 -07:00
Kartik K. Agaram 08b7318c0d Merge lines.love 2022-08-19 17:11:47 -07:00
Kartik K. Agaram 13f67fa851 regression: dropping files on the window 
Also improve the test to catch this next time.
 2022-08-19 17:05:41 -07:00
Kartik K. Agaram 8ce39fe403 title 2022-08-15 22:27:31 -07:00
Kartik K. Agaram 9d792a203b new fork: rip out drawing support 2022-08-14 09:20:14 -07:00
Kartik K. Agaram 9459d91abc remove some duplication 2022-08-14 08:10:24 -07:00
Kartik K. Agaram cc289363fa overzealous search-and-replace 2022-08-13 22:01:40 -07:00
Kartik K. Agaram 48162b9816 have file API operate on state object 2022-07-25 19:56:39 -07:00
Kartik K. Agaram 94b6d04e83 bugfix: alt-tab shouldn't emit keypress events 
Looks like this only happens on Linux:
  https://love2d.org/forums/viewtopic.php?p=249700
 2022-07-25 15:33:06 -07:00
Kartik K. Agaram 6c6a7aab07 move 2022-07-25 15:25:22 -07:00
Kartik K. Agaram fe8e4fd9da simplify hysteresis logic 2022-07-25 15:23:01 -07:00
Kartik K. Agaram 6f74f95a46 extract method 2022-07-23 23:36:04 -07:00
Kartik K. Agaram 29dac6a6ec separate data structure for each line's cache data 
I have no idea what the performance implications of this are..
 2022-07-17 21:05:01 -07:00
Kartik K. Agaram a1da18c107 more precise name 2022-07-15 22:15:07 -07:00
Kartik K. Agaram 2884f872d8 make test initializations a little more obvious 2022-07-15 22:12:25 -07:00
Kartik K. Agaram fc6b602342 bugfix: zoom in/out hotkeys 
Broken since commit 3b36093553 5 hours ago.
 2022-07-13 23:31:52 -07:00
Kartik K. Agaram 119abbd52e bugfix: resize 2022-07-13 15:40:14 -07:00
Kartik K. Agaram 3b36093553 left/right margin -> left/right coordinates 
Editor state initialization now depends on window dimensions, so we have
to more carefully orchestrate startup.
 2022-07-12 20:54:50 -07:00
Kartik K. Agaram f7d4deef0c add state arg to a few functions 
- Text.cursor_at_final_screen_line
  - Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary
  - Text.snap_cursor_to_bottom_of_screen
  - Text.in_line
  - Text.to_pos_on_line
  - Text.to2
  - Text.to1
  - Text.previous_screen_line
  - Text.tweak_screen_top_and_cursor
  - Text.redraw_all
 2022-07-12 17:24:01 -07:00
Kartik K. Agaram 81ecca89ff start passing in Editor_state explicitly 
In this commit, top-level edit functions:
  - edit.draw
  - edit.update
  - edit.quit
  - edit.mouse_pressed
  - edit.mouse_released
  - edit.textinput
  - edit.keychord_pressed
  - edit.key_released
 2022-07-12 15:33:06 -07:00
Kartik K. Agaram e95b4fec12 initialize contains test state 2022-07-12 15:29:22 -07:00
Kartik K. Agaram 8bbc1ffe34 group all editor globals 
We're still accessing them through a global. But we'll change that next.
 2022-07-12 15:24:56 -07:00
Kartik K. Agaram a5f725ab3b bring couple more globals back to the app level 2022-07-12 13:45:38 -07:00
Kartik K. Agaram 094f3bd7e8 button framework is at the app level 2022-07-12 13:40:53 -07:00
Kartik K. Agaram 2e3a85d94b experiment: new edit namespace 
Still lots to do, but the eventual hope is that this will make this
project's code easier to reuse from other LÖVE projects.

One gotcha: even as we start putting code more aggressively into nested
tables, tests must remain at the top-level. Otherwise they won't run.
 2022-07-11 23:18:26 -07:00
Kartik K. Agaram 3dccd7f81a stop pretending globals are local 
One advantage of this approach: we don't end up with multiple lexical
scopes containing duplicates of the same modules.
 2022-07-11 22:11:58 -07:00
Kartik K. Agaram e68d235c5f . 2022-07-11 22:03:41 -07:00
Kartik K. Agaram d2d54db1f9 fix a variable name 2022-07-11 22:01:30 -07:00
Kartik K. Agaram 3eb89adca6 add args to some functions 
- Text.snap_cursor_to_bottom_of_screen
 2022-07-08 16:22:11 -07:00
Kartik K. Agaram abcc18002b add args to some functions 
- Text.to_pos_on_line
 2022-07-08 15:45:45 -07:00
Kartik K. Agaram 9fb8f25030 indent 2022-07-08 15:43:45 -07:00
Kartik K. Agaram 00c64ed6e4 add args to some functions 
- Text.in_line
 2022-07-08 15:37:09 -07:00
Kartik K. Agaram a27dd15c1f add args to some functions 
- Text.clip_selection
  - Text.cut_selection
  - Text.delete_selection
  - Text.delete_selection_without_undo
  - Text.mouse_pos
  - Text.to_pos
 2022-07-08 15:30:10 -07:00
Kartik K. Agaram e39269b19e start passing left/right margins everywhere 
I have a set of changes that passes all tests, but I'm going to commit
them very carefully to ensure I don't miss any call-sites. In this
commit I'm adding the args to:
  - Text.draw
  - Text.tweak_screen_top_and_cursor

But calls within them don't yet pass them where they should. In this
manner I'm going to progress systematically from the top down.
 2022-07-08 15:12:17 -07:00
Kartik K. Agaram 048b6d9d3a drop an arg from a function 2022-07-08 09:44:49 -07:00
Kartik K. Agaram cff1e58cf6 switch arg for a function 2022-07-08 09:44:49 -07:00
Kartik K. Agaram 50a57d7ef6 stop scanning from start of file on every App.draw 2022-07-07 21:51:06 -07:00
Kartik K. Agaram 6dfe954c02 yet another bugfix in selection management 
Thanks Leonard Schütz for the report!

Failing scenario:
  click to move cursor
  hit backspace

First backspace wasn't being doing anything earlier.
 2022-07-07 07:39:01 -07:00
Kartik K. Agaram dff4587219 just keep the cursor visible after any input events 
This is much nicer.
 2022-07-06 09:03:54 -07:00
Kartik K. Agaram 2973324ef6 show cursor immediately after a mouse click 
I've been subtly finding myself waiting for the cursor to stop blinking
to see if I clicked on the right place.
 2022-07-06 08:57:45 -07:00
Kartik K. Agaram f2e5c4ffee bugfix: avoid scrolling on 'end' 
There's multiple ways to do this, only one of them is right, and I keep
forgetting what it is. Turn it into a method.
 2022-07-05 11:27:23 -07:00
Kartik K. Agaram 3422d92a00 bugfix: 'escape' to cancel a stroke 
This has been broken since commit b544e8c357 on May 17 :/
I'm just undoing that commit, which turns out to be completely
unnecessary. And adding a test.
 2022-07-05 11:06:55 -07:00
Kartik K. Agaram 3197bb5739 what should happen to selection while drawing? 
First idea: just leave it alone. Let's see how this works.
 2022-07-05 10:09:51 -07:00
Kartik K. Agaram ea40a9b661 bugfix 
Gracefully degrade if previously edited file shrinks.
 2022-07-03 21:03:52 -07:00
Kartik K. Agaram 53c35241fb ugh, handle absolute as well as relative paths 2022-07-01 13:56:17 -07:00
Kartik K. Agaram f311013200 include CWD when saving filename 2022-07-01 12:31:23 -07:00
Kartik K. Agaram 914d9c6f98 bugfix: clicking on empty lines 2022-07-01 12:16:43 -07:00
Kartik K. Agaram 79df3da04b enforce press/release state only processed once 
bugfix scenario:
  press pageup
  click somewhere near the bottom

Before this change the selection was flickering when doing this.
 2022-07-01 11:42:54 -07:00
Kartik K. Agaram e839c3036a bugfix: manage screen_top and cursor when resizing 2022-07-01 11:01:20 -07:00
Kartik K. Agaram 37c5ab87ec bugfix: enable resize when loading settings 2022-06-30 23:02:24 -07:00
Kartik K. Agaram 429a42eb1c right margin 2022-06-30 22:54:34 -07:00
Kartik K. Agaram da3f6c65b3 start loading settings as applicable 2022-06-30 22:46:45 -07:00
Kartik K. Agaram b40dab67f2 start saving some settings to disk on quit 
We're still not reading them anywhere.
 2022-06-30 22:20:16 -07:00
Kartik K. Agaram 2025172e52 initialize screen width to something reasonable 2022-06-30 22:04:27 -07:00
Kartik K. Agaram 0cd678581b rip out geometry commandline arg 
Let's try really hard to ignore the terminal.
 2022-06-30 22:02:31 -07:00
Kartik K. Agaram 86cef33630 use the background color 
I'd hoped this would reduce the blocks of black while resizing, but it
doesn't seem to have made a difference.
 2022-06-30 21:59:17 -07:00
Kartik K. Agaram e1a49c216e stop blanking screen while resizing 2022-06-30 21:56:21 -07:00
Kartik K. Agaram 8c7bea8f76 rip out notion of Line_width 2022-06-30 19:50:27 -07:00
Kartik K. Agaram 08a50b7fff rip out the line-width slider 
New plan:
  - render text across the whole window
  - let people resize the window to the desired line width
  - save window size settings between sessions
 2022-06-30 19:36:37 -07:00
Kartik K. Agaram 510b0d1dc3 bugfix: lines that aren't drawn from the start 
I can't believe I didn't catch this until now. All I had to do is open
MobyDick.markdown from https://www.hogbaysoftware.com/posts/moby-dick-workout,
press page-down and click on the top screen line (or any screen line
containing the same line as the top screen line). Easy to catch with any
file containing lots of overly long lines, as happens in particular at
the start of Moby Dick.

I _had_ seen this problem before, but it seemed to disappear after
unrelated changes, and I convinced myself I'd fixed it as a side-effect.
The bug just failed to manifest if the top line happened to start at the
top of the screen. Scroll down a few pages in Moby Dick and the dialogue
starts and line length drops precipitously.
 2022-06-30 18:14:48 -07:00
Kartik K. Agaram d009390cc4 bugfix: save previous file when dropping a new one on 2022-06-29 17:58:58 -07:00
Kartik K. Agaram 9410cccb08 avoid redundant writes on exit 2022-06-29 17:36:56 -07:00
Kartik K. Agaram 938e3ca1bb when naming points, allow backspacing back to '' 2022-06-27 17:36:10 -07:00
Kartik K. Agaram 83ba9e61d1 bugfix: typing a capital letter deletes selection 2022-06-26 17:07:27 -07:00
Kartik K. Agaram 84875f3c43 bugfix: don't delete selection when moving cursor 2022-06-23 12:05:36 -07:00
Kartik K. Agaram 39913ddbb8 show the line width when dragging the slider 2022-06-22 18:00:53 -07:00
Kartik K. Agaram 8e68c699f5 bugfix: delete selection before pasting 2022-06-21 09:56:04 -07:00
Kartik K. Agaram 0d1e6aacd9 revert selection logic to before commit 3ffc2ed8f 
We still have a failing test, but now it's the one we introduced in
commit 3ffc2ed8f.
 2022-06-20 13:12:29 -07:00
Kartik K. Agaram 7508a70ed5 selection bugfix 2022-06-20 12:02:51 -07:00
Kartik K. Agaram c1b6bac187 much simpler 
We just need to ensure textinput events never make use of selection
state.

All tests are passing, but I'm aware of a couple of issues. But now we
can keep all the special cases in one place.
 2022-06-20 11:58:26 -07:00
Kartik K. Agaram 3986e99fe0 no, that's not right 
Bugfix: we want selections to persist even when we lift up the shift
key.

This requires hoisting some code inside every case inside the whole
keypress hierarchy, to ensure we never clear selections before
textinput events can handle them.

Current cross-cutting concerns we're explicitly scattering code for.
  - autosave
  - undo
  - selection management
 2022-06-20 11:31:14 -07:00
Kartik K. Agaram 3be413602a bugfix: typing should delete highlighted text 
The test harness now also mimics real usage more precisely.
 2022-06-20 10:48:35 -07:00
Kartik K. Agaram 3ffc2ed8f3 bugfix 
To reproduce:
  click to position cursor at end of a line
  hit enter
  press any key

before:
  newline got erased and key got added to previous line

now:
  newline is preserved

The new test checks a generalization of this.
 2022-06-19 09:21:32 -07:00
Kartik K. Agaram 703ed905c1 bugfix: crash in Text.up() after return 
Let's just make all the utf8.offset calculations more defensive.
 2022-06-19 09:06:41 -07:00
Kartik K. Agaram 2a26a260bb make sure to save right when quitting 
I just noticed a few characters missing from one of my notes.
 2022-06-18 16:26:45 -07:00
Kartik K. Agaram c15ee0b4a0 correct location of the line width slider 2022-06-18 00:03:19 -07:00
Kartik K. Agaram 1ecc3f43e5 drop last couple of manual tests 2022-06-17 22:24:46 -07:00
Kartik K. Agaram efbbdfc586 affordance to adjust width for word wrap 2022-06-17 21:36:07 -07:00
Kartik K. Agaram 0fb98d2ac9 indent 2022-06-17 20:08:18 -07:00
Kartik K. Agaram 856c51212a autosave slightly less aggressively 
It might reduce wear and tear on disk, and losing 3 seconds of data
doesn't feel catastrophic (short of a C-z rampage).

Thanks to the love2d.org community for the suggestion:
  https://love2d.org/forums/viewtopic.php?f=14&t=93173
 2022-06-17 15:43:31 -07:00
Kartik K. Agaram 1aa2590236 test: undo naming a point 
Also ensure we autosave.
 2022-06-14 22:39:05 -07:00
Kartik K. Agaram 4f9789db41 test: naming a point 2022-06-14 21:07:04 -07:00
Kartik K. Agaram 0c57f6bbdc drop non-existent feature from comment 2022-06-14 14:59:51 -07:00
Kartik K. Agaram e3c7e9c96b extract variables for drawing padding 2022-06-14 10:49:10 -07:00
Kartik K. Agaram f277a78455 extract variable Margin_left 2022-06-14 10:49:06 -07:00
Kartik K. Agaram c1d8201d44 mouse buttons are integers, not strings 
Not sure where that idiom comes from or why strings work in some places
(auto-coercion?). I picked it up off some example apps. But
https://love2d.org/wiki/love.mouse.isDown says it should be an integer.
 2022-06-14 09:05:02 -07:00