tcl-hacks

Check-in [ec40ff26f2]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:put getline in a namespace
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:ec40ff26f2a98c7641f2a98ee7aedd77105abd41
User & Date: aspect 2018-05-17 15:16:03
Context
2018-05-17
15:18
fix cursor leave after redraw-following (using tty::save, which sucks a little bit) check-in: 186f8b8e1f user: aspect tags: trunk
15:16
put getline in a namespace check-in: ec40ff26f2 user: aspect tags: trunk
13:14
redraw wants attention .. or do I live with overdrawing for now? check-in: 1cd0a87f38 user: aspect tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to getline/getline.tcl.

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



































## class Getline is an "engine".  Methods on it may be addressed in the keymap.
# Getline is a single-line-only getter; Getlines extends on it with line continuation capability
#
oo::class create Getline {

    # state:
    variable Yank

    # multi-line state:
    variable Lines
    variable Lineidx
    variable Prompts

    # options:
    variable Prompt
    variable Chan
    method Complete? {input} { info complete $input\n }
    method Completions {s}   { return "" }
    method History {args} {
        History create History
        oo::objdefine [self] forward History History
        tailcall my History {*}$args
    }

    constructor {args} {
        set Yank ""
        set Lines {""}
        set Lineidx 0
        set Prompt "getline> "
        set Chan stdout

        my Configure {*}$args

        set Prompts [list $Prompt]

        Input create             input
        Output create            output $Chan
        keymap::KeyMapper create keymap [expr {$Chan eq "stdout" ? "stdin" : $Chan}]
    }

    method Configure {args} {
        set OptSpec {
            -prompt     { set Prompt $val }
            -chan       { set Chan $val }
            -history    { oo::objdefine [self] forward History [uplevel 1 [list namespace which $val]] }
            -iscomplete { oo::objdefine [self] forward Complete? [uplevel 1 [list namespace which $val]] }
            -completer  { oo::objdefine [self] forward Completions [uplevel 1 [list namespace which $val]] }
        }

        dict for {opt val} $args {
            set pat $opt*
            set matched 0
            dict for {key script} $OptSpec {
                if {[string match $pat* $opt]} {
                    try $script
                    set matched 1
                    break
                }
            }
            if {!$matched} {
                return -code error "Unknown option; expected one of [join [dict keys $OptSpec] ", "]."
            }
        }
    }

    method getline {} {

        my reset

        while 1 {
            # {TOKEN tok {c c c}} or {LITERAL "" {c c c}}
            lassign [keymap gettok] kind tok chars
            if {$kind eq "TOKEN"} {
                try {
                    my $tok
                    continue
                } trap {TCL LOOKUP METHOD *} {} { }
            }
            foreach char $chars {
                my insert $char
            }
        }
    }

    method beep {msg} {
        output beep
        if {$msg ne ""} {tailcall output flash-message $msg}
    }

    method reset {} {
        set Lines {""}
        set Lineidx 0
        input reset
        output reset $Prompt
    }

    method get {} {
        lset Lines $Lineidx [input get]
        join $Lines \n
    }

    # action methods:
    method sigpipe {} {
        if {[input get] ne ""}  { my beep "sigpipe with [string length [input get]] chars"; return }
        return -level 2 -code break
    }
    method sigint {}      { return -level 2 -code continue }

    method redraw {} {
        my redraw-preceding
        my redraw-following
        my redraw-line
    }

    method redraw-line {} { output redraw }
    # these redraw too much by virtue of next/prior-line'ing over the whole input
    method redraw-preceding {} {
        set pos [input pos]
        lset Lines $Lineidx [input get]
        set idx $Lineidx
        while {![my is-first-line]} { my prior-line }
        while {$Lineidx > $idx}      { my next-line }
        my goto $pos
    }
    method redraw-following {} {
        set pos [input pos]
        lset Lines $Lineidx [input get]
        set idx $Lineidx
        while {![my is-last-line]} { my next-line }
        output emit \n      ;# tty::down won't force a scroll
        output emit [tty::erase-line]
        output emit [tty::up]
        while {$Lineidx > $idx}   { my prior-line }
        my goto $pos
    }

    method insert {s} {
        foreach c [split $s ""] {
            if {$c eq "\n"} {
                my insert-newline
            } else {
                input insert $c
                output insert [rep $c]  ;# attr?
            }
        }
    }

    method insert-newline {} {
        set rest [my kill-after]
        lset Lines $Lineidx [my get]
        set Lines [linsert $Lines $Lineidx+1 $rest]
        output emit \n
        my next-line
    }

    method goto {i} {
        if {$i < [input pos]} {
            my back  [expr {[input pos] - $i}]
        } else {
            my forth [expr {$i - [input pos]}]
        }
    }

    method back {{n 1}} {
        if {$n == 0} return
        while {$n > [input pos] && ![my is-first-line]} {
            incr n -[input pos]
            incr n -1
            my prior-line
            my end
        }
        if {[input pos] < 1} {my beep "back at BOL"; return}
        set n [expr {min($n, [input pos])}]
        if {$n == 0} return
        output back [string length [srep [input back $n]]]
    }
    method forth {{n 1}} {
        if {$n == 0} return
        while {$n > [input rpos] && ![my is-last-line]} {
            incr n -[input rpos]
            incr n -1
            my next-line
            my home
        }
        if {[input rpos] < 1} {my beep "forth at EOL"; return}
        set n [expr {min($n, [input rpos])}]
        if {$n == 0} return
        output forth [string length [srep [input forth $n]]]
    }

    method backspace {{n 1}} {
        if {$n == 0} return
        while {$n > [input pos] && ![my is-first-line]} {
            incr n -[input pos]
            incr n -1
            my kill-before
            my prior-line
            my end
            set s [my kill-next-line]
            my insert $s
            my redraw-following
        }
        if {[input pos] < 1} {my beep "backspace at BOL"; return}
        set n [expr {min($n, [input pos])}]
        if {$n == 0} return
        set in [input backspace $n]
        output backspace [string length [srep $in]]
        return $in
    }
    method delete {{n 1}} {
        if {$n == 0} return
        while {$n > [input rpos] && ![my is-last-line]} {
            incr n -[input rpos]
            incr n -1
            set rest [my kill-next-line]
            my insert $rest
            my back [string length $rest]
            my redraw-following
        }
        if {[input rpos] < 1} {my beep "delete at EOL"; return}
        set n [expr {min($n, [input rpos])}]
        if {$n == 0} return
        set in [input delete $n]
        output delete [string length [srep $in]]
        return $in
    }

    method clear {} {
        set r [input get]
        if {[input rpos]} {my kill-after}
        if {[input pos]} {my kill-before}
        while {![my is-last-line]} {my kill-next-line}
        while {![my is-first-line]} {my kill-prior-line}
        return $r
    }
    method replace-input {s {pos 0}} {
        my clear
        my insert $s
        if {[my get] ne $s} {error "didn't work!: [my get] [list $Lines]"}
        my goto $pos
    }
    method set-state {{s ""} {p 0}} {
        input set-state $s $p
        ssplit $s $p -> a b
        set a [srep $a]; set b [srep $b]    ;# attrs? :(
        output set-state $Prompt$a$b [string length $Prompt$a]
    }

    # multi-line helpers
    method is-first-line {}     { expr {$Lineidx == 0} }
    method is-last-line {}      { expr {$Lineidx == [llength $Lines]-1} }

    method prior-line {} {
        if {[my is-first-line]} {my beep "No prior line"; return}
        my home
        lset Lines $Lineidx [input get]
        incr Lineidx -1
        my set-state [lindex $Lines $Lineidx]
        set  nrows [output wrap 0 [output len]]  ;# hmmm
        incr nrows 1
        output emit [tty::up $nrows]
        my redraw-line
    }
    method next-line {} {
        if {[my is-last-line]} {my beep "No next line"; return}
        my end
        lset Lines $Lineidx [input get]
        incr Lineidx 1
        my set-state [lindex $Lines $Lineidx]
        set  nrows [output wrap 0 [output len]]  ;# hmmm
        incr nrows 1
        output emit [tty::down $nrows]
        my redraw-line
    }

    method kill-next-line {} {
        set r [lindex $Lines $Lineidx+1]
        set Lines [lreplace $Lines $Lineidx+1 $Lineidx+1]
        return $r
    }
    method kill-prior-line {} {
        set r [lindex $Lines $Lineidx-1]
        set Lines [lreplace $Lines $Lineidx-1 $Lineidx-1]
        return $r
    }

    method up {{n 1}} {
        if {$n == 0} {return}
        if {[my is-first-line]} {my beep "No more lines!"; return}
        set pos [input pos]
        while {$n > 0 && ![my is-first-line]} {
            my prior-line
            my goto [expr {min($pos,[input rpos])}]
            incr n -1
        }
    }
    method down {{n 1}} {
        if {$n == 0} {return}
        if {[my is-last-line]} {my beep "No more lines!"; return}
        set pos [input pos]
        while {$n > 0 && ![my is-first-line]} {
            my prior-line
            my goto [expr {min($pos,[input rpos])}]
            incr n 1
        }
    }

    method very-home {} {
        my home
        while {![my is-first-line]} { my back 1 ; my home }
    }
    method very-end {} {
        my end
        while {![my is-last-line]} { my forth 1 ; my end }
    }

    method yank {s} { variable Yank ; set Yank $s }
    method paste {} { variable Yank ; my insert $Yank }

    method yank-before {}      { my yank [my kill-before] }
    method yank-after {}       { my yank [my kill-after] }
    method yank-word-before {} { my yank [my kill-word-before] }
    method yank-word-after {}  { my yank [my kill-word-after] }

    method home {}             { my back      [input pos] }
    method end {}              { my forth    [input rpos] }
    method kill-before {}      { my backspace [input pos] }
    method kill-after {}       { my delete   [input rpos] }

    method back-word {}        { my back      [word-length-before [input get] [input pos]] }
    method forth-word {}       { my forth     [word-length-after  [input get] [input pos]] }
    method kill-word-before {} { my backspace [word-length-before [input get] [input pos]] }
    method kill-word-after {}  { my delete    [word-length-after  [input get] [input pos]] }
    # softbreak tab

    method history-prev {} {
        set s [my History prev [my get]]
        if {$s eq ""}   { my beep "no more history!"; return }
        my replace-input $s
        my redraw
    }
    method history-next {} {
        set s [my History next [my get]]
        if {$s eq ""}   { my beep "no more history!"; return }
        my replace-input $s
    }
    method history-prev-starting {} {
        set pos [input pos]
        set s [my History prev-starting [input pre] [my get]]
        if {$s eq ""}   { my beep "no more matching history!"; return }
        # my replace-input $s $pos
        my kill-after
        my insert [string range $s $pos end]
        my goto $pos
    }
    method history-next-starting {} {
        set pos [input pos]
        set s [my History next-starting [input pre] [my get]]
        if {$s eq ""}   { my beep "no more matching history!"; return }
        # my replace-input $s $pos
        my kill-after
        my insert [string range $s $pos end]
        my goto $pos
    }

    method accept {} {
        set input [my get]
        if {![string is space $input]}  { my History add $input }
        my end
        output emit \n
        return -code return $input  ;# FIXME: forcing [tailcall accept] is terrible
    }

    method newline {} {
        set input [my get]
        if {[my Complete? $input]} {
            my very-end
            tailcall my accept
        } else {
            my insert \n
        }
    }

    method editor {} {
        set fd [file tempfile fn]
        puts $fd [input get]
        close $fd
        exec $::env(VISUAL) $fn <@ stdin >@ stdout 2>@ stderr
        set fd [open $fn r]
        set data [read $fd]
        set data [string trimright $data \n]
        close $fd
        file delete $fn
        my clear
        my insert $data
    }
}




































