about summary refs log tree commit diff stats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* a couple more global curses bindingsKartik K. Agaram2021-11-291-0/+3
|
* fix regression in showing error messagesKartik K. Agaram2021-11-291-4/+4
|
* .Kartik K. Agaram2021-11-291-2/+0
|
* let people fix bad images from within TelivaKartik K. Agaram2021-11-292-12/+28
| | | | | | | | | Short of syntax errors that keep us from parsing the teliva_program table, we should now be able to recover gracefully from everything. Yesterday I started to try to add this to load_definitions before realizing most errors are only noticed while running `main`. But I didn't think of recovering from the docall of `main` until this morning.
* redo uncommentKartik K. Agaram2021-11-281-5/+6
| | | | It was printing a phantom null at end of line on screen.
* auto-indentKartik K. Agaram2021-11-281-1/+7
|
* tab key: always insert two spacesKartik K. Agaram2021-11-281-0/+5
|
* hide some 'advanced' hotkeys to support narrow windowsKartik K. Agaram2021-11-281-4/+0
|
* ctrl-/ to comment/uncomment lineKartik K. Agaram2021-11-282-0/+28
|
* ctrl-u/ctrl-k to make editing a bit more ergonomicKartik K. Agaram2021-11-282-1/+18
|
* special indent settings for kiloKartik K. Agaram2021-11-281-0/+3
|
* indentKartik K. Agaram2021-11-281-40/+40
|
* mac backspace attempt 3Kartik K. Agaram2021-11-281-1/+1
|
* fix half-assed mac os backspace commitKartik K. Agaram2021-11-282-4/+4
|
* sacrificing another LoC to ward off crashesKartik K. Agaram2021-11-281-0/+1
| | | | | | It makes me very nervous now that there's save_editor_state within editor event loop, when the editor could be editing notes. Things are slightly better than this morning, but this prototype still suxxors.
* editing notes sucks a little lessKartik K. Agaram2021-11-282-4/+10
| | | | | | I think I've gotten rid of all the segfaults, but it's still pretty messed up: if you hit ctrl-g and go edit some definition, it doesn't get saved. You're just storing the edit in the note.
* fix the bug described in commit cec57992b7Kartik K. Agaram2021-11-281-4/+12
|
* rename a fn and reorganize its responsibilitiesKartik K. Agaram2021-11-281-3/+3
|
* split a lumpy abstraction into two cleaner onesKartik K. Agaram2021-11-281-13/+19
| | | | | | | | | | | | | | I'm mindful of the way abstractions can create duplicate effort: https://flak.tedunangst.com/post/browser-ktrace-browsing == Kartik's SAD theorem As programs grow complex, you will be repeatedly forced to either: - maintain some State, - perform some computations Again, - or Duplicate some code. Here a small amount of duplication seems like the best alternative. Particularly since no syscalls are involved.
* purge abstraction hiding teliva_editor_bufferKartik K. Agaram2021-11-281-10/+5
|
* inline another functionKartik K. Agaram2021-11-282-8/+2
| | | | | I'm going to give up on hiding teliva_editor_buffer from kilo. It was taking too much knowledge of extern function prototypes on both sides.
* take one responsibility away from edit_imageKartik K. Agaram2021-11-281-4/+4
| | | | Also rename it appropriately.
* .Kartik K. Agaram2021-11-281-1/+1
|
* inline an unnecessary functionKartik K. Agaram2021-11-281-7/+2
|
* start streamlining architectureKartik K. Agaram2021-11-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the spaghetti is hiding another issue: when we load editor state, that code path currently never leads to importing the edited buffer back into the image. Yet another attempt at drawing the state diagram: Wgetch -> switch_to_editor -> select_view select_view -> load_editor_state | big_picture_view load_editor_state -> edit_from -> editorProcessKeypress big_picture_view -> edit_image -> edit_buffer -> resumeEdit* -> load_editor_buffer -> editorProcessKeypress big_picture_view -> recent_changes recent_changes -> big_picture_view | edit_buffer The problem is that load_editor_state doesn't eventually call load_editor_buffer the way its sibling big_picture_view does. For starters, it's confusing that switch_to_editor calls big_picture_view which calls other editor functions. What is 'editor' here, anyway? Let's rename switch_to_editor to developer_mode. So the app starts out in user mode, and might eventually transition to developer mode. Developer mode is a black hole; to leave it and return to user mode we restart the entire app. The architecture in my mind is now: - Teliva consists of user mode and developer mode - Developer mode consists of multiple views - Each view, when it needs to edit something: - initializes kilo - loads a buffer into it - resumes editing the buffer as necessary
* fix going to big picture after saving editor stateKartik K. Agaram2021-11-281-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My code is already at spaghetti levels. Some coping mechanisms. === The big problem with the Teliva approach compared to my previous Mu project: no tests. At this point I should document the growing list of manual tests I've been maintaining: run a program run a program, edit run a program, edit, make an edit, run | edit takes effect run a program with error run a program, edit, make an error, run run a program, edit, ^g to a different definition, make an edit, ^e to run again run a program, edit, ^g to a non-existent definition run a program, edit, ^g to a different definition, ^g to a different definition, ^e to run again start -> big picture -> edit -> move cursor -> run -> edit | cursor preserved start -> big picture -> edit A -> move cursor -> big picture -> edit B | cursor initialized start -> big picture -> edit A -> move cursor -> run -> exit -> start -> big picture -> edit B | cursor initialized start -> big picture -> edit A -> move cursor -> run -> exit -> start -> big picture -> edit B -> big picture (*) syntax highlighting for line comments syntax highlighting for multiline comments (*) - fixed in this commit === Coarse-grained state diagram (ignoring recent_changes_view): app -> big picture on ^e big picture -> editor when selecting a definition editor -> app on e editor -> big picture on ^b Fine-grained sequence diagram: main -> pmain -> ... -> Wgetch -> switch_to_editor -> select_view select_view -> load_editor_state, falling through to big_picture_view if needed load_editor_state -> edit_from -> editorProcessKeypress The consequence I hadn't fully internalized was the return path: editorProcessKeypress -> edit_from -> big_picture_view Which implies that load_editor_state fails in two ways: - when the state doesn't exist or is not applicable or is corrupted - when editing from the state explicitly requested the big picture view Switching the return value semantics for load_editor_state now supports both ways.
* yet another fucking makefile bugKartik K. Agaram2021-11-281-1/+1
| | | | | | | | | | | | | | Making changes to lcurses directory was causing it to be compiled, but not causing teliva to be relinked. Now I'm: - unconditionally running `make` on subdirectories - conditionally linking their outputs Seems reasonable when I put it like that. Hopefully this is working now. I used to know `make` down cold a decade ago, but it's evaporated from my brain.
* clear editor state across user-visible restartsKartik K. Agaram2021-11-281-1/+3
| | | | | | | | | | | | | | | | Teliva's constantly restarting without the user being aware of it. So far I figured saving history across the user actually exiting and restarting Teliva was just a happy "feature". However, it looks like that's actually more complex to implement. Keeping editor state across user-visible restarts results in these problems: - opening the editor after restart has the cursor position messed up, no matter what definition you open. - more seriously, opening the editor after restart can't seem to get to the big-picture view anymore. Rather than try to debug what's going on, I'm going to just cordon off that part of the state space for now.
* use header everywhereKartik K. Agaram2021-11-281-3/+3
|
* unused variableKartik K. Agaram2021-11-281-1/+0
|
* standardize filenames that teliva strews on diskKartik K. Agaram2021-11-282-26/+26
| | | | | We still need a proper story for file system side effects. But it's not time yet for sandboxing considerations. Soon, but not yet.
* restore editor state from snapshotKartik K. Agaram2021-11-282-1/+62
|
* make look_up_definition more composableKartik K. Agaram2021-11-281-7/+12
|
* save a snapshot of editor state across restartsKartik K. Agaram2021-11-282-1/+14
| | | | | | | | | | | | | | | | We're not using this yet. I agonized over this decision for several weeks. Is Teliva's need to restart with execve an utter hack or a good thing? I'm leaning towards the latter. Constantly exercising the initial flow makes Teliva more crash-only. We can build Steve Yegge's idea of immortality (http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html) out of crash-only primitives, just by making reboots instantaneous. But focusing directly on immortality tends to compromise crash-only by exercising it more rarely. One other issue this brings up: loading these Lua tables from disk is a vector for arbitrary code execution. I need to fix these when I get to sandboxing.
* more salient concept of 'views'Kartik K. Agaram2021-11-281-4/+4
|
* fix backspace on MacKartik K. Agaram2021-11-282-1/+6
| | | | | I'm deliberately restricting this incompatibility to the editor environment for now.
* editor hotkeys: sol/eolKartik K. Agaram2021-11-282-4/+20
| | | | | I'm growing attached to ^e, so mildly breaking with convention there. Perhaps this is a bad idea.
* pass some CFLAGS at least to libcursesKartik K. Agaram2021-11-271-3/+3
| | | | | My Makefiles are an utter mess. Unclear how to reconcile staying close to upstream with being clean in isolation.
* .Kartik K. Agaram2021-11-271-0/+1
|
* one final issue building on Mac OS XKartik K. Agaram2021-11-271-2/+2
|
* now building on OpenBSDKartik K. Agaram2021-11-273-14/+15
| | | | Still emitting a bunch of warnings on OpenBSD, though.
* select C99 in luasecKartik K. Agaram2021-11-272-3/+3
| | | | | | I can't select C99 in luasocket, because I don't know how to include the definition of struct timespec. All this fucking complexity. But hopefully things will build on OpenBSD now.
* select C99 standardKartik K. Agaram2021-11-273-5/+10
|
* clean up luasocket build fileKartik K. Agaram2021-11-271-142/+15
| | | | | | Teliva is never intended to be "installed" somewhere. Just work inside its directory and separately share the .tlv files you create. (Though I don't yet have a good flow for starting a new .tlv file.)
* .Kartik K. Agaram2021-11-271-6/+6
|
* fix build on MacKartik K. Agaram2021-11-273-2/+7
|
* starting to test compilation on Mac and BSD.Kartik K. Agaram2021-11-271-2/+2
| | | | | | | | For starters, put Linux-specific stuff in a Linux-specific target. By not resetting MYCFLAGS and MYLDFLAGS, I'm unnecessarily passing in -DLUA_USE_LINUX. But that'll make it easier to get things running on Mac and BSD.
* bugfix: emit legal Lua representationKartik K. Agaram2021-11-261-1/+1
|
* support space/backspace in recent changes viewKartik K. Agaram2021-11-261-6/+8
|
* standardize indentKartik K. Agaram2021-11-261-4/+4
|
s='oid'>8326c8b3 ^
0f01f30b ^
0b40de5a ^

c16871d1 ^
0f01f30b ^

0f01f30b ^

9d94ac5c ^
8326c8b3 ^
0f01f30b ^
0b40de5a ^

c16871d1 ^
0f01f30b ^


0f01f30b ^

9d94ac5c ^
8326c8b3 ^
0f01f30b ^
0b40de5a ^

c16871d1 ^
0f01f30b ^

0f01f30b ^

f60864f8 ^
292ae567 ^


292ae567 ^
10a3a3a6 ^
e9959d5d ^




27293ebb ^

1a300ce7 ^

e9959d5d ^
292ae567 ^
e9959d5d ^
1a300ce7 ^
1a300ce7 ^
10a3a3a6 ^
e9959d5d ^
10a3a3a6 ^
292ae567 ^
e9959d5d ^




1a300ce7 ^
27293ebb ^
1a300ce7 ^


292ae567 ^
10a3a3a6 ^
292ae567 ^
e9959d5d ^

292ae567 ^



d8a92f93 ^

b6095ca9 ^
eff5986d ^
78e8232b ^
d8a92f93 ^
b6095ca9 ^
d8a92f93 ^
b6095ca9 ^




d8a92f93 ^

b6095ca9 ^






a6e66cc5 ^


d6e92f62 ^
b6095ca9 ^
d6e92f62 ^
b6095ca9 ^




a54518f2 ^
b6095ca9 ^
eff5986d ^


d8a92f93 ^


















b6095ca9 ^

d8a92f93 ^



b6095ca9 ^
d8a92f93 ^




b6095ca9 ^
d8a92f93 ^
b6095ca9 ^
d8a92f93 ^


b6095ca9 ^
d8a92f93 ^













c84cb17b ^

d8a92f93 ^





c84cb17b ^
b6095ca9 ^





d8a92f93 ^
0f01f30b ^

eff5986d ^
0f01f30b ^



bc6f8ceb ^



7584ddaa ^

bc6f8ceb ^




0f01f30b ^

bc6f8ceb ^


0f01f30b ^
bc6f8ceb ^
b1bfdf65 ^
0f01f30b ^
0f01f30b ^
0f01f30b ^
bc6f8ceb ^


0f01f30b ^


eff5986d ^
0f01f30b ^



d25d6b45 ^
22531280 ^
eff5986d ^
0f01f30b ^









eff5986d ^


a54518f2 ^
eff5986d ^
a54518f2 ^
eff5986d ^

0f01f30b ^








d8a92f93 ^
ebc87b8b ^
0f01f30b ^
4898ed10 ^





48f9f3b3 ^
2fc7937d ^





48f9f3b3 ^
2fc7937d ^
48f9f3b3 ^
2fc7937d ^

48f9f3b3 ^
2fc7937d ^



48f9f3b3 ^
2fc7937d ^

















48f9f3b3 ^
48f9f3b3 ^
48f9f3b3 ^
2fc7937d ^




48f9f3b3 ^

4898ed10 ^







eff5986d ^
0f01f30b ^
4898ed10 ^
0f01f30b ^


9f2f54b2 ^
0f01f30b ^







eff5986d ^

9ba5a576 ^
eff5986d ^
9ba5a576 ^
eff5986d ^

0f01f30b ^


eff5986d ^
0f01f30b ^



0f01f30b ^



0f01f30b ^



eff5986d ^

9ba5a576 ^
eff5986d ^
c3ad3c0b ^
eff5986d ^

0f01f30b ^


c16871d1 ^






13f0166a ^
c16871d1 ^












eff5986d ^
0f01f30b ^

ced5a8c2 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580