suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor to create `racket/snip' collection.

Browse Source
This commit is contained in:
Sam Tobin-Hochstadt 2010-12-17 11:27:00 -05:00
parent bb7307883a
commit fb76a887d8
21 changed files with 108 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/mred/mred.rkt
View File

@ -11,14 +11,13 @@
(prefix wx: "private/wxme/editor.ss")
(prefix wx: "private/wxme/text.ss")
(prefix wx: "private/wxme/pasteboard.ss")
(prefix wx: "private/wxme/snip.ss")
(prefix wx: racket/snip)
(prefix wx: "private/wxme/keymap.ss")
(prefix wx: "private/wxme/editor-admin.ss")
(prefix wx: "private/wxme/editor-data.ss")
(prefix wx: "private/wxme/editor-snip.ss")
(prefix wx: "private/wxme/stream.ss")
(prefix wx: "private/wxme/wordbreak.ss")
(prefix wx: "private/wxme/snip-admin.ss")
"private/wxtop.ss"
"private/app.ss"
"private/misc.ss"

2
collects/mred/private/snipfile.rkt
View File

@ -3,7 +3,7 @@
racket/port
syntax/moddep
(prefix-in wx: "kernel.ss")
(prefix-in wx: "wxme/snip.ss")
(prefix-in wx: racket/snip)
(prefix-in wx: "wxme/cycle.ss")
"check.ss"
"editor.ss")

2
collects/mred/private/wxme/cycle.rkt
View File

@ -8,7 +8,6 @@
(decl text% set-text%!)
(decl pasteboard% set-pasteboard%!)
(decl snip-admin% set-snip-admin%!)
(decl editor-stream-in% set-editor-stream-in%!)
(decl editor-stream-out% set-editor-stream-out%!)
(decl editor-snip% set-editor-snip%!)
@ -18,7 +17,6 @@
(decl extended-text% set-extended-text%!)
(decl extended-pasteboard% set-extended-pasteboard%!)
;(decl get-snip-class set-get-snip-class!)
(decl get-editor-data-class set-get-editor-data-class!)
(decl editor-get-file set-editor-get-file!)

2
collects/mred/private/wxme/editor-admin.rkt
View File

@ -1,7 +1,7 @@
#lang scheme/base
(require scheme/class
"../syntax.ss"
"snip.ss"
racket/snip
"private.ss"
(only-in "cycle.ss" popup-menu%))

12
collects/mred/private/wxme/editor-data.rkt
View File

@ -3,17 +3,15 @@
(require scheme/class
scheme/file file/convertible
"../syntax.ss"
"snip-flags.ss"
racket/snip/snip-flags
"private.ss"
"style.ss"
"load-one.rkt"
;; used only in contracts
(only-in "cycle.ss" editor-stream-in% editor-stream-out% snip-admin%)
;; used for real
(only-in "cycle.ss" get-editor-data-class set-get-editor-data-class!)
(only-in "cycle.ss"
editor-stream-in% editor-stream-out%
get-editor-data-class set-get-editor-data-class!)
"../wx/common/event.rkt"
racket/draw
(only-in "wx.ss" begin-busy-cursor end-busy-cursor get-highlight-text-color))
racket/draw)
(provide get-the-editor-data-class-list
editor-data%

8
collects/mred/private/wxme/editor-snip-class.rkt
View File

@ -3,14 +3,12 @@
(require racket/class
racket/file file/convertible
"../syntax.ss"
"snip-flags.ss"
racket/snip/snip-flags
"private.ss"
"style.ss"
"snip.rkt"
;; used only in contracts
(only-in "cycle.ss" editor-stream-in% editor-stream-out% snip-admin%)
;; used for real
racket/snip
(only-in "cycle.ss"
editor-stream-in% editor-stream-out%
extended-text% extended-pasteboard% extended-editor-snip%
get-editor-data-class)
"../wx/common/event.rkt"

9
collects/mred/private/wxme/editor-snip.rkt
View File

@ -3,12 +3,12 @@
"../syntax.ss"
"private.ss"
"const.ss"
"snip.ss"
"snip-flags.ss"
racket/snip
racket/snip/snip-flags
"standard-snip-admin.rkt"
"editor.ss"
"editor-admin.ss"
"editor-snip-class.rkt"
"snip-admin.ss"
"text.ss"
"pasteboard.ss"
"wx.ss"
@ -16,8 +16,7 @@
text%
pasteboard%
editor-snip%
editor-snip-editor-admin%
snip-admin%))
editor-snip-editor-admin%))
(provide editor-snip%
editor-snip-editor-admin<%>)

4
collects/mred/private/wxme/editor.rkt
View File

@ -5,8 +5,8 @@
"../syntax.ss"
"private.ss"
"style.ss"
"snip.ss"
"snip-flags.ss"
racket/snip
racket/snip/snip-flags
"editor-admin.ss"
"stream.ss"
"undo.ss"

4
collects/mred/private/wxme/mline.rkt
View File

@ -2,8 +2,8 @@
(require scheme/class
"../syntax.ss"
"const.ss"
"snip.ss"
"snip-flags.ss"
racket/snip
racket/snip/snip-flags
"private.ss")
(provide create-mline

6
collects/mred/private/wxme/pasteboard.rkt
View File

@ -9,9 +9,9 @@
"editor-data.rkt"
"undo.ss"
"style.ss"
"snip.ss"
"snip-flags.ss"
"snip-admin.ss"
racket/snip
racket/snip/snip-flags
"standard-snip-admin.rkt"
"keymap.ss"
(only-in "cycle.ss" set-pasteboard%!)
"wordbreak.ss"

59
collects/mred/private/wxme/snip-admin.rkt → collects/mred/private/wxme/standard-snip-admin.rkt
View File

@ -1,70 +1,15 @@
#lang scheme/base
(require scheme/class
"../syntax.ss"
"snip.ss"
racket/snip
(only-in "cycle.ss"
set-snip-admin%!
popup-menu%)
(prefix-in wx: "wx.ss"))
(provide snip-admin%
standard-snip-admin%)
(provide standard-snip-admin%)
(define TAB-WIDTH 20)
(defclass snip-admin% object%
(super-new)
(def/public (get-editor) #f)
(def/public (get-dc) #f)
(def/public (get-view-size [maybe-box? w] [maybe-box? h])
#f)
(def/public (get-view [maybe-box? x] [maybe-box? y] [maybe-box? w] [maybe-box? h]
[(make-or-false snip%) [snip #f]])
#f)
(def/public (scroll-to [snip% s]
[real? x] [real? y]
[nonnegative-real? w] [nonnegative-real? h]
[any? refresh?]
[(symbol-in start end none) [bias 'none]])
#f)
(def/public (set-caret-owner [snip% s] [(symbol-in imeditorte display global) dist])
(void))
(def/public (resized [snip% s] [any? redraw?]) (void))
(def/public (recounted [snip% s] [any? redraw?]) (void))
(def/public (needs-update [snip% s] [real? x] [real? y]
[nonnegative-real? w] [nonnegative-real? h])
(void))
(def/public (release-snip [snip% s]) #f)
(def/public (update-cursor) (void))
(def/public (popup-menu [popup-menu% p][snip% snip][real? x][real? y])
#f)
(def/public (modified [snip% s] [any? modified?])
(void))
(def/public (get-line-spacing)
#f)
(def/public (get-selected-text-color)
#f)
(def/public (call-with-busy-cursor [procedure? thunk])
(void))
(def/public (get-tabs [maybe-box? [length #f]] [maybe-box? [tab-width #f]] [maybe-box? [in-units #f]])
#f))
(set-snip-admin%! snip-admin%)
(defclass standard-snip-admin% snip-admin%
(init-field editor)

2
collects/mred/private/wxme/stream.rkt
View File

@ -2,7 +2,7 @@
(require scheme/class
"../syntax.ss"
"private.ss"
"snip.ss"
racket/snip
"editor-data.rkt"
(only-in "cycle.ss"
set-editor-stream-in%!

6
collects/mred/private/wxme/text.rkt
View File

@ -11,9 +11,9 @@
"editor-data.rkt"
"undo.ss"
"style.ss"
"snip.ss"
"snip-flags.ss"
"snip-admin.ss"
racket/snip
racket/snip/snip-flags
"standard-snip-admin.rkt"
"keymap.ss"
(only-in "cycle.ss" set-text%!)
"wordbreak.ss"

4
collects/mred/private/wxme/undo.rkt
View File

@ -1,8 +1,8 @@
#lang scheme/base
(require scheme/class
"private.ss"
"snip.ss"
"snip-flags.ss")
racket/snip
racket/snip/snip-flags)
(provide change-record%
proc-record%

2
collects/mred/private/wxtextfield.rkt
View File

@ -3,7 +3,7 @@
mzlib/class100
(prefix-in wx: "kernel.ss")
(prefix-in wx: "wxme/text.ss")
(prefix-in wx: "wxme/snip.ss")
(prefix-in wx: racket/snip)
(prefix-in wx: "wxme/editor-canvas.ss")
"lock.ss"
"const.ss"

2
collects/mrlib/cache-image-snip.rkt
View File

@ -1,6 +1,6 @@
(module cache-image-snip mzscheme
(require racket/draw
mred/private/wxme/snip
racket/snip
mzlib/class
mzlib/string
mzlib/contract

14
collects/mrlib/image-core.rkt
View File

@ -33,14 +33,12 @@ has been moved out).
file/convertible
racket/math
racket/contract
"private/image-core-bitmap.ss" ;; safe
"image-core-wxme.ss" ;; safe
"private/image-core-snipclass.rkt" ;; safe
"private/regmk.rkt" ;; safe
;; the hard cases
mred/private/wxme/snip
(prefix-in cis: "cache-image-snip.ss") ;; safe
)
"private/image-core-bitmap.ss"
"image-core-wxme.ss"
"private/image-core-snipclass.rkt"
"private/regmk.rkt"
racket/snip
(prefix-in cis: "cache-image-snip.ss"))

3
collects/racket/snip.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang racket/base
(require "snip/snip.rkt" "snip/snip-admin.rkt")
(provide (all-from-out "snip/snip.rkt" "snip/snip-admin.rkt"))

62
collects/racket/snip/snip-admin.rkt Normal file
View File

@ -0,0 +1,62 @@
#lang scheme/base
(require scheme/class
mred/private/syntax
"snip.ss")
(provide snip-admin%)
;; for contract only
(define fake-popup-menu% object%)
(defclass snip-admin% object%
(super-new)
(def/public (get-editor) #f)
(def/public (get-dc) #f)
(def/public (get-view-size [maybe-box? w] [maybe-box? h])
#f)
(def/public (get-view [maybe-box? x] [maybe-box? y] [maybe-box? w] [maybe-box? h]
[(make-or-false snip%) [snip #f]])
#f)
(def/public (scroll-to [snip% s]
[real? x] [real? y]
[nonnegative-real? w] [nonnegative-real? h]
[any? refresh?]
[(symbol-in start end none) [bias 'none]])
#f)
(def/public (set-caret-owner [snip% s] [(symbol-in imeditorte display global) dist])
(void))
(def/public (resized [snip% s] [any? redraw?]) (void))
(def/public (recounted [snip% s] [any? redraw?]) (void))
(def/public (needs-update [snip% s] [real? x] [real? y]
[nonnegative-real? w] [nonnegative-real? h])
(void))
(def/public (release-snip [snip% s]) #f)
(def/public (update-cursor) (void))
(def/public (popup-menu [fake-popup-menu% p][snip% snip][real? x][real? y])
#f)
(def/public (modified [snip% s] [any? modified?])
(void))
(def/public (get-line-spacing)
0.0)
(def/public (get-selected-text-color)
#f)
(def/public (call-with-busy-cursor [procedure? thunk])
(void))
(def/public (get-tabs [maybe-box? [length #f]] [maybe-box? [tab-width #f]] [maybe-box? [in-units #f]])
#f))

0
collects/mred/private/wxme/snip-flags.rkt → collects/racket/snip/snip-flags.rkt
View File

15
collects/mred/private/wxme/snip.rkt → collects/racket/snip/snip.rkt
View File

@ -1,15 +1,12 @@
#lang scheme/base
(require scheme/class
scheme/file file/convertible
"../syntax.ss"
"snip-flags.ss"
"private.ss"
"style.ss"
"load-one.rkt"
;; used only in contracts
;(only-in "cycle.ss" editor-stream-in% editor-stream-out% snip-admin%)
;; used for real
"../wx/common/event.rkt"
mred/private/syntax
mred/private/wxme/private
mred/private/wxme/style
mred/private/wxme/load-one
mred/private/wx/common/event
racket/draw)
(provide snip%
@ -51,8 +48,6 @@
caret-status?
;selected-text-color
image-type?)
;; these are used only in contracts