|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
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
namespace eval getline {

    source input.tcl
    source output.tcl
    source keymap.tcl
    source history.tcl
    source util.tcl     ;# ssplit

    proc rep {c} {
        if {[string length $c] != 1} {error "Bad input: [binary encode hex $c]"}
        if {[string is print $c]} {return $c}
        return "\\x[binary encode hex $c]"
    }

    proc srep {s} {
        join [lmap c [split $s ""] {rep $c}] ""
    }

    proc word-length-before {s i} {
        set j 0
        foreach ab [regexp -inline -indices -all {.\m} $s] {
            lassign $ab a b
            incr a
            if {$a >= $i} break
            set j $a
        }
        expr {$i - $j}
    }
    proc word-length-after {s i} {
        if {![regexp -indices -start $i {\M} $s ab]} {return $i}
        lassign $ab a b
        expr {$a - $i}
    }

    ## class Getline is an "engine".  Methods on it may be addressed in the keymap.
    # Getline is a single-line-only getter; Getlines extends on it with line continuation capability
    #
    oo::class create Getline {

        # state:
        variable Yank

        # multi-line state:
        variable Lines
        variable Lineidx
        variable Prompts

        # options:
        variable Prompt
        variable Chan
        method Complete? {input} { info complete $input\n }
        method Completions {s}   { return "" }
        method History {args} {
            History create History
            oo::objdefine [self] forward History History
            tailcall my History {*}$args
        }

        constructor {args} {
            namespace path [list [namespace qualifiers [self class]] {*}[namespace path]]
            set Yank ""
            set Lines {""}
            set Lineidx 0
            set Prompt "getline> "
            set Chan stdout

            my Configure {*}$args

            set Prompts [list $Prompt]

            Input create             input
            Output create            output $Chan
            keymap::KeyMapper create keymap [expr {$Chan eq "stdout" ? "stdin" : $Chan}]
        }

        method Configure {args} {
            set OptSpec {
                -prompt     { set Prompt $val }
                -chan       { set Chan $val }
                -history    { oo::objdefine [self] forward History [uplevel 1 [list namespace which $val]] }
                -iscomplete { oo::objdefine [self] forward Complete? [uplevel 1 [list namespace which $val]] }
                -completer  { oo::objdefine [self] forward Completions [uplevel 1 [list namespace which $val]] }
            }

            dict for {opt val} $args {
                set pat $opt*
                set matched 0
                dict for {key script} $OptSpec {
                    if {[string match $pat* $opt]} {
                        try $script
                        set matched 1
                        break
                    }
                }
                if {!$matched} {
                    return -code error "Unknown option; expected one of [join [dict keys $OptSpec] ", "]."
                }
            }
        }

        method getline {} {

            my reset

            while 1 {
                # {TOKEN tok {c c c}} or {LITERAL "" {c c c}}
                lassign [keymap gettok] kind tok chars
                if {$kind eq "TOKEN"} {
                    try {
                        my $tok
                        continue
                    } trap {TCL LOOKUP METHOD *} {} { }
                }
                foreach char $chars {
                    my insert $char
                }
            }
        }

        method beep {msg} {
            output beep
            if {$msg ne ""} {tailcall output flash-message $msg}
        }

        method reset {} {
            set Lines {""}
            set Lineidx 0
            input reset
            output reset $Prompt
        }

        method get {} {
            lset Lines $Lineidx [input get]
            join $Lines \n
        }

        # action methods:
        method sigpipe {} {
            if {[input get] ne ""}  { my beep "sigpipe with [string length [input get]] chars"; return }
            return -level 2 -code break
        }
        method sigint {}      { return -level 2 -code continue }

        method redraw {} {
            my redraw-preceding
            my redraw-following
            my redraw-line
        }

        method redraw-line {} { output redraw }
        # these redraw too much by virtue of next/prior-line'ing over the whole input
        method redraw-preceding {} {
            set pos [input pos]
            lset Lines $Lineidx [input get]
            set idx $Lineidx
            while {![my is-first-line]} { my prior-line }
            while {$Lineidx > $idx}      { my next-line }
            my goto $pos
        }
        method redraw-following {} {
            set pos [input pos]
            lset Lines $Lineidx [input get]
            set idx $Lineidx
            while {![my is-last-line]} { my next-line }
            output emit \n      ;# tty::down won't force a scroll
            output emit [tty::erase-line]
            output emit [tty::up]
            while {$Lineidx > $idx}   { my prior-line }
            my goto $pos
        }

        method insert {s} {
            foreach c [split $s ""] {
                if {$c eq "\n"} {
                    my insert-newline
                } else {
                    input insert $c
                    output insert [rep $c]  ;# attr?
                }
            }
        }

        method insert-newline {} {
            set rest [my kill-after]
            lset Lines $Lineidx [my get]
            set Lines [linsert $Lines $Lineidx+1 $rest]
            output emit \n
            my next-line
        }

        method goto {i} {
            if {$i < [input pos]} {
                my back  [expr {[input pos] - $i}]
            } else {
                my forth [expr {$i - [input pos]}]
            }
        }

        method back {{n 1}} {
            if {$n == 0} return
            while {$n > [input pos] && ![my is-first-line]} {
                incr n -[input pos]
                incr n -1
                my prior-line
                my end
            }
            if {[input pos] < 1} {my beep "back at BOL"; return}
            set n [expr {min($n, [input pos])}]
            if {$n == 0} return
            output back [string length [srep [input back $n]]]
        }
        method forth {{n 1}} {
            if {$n == 0} return
            while {$n > [input rpos] && ![my is-last-line]} {
                incr n -[input rpos]
                incr n -1
                my next-line
                my home
            }
            if {[input rpos] < 1} {my beep "forth at EOL"; return}
            set n [expr {min($n, [input rpos])}]
            if {$n == 0} return
            output forth [string length [srep [input forth $n]]]
        }

        method backspace {{n 1}} {
            if {$n == 0} return
            while {$n > [input pos] && ![my is-first-line]} {
                incr n -[input pos]
                incr n -1
                my kill-before
                my prior-line
                my end
                set s [my kill-next-line]
                my insert $s
                my redraw-following
            }
            if {[input pos] < 1} {my beep "backspace at BOL"; return}
            set n [expr {min($n, [input pos])}]
            if {$n == 0} return
            set in [input backspace $n]
            output backspace [string length [srep $in]]
            return $in
        }
        method delete {{n 1}} {
            if {$n == 0} return
            while {$n > [input rpos] && ![my is-last-line]} {
                incr n -[input rpos]
                incr n -1
                set rest [my kill-next-line]
                my insert $rest
                my back [string length $rest]
                my redraw-following
            }
            if {[input rpos] < 1} {my beep "delete at EOL"; return}
            set n [expr {min($n, [input rpos])}]
            if {$n == 0} return
            set in [input delete $n]
            output delete [string length [srep $in]]
            return $in
        }

        method clear {} {
            set r [input get]
            if {[input rpos]} {my kill-after}
            if {[input pos]} {my kill-before}
            while {![my is-last-line]} {my kill-next-line}
            while {![my is-first-line]} {my kill-prior-line}
            return $r
        }
        method replace-input {s {pos 0}} {
            my clear
            my insert $s
            if {[my get] ne $s} {error "didn't work!: [my get] [list $Lines]"}
            my goto $pos
        }
        method set-state {{s ""} {p 0}} {
            input set-state $s $p
            ssplit $s $p -> a b
            set a [srep $a]; set b [srep $b]    ;# attrs? :(
            output set-state $Prompt$a$b [string length $Prompt$a]
        }

        # multi-line helpers
        method is-first-line {}     { expr {$Lineidx == 0} }
        method is-last-line {}      { expr {$Lineidx == [llength $Lines]-1} }

        method prior-line {} {
            if {[my is-first-line]} {my beep "No prior line"; return}
            my home
            lset Lines $Lineidx [input get]
            incr Lineidx -1
            my set-state [lindex $Lines $Lineidx]
            set  nrows [output wrap 0 [output len]]  ;# hmmm
            incr nrows 1
            output emit [tty::up $nrows]
            my redraw-line
        }
        method next-line {} {
            if {[my is-last-line]} {my beep "No next line"; return}
            my end
            lset Lines $Lineidx [input get]
            incr Lineidx 1
            my set-state [lindex $Lines $Lineidx]
            set  nrows [output wrap 0 [output len]]  ;# hmmm
            incr nrows 1
            output emit [tty::down $nrows]
            my redraw-line
        }

        method kill-next-line {} {
            set r [lindex $Lines $Lineidx+1]
            set Lines [lreplace $Lines $Lineidx+1 $Lineidx+1]
            return $r
        }
        method kill-prior-line {} {
            set r [lindex $Lines $Lineidx-1]
            set Lines [lreplace $Lines $Lineidx-1 $Lineidx-1]
            return $r
        }

        method up {{n 1}} {
            if {$n == 0} {return}
            if {[my is-first-line]} {my beep "No more lines!"; return}
            set pos [input pos]
            while {$n > 0 && ![my is-first-line]} {
                my prior-line
                my goto [expr {min($pos,[input rpos])}]
                incr n -1
            }
        }
        method down {{n 1}} {
            if {$n == 0} {return}
            if {[my is-last-line]} {my beep "No more lines!"; return}
            set pos [input pos]
            while {$n > 0 && ![my is-first-line]} {
                my prior-line
                my goto [expr {min($pos,[input rpos])}]
                incr n 1
            }
        }

        method very-home {} {
            my home
            while {![my is-first-line]} { my back 1 ; my home }
        }
        method very-end {} {
            my end
            while {![my is-last-line]} { my forth 1 ; my end }
        }

        method yank {s} { variable Yank ; set Yank $s }
        method paste {} { variable Yank ; my insert $Yank }

        method yank-before {}      { my yank [my kill-before] }
        method yank-after {}       { my yank [my kill-after] }
        method yank-word-before {} { my yank [my kill-word-before] }
        method yank-word-after {}  { my yank [my kill-word-after] }

        method home {}             { my back      [input pos] }
        method end {}              { my forth    [input rpos] }
        method kill-before {}      { my backspace [input pos] }
        method kill-after {}       { my delete   [input rpos] }

        method back-word {}        { my back      [word-length-before [input get] [input pos]] }
        method forth-word {}       { my forth     [word-length-after  [input get] [input pos]] }
        method kill-word-before {} { my backspace [word-length-before [input get] [input pos]] }
        method kill-word-after {}  { my delete    [word-length-after  [input get] [input pos]] }
        # softbreak tab

        method history-prev {} {
            set s [my History prev [my get]]
            if {$s eq ""}   { my beep "no more history!"; return }
            my replace-input $s
            my redraw
        }
        method history-next {} {
            set s [my History next [my get]]
            if {$s eq ""}   { my beep "no more history!"; return }
            my replace-input $s
        }
        method history-prev-starting {} {
            set pos [input pos]
            set s [my History prev-starting [input pre] [my get]]
            if {$s eq ""}   { my beep "no more matching history!"; return }
            # my replace-input $s $pos
            my kill-after
            my insert [string range $s $pos end]
            my goto $pos
        }
        method history-next-starting {} {
            set pos [input pos]
            set s [my History next-starting [input pre] [my get]]
            if {$s eq ""}   { my beep "no more matching history!"; return }
            # my replace-input $s $pos
            my kill-after
            my insert [string range $s $pos end]
            my goto $pos
        }

        method accept {} {
            set input [my get]
            if {![string is space $input]}  { my History add $input }
            my end
            output emit \n
            return -code return $input  ;# FIXME: forcing [tailcall accept] is terrible
        }

        method newline {} {
            set input [my get]
            if {[my Complete? $input]} {
                my very-end
                tailcall my accept
            } else {
                my insert \n
            }
        }

        method editor {} {
            set fd [file tempfile fn]
            puts $fd [input get]
            close $fd
            exec $::env(VISUAL) $fn <@ stdin >@ stdout 2>@ stderr
            set fd [open $fn r]
            set data [read $fd]
            set data [string trimright $data \n]
            close $fd
            file delete $fn
            my clear
            my insert $data
        }
    }
}

