From 1881e90bcf8524693024b6a85a2cb9b53c9a2f76 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Fri, 10 Nov 2017 22:46:16 -0500 Subject: [PATCH] broke view module out into it's own file and updated status to display filename --- Makefile | 3 +- docs/Buf.Cursor.html | 3 +- docs/Buf.html | 4 +- docs/Cfg.Color.Syntax.html | 3 +- docs/Cfg.Color.html | 3 +- docs/Cfg.html | 3 +- docs/Draw.Cursor.html | 3 +- docs/Draw.html | 3 +- docs/Misc.html | 3 +- docs/Rope.html | 3 +- docs/Scrollmap.html | 7 +++- docs/View.html | 65 +++++++++++++++++++++++++++++++++ docs/X11.GlyphMap.html | 3 +- docs/X11.Rune.html | 3 +- docs/X11.html | 3 +- docs/index.html | 4 +- docs/index_attributes.html | 3 +- docs/index_class_types.html | 3 +- docs/index_classes.html | 3 +- docs/index_exceptions.html | 3 +- docs/index_extensions.html | 3 +- docs/index_methods.html | 3 +- docs/index_module_types.html | 3 +- docs/index_modules.html | 6 ++- docs/index_types.html | 5 ++- docs/index_values.html | 23 +++++++++++- docs/type_Buf.Cursor.html | 3 +- docs/type_Buf.html | 3 +- docs/type_Cfg.Color.Syntax.html | 3 +- docs/type_Cfg.Color.html | 3 +- docs/type_Cfg.html | 3 +- docs/type_Draw.Cursor.html | 3 +- docs/type_Draw.html | 3 +- docs/type_Misc.html | 3 +- docs/type_Rope.html | 3 +- docs/type_Scrollmap.html | 3 +- docs/type_View.html | 20 ++++++++++ docs/type_X11.GlyphMap.html | 3 +- docs/type_X11.Rune.html | 3 +- docs/type_X11.html | 3 +- edit.ml | 39 +------------------- lib/buf.ml | 3 ++ lib/buf.mli | 1 + lib/rope.ml | 8 ---- lib/view.ml | 37 +++++++++++++++++++ 45 files changed, 233 insertions(+), 85 deletions(-) create mode 100644 docs/View.html create mode 100644 docs/type_View.html create mode 100644 lib/view.ml diff --git a/Makefile b/Makefile index a4088f1..6949434 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,8 @@ LIBSRCS = \ lib/rope.ml \ lib/buf.ml \ lib/draw.ml \ - lib/scrollmap.ml + lib/scrollmap.ml \ + lib/view.ml LIBOBJS = \ $(LIBSRCS:.ml=.$(OBJEXT)) \ diff --git a/docs/Buf.Cursor.html b/docs/Buf.Cursor.html index 42b69e9..f55b43b 100644 --- a/docs/Buf.Cursor.html +++ b/docs/Buf.Cursor.html @@ -16,7 +16,8 @@ -Buf.Cursor + +Buf.Cursor
 Up diff --git a/docs/Buf.html b/docs/Buf.html index f2246c7..fef0b39 100644 --- a/docs/Buf.html +++ b/docs/Buf.html @@ -18,7 +18,8 @@ -Buf + +Buf
Previous @@ -99,6 +100,7 @@ 
val empty : buf
val load : string -> buf
+
val path : buf -> string
val length : buf -> int
val iteri : (int -> Rope.rune -> bool) -> buf -> int -> unit
val iter : (Rope.rune -> bool) -> buf -> int -> unit
diff --git a/docs/Cfg.Color.Syntax.html b/docs/Cfg.Color.Syntax.html index 24bc7bf..4e24f31 100644 --- a/docs/Cfg.Color.Syntax.html +++ b/docs/Cfg.Color.Syntax.html @@ -16,7 +16,8 @@ -Cfg.Color.Syntax + +Cfg.Color.Syntax
 Up diff --git a/docs/Cfg.Color.html b/docs/Cfg.Color.html index d52acd4..71da952 100644 --- a/docs/Cfg.Color.html +++ b/docs/Cfg.Color.html @@ -16,7 +16,8 @@ -Cfg.Color + +Cfg.Color
 Up diff --git a/docs/Cfg.html b/docs/Cfg.html index 3db7037..6a81cb1 100644 --- a/docs/Cfg.html +++ b/docs/Cfg.html @@ -18,7 +18,8 @@ -Cfg + +Cfg
