Rework statemachine

core.fnl

@@ -219,6 +219,7 @@ Returns nil. This function causes side-effects.
                 :apps
                 :lib.bind
                 :lib.modal
+                :lib.new-modal
                 :lib.apps])
 
 (defadvice get-config-impl

lib/functional.fnl

@@ -206,6 +206,16 @@
   (let [filtered (filter f tbl)]
     (<= 1 (length filtered))))
 
+(fn conj
+  [tbl e]
+  "Return a new list with the element e added at the end"
+  (concat tbl [e]))
+
+(fn butlast
+  [tbl]
+  "Return a new list with all but the last item"
+  (slice 1 -1 tbl))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Others
@@ -226,9 +236,11 @@
 ;; Exports
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-{: call-when
+{: butlast
+ : call-when
  : compose
  : concat
+ : conj
  : contains?
  : count
  : eq?

lib/modal.fnl

@@ -12,8 +12,10 @@ switching menus in one place which is then powered by config.fnl.
 (local atom (require :lib.atom))
 (local statemachine (require :lib.statemachine))
 (local apps (require :lib.apps))
-(local {: call-when
+(local {: butlast
+        : call-when
         : concat
+        : conj
         : find
         : filter
         : has-some?
@@ -272,7 +274,7 @@ switching menus in one place which is then powered by config.fnl.
    :stop-timeout :nil
    :unbind-keys (bind-menu-keys menu.items)
    :history (if history
-                (concat [] history [menu])
+                (conj history menu)
                 [menu])})
 
 
@@ -438,7 +440,7 @@ switching menus in one place which is then powered by config.fnl.
                (show-modal-menu (merge state
                                        {:menu prev-menu
                                         :prev-menu menu}))
-               {:history (slice 1 -1 history)})
+               {:history (butlast history)})
         (idle->active state))))
 
 
@@ -536,4 +538,11 @@ switching menus in one place which is then powered by config.fnl.
 
 
 {:init           init
+ : modal-alert ;; DELETEME: Temporary for PR
+ : timeout ;; DELETEME: Temporary for PR
+ : by-key ;; DELETEME: Temporary for PR
+ : activate-modal ;; DELETEME: Temporary for PR
+ : deactivate-modal ;; DELETEME: Temporary for PR
+ : previous-modal ;; DELETEME: Temporary for PR
+ : proxy-app-action ;; DELETEME: Temporary for PR
  :activate-modal activate-modal}