original commit: 5c0fc3a6d713f41815a1a8397476e0c9422ef0ee
This commit is contained in:
Matthew Flatt 2003-07-03 00:34:35 +00:00
parent a99bfb44a7
commit e01d4ece1c
2 changed files with 72 additions and 72 deletions

View File

@ -7402,24 +7402,26 @@
(format "end index outside the range [~a,~a]: " start last) (format "end index outside the range [~a,~a]: " start last)
end)))) end))))
;; Create the port: ;; Create the port:
(let-values ([(pipe-r pipe-w) (make-pipe)])
(let* ([end (if (eq? end 'end) (send text last-position) end)] (let* ([end (if (eq? end 'end) (send text last-position) end)]
[snip (send text find-snip start 'after-or-none)] [snip (send text find-snip start 'after-or-none)]
[str #f] [next? #f]
[pos 0] [pos 0]
[lock-semaphore (make-semaphore 1)] [lock-semaphore (make-semaphore 1)]
[update-str-to-snip [update-str-to-snip
(lambda () (lambda ()
(if (not snip) (if snip
(set! str #f)
(let ([snip-start (send text get-snip-position snip)]) (let ([snip-start (send text get-snip-position snip)])
(cond (cond
[(snip-start . >= . end) [(snip-start . >= . end)
(set! str #f)] (set! snip #f)
(set! next? #f)]
[(is-a? snip wx:string-snip%) [(is-a? snip wx:string-snip%)
(set! str (send snip get-text 0 (min (send snip get-count) (display (send snip get-text 0 (send snip get-count)) pipe-w)
(- end snip-start))))] (set! next? #t)]
[else [else
(set! str 'snip)]))))] (set! next? #f)]))
(set! next? #f)))]
[next-snip [next-snip
(lambda () (lambda ()
(set! snip (send snip next)) (set! snip (send snip next))
@ -7427,19 +7429,10 @@
(update-str-to-snip))] (update-str-to-snip))]
[read-chars (lambda (to-str) [read-chars (lambda (to-str)
(cond (cond
[(not str) eof] [next?
[(string? str) (next-snip)
(let* ([sl (string-length str)] 0]
[n (min (- sl pos) (string-length to-str))]) [snip
(let loop ([i 0])
(unless (= i n)
(string-set! to-str i (string-ref str (+ i pos)))
(loop (add1 i))))
(set! pos (+ pos n))
(when (sl . <= . pos)
(next-snip))
n)]
[(eq? str 'snip)
(let ([the-snip snip]) (let ([the-snip snip])
(lambda (file line col ppos) (lambda (file line col ppos)
(if (is-a? the-snip readable-snip<%>) (if (is-a? the-snip readable-snip<%>)
@ -7456,24 +7449,25 @@
(values val size))) (values val size)))
(begin (begin
(next-snip) (next-snip)
(values (send the-snip copy) 1)))))]))] (values (send the-snip copy) 1)))))]
[else eof]))]
[close (lambda () (void))] [close (lambda () (void))]
;; We create a slow port for now; in the future, try
;; grabbing more characters:
[port (make-custom-input-port [port (make-custom-input-port
(lambda (s) (lambda (s)
(if (char-ready? pipe-r)
(read-string-avail!* s pipe-r)
(parameterize ([break-enabled #f]) (parameterize ([break-enabled #f])
(if (semaphore-try-wait? lock-semaphore) (if (semaphore-try-wait? lock-semaphore)
(dynamic-wind (dynamic-wind
void void
(lambda () (read-chars s)) (lambda () (read-chars s))
(lambda () (semaphore-post lock-semaphore))) (lambda () (semaphore-post lock-semaphore)))
(make-semaphore-peek lock-semaphore)))) (make-semaphore-peek lock-semaphore)))))
#f ; no peek #f ; no peek
close)]) close)])
(update-str-to-snip) (update-str-to-snip)
(port-count-lines! port) (port-count-lines! port)
port)] port))]
[(text start) (open-input-text-editor text start 'end)] [(text start) (open-input-text-editor text start 'end)]
[(text) (open-input-text-editor text 0 'end)])) [(text) (open-input-text-editor text 0 'end)]))

View File

@ -203,6 +203,7 @@
num-scroll-lines num-scroll-lines
scroll-line-location scroll-line-location
get-snip-location get-snip-location
locations-computed?
in-edit-sequence? in-edit-sequence?
refresh-delayed? refresh-delayed?
end-edit-sequence end-edit-sequence
@ -1144,6 +1145,7 @@
on-event on-event
size-cache-invalid size-cache-invalid
copy copy
get-text!
get-text get-text
merge-with merge-with
split split
@ -1181,6 +1183,7 @@
on-event on-event
size-cache-invalid size-cache-invalid
copy copy
get-text!
get-text get-text
merge-with merge-with
split split
@ -1205,6 +1208,7 @@
on-event on-event
size-cache-invalid size-cache-invalid
copy copy
get-text!
get-text get-text
merge-with merge-with
split split
@ -1234,6 +1238,7 @@
on-event on-event
size-cache-invalid size-cache-invalid
copy copy
get-text!
get-text get-text
merge-with merge-with
split split
@ -1276,6 +1281,7 @@
on-event on-event
size-cache-invalid size-cache-invalid
copy copy
get-text!
get-text get-text
merge-with merge-with
split split