Previous diff --git a/docs/Draw.Cursor.html b/docs/Draw.Cursor.html index 20875f9..6dd4c39 100644 --- a/docs/Draw.Cursor.html +++ b/docs/Draw.Cursor.html @@ -16,7 +16,8 @@ -Draw.Cursor + +Draw.Cursor
 Up diff --git a/docs/Draw.html b/docs/Draw.html index 534867c..92f03a4 100644 --- a/docs/Draw.html +++ b/docs/Draw.html @@ -18,7 +18,8 @@ -Draw + +Draw
Previous diff --git a/docs/Misc.html b/docs/Misc.html index 8182d24..3f975b4 100644 --- a/docs/Misc.html +++ b/docs/Misc.html @@ -17,7 +17,8 @@ -Misc + +Misc
 Up diff --git a/docs/Rope.html b/docs/Rope.html index cd7d93a..1dafc57 100644 --- a/docs/Rope.html +++ b/docs/Rope.html @@ -18,7 +18,8 @@ -Rope + +Rope
Previous diff --git a/docs/Scrollmap.html b/docs/Scrollmap.html index 35cb91c..be5b11d 100644 --- a/docs/Scrollmap.html +++ b/docs/Scrollmap.html @@ -6,6 +6,7 @@ + @@ -17,12 +18,14 @@ -Scrollmap + +Scrollmap
Previous  Up - 
+ Next +

Module Scrollmap

module Scrollmap: sig .. end
diff --git a/docs/View.html b/docs/View.html new file mode 100644 index 0000000..2d6e1fa --- /dev/null +++ b/docs/View.html @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + +View + + +
Previous + Up + 
+

Module View

+ +
module View: sig .. end
+ +
type t = {
+ + + + + + + + + + + + + + +
+   +num : int;
+   +buf : Buf.t;
+   +map : Scrollmap.t;
+} + + + +
val from_buffer : Buf.t -> int -> 'a -> t
+
val empty : int -> 'a -> t
+
val make : int -> 'a -> string -> t
+
val path : t -> string
+
val resize : t -> int -> t
+
val draw : t -> Draw.Cursor.t -> t
+
val scroll_up : t -> t
+
val scroll_dn : t -> t
+
val scroll_params : t -> float * float
\ No newline at end of file diff --git a/docs/X11.GlyphMap.html b/docs/X11.GlyphMap.html index aa799ed..e94cdda 100644 --- a/docs/X11.GlyphMap.html +++ b/docs/X11.GlyphMap.html @@ -17,7 +17,8 @@ -X11.GlyphMap + +X11.GlyphMap
Previous diff --git a/docs/X11.Rune.html b/docs/X11.Rune.html index 3156c17..2a9f928 100644 --- a/docs/X11.Rune.html +++ b/docs/X11.Rune.html @@ -17,7 +17,8 @@ -X11.Rune + +X11.Rune
 Up diff --git a/docs/X11.html b/docs/X11.html index 41d086d..6271273 100644 --- a/docs/X11.html +++ b/docs/X11.html @@ -18,7 +18,8 @@ -X11 + +X11
Previous diff --git a/docs/index.html b/docs/index.html index 995df80..d21b245 100644 --- a/docs/index.html +++ b/docs/index.html @@ -15,7 +15,8 @@ - + +

