From 4843bd64ead67e74c22eb715eac3ca814304250a Mon Sep 17 00:00:00 2001
From: Dave Carlton <davec@mac.com>
Date: Thu, 8 Sep 2022 11:49:37 -0500
Subject: [PATCH] Use symbols for shapes

---
 basis/ui/gadgets/editors/editors-docs.factor |  9 ++++-----
 basis/ui/gadgets/editors/editors.factor      | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/basis/ui/gadgets/editors/editors-docs.factor b/basis/ui/gadgets/editors/editors-docs.factor
index 927e506824..15da0b931e 100644
--- a/basis/ui/gadgets/editors/editors-docs.factor
+++ b/basis/ui/gadgets/editors/editors-docs.factor
@@ -40,16 +40,15 @@ HELP: caret-is-shape
 $nl
 { $code
 "  IN: ui.gadgets.editors"
-"  2 caret-is-shape set"
+"  +box+ caret-shape set-global"
 ""
 } print-element
 $nl
 { $table
   { "Value" "Shape" }
-  { "f" "default (line)" }
-  { "0" "line" }
-  { "1" "box" }
-  { "2" "filled box" }
+  { "+line+" "line (default)" }
+  { "+box+" "box" }
+  { "+filled+" "filled box" }
 } print-element
 
 { $references   "Set desired shape in your .factor-rc file" 
diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index b4ec2c3744..f846d6cbdb 100644
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -8,12 +8,13 @@ models.arrow namespaces opengl opengl.gl sequences sorting
 splitting system timers ui.baseline-alignment ui.clipboards
 ui.commands ui.gadgets ui.gadgets.borders
 ui.gadgets.line-support ui.gadgets.menus ui.gadgets.scrollers
-prettyprint ui.gadgets.editors.private math.parser
+prettyprint math.parser
 ui.gestures ui.pens.solid ui.render ui.text ui.theme unicode variables ;
 IN: ui.gadgets.editors
 
 TUPLE: editor < line-gadget
     caret mark
+    caret-shape
     focused? blink blink-timer
     default-text
     preedit-start
@@ -25,8 +26,11 @@ TUPLE: editor < line-gadget
 
 M: editor preedit? preedit-start>> ;
 
-SYMBOL: caret-is-shape 
-: <caret-shape> ( -- shape )  caret-is-shape get <model> ;
+SYMBOLS: +line+ +box+ +filled+ ;
+GLOBAL: caret-is-shape 
++line+ caret-is-shape set-global
+
+: <caret-shape> ( -- shape )  caret-is-shape get-global <model> ;
 
 <PRIVATE
 
@@ -188,10 +192,10 @@ M: editor ungraft*
     (caret-location) (caret-rect) gl-fill-rect ;
 
 : draw-caret-shape ( editor -- )
-    dup caret-shape>> value>> 
+    dup caret-shape>> value>>
     {
-        { 1 [ draw-caret-rect ] }
-        { 2 [ draw-caret-rect-filled ] }
+        { +box+ [ draw-caret-rect ] }
+        { +filled+ [ draw-caret-rect-filled ] }
         [ drop  draw-caret-line ]
     } case ;
     
@@ -199,8 +203,7 @@ M: editor ungraft*
 : draw-caret ( editor -- )
     dup draw-caret? [
         [ editor-caret-color gl-color ] dip
-        [ caret-loc ] [ caret-dim ] bi
-        over v+ gl-line
+        draw-caret-shape
     ] [ drop ] if ;
 
 :: draw-preedit-underlines ( editor -- )
-- 
2.34.1