deprecate imstate

editor/imstate.fnl

@@ -1,267 +0,0 @@
-(local core (require :core))
-(local config (require :core.config))
-(local command (require :core.command))
-(local keymap (require :core.keymap))
-(local style (require :core.style))
-(local lume (require :lib.lume))
-
-(fn attach-imstate [view]
-  (set view.imstate {})
-  (fn view.on_mouse_pressed [self button x y clicks]
-    (tset self.imstate button :pressed)
-    (self.__index.on_mouse_pressed self button x y clicks))
-  (fn view.on_mouse_released [self button x y]
-    (tset self.imstate button :released)
-    (self.__index.on_mouse_released self button x y))
-  (fn view.on_key_pressed [self key]
-    (when (= self.imstate.keys nil)
-      (set self.imstate.keys []))
-    (table.insert self.imstate.keys key))
-  (fn view.on_text_input [self text]
-    (set self.imstate.text (.. (or self.imstate.text "") text))
-    (self.__index.on_text_input self text))
-  (fn view.draw [self]
-    (set self.cursor nil)
-    (self.__index.draw self)
-    (when self.imstate.postponed
-      (each [_ action (ipairs self.imstate.postponed)]
-        (action))
-      (set self.imstate.postponed nil))
-    (when (= self.cursor nil) (set self.cursor :arrow))
-    (set self.imstate.keys nil)
-    (set self.imstate.text nil)
-    (when (= self.imstate.left :released)
-      (set self.imstate.active nil))
-    (each [_ button (pairs [:left :middle :right])]
-      (tset self.imstate button
-        (match (. self.imstate button)
-          :pressed  :down
-          :down     :down
-          :released nil)))))
-
-(fn register-keys [keys]
-  (local commands {})
-  (local keymaps {})
-  (each [_ key (ipairs keys)]
-    (local command-name (.. "imstate:" key))
-    (tset commands command-name #(core.active_view:on_key_pressed key))
-    (tset keymaps key command-name))
-  (command.add #(not= (-?> core.active_view.imstate (. :focus)) nil) commands)
-  (keymap.add keymaps))
-
-(register-keys [:backspace :delete :left :right :shift+left :shift+right :home :end :shift+home :shift+end
-                :ctrl+left :ctrl+right :ctrl+shift+left :ctrl+shift+right :ctrl+c :ctrl+v])
-
-(fn cmd-predicate [p]
-  (var p-fn p)
-  (when (= (type p-fn) :string) (set p-fn (require p-fn)))
-  (when (= (type p-fn) :table)
-    (local cls p-fn)
-    (set p-fn (fn [] (core.active_view:is cls))))
-  (fn [] (when (= (-?> core.active_view.imstate (. :focus)) nil)
-           (p-fn))))
-
-(fn postpone [view f]
-  (when (= view.imstate.postponed nil)
-    (set view.imstate.postponed []))
-  (table.insert view.imstate.postponed f))
-
-(fn make-tag [tag]
-  (match (type tag)
-    :string tag
-    :table  (table.concat tag "::")
-    _       (tostring tag)))
-
-(fn mouse-inside [x y w h]
-  (local (mx my) (values (love.mouse.getX) (love.mouse.getY)))
-  (and (>= mx x) (<= mx (+ x w)) (>= my y) (<= my (+ y h))))
-
-(fn consume-pressed [view button]
-  (when (= (. view.imstate button) :pressed)
-    (tset view.imstate button :down)
-    true))
-
-(fn activate [view tag x y w h]
-  (when (and (mouse-inside x y w h) (consume-pressed view :left))
-    (set view.imstate.active (make-tag tag))
-    true))
-
-(fn set-cursor [view cursor]
-  (when (= view.cursor nil) (set view.cursor cursor)))
-
-(fn active? [view tag] (= view.imstate.active (make-tag tag)))
-(fn button [view tag x y w h]
-  (when (mouse-inside x y w h) (set-cursor view :hand))
-  (activate view tag x y w h)
-  (values (and (active? view tag) (= view.imstate.left :released) (mouse-inside x y w h)) (+ y h style.padding.y)))
-
-(fn textbutton [view label x y ?font]
-  (let [font (or ?font style.font)]
-    (local (w h) (values (+ (font:get_width label) style.padding.x) (+ (font:get_height) style.padding.y)))
-    (renderer.draw_rect x y w h style.selection)
-    (renderer.draw_text font label (+ x (/ style.padding.x 2)) (+ y (/ style.padding.y 2)) style.text)
-    (values (button view label x y w h) (+ y h))))
-
-(fn checkbox [view name isset x y ?tag]
-  (love.graphics.rectangle (if isset :fill :line) x y (* 12 SCALE) (* 12 SCALE))
-  (local xEnd (renderer.draw_text style.font name (+ x (* 16 SCALE)) y style.text))
-  (love.graphics.setColor 1 1 1 1)
-  (button view (or ?tag name) x y (- xEnd x) (* 12 SCALE)))
-
-(fn focused? [view tag] (= (make-tag tag) (-?> view.imstate.focus (. :tag))))
-(fn focus [view tag x y w h opts]
-  (if (activate view tag x y w h)
-      (set view.imstate.focus
-        (doto (lume.clone (or opts {}))
-          (tset :tag (make-tag tag))))
-
-      (and (= view.imstate.left :released) (focused? view tag) (not (mouse-inside x y w h)))
-      (set view.imstate.focus nil))
-  (focused? view tag))
-
-(local blink_period 0.8)
-(fn x-from-i [s i xLeft font]
-  (if (or (<= i 1) (= s "")) xLeft
-      (x-from-i (s:sub 2) (- i 1) (+ xLeft (font:get_width (s:sub 1 1))) font)))
-(fn i-from-x [s x xLeft font ?i]
-  (local i (or ?i 1))
-  (local w (font:get_width (s:sub 1 1)))
-  (local xMid (+ xLeft (/ w 2)))
-  (if (or (<= x xMid) (= s "")) i
-      (i-from-x (s:sub 2) x (+ xLeft w) font (+ i 1))))
-
-(fn next-match [text i di pred]
-  (local imax (+ (length text) 1))
-  (local inext (+ i di))
-  (if (<= inext 1) 1
-      (> inext imax) imax
-      (pred (text:sub inext inext)) (if (< di 0) i inext)
-    (next-match text inext di pred)))
-(fn is-nonword-char [char] (config.non_word_chars:find char nil true))
-(fn next-word [text i di]
-  (let [iwordboundary (next-match text i di #(is-nonword-char $1))]
-    (next-match text iwordboundary di #(not (is-nonword-char $1)))))
-
-(fn textnav [key i text]
-  (local imax (+ (length text) 1))
-  (match key
-    :left       (math.max 1 (- i 1))
-    :right      (math.min imax (+ i 1))
-    :ctrl+left  (next-word text i -1)
-    :ctrl+right (next-word text i 1)
-    :home       1
-    :end        imax))
-
-(fn selection-span [view]
-  (let [f       view.imstate.focus
-        iStart  (math.min f.i f.iAnchor)
-        iLim    (math.max f.i f.iAnchor)]
-    (values iStart iLim)))
-(fn selection-text [view text]
-  (local (iStart iLim) (selection-span view))
-  (text:sub iStart (- iLim 1)))
-
-(fn replace-selection [view s replacement ?iStart ?iLim]
-  (local (iStart iLim) (if ?iLim (values ?iStart ?iLim) (selection-span view)))
-  (local text
-    (.. (s:sub 1 (- iStart 1))
-        replacement
-        (s:sub iLim)))
-  (local iNew (+ iStart (length replacement)))
-  (set view.imstate.focus.i iNew)
-  (set view.imstate.focus.iAnchor iNew)
-  text)
-
-(fn textbox [view tag text x y w]
-  (var textNew (or text ""))
-  (local (h hText xText yText) (values (+ (style.font:get_height) 4) (style.font:get_height) (+ x 2) (+ y 2)))
-  (local initial-press (= view.imstate.left :pressed))
-
-  ; handle key events
-  (when (focus view tag x y w h {:i 1 :iAnchor 1 :blink (love.timer.getTime)})
-    (local f view.imstate.focus)
-    (when (> f.i (+ (length text) 1))       (set f.i (+ (length text) 1)))
-    (when (> f.iAnchor (+ (length text) 1)) (set f.iAnchor (+ (length text) 1)))
-    (when view.imstate.text
-      (set textNew (replace-selection view textNew view.imstate.text)))
-    (each [_ key (ipairs (or view.imstate.keys []))]
-      (set view.imstate.focus.blink (love.timer.getTime))
-      (if (= key :ctrl+c) (system.set_clipboard (selection-text view textNew))
-          (= key :ctrl+v) (set textNew (replace-selection view textNew (system.get_clipboard)))
-          (key:find "shift%+") (set f.i (or (textnav (key:gsub "shift%+" "") f.i textNew) f.i))
-        (let [iNav (textnav key f.i textNew)]
-          (when iNav
-            (set f.i iNav)
-            (set f.iAnchor iNav))
-          (when (or (= key :delete) (= key :backspace))
-            (local (iStartDel iLimDel)
-              (if (not= f.i f.iAnchor) (selection-span view)
-                  (= key :delete)      (values f.i (+ f.i 1))
-                  (= key :backspace)   (values (math.max 1 (- f.i 1)) f.i)))
-            (set textNew (replace-selection view textNew "" iStartDel iLimDel)))))))
-
-  ; handle mouse events
-  (when (mouse-inside x y w h) (set-cursor view :ibeam))
-  (when (and (focused? view tag) (active? view tag) (mouse-inside x y w h))
-    (local mouse-i (i-from-x textNew (love.mouse.getX) x style.font))
-    (when initial-press
-      (set view.imstate.focus.iAnchor mouse-i))
-    (set view.imstate.focus.i mouse-i))
-
-  ; draw box
-  (love.graphics.setLineWidth 1)
-  (love.graphics.rectangle :line x y w h)
-  (if (focused? view tag)
-    ; draw text with selection + caret
-    (let [(iStart iLim) (selection-span view)
-          xSelect (renderer.draw_text style.font (textNew:sub 1 (- iStart 1)) xText yText style.text)
-          sSelect (textNew:sub iStart (- iLim 1))
-          wSelect (style.font:get_width sSelect)
-          xTail   (+ xSelect wSelect)]
-      (when (> wSelect 0)
-        (renderer.draw_rect xSelect yText wSelect hText style.selection)
-        (renderer.draw_text style.font sSelect xSelect yText style.text))
-      (renderer.draw_text style.font (textNew:sub iLim) xTail yText style.text)
-      (when (or (active? view tag)
-                 (< (% (- (love.timer.getTime) view.imstate.focus.blink) (* blink_period 2)) blink_period))
-         (renderer.draw_rect (x-from-i textNew view.imstate.focus.i xText style.font) yText style.caret_width hText style.caret)))
-    ; just draw the text
-    (renderer.draw_text style.font textNew xText yText style.text))
-  (love.graphics.setColor 1 1 1)
-  (values textNew (+ y h)))
-
-(fn textfield [view label text x y wLabel wText]
-  (renderer.draw_text style.font label x y style.text)
-  (textbox view label text (+ x wLabel) y wText))
-
-(fn option-text [option]
-  (match (type option)
-    :string option
-    :table (or option.label (tostring option))
-    _ (tostring option)))
-
-(fn dropdown [view tag selection options x y w]
-  (local row-h (+ (style.font:get_height) style.padding.y))
-  (var new-selection nil)
-
-  (renderer.draw_rect x y w row-h style.selection)
-  (renderer.draw_text style.font (option-text selection) (+ x style.padding.x) (+ y (/ style.padding.y 2)) style.text)
-  (renderer.draw_text style.icon_font "-" (+ x w (- style.padding.x)) (+ y (/ style.padding.y 2)) style.text)
-
-  (when (focused? view tag)
-    (var row-y (+ y row-h))
-    (each [i option (ipairs options)]
-      (when (button view [(make-tag tag) i] x row-y w row-h)
-        (set new-selection option))
-      (set row-y (+ row-y row-h)))
-    (postpone view (fn []
-       (var row-y (+ y row-h))
-       (each [i option (ipairs options)]
-         (renderer.draw_rect x row-y w row-h style.selection)
-         (renderer.draw_text style.font (option-text option) (+ x style.padding.x) (+ row-y (/ style.padding.y 2)) style.text)
-       (set row-y (+ row-y row-h))))))
-  (focus view tag x y w row-h)
-  (values (or new-selection selection) (+ y row-h)))
-
-{: attach-imstate : cmd-predicate : postpone : mouse-inside : activate : active?
- : button : checkbox : textbox : textfield : textbutton : dropdown}

editor/init.fnl

@@ -3,7 +3,7 @@
 (local MapEditView (require :editor.mapedit))
 (local ScreenEditView (require :editor.screenedit))
 (local PortraitView (require :editor.portraitedit))
-(local {: cmd-predicate} (util.require :editor.imstate))
+(local {: cmd-predicate} (util.require :editor.imgui))
 (local core (require :core))
 (local command (require :core.command))
 (local keymap (require :core.keymap))

editor/screenedit.fnl

@@ -3,7 +3,7 @@
 (local lume (require :lib.lume))
 (local style (require :core.style))
 (local {: char-to-sprite : scanline-to-sprite : screen-y-to-offset} (util.require :editor.tiledraw))
-(local {: mouse-inside : activate : active? : checkbox : textfield : textbutton} (util.require :editor.imstate))
+(local {: mouse-inside : activate : active?} (util.require :editor.imgui))
 
 (local ScreenEditView (GraphicsEditView:extend))
 (local screen-scale 4)
@@ -54,7 +54,7 @@
 
 (fn ScreenEditView.draw-screen-editor [self x y]
   (local (w h) (values (* screenw screen-scale) (* screenh screen-scale)))
-  (activate self :screen x y w h)
+  (activate {:view self :tag :screen : x : y : w : h})
   (var screen self.screen)
   (when (and self.itile (mouse-inside x y w h))
     (local mx (math.floor (/ (- (love.mouse.getX) x) screen-scale)))

presentation/engine.fnl

@@ -2,7 +2,7 @@
 (local style (require :core.style))
 (local common (require :core.common))
 (local View (require :core.view))
-(local {: attach-imstate : textbutton} (require :editor.imstate))
+(local {: attach-imstate : textbutton} (require :editor.imgui))
 
 (local SlideshowView (View:extend))
 (fn SlideshowView.parse [slides]
@@ -107,13 +107,10 @@
 
 (fn SlideshowView.render-element [self element y]
   (if element.button
-      (let [(pressed yNext) (textbutton self
+      (let [form {:view self :font element.font
-                                        element.text
+                  :x (+ self.position.x (self:justify element (element.font:get_width element.text))) : y}]
-                                        (+ self.position.x (self:justify element (element.font:get_width element.text)))
+        (when (textbutton form element.text) (element:button))
-                                        y
+        (self:next-y element form.h y))
-                                        element.font)]
-        (when pressed (element:button))
-        (self:next-y element (- yNext y) y))
 
       element.text
       (let [lines (self:word-wrap element)

presentation/slides.fnl

@@ -25,8 +25,9 @@
    :justify :left
    :lowerPadding 7
    :pause-after true})
-(fn p [style ?text] (lume.merge style {:pause-after true} (if ?text {:text ?text :style false})))
+
-(fn np [style ?text] (lume.merge style {:pause-after false} (if ?text {:text ?text :style false})))
+(fn p [style ?text] (lume.merge style {:pause-after true} (if ?text {:text ?text :style false} {})))
+(fn np [style ?text] (lume.merge style {:pause-after false} (if ?text {:text ?text :style false} {})))
 
 (fn bgimg [filename] {:image filename :justify :center :overlay true :alpha 0.3 :topPadding 0})