Changes to getline/history.tcl.

8
9
10
11
12
13
14

15
16
17
18
19
20
21
..
54
55
56
57
58
59
60

61
62
63
64
65
66
67
#  using history-search (for prefix), edits are immediately discarded
#  using search-history also preserves edits

oo::class create HistoryCursor {
    variable Items Index

    constructor {items {index ""}} {

        if {$index eq ""} {
            set index [llength $items]
        }
        set Items $items
        set Index $index
    }

................................................................................
}

oo::class create History {
    variable Items
    variable Cursor

    constructor {} {

        set Items {}
        set Cursor {}
    }
    destructor {
        my cursor destroy
    }








>







 







>







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
..
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
#  using history-search (for prefix), edits are immediately discarded
#  using search-history also preserves edits

oo::class create HistoryCursor {
    variable Items Index

    constructor {items {index ""}} {
        namespace path [list [namespace qualifiers [self class]] {*}[namespace path]]
        if {$index eq ""} {
            set index [llength $items]
        }
        set Items $items
        set Index $index
    }

................................................................................
}

oo::class create History {
    variable Items
    variable Cursor

    constructor {} {
        namespace path [list [namespace qualifiers [self class]] {*}[namespace path]]
        set Items {}
        set Cursor {}
    }
    destructor {
        my cursor destroy
    }

Changes to getline/input.tcl.

2
3
4
5
6
7
8

9
10
11
12
13
14
15

oo::class create Input {

    variable input
    variable moreinput

    constructor {{in ""} {idx end}} {

        my init $in $idx
    }

    method init {{in ""} {idx end}} {
        ssplit $in $idx -> input moreinput
    }








>







2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

oo::class create Input {

    variable input
    variable moreinput

    constructor {{in ""} {idx end}} {
        namespace path [list [namespace qualifiers [self class]] {*}[namespace path]]
        my init $in $idx
    }

    method init {{in ""} {idx end}} {
        ssplit $in $idx -> input moreinput
    }

Changes to getline/keymap.tcl.

105
106
107
108
109
110
111
112

113
114
115
116
117
118
119
120
121
122
123
    }

    oo::class create KeyMapper {
        variable Chan
        variable KeyTrie
        variable Map
        constructor {chan {map .}} {
            namespace path [list [namespace qualifiers [self class]] {*}[namespace path]]

            try {
                dict size $map
            } on error {} {
                set map $::keymap::default_keymap
            }
            set Chan $chan

            # turn keycodes into lists of bytes
            set Map [dict map {k v} $map {
                set k [split [keycode $k] ""]
                set v







|
>



|







105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
    }

    oo::class create KeyMapper {
        variable Chan
        variable KeyTrie
        variable Map
        constructor {chan {map .}} {
            set ns [namespace qualifiers [self class]]
            namespace path [list $ns {*}[namespace path]]
            try {
                dict size $map
            } on error {} {
                set map [set ${ns}::default_keymap]
            }
            set Chan $chan

            # turn keycodes into lists of bytes
            set Map [dict map {k v} $map {
                set k [split [keycode $k] ""]
                set v

Changes to getline/main.tcl.

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
#  ? mark
#  ? transpositions
#  ? undo
#  ? ^search^replace and !! and !prefix and !-n
# OPTIMISATION:
#  - don't redraw so greedily when forthing
#  - incrementally fix up lines
source input.tcl
source output.tcl
source keymap.tcl
source history.tcl
source util.tcl     ;# ssplit

proc rep {c} {
    if {[string length $c] != 1} {error "Bad input: [binary encode hex $c]"}
    if {[string is print $c]} {return $c}
    return "\\x[binary encode hex $c]"
}

proc srep {s} {
    join [lmap c [split $s ""] {rep $c}] ""
}

proc word-length-before {s i} {
    set j 0
    foreach ab [regexp -inline -indices -all {.\m} $s] {
        lassign $ab a b
        incr a
        if {$a >= $i} break
        set j $a
    }
    expr {$i - $j}
}
proc word-length-after {s i} {
    if {![regexp -indices -start $i {\M} $s ab]} {return $i}
    lassign $ab a b
    expr {$a - $i}
}

source getline.tcl



proc main {args} {
    exec stty raw -echo <@ stdin
    trace add variable args unset {apply {args {exec stty -raw echo <@ stdin}}}

    chan configure stdin -blocking 0
    chan configure stdout -buffering none







<
<
<
<
<

<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<

>
>







28
29
30
31
32
33
34





35


























36
37
38
39
40
41
42
43
44
45
#  ? mark
#  ? transpositions
#  ? undo
#  ? ^search^replace and !! and !prefix and !-n
# OPTIMISATION:
#  - don't redraw so greedily when forthing
#  - incrementally fix up lines
































source getline.tcl

namespace path ::getline

proc main {args} {
    exec stty raw -echo <@ stdin
    trace add variable args unset {apply {args {exec stty -raw echo <@ stdin}}}

    chan configure stdin -blocking 0
    chan configure stdout -buffering none

Changes to getline/output.tcl.

7
8
9
10
11
12
13

14
15
16
17
18
19
20
    variable output
    variable pos
    variable cols
    variable rows
    variable flashid

    constructor {Chan} {

        set pos 0
        set output ""
        lassign [exec stty size <@ stdin] rows cols
        set chan $Chan
    }

    destructor {







>







7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
    variable output
    variable pos
    variable cols
    variable rows
    variable flashid

    constructor {Chan} {
        namespace path [list [namespace qualifiers [self class]] {*}[namespace path]]
        set pos 0
        set output ""
        lassign [exec stty size <@ stdin] rows cols
        set chan $Chan
    }

    destructor {