update examples

Author: kandu

examples/asciiart/asciiart.ml

@@ -64,7 +64,7 @@ open CamomileLibrary
 class asciiart img = object(self)
   inherit t "asciiart" as super
 
-  method can_focus = true
+  method! can_focus = true
 
   (* scrollable interfaces *)
   val vscroll = new scrollable
@@ -81,7 +81,7 @@ class asciiart img = object(self)
     vscroll#set_document_size self#document_size.rows;
     hscroll#set_document_size self#document_size.cols
 
-  method set_allocation r = 
+  method! set_allocation r = 
     super#set_allocation r;
     let size = size_of_rect r in
     vscroll#set_page_size size.rows;
@@ -98,13 +98,13 @@ class asciiart img = object(self)
     | Some(r, c, i) when r = !avg_rows && c = !avg_cols -> i
     | _ -> stored_img <- Some(!avg_rows, !avg_cols, indices img); self#img
 
-  method draw ctx focused = 
+  method! draw ctx _focused = 
     let { rows; cols } = LTerm_draw.size ctx in
     let img = self#img in
     for row=0 to rows-1 do
       for col=0 to cols-1 do
         LTerm_draw.draw_char ~style ctx row col @@ 
-          UChar.of_char palette.[ 
+          Zed_char.unsafe_of_char palette.[ 
             try img.(row + vscroll#offset).(col + hscroll#offset) with _ -> 0 
           ]
       done
@@ -126,29 +126,29 @@ class asciiart img = object(self)
 
   (* adjust scale, which changes the document size *)
   method private scale_event = function
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c} when c = UChar.of_char 'w' ->
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c;_} when c = UChar.of_char 'w' ->
       avg_rows := max 1 (!avg_rows - 1);
       vscroll#set_document_size self#document_size.rows;
       self#queue_draw; true
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c} when c = UChar.of_char 's' ->
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c;_} when c = UChar.of_char 's' ->
       avg_rows := !avg_rows + 1; 
       vscroll#set_document_size self#document_size.rows;
       self#queue_draw; true
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c} when c = UChar.of_char 'a' ->
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c;_} when c = UChar.of_char 'a' ->
       avg_cols := max 1 (!avg_cols - 1); 
       hscroll#set_document_size self#document_size.cols;
       self#queue_draw; true
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c} when c = UChar.of_char 'd' ->
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Char c;_} when c = UChar.of_char 'd' ->
       avg_cols := !avg_cols + 1; 
       hscroll#set_document_size self#document_size.cols;
       self#queue_draw; true
     | _ -> false
 
   (* page up/down *)
   method page_event = function
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Next_page} ->
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Next_page;_} ->
       vscroll#set_offset @@ vscroll#page_next; self#queue_draw; true
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Prev_page} ->
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Prev_page;_} ->
       vscroll#set_offset @@ vscroll#page_prev; self#queue_draw; true
     | _ -> false
 
@@ -202,7 +202,7 @@ let main () =
   top#set vbox;
 
   top#on_event (function (* quit with escape key *)
-    | LTerm_event.Key{LTerm_key.code=LTerm_key.Escape} -> 
+    | LTerm_event.Key{LTerm_key.code=LTerm_key.Escape;_} -> 
       wakeup wakener (); false 
     | _ -> false);
 

examples/buttons.ml

@@ -14,7 +14,10 @@ let main () =
   let waiter, wakener = wait () in
 
   let vbox = new vbox in
-  let button = new button ~brackets:("[ "," ]") "exit" in
+  let button = new button
+    ~brackets:("[ ", " ]")
+    "exit退出"
+  in
   let label = new label "_" in
   button#on_click (wakeup wakener);
   vbox#add button;
@@ -23,7 +26,7 @@ let main () =
   for i = 0 to 2 do
     let hbox = new hbox in
     let button i = 
-      let button = new button ("button" ^ string_of_int i) in
+      let button = new button ("button按钮" ^ string_of_int i) in
       button#on_click (fun () -> label#set_text (string_of_int i));
       button
     in
@@ -38,7 +41,7 @@ let main () =
 
   let frame = new frame in
   frame#set vbox;
-  frame#set_label ~alignment:LTerm_geom.H_align_center "Button test";
+  frame#set_label ~alignment:LTerm_geom.H_align_center "Button test按钮测试";
 
   Lazy.force LTerm.stdout >>= fun term ->
   LTerm.enable_mouse term >>= fun () ->