@@ -34,6 +35,7 @@ Buf Draw Scrollmap +View \ No newline at end of file diff --git a/docs/index_attributes.html b/docs/index_attributes.html index c0642f2..0922333 100644 --- a/docs/index_attributes.html +++ b/docs/index_attributes.html @@ -14,7 +14,8 @@ -Index of class attributes + +Index of class attributes
 Up diff --git a/docs/index_class_types.html b/docs/index_class_types.html index e4743e1..942121f 100644 --- a/docs/index_class_types.html +++ b/docs/index_class_types.html @@ -14,7 +14,8 @@ -Index of class types + +Index of class types
 Up diff --git a/docs/index_classes.html b/docs/index_classes.html index b02809c..252701f 100644 --- a/docs/index_classes.html +++ b/docs/index_classes.html @@ -14,7 +14,8 @@ -Index of classes + +Index of classes
 Up diff --git a/docs/index_exceptions.html b/docs/index_exceptions.html index 79682f4..b674928 100644 --- a/docs/index_exceptions.html +++ b/docs/index_exceptions.html @@ -14,7 +14,8 @@ -Index of exceptions + +Index of exceptions
 Up diff --git a/docs/index_extensions.html b/docs/index_extensions.html index e14ae70..94be4bd 100644 --- a/docs/index_extensions.html +++ b/docs/index_extensions.html @@ -14,7 +14,8 @@ -Index of extensions + +Index of extensions
 Up diff --git a/docs/index_methods.html b/docs/index_methods.html index e14ac89..b125c72 100644 --- a/docs/index_methods.html +++ b/docs/index_methods.html @@ -14,7 +14,8 @@ -Index of class methods + +Index of class methods
 Up diff --git a/docs/index_module_types.html b/docs/index_module_types.html index b291d77..bbf4bc8 100644 --- a/docs/index_module_types.html +++ b/docs/index_module_types.html @@ -14,7 +14,8 @@ -Index of module types + +Index of module types
 Up diff --git a/docs/index_modules.html b/docs/index_modules.html index f7ab3ae..1407eb6 100644 --- a/docs/index_modules.html +++ b/docs/index_modules.html @@ -14,7 +14,8 @@ -Index of modules + +Index of modules
 Up @@ -52,6 +53,9 @@ Syntax [Cfg.Color] +
V +View +
X X11 diff --git a/docs/index_types.html b/docs/index_types.html index 79c783a..c9e1ebc 100644 --- a/docs/index_types.html +++ b/docs/index_types.html @@ -14,7 +14,8 @@ -Index of types + +Index of types
 Up @@ -42,6 +43,8 @@ rune [Rope]
T +t [View] + t [Scrollmap] t [Draw.Cursor] diff --git a/docs/index_values.html b/docs/index_values.html index 8e33641..7e34b42 100644 --- a/docs/index_values.html +++ b/docs/index_values.html @@ -14,7 +14,8 @@ -Index of values + +Index of values
 Up @@ -68,6 +69,8 @@ disconnect [X11] +draw [View] + draw_char [X11] draw_glyph [Draw.Cursor] @@ -97,6 +100,8 @@ edit_tags [Cfg] +empty [View] + empty [Buf] empty [Rope] @@ -130,6 +135,8 @@ font_load [X11] +from_buffer [View] + from_string [Rope]
G @@ -219,6 +226,8 @@ load_file [Misc]
M +make [View] + make [Scrollmap] make [Draw.Cursor] @@ -272,6 +281,10 @@
P palette [Cfg.Color] +path [View] + +path [Buf] + place_glyph [Draw.Cursor] preproc [Cfg.Color.Syntax] @@ -301,6 +314,8 @@
R rectangle [Draw] +resize [View] + resize [Scrollmap] restart [Draw.Cursor] @@ -312,12 +327,18 @@
S scroll [Draw] +scroll_dn [View] + scroll_dn [Scrollmap] scroll_lines [Cfg] scroll_nor [Cfg.Color] +scroll_params [View] + +scroll_up [View] + scroll_up [Scrollmap] show_window [X11] diff --git a/docs/type_Buf.Cursor.html b/docs/type_Buf.Cursor.html index dd15c50..4a11d65 100644 --- a/docs/type_Buf.Cursor.html +++ b/docs/type_Buf.Cursor.html @@ -13,7 +13,8 @@ -Buf.Cursor + +Buf.Cursor sig
diff --git a/docs/type_Buf.html b/docs/type_Buf.html index e7472aa..bf8bd13 100644 --- a/docs/type_Buf.html +++ b/docs/type_Buf.html @@ -13,7 +13,8 @@ -Buf + +Buf sig  end \ No newline at end of file diff --git a/docs/type_Cfg.Color.Syntax.html b/docs/type_Cfg.Color.Syntax.html index 4058345..a9c8a31 100644 --- a/docs/type_Cfg.Color.Syntax.html +++ b/docs/type_Cfg.Color.Syntax.html @@ -13,7 +13,8 @@ -Cfg.Color.Syntax + +Cfg.Color.Syntax sig
diff --git a/docs/type_Cfg.Color.html b/docs/type_Cfg.Color.html index 96343e5..e9aa915 100644 --- a/docs/type_Cfg.Color.html +++ b/docs/type_Cfg.Color.html @@ -13,7 +13,8 @@ -Cfg.Color + +Cfg.Color sig
diff --git a/docs/type_Cfg.html b/docs/type_Cfg.html index 47691a6..f415608 100644 --- a/docs/type_Cfg.html +++ b/docs/type_Cfg.html @@ -13,7 +13,8 @@ -Cfg + +Cfg sig  end \ No newline at end of file diff --git a/docs/type_Draw.Cursor.html b/docs/type_Draw.Cursor.html index c98866d..d39b6e8 100644 --- a/docs/type_Draw.Cursor.html +++ b/docs/type_Draw.Cursor.html @@ -13,7 +13,8 @@ -Draw.Cursor + +Draw.Cursor sig
diff --git a/docs/type_Draw.html b/docs/type_Draw.html index b9fab20..e221ec0 100644 --- a/docs/type_Draw.html +++ b/docs/type_Draw.html @@ -13,7 +13,8 @@ -Draw + +Draw sig  end \ No newline at end of file diff --git a/docs/type_Misc.html b/docs/type_Misc.html index 178e962..705a85c 100644 --- a/docs/type_Misc.html +++ b/docs/type_Misc.html @@ -13,7 +13,8 @@ -Misc + +Misc sig  end \ No newline at end of file diff --git a/docs/type_Rope.html b/docs/type_Rope.html index 12b9d51..b68790e 100644 --- a/docs/type_Rope.html +++ b/docs/type_Rope.html @@ -13,7 +13,8 @@ -Rope + +Rope sig  end \ No newline at end of file diff --git a/docs/type_Scrollmap.html b/docs/type_Scrollmap.html index 5c005c1..7564240 100644 --- a/docs/type_Scrollmap.html +++ b/docs/type_Scrollmap.html @@ -13,7 +13,8 @@ -Scrollmap + +Scrollmap sig  end \ No newline at end of file diff --git a/docs/type_View.html b/docs/type_View.html new file mode 100644 index 0000000..5a0496b --- /dev/null +++ b/docs/type_View.html @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + +View + + +sig  end \ No newline at end of file diff --git a/docs/type_X11.GlyphMap.html b/docs/type_X11.GlyphMap.html index c020538..80ee296 100644 --- a/docs/type_X11.GlyphMap.html +++ b/docs/type_X11.GlyphMap.html @@ -13,7 +13,8 @@ -X11.GlyphMap + +X11.GlyphMap sig
diff --git a/docs/type_X11.Rune.html b/docs/type_X11.Rune.html index 292a182..35ae8cd 100644 --- a/docs/type_X11.Rune.html +++ b/docs/type_X11.Rune.html @@ -13,7 +13,8 @@ -X11.Rune + +X11.Rune sig type t = int val compare : int -> int -> int end \ No newline at end of file diff --git a/docs/type_X11.html b/docs/type_X11.html index f6f7286..faf9e8c 100644 --- a/docs/type_X11.html +++ b/docs/type_X11.html @@ -13,7 +13,8 @@ -X11 + +X11 sig  end \ No newline at end of file diff --git a/edit.ml b/edit.ml index f690825..e45eb69 100644 --- a/edit.ml +++ b/edit.ml @@ -1,42 +1,5 @@ open X11 -module View = struct - type t = { - num : int; - buf : Buf.t; - map : Scrollmap.t - } - - let from_buffer buf width height = - { num = 0; buf = buf; map = Scrollmap.make buf width 0 } - - let empty width height = - from_buffer (Buf.empty) width height - - let make width height path = - from_buffer (Buf.load path) width height - - let resize view width = - { view with map = Scrollmap.resize view.map view.buf width } - - let draw view csr = - let view = (resize view (Draw.Cursor.max_width csr)) in - let num = Draw.buffer csr view.buf (Scrollmap.first view.map) in - { view with num = num } - - let scroll_up view = - { view with map = Scrollmap.scroll_up view.map view.buf } - - let scroll_dn view = - { view with map = Scrollmap.scroll_dn view.map view.buf } - - let scroll_params view = - let length = float_of_int (Buf.length view.buf) - and first = float_of_int (Scrollmap.first view.map) - and nvisible = float_of_int view.num in - ((first /. length), (nvisible /. length)) -end - let tags_buf = ref Buf.empty let edit_view = ref (View.empty 640 480) @@ -60,7 +23,7 @@ let onmousemove mods x y = () let onupdate width height = let csr = Draw.Cursor.make (width, height) 0 0 in - Draw.status csr "UNSI> *scratch*"; + Draw.status csr (View.path !edit_view); Draw.tags csr !tags_buf; let scrollcsr = (Draw.Cursor.clone csr) in Draw.Cursor.move_x csr 15; diff --git a/lib/buf.ml b/lib/buf.ml index ef6f37a..f139e9e 100644 --- a/lib/buf.ml +++ b/lib/buf.ml @@ -16,6 +16,9 @@ let empty = let load path = { path = path; rope = Rope.from_string (Misc.load_file path) } +let path buf = + buf.path + let length buf = Rope.length buf.rope diff --git a/lib/buf.mli b/lib/buf.mli index 57f6304..9b8831b 100644 --- a/lib/buf.mli +++ b/lib/buf.mli @@ -36,6 +36,7 @@ end val empty : t val load : string -> t +val path : t -> string val length : t -> int val iter : (int -> bool) -> t -> int -> unit val iteri : (int -> int -> bool) -> t -> int -> unit diff --git a/lib/rope.ml b/lib/rope.ml index d975940..16e699a 100644 --- a/lib/rope.ml +++ b/lib/rope.ml @@ -12,8 +12,6 @@ let empty = Leaf ("", 0, 0) let from_string s = Leaf (s, 0, (String.length s)) -(******************************************************************************) - let length = function | Leaf (_,_,l) -> l | Node (_,_,_,l) -> l @@ -39,8 +37,6 @@ let check_index rope i = if i < 0 || i >= (length rope) then raise (Out_of_bounds "Rope.check_index") -(******************************************************************************) - let rec getb rope i = check_index rope i; match rope with @@ -71,8 +67,6 @@ let rec getc rope i = else getc r (i - left_len) -(******************************************************************************) - (* inefficient form of iteri *) let rec iteri fn rope pos = if pos < (length rope) && (fn pos (Char.code (getb rope pos))) then @@ -107,8 +101,6 @@ let gets rope i j = rope i; Bytes.unsafe_to_string buf -(******************************************************************************) - (* Rebalancing: * Height of leaf is 0 diff --git a/lib/view.ml b/lib/view.ml new file mode 100644 index 0000000..fab1ed6 --- /dev/null +++ b/lib/view.ml @@ -0,0 +1,37 @@ +type t = { + num : int; + buf : Buf.t; + map : Scrollmap.t +} + +let from_buffer buf width height = + { num = 0; buf = buf; map = Scrollmap.make buf width 0 } + +let empty width height = + from_buffer (Buf.empty) width height + +let make width height path = + from_buffer (Buf.load path) width height + +let path view = + Buf.path view.buf + +let resize view width = + { view with map = Scrollmap.resize view.map view.buf width } + +let draw view csr = + let view = (resize view (Draw.Cursor.max_width csr)) in + let num = Draw.buffer csr view.buf (Scrollmap.first view.map) in + { view with num = num } + +let scroll_up view = + { view with map = Scrollmap.scroll_up view.map view.buf } + +let scroll_dn view = + { view with map = Scrollmap.scroll_dn view.map view.buf } + +let scroll_params view = + let length = float_of_int (Buf.length view.buf) + and first = float_of_int (Scrollmap.first view.map) + and nvisible = float_of_int view.num in + ((first /. length), (nvisible /. length)) -- 2.52.0