examples/checkbuttons.ml

@@ -14,8 +14,8 @@ let main () =
   let waiter, wakener = wait () in
 
   let vbox = new vbox in
-  let checked_label = (new label "") in
-  let create_button n = new checkbutton ("button" ^ (string_of_int n)) false in
+  let checked_label = new label "" in
+  let create_button n = new checkbutton ("button按钮" ^ (string_of_int n)) false in
   let checkbuttons = Array.init 9 create_button in
   let callback () =
     let new_label = ref "" in
@@ -26,7 +26,7 @@ let main () =
     done;
     checked_label#set_text !new_label
   in
-  let button = new button "exit" in
+  let button = new button "exit退出" in
   button#on_click (wakeup wakener);
   vbox#add ~expand:false button;
   vbox#add ~expand:false (new hline);

examples/clock.ml

@@ -22,7 +22,7 @@ let main () =
 
   let vbox = new vbox in
   let clock = new label (get_time ()) in
-  let button = new button "exit" in
+  let button = new button "exit退出" in
   vbox#add clock;
   vbox#add button;
 

examples/editor.ml

@@ -32,7 +32,7 @@ let main () =
     [ LTerm_edit.Custom (fun () -> wakeup wakener ()) ];
 
   Zed_edit.insert editor#context
-    (Zed_rope.of_string "\
+    (Zed_rope.of_string @@ Zed_string_UTF8.to_t_exn "\
 This is a simple edition widget.
 
 Type C-x C-c to exit.

examples/hello.ml

@@ -16,7 +16,9 @@ let main () =
   (* Create the UI. *)
   let vbox = new LTerm_widget.vbox in
   vbox#add (new LTerm_widget.label "Hello, world!");
-  vbox#add (new LTerm_widget.label "Press escape to exit.");
+  vbox#add (new LTerm_widget.label "你好，世界！");
+  vbox#add (new LTerm_widget.label "ハロー・ワールド");
+  vbox#add (new LTerm_widget.label "안녕, 세계!");
   vbox#on_event (function
                    | LTerm_event.Key { LTerm_key.code = LTerm_key.Escape; _ } -> wakeup wakener (); true
                    | _ -> false);

examples/move.ml

@@ -39,10 +39,10 @@ let draw ui matrix coord =
   let size = LTerm_ui.size ui in
   let ctx = LTerm_draw.context matrix size in
   LTerm_draw.clear ctx;
-  LTerm_draw.draw_frame_labelled ctx { row1 = 0; col1 = 0; row2 = size.rows; col2 = size.cols } ~alignment:H_align_center "Use arrow keys to move text" LTerm_draw.Light;
+  LTerm_draw.draw_frame_labelled ctx { row1 = 0; col1 = 0; row2 = size.rows; col2 = size.cols } ~alignment:H_align_center (Zed_string_UTF8.to_t_exn "Use arrow keys to move text 文字") LTerm_draw.Light;
   if size.rows > 2 && size.cols > 2 then begin
     let ctx = LTerm_draw.sub ctx { row1 = 1; col1 = 1; row2 = size.rows - 1; col2 = size.cols - 1 } in
-    LTerm_draw.draw_styled ctx coord.row coord.col (eval [B_fg LTerm_style.lblue; S"Move me"; E_fg])
+    LTerm_draw.draw_styled ctx coord.row coord.col (eval [B_fg LTerm_style.lblue; S "Move m̀é 囧"; E_fg])
   end
 
 let main () =

examples/read_password.ml

@@ -15,7 +15,7 @@ let ( >>= ) = Lwt.( >>= )
 
 class read_password term = object(self)
   inherit LTerm_read_line.read_password () as super
-  inherit [Zed_utf8.t] LTerm_read_line.term term
+  inherit [Zed_string.t] LTerm_read_line.term term
 
   method! send_action = function
     | LTerm_read_line.Break ->
@@ -25,7 +25,7 @@ class read_password term = object(self)
         super#send_action action
 
   initializer
-    self#set_prompt (S.const (LTerm_text.of_string "Type a password: "))
+    self#set_prompt (S.const (LTerm_text.of_utf8 "Type a password: "))
 end
 
 let main () =
@@ -35,6 +35,6 @@ let main () =
   >>= fun term ->
   (new read_password term)#run
   >>= fun password ->
-  Lwt_io.printlf "You typed %S" password
+  Lwt_io.printlf "You typed %S" (Zed_string_UTF8.of_t password)
 
 let () = Lwt_main.run (main ())

examples/repl.ml

@@ -48,7 +48,7 @@ let make_output state out =
 
 class read_line ~term ~history ~state = object(self)
   inherit LTerm_read_line.read_line ~history ()
-  inherit [Zed_utf8.t] LTerm_read_line.term term
+  inherit [Zed_string.t] LTerm_read_line.term term
 
   method! show_box = false
 
@@ -62,13 +62,14 @@ end
 
 let rec loop term history state =
   Lwt.catch (fun () ->
-    let rl = new read_line ~term ~history:(LTerm_history.contents history) ~state in
+    let rl = new read_line ~term ~history:(LTerm_history.zed_contents history) ~state in
     rl#run >|= fun command -> Some command)
     (function
       | Sys.Break -> return None
       | exn -> Lwt.fail exn)
   >>= function
   | Some command ->
+    let command= Zed_string_UTF8.of_t command in 
     let state, out = Interpreter.eval state command in
     LTerm.fprintls term (make_output state out)
     >>= fun () ->

examples/scroll.ml

@@ -22,7 +22,7 @@ class scrollable_nums (scroll : scrollable) = object
     let { rows; _ } = LTerm_draw.size ctx in
 
     for row=0 to rows-1 do
-      LTerm_draw.draw_string ctx row 0 (string_of_int (row + scroll#offset))
+      LTerm_draw.draw_string ctx row 0 (Zed_string_UTF8.to_t_exn (string_of_int (row + scroll#offset)))
     done
 
 end

examples/scroll_debug.ml

@@ -20,7 +20,7 @@ class scroll_label scroll = object
   method! draw ctx _focused =
     LTerm_draw.fill_style ctx style;
     LTerm_draw.draw_string_aligned ctx 0 H_align_center ~style
-      (Printf.sprintf "%i/%i" scroll#offset scroll#range)
+      (Zed_string_UTF8.to_t_exn (Printf.sprintf "%i/%i" scroll#offset scroll#range))
 
 end
 

examples/shell.ml

@@ -114,6 +114,7 @@ let get_binaries () =
     String_set.empty
     (get_paths ())
   >|= String_set.elements
+  >|= List.map Zed_string_UTF8.to_t_exn
 
 (* +-----------------------------------------------------------------+
    | Customization of the read-line engine                           |
@@ -128,12 +129,12 @@ let time =
 
 class read_line ~term ~history ~exit_code ~binaries = object(self)
   inherit LTerm_read_line.read_line ~history ()
-  inherit [Zed_utf8.t] LTerm_read_line.term term
+  inherit [Zed_string.t] LTerm_read_line.term term
 
   method! completion =
     let prefix  = Zed_rope.to_string self#input_prev in
-    let binaries = List.filter (fun file -> Zed_utf8.starts_with file prefix) binaries in
-    self#set_completion 0 (List.map (fun file -> (file, " ")) binaries)
+    let binaries = List.filter (fun file -> Zed_string.starts_with ~prefix file) binaries in
+    self#set_completion 0 (List.map (fun file -> (file, Zed_string_UTF8.to_t_exn " ")) binaries)
 
   initializer
     self#set_prompt (S.l2 (fun size time -> make_prompt size exit_code time) self#size time)
@@ -147,14 +148,15 @@ let rec loop term history exit_code =
   get_binaries ()
   >>= fun binaries ->
   Lwt.catch (fun () ->
-    (new read_line ~term ~history:(LTerm_history.contents history)
+    (new read_line ~term ~history:(LTerm_history.zed_contents history)
       ~exit_code ~binaries)#run
     >|= fun command -> Some command)
     (function
       | Sys.Break -> return None
       | exn -> Lwt.fail exn)
   >>= function
   | Some command ->
+    let command= Zed_string_UTF8.of_t command in
     Lwt.catch (fun () -> Lwt_process.exec (Lwt_process.shell command))
       (function
         | Unix.Unix_error (Unix.ENOENT, _, _) ->