From 265a2b25e588ec6ee467f95825098208e8e29212 Mon Sep 17 00:00:00 2001
From: Eli Dowling <eli.jambu@gmail.com>
Date: Mon, 30 Sep 2024 21:15:25 +1000
Subject: [PATCH] add signal lib for events. event to reset selection after
 commands

---
 flake.nix                                     |   43 +-
 forks/nottui/lib/nottui/dune                  |    2 +-
 forks/nottui/lib/nottui/nottui_main.ml        | 1111 +++++++++--------
 forks/nottui/lib/nottui/widgets/overlays.ml   |   16 +-
 forks/nottui/lib/nottui/widgets/overlays.mli  |    2 +
 .../lib/nottui/widgets/selection_list.ml      |   23 +-
 .../lib/nottui/widgets/selection_list.mli     |    2 +
 jj_tui/bin/dune                               |    2 +-
 jj_tui/bin/file_view.ml                       |    3 +-
 jj_tui/bin/global_vars.ml                     |   11 +
 jj_tui/bin/graph_view.ml                      |    5 +-
 jj_tui/bin/jj_commands.ml                     |   18 +-
 jj_tui/bin/jj_ui.ml                           |    3 +
 13 files changed, 707 insertions(+), 534 deletions(-)

diff --git a/flake.nix b/flake.nix
index 280254f..52fd7c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -130,15 +130,18 @@
                 version = "0.5.0";
                 duneVersion = "3";
                 src = picos_src;
-                buildInputs = with ocamlPackages;picos_io.buildInputs ++[
-                  picos
-                  picos_aux
-                  picos_std
-                  picos_io
-                  backoff
-                  multicore-magic
-                  thread-local-storage
-                ];
+                buildInputs =
+                  with ocamlPackages;
+                  picos_io.buildInputs
+                  ++ [
+                    picos
+                    picos_aux
+                    picos_std
+                    picos_io
+                    backoff
+                    multicore-magic
+                    thread-local-storage
+                  ];
 
                 strictDeps = true;
               };
@@ -168,7 +171,25 @@
                 ];
 
                 strictDeps = true;
+
+              };
+
+              signal = ocamlPackages.buildDunePackage {
+                pname = "signal";
+                version = "0.4.2";
+                duneVersion = "3";
+                src = pkgs.fetchFromGitHub {
+                  owner = "rizo";
+                  repo = "signal";
+                  rev = "704fefe7cd7b59e234a51bb470c7a3254468b5a8";
+                  sha256 = "sha256-AcphzD/4rrWnsVB5ebXzdthQ1Rrw3xXkv4n5ZHosoz0=";
+                };
+                buildInputs = with ocamlPackages; [
+
+                ];
+                strictDeps = true;
               };
+
               lwd = ocamlPackages.buildDunePackage {
                 pname = "lwd";
                 version = "0.1.0";
@@ -195,6 +216,7 @@
                   duneVersion = "3";
                   src = ./forks/nottui/.;
                   buildInputs = with ocamlPackages; [
+                  signal
                     lwd
                     notty-mine
                     seq
@@ -218,6 +240,7 @@
 
                   strictDeps = true;
                 };
+
               jj_tui_build_pkgs =
 
                 picos.buildInputs
@@ -235,6 +258,8 @@
 
                   picos_aux
 
+                  signal
+
                   ocamlPackages.logs
                   ocamlPackages.logs-ppx
 
diff --git a/forks/nottui/lib/nottui/dune b/forks/nottui/lib/nottui/dune
index e798699..3462f74 100644
--- a/forks/nottui/lib/nottui/dune
+++ b/forks/nottui/lib/nottui/dune
@@ -4,5 +4,5 @@
  (name nottui)
  (public_name nottui)
  (wrapped true)
- (libraries lwd notty notty.unix)
+ (libraries lwd notty notty.unix signal)
  )
diff --git a/forks/nottui/lib/nottui/nottui_main.ml b/forks/nottui/lib/nottui/nottui_main.ml
index 9ff0c98..c6caf49 100644
--- a/forks/nottui/lib/nottui/nottui_main.ml
+++ b/forks/nottui/lib/nottui/nottui_main.ml
@@ -1,35 +1,36 @@
 open Notty
 open Lwd_utils
 
-module Focus :
-sig
+module Focus : sig
   type var = int Lwd.var
   type handle
+
   val make : unit -> handle
   val request : handle -> unit
   val request_var : var -> unit
   val release : handle -> unit
 
-  val request_reversable : handle -> unit
   (** Request the focus and add to the focus stack *)
+  val request_reversable : handle -> unit
 
-  val release_reversable : handle -> unit
   (** Release the focus (if the handle has it) and restore the last focus on the stack *)
+  val release_reversable : handle -> unit
 
   type status =
     | Empty
     | Handle of int * var
     | Conflict of int
-  val peek_has_focus:handle->bool
 
+  val peek_has_focus : handle -> bool
   val empty : status
+
   (*val is_empty : status -> bool*)
   val status : handle -> status Lwd.t
   val has_focus : status -> bool
   val merge : status -> status -> status
 end = struct
   (*The focus system works by having a clock which changes each time the focus changes. An item has focus so long as its `var` is greater than 0
-  When we render the UI we go through and set anything with a focus value not matching that of the clock to 0  *)
+    When we render the UI we go through and set anything with a focus value not matching that of the clock to 0 *)
 
   type var = int Lwd.var
 
@@ -40,92 +41,84 @@ end = struct
 
   type handle = var * status Lwd.t
 
-  let make ():handle =
+  let make () : handle =
     let v = Lwd.var 0 in
-    (v,
-    (Lwd.get v)|> Lwd.map ~f:(fun i -> Handle (i, v)) 
-     )
+    v, Lwd.get v |> Lwd.map ~f:(fun i -> Handle (i, v))
+  ;;
 
   let empty : status = Empty
-
   let status (h : handle) : status Lwd.t = snd h
 
   let has_focus = function
     | Empty -> false
     | Handle (i, _) | Conflict i -> i > 0
+  ;;
 
-  let peek_has_focus (h : handle) : bool= fst h|>Lwd.peek>0
-
+  let peek_has_focus (h : handle) : bool = fst h |> Lwd.peek > 0
   let clock = ref 0
-
-  let currently_focused:var ref= ref (make()|>fst)
-
-  let focus_stack:var Stack.t= Stack.create()
+  let currently_focused : var ref = ref (make () |> fst)
+  let focus_stack : var Stack.t = Stack.create ()
 
   let request_var (v : var) =
     incr clock;
     Lwd.set v !clock;
-    currently_focused := v;
-    ;;
-  let request ((v, _ ): handle) = 
-    request_var v;
-    ;;
-  let release (v, _ : handle) = incr clock; Lwd.set v 0
+    currently_focused := v
+  ;;
 
+  let request ((v, _) : handle) = request_var v
 
-  let request_reversable (v, _ : handle)=
-      focus_stack|>Stack.push !currently_focused;
-      request_var v ;
+  let release ((v, _) : handle) =
+    incr clock;
+    Lwd.set v 0
   ;;
 
-  let release_reversable (v, _ : handle)=
-    (* we should only release if we actually have the focus*)
-    if (Lwd.peek v)>0 then
-    focus_stack|>Stack.pop |>request_var;
-
+  let request_reversable ((v, _) : handle) =
+    focus_stack |> Stack.push !currently_focused;
+    request_var v
   ;;
 
+  let release_reversable ((v, _) : handle) =
+    (* we should only release if we actually have the focus*)
+    if Lwd.peek v > 0 then focus_stack |> Stack.pop_opt |> Option.iter request_var
+  ;;
 
-  let merge s1 s2 : status = match s1, s2 with
+  let merge s1 s2 : status =
+    match s1, s2 with
     | Empty, x | x, Empty -> x
     | _, Handle (0, _) -> s1
     | Handle (0, _), _ -> s2
     | Handle (i1, _), Handle (i2, _) when i1 = i2 -> s1
     | (Handle (i1, _) | Conflict i1), Conflict i2 when i1 < i2 -> s2
-    | (Handle (i1, _) | Conflict i1), Handle (i2, _) when i1 < i2 ->
-      Conflict i2
+    | (Handle (i1, _) | Conflict i1), Handle (i2, _) when i1 < i2 -> Conflict i2
     | Conflict _, (Handle (_, _) | Conflict _) -> s1
     | Handle (i1, _), (Handle (_, _) | Conflict _) -> Conflict i1
+  ;;
 
-    (*
-    Can i get the currently focused focus handle??
-
-    I could modify the focus handle so that it stores the last focused thing. That way when i call focus release on it it can return us to that. In a sense this would be almost like a linked list.
-    I have an issue that if the focus isn't stored in the UI somewhere if i have two concurrent UIs their focus control will collide. Is this a real concern? Could I store the current focus in the root node, or as part of the UI rendering?
-
-    The renderer could store the currently focused item.
-    When we walk the focus tree, if the items are focused we keep walking untill we hit the end and then we assign that as the focused item.
-    When switching focus we use that focused item.
-
-
-    Would could have a FocusManager module. It stores the most recently focused item and also has the focus heap. When you request focus it can either be a queue adding request or a non queue adding request. When i release focus it will always release back to the last item in the heap
-    *)
+  (*
+     Can i get the currently focused focus handle??
 
+     I could modify the focus handle so that it stores the last focused thing. That way when i call focus release on it it can return us to that. In a sense this would be almost like a linked list.
+     I have an issue that if the focus isn't stored in the UI somewhere if i have two concurrent UIs their focus control will collide. Is this a real concern? Could I store the current focus in the root node, or as part of the UI rendering?
 
+     The renderer could store the currently focused item.
+     When we walk the focus tree, if the items are focused we keep walking untill we hit the end and then we assign that as the focused item.
+     When switching focus we use that focused item.
 
-  
+     Would could have a FocusManager module. It stores the most recently focused item and also has the focus heap. When you request focus it can either be a queue adding request or a non queue adding request. When i release focus it will always release back to the last item in the heap
+  *)
 end
 
-
-module Gravity :
-sig
-  type direction = [
-    | `Negative
+module Gravity : sig
+  type direction =
+    [ `Negative
     | `Neutral
     | `Positive
-  ]
+    ]
+
   val pp_direction : Format.formatter -> direction -> unit
+
   type t
+
   val pp : Format.formatter -> t -> unit
   val make : h:direction -> v:direction -> t
   val default : t
@@ -133,12 +126,17 @@ sig
   val v : t -> direction
 
   type t2
+
   val pair : t -> t -> t2
   val p1 : t2 -> t
   val p2 : t2 -> t
-end =
-struct
-  type direction = [ `Negative | `Neutral | `Positive ]
+end = struct
+  type direction =
+    [ `Negative
+    | `Neutral
+    | `Positive
+    ]
+
   type t = int
   type t2 = int
 
@@ -146,45 +144,49 @@ struct
 
   let pack = function
     | `Negative -> 0
-    | `Neutral  -> 1
+    | `Neutral -> 1
     | `Positive -> 2
+  ;;
 
   let unpack = function
     | 0 -> `Negative
     | 1 -> `Neutral
     | _ -> `Positive
+  ;;
 
-  let make ~h ~v =
-    (pack h lsl 2) lor pack v
-
+  let make ~h ~v = (pack h lsl 2) lor pack v
   let h x = unpack (x lsr 2)
   let v x = unpack (x land 3)
 
   let pp_direction ppf dir =
-    let text = match dir with
+    let text =
+      match dir with
       | `Negative -> "`Negative"
-      | `Neutral  -> "`Neutral"
+      | `Neutral -> "`Neutral"
       | `Positive -> "`Positive"
     in
     Format.pp_print_string ppf text
+  ;;
 
   let pp ppf g =
     Format.fprintf ppf "{ h = %a; v = %a }" pp_direction (h g) pp_direction (v g)
+  ;;
 
-  let pair t1 t2 =
-    (t1 lsl 4) lor t2
-
+  let pair t1 t2 = (t1 lsl 4) lor t2
   let p1 t = (t lsr 4) land 15
   let p2 t = t land 15
 end
+
 type gravity = Gravity.t
 
 module Interval : sig
   type t = private int
+
   val make : int -> int -> t
   val shift : t -> int -> t
   val fst : t -> int
   val snd : t -> int
+
   (*val size : t -> int*)
   val zero : t
 end = struct
@@ -197,49 +199,75 @@ end = struct
     let size = y - x in
     (*assert (size >= 0);*)
     (x lsl half) lor (size land mask)
+  ;;
 
-  let shift t d =
-    t + d lsl half
-
+  let shift t d = t + (d lsl half)
   let fst t = t asr half
   let size t = t land mask
   let snd t = fst t + size t
-
   let zero = 0
 end
 
-module Ui =
-struct
-
-  type mouse_handler = x:int -> y:int -> Unescape.button -> [
-      | `Unhandled
-      | `Handled
-      | `Grab of (x:int -> y:int -> unit) * (x:int -> y:int -> unit)
+module Ui = struct
+  type mouse_handler =
+    x:int
+    -> y:int
+    -> Unescape.button
+    -> [ `Unhandled
+       | `Handled
+       | `Grab of (x:int -> y:int -> unit) * (x:int -> y:int -> unit)
+       ]
+
+  type semantic_key =
+    [ (* Clipboard *)
+      `Copy
+    | `Paste
+    | (* Focus management *)
+      `Focus of
+      [ `Out | `Next | `Prev | `Left | `Right | `Up | `Down ]
     ]
 
-  type semantic_key = [
-    (* Clipboard *)
-    | `Copy
-    | `Paste
-    (* Focus management *)
-    | `Focus of [`Out| `Next | `Prev | `Left | `Right | `Up | `Down]
-  ]
+  type key =
+    [ Unescape.special | `Uchar of Uchar.t | `ASCII of char | semantic_key ]
+    * Unescape.mods
 
-  type key = [
-    | Unescape.special | `Uchar of Uchar.t | `ASCII of char | semantic_key
-  ] * Unescape.mods
-  type may_handle = [ `Unhandled | `Handled | `Remap of key ]
+  type may_handle =
+    [ `Unhandled
+    | `Handled
+    | `Remap of key
+    ]
 
   type mouse = Unescape.mouse
 
-  type event = [ `Key of key | `Mouse of mouse | `Paste of Unescape.paste ]
-
-  type layout_spec = { w : int; h : int; sw : int; sh : int ; mw : int; mh : int}
+  type event =
+    [ `Key of key
+    | `Mouse of mouse
+    | `Paste of Unescape.paste
+    ]
 
-  let pp_layout_spec ppf { w; h; sw; sh;mw;mh } =
-    Format.fprintf ppf "{ w = %d; h = %d; sw = %d; sh = %d; mw= %d; mh=%d;  }" w h sw sh mw mh
+  type layout_spec =
+    { w : int
+    ; h : int
+    ; sw : int
+    ; sh : int
+    ; mw : int
+    ; mh : int
+    }
+
+  let pp_layout_spec ppf { w; h; sw; sh; mw; mh } =
+    Format.fprintf
+      ppf
+      "{ w = %d; h = %d; sw = %d; sh = %d; mw= %d; mh=%d;  }"
+      w
+      h
+      sw
+      sh
+      mw
+      mh
+  ;;
 
   type flags = int
+
   let flags_none = 0
   let flag_transient_sensor = 1
   let flag_permanent_sensor = 2
@@ -247,20 +275,26 @@ struct
   type size_sensor = w:int -> h:int -> unit
   type frame_sensor = x:int -> y:int -> w:int -> h:int -> unit -> unit
 
-  type t = {
-    w : int; sw : int;
-    mw : int; mh : int;
-    h : int; sh : int;
-    mutable desc : desc;
-    focus : Focus.status;
-    mutable flags : flags;
-    mutable sensor_cache : (int * int * int * int) option;
-    mutable cache : cache;
-  }
-  and cache = {
-    vx : Interval.t; vy : Interval.t;
-    image : image;
-  }
+  type t =
+    { w : int
+    ; sw : int
+    ; mw : int
+    ; mh : int
+    ; h : int
+    ; sh : int
+    ; mutable desc : desc
+    ; focus : Focus.status
+    ; mutable flags : flags
+    ; mutable sensor_cache : (int * int * int * int) option
+    ; mutable cache : cache
+    }
+
+  and cache =
+    { vx : Interval.t
+    ; vy : Interval.t
+    ; image : image
+    }
+
   and desc =
     | Atom of image
     | Size_sensor of t * size_sensor
@@ -270,37 +304,52 @@ struct
     | Mouse_handler of t * mouse_handler
     | Focus_area of t * (key -> may_handle)
     | Shift_area of t * int * int
-    | Event_filter of t * ([`Key of key | `Mouse of mouse] -> may_handle)
+    | Event_filter of t * ([ `Key of key | `Mouse of mouse ] -> may_handle)
     | X of t * t
     | Y of t * t
     | Z of t * t
 
-
   let layout_spec t : layout_spec =
-    { w = t.w; h = t.h; sw = t.sw; sh = t.sh ; mw=t.mw; mh=t.mh }
+    { w = t.w; h = t.h; sw = t.sw; sh = t.sh; mw = t.mw; mh = t.mh }
+  ;;
+
   let layout_width t = t.w
   let layout_stretch_width t = t.sw
   let layout_height t = t.h
   let layout_stretch_height t = t.sh
   let layout_max_width t = t.mw
   let layout_max_height t = t.mh
-
-  let cache : cache =
-    { vx = Interval.zero; vy = Interval.zero; image = I.empty }
+  let cache : cache = { vx = Interval.zero; vy = Interval.zero; image = I.empty }
 
   let empty : t =
-    { w = 0; sw = 0; h = 0; sh = 0; mw= 0; mh=0; flags = flags_none;
-      focus = Focus.empty; desc = Atom I.empty;
-      sensor_cache = None; cache }
+    { w = 0
+    ; sw = 0
+    ; h = 0
+    ; sh = 0
+    ; mw = 0
+    ; mh = 0
+    ; flags = flags_none
+    ; focus = Focus.empty
+    ; desc = Atom I.empty
+    ; sensor_cache = None
+    ; cache
+    }
+  ;;
 
   let atom img : t =
-    { w = I.width img; sw = 0;
-    mw=I.width img;
-    mh=I.height img;
-      h = I.height img; sh = 0;
-      focus = Focus.empty; flags = flags_none;
-      desc = Atom img;
-      sensor_cache = None; cache; }
+    { w = I.width img
+    ; sw = 0
+    ; mw = I.width img
+    ; mh = I.height img
+    ; h = I.height img
+    ; sh = 0
+    ; focus = Focus.empty
+    ; flags = flags_none
+    ; desc = Atom img
+    ; sensor_cache = None
+    ; cache
+    }
+  ;;
 
   let space_1_0 = atom (I.void 1 0)
   let space_0_1 = atom (I.void 0 1)
@@ -313,160 +362,195 @@ struct
     | 0, 1 -> space_0_1
     | 1, 1 -> space_1_1
     | _ -> atom (I.void x y)
+  ;;
 
-  let mouse_area f t : t =
-    { t with desc = Mouse_handler (t, f) }
+  let mouse_area f t : t = { t with desc = Mouse_handler (t, f) }
 
   let keyboard_area ?focus f t : t =
-    let focus = match focus with
+    let focus =
+      match focus with
       | None -> t.focus
       | Some focus -> Focus.merge focus t.focus
     in
     { t with desc = Focus_area (t, f); focus }
+  ;;
 
-  let shift_area x y t : t =
-    { t with desc = Shift_area (t, x, y) }
-
-  let size_sensor handler t : t =
-    { t with desc = Size_sensor (t, handler) }
+  let shift_area x y t : t = { t with desc = Shift_area (t, x, y) }
+  let size_sensor handler t : t = { t with desc = Size_sensor (t, handler) }
 
   let transient_sensor frame_sensor t =
-    { t with desc = Transient_sensor (t, frame_sensor);
-             flags = t.flags lor flag_transient_sensor }
+    { t with
+      desc = Transient_sensor (t, frame_sensor)
+    ; flags = t.flags lor flag_transient_sensor
+    }
+  ;;
 
   let permanent_sensor frame_sensor t =
-    { t with desc = Permanent_sensor (t, frame_sensor);
-             flags = t.flags lor flag_permanent_sensor }
+    { t with
+      desc = Permanent_sensor (t, frame_sensor)
+    ; flags = t.flags lor flag_permanent_sensor
+    }
+  ;;
 
   let prepare_gravity = function
     | None, None -> Gravity.(pair default default)
     | Some g, None | None, Some g -> Gravity.(pair g g)
     | Some pad, Some crop -> Gravity.(pair pad crop)
+  ;;
 
-  let resize ?w ?h ?sw ?sh ?mw ?mh ?pad ?crop ?(bg=A.empty) t : t =
+  let resize ?w ?h ?sw ?sh ?mw ?mh ?pad ?crop ?(bg = A.empty) t : t =
     let g = prepare_gravity (pad, crop) in
-    match (w, t.w), (h, t.h), (sw, t.sw), (sh, t.sh), (mw,t.mw) ,(mh,t.mh) with
-    | (Some w, _ | None, w), (Some h, _ | None, h),
-      (Some sw, _ | None, sw), (Some sh, _ | None, sh), (Some mw, _ | None, mw),(Some mh, _ | None, mh) ->
-      let mw= if w>mw then w else mw 
-      and mh= if h>mh then h else mh
-      in
-      {t with w; h; sw; sh; mw; mh; desc = Resize (t, g, bg)}
+    match (w, t.w), (h, t.h), (sw, t.sw), (sh, t.sh), (mw, t.mw), (mh, t.mh) with
+    | ( (Some w, _ | None, w)
+      , (Some h, _ | None, h)
+      , (Some sw, _ | None, sw)
+      , (Some sh, _ | None, sh)
+      , (Some mw, _ | None, mw)
+      , (Some mh, _ | None, mh) ) ->
+      let mw = if w > mw then w else mw
+      and mh = if h > mh then h else mh in
+      { t with w; h; sw; sh; mw; mh; desc = Resize (t, g, bg) }
+  ;;
 
-  let resize_to ({w; h; sw; sh;mw;mh} : layout_spec) ?pad ?crop ?(bg=A.empty) t : t =
+  let resize_to ({ w; h; sw; sh; mw; mh } : layout_spec) ?pad ?crop ?(bg = A.empty) t : t =
     let g = prepare_gravity (pad, crop) in
-    let mw= if w>mw then w else mw 
-    and mh= if h>mh then h else mh
-    in
-    {t with w; h; sw; sh; mw; mh; desc = Resize (t, g, bg)}
+    let mw = if w > mw then w else mw
+    and mh = if h > mh then h else mh in
+    { t with w; h; sw; sh; mw; mh; desc = Resize (t, g, bg) }
+  ;;
 
   let event_filter ?focus f t : t =
-    let focus = match focus with
+    let focus =
+      match focus with
       | None -> t.focus
       | Some focus -> focus
     in
     { t with desc = Event_filter (t, f); focus }
+  ;;
+
+  let join_x a b =
+    { w = a.w + b.w
+    ; sw = a.sw + b.sw
+    ; h = maxi a.h b.h
+    ; sh = maxi a.sh b.sh
+    ; mw = a.mw + b.mw
+    ; mh = maxi a.mh b.mh
+    ; flags = a.flags lor b.flags
+    ; focus = Focus.merge a.focus b.focus
+    ; desc = X (a, b)
+    ; sensor_cache = None
+    ; cache
+    }
+  ;;
+
+  let join_y a b =
+    { w = maxi a.w b.w
+    ; sw = maxi a.sw b.sw
+    ; h = a.h + b.h
+    ; sh = a.sh + b.sh
+    ; mw = maxi a.mw b.mw
+    ; mh = a.mh + b.mh
+    ; flags = a.flags lor b.flags
+    ; focus = Focus.merge a.focus b.focus
+    ; desc = Y (a, b)
+    ; sensor_cache = None
+    ; cache
+    }
+  ;;
 
-  let join_x a b = {
-    w = (a.w + b.w);   sw = (a.sw + b.sw);
-    h = (maxi a.h b.h); sh = (maxi a.sh b.sh);
-    mw=a.mw+b.mw;
-    mh=maxi a.mh b.mh;
-    flags = a.flags lor b.flags;
-    focus = Focus.merge a.focus b.focus; desc = X (a, b);
-    sensor_cache = None; cache
-  }
-
-  let join_y a b = {
-    w = (maxi a.w b.w); sw = (maxi a.sw b.sw);
-    h = (a.h + b.h);   sh = (a.sh + b.sh);
-    mw=maxi a.mw b.mw;
-    mh=a.mh+b.mh;
-    flags = a.flags lor b.flags;
-    focus = Focus.merge a.focus b.focus; desc = Y (a, b);
-    sensor_cache = None; cache;
-  }
-
-  let join_z a b = {
-    w = (maxi a.w b.w); sw = (maxi a.sw b.sw);
-    h = (maxi a.h b.h); sh = (maxi a.sh b.sh);
-    mw=maxi a.mw b.mw;
-    mh=maxi a.mh b.mh;
-    flags = a.flags lor b.flags;
-    focus = Focus.merge a.focus b.focus; desc = Z (a, b);
-    sensor_cache = None; cache;
-  }
-
-  let pack_x = (empty, join_x)
-  let pack_y = (empty, join_y)
-  let pack_z = (empty, join_z)
+  let join_z a b =
+    { w = maxi a.w b.w
+    ; sw = maxi a.sw b.sw
+    ; h = maxi a.h b.h
+    ; sh = maxi a.sh b.sh
+    ; mw = maxi a.mw b.mw
+    ; mh = maxi a.mh b.mh
+    ; flags = a.flags lor b.flags
+    ; focus = Focus.merge a.focus b.focus
+    ; desc = Z (a, b)
+    ; sensor_cache = None
+    ; cache
+    }
+  ;;
 
+  let pack_x = empty, join_x
+  let pack_y = empty, join_y
+  let pack_z = empty, join_z
   let hcat xs = Lwd_utils.reduce pack_x xs
   let vcat xs = Lwd_utils.reduce pack_y xs
   let zcat xs = Lwd_utils.reduce pack_z xs
-
   let has_focus t = Focus.has_focus t.focus
 
   let rec pp ppf t =
-    Format.fprintf ppf
+    Format.fprintf
+      ppf
       "@[<hov>{@ w = %d;@ h = %d;@ sw = %d;@ sh = %d;@ desc = @[%a@];@ }@]"
-      t.w t.h t.sw t.sh pp_desc t.desc
+      t.w
+      t.h
+      t.sw
+      t.sh
+      pp_desc
+      t.desc
 
   and pp_desc ppf = function
-    | Atom _   -> Format.fprintf ppf "Atom _"
-    | Size_sensor (desc, _) ->
-      Format.fprintf ppf "Size_sensor (@[%a,@ _@])" pp desc
+    | Atom _ -> Format.fprintf ppf "Atom _"
+    | Size_sensor (desc, _) -> Format.fprintf ppf "Size_sensor (@[%a,@ _@])" pp desc
     | Transient_sensor (desc, _) ->
       Format.fprintf ppf "Transient_sensor (@[%a,@ _@])" pp desc
     | Permanent_sensor (desc, _) ->
       Format.fprintf ppf "Permanent_sensor (@[%a,@ _@])" pp desc
     | Resize (desc, gravity, _bg) ->
-      Format.fprintf ppf "Resize (@[%a,@ %a,@ %a@])" pp desc
-        Gravity.pp (Gravity.p1 gravity)
-        Gravity.pp (Gravity.p2 gravity)
-    | Mouse_handler (n, _) ->
-      Format.fprintf ppf "Mouse_handler (@[%a,@ _@])" pp n
-    | Focus_area (n, _) ->
-      Format.fprintf ppf "Focus_area (@[%a,@ _@])" pp n
-    | Shift_area (n, _, _) ->
-      Format.fprintf ppf "Shift_area (@[%a,@ _@])" pp n
-    | Event_filter (n, _) ->
-      Format.fprintf ppf "Event_filter (@[%a,@ _@])" pp n
+      Format.fprintf
+        ppf
+        "Resize (@[%a,@ %a,@ %a@])"
+        pp
+        desc
+        Gravity.pp
+        (Gravity.p1 gravity)
+        Gravity.pp
+        (Gravity.p2 gravity)
+    | Mouse_handler (n, _) -> Format.fprintf ppf "Mouse_handler (@[%a,@ _@])" pp n
+    | Focus_area (n, _) -> Format.fprintf ppf "Focus_area (@[%a,@ _@])" pp n
+    | Shift_area (n, _, _) -> Format.fprintf ppf "Shift_area (@[%a,@ _@])" pp n
+    | Event_filter (n, _) -> Format.fprintf ppf "Event_filter (@[%a,@ _@])" pp n
     | X (a, b) -> Format.fprintf ppf "X (@[%a,@ %a@])" pp a pp b
     | Y (a, b) -> Format.fprintf ppf "Y (@[%a,@ %a@])" pp a pp b
     | Z (a, b) -> Format.fprintf ppf "Z (@[%a,@ %a@])" pp a pp b
+  ;;
 
-  let iter f ui = match ui.desc with
+  let iter f ui =
+    match ui.desc with
     | Atom _ -> ()
-    | Size_sensor (u, _) | Transient_sensor (u, _) | Permanent_sensor (u, _)
-    | Resize (u, _, _) | Mouse_handler (u, _)
-    | Focus_area (u, _) | Shift_area (u, _, _) | Event_filter (u, _)
-      -> f u
-    | X (u1, u2) | Y (u1, u2) | Z (u1, u2) -> f u1; f u2
+    | Size_sensor (u, _)
+    | Transient_sensor (u, _)
+    | Permanent_sensor (u, _)
+    | Resize (u, _, _)
+    | Mouse_handler (u, _)
+    | Focus_area (u, _)
+    | Shift_area (u, _, _)
+    | Event_filter (u, _) -> f u
+    | X (u1, u2) | Y (u1, u2) | Z (u1, u2) ->
+      f u1;
+      f u2
+  ;;
 end
+
 type ui = Ui.t
 
-module Renderer =
-struct
+module Renderer = struct
   open Ui
 
   type size = int * int
-
   type grab_function = (x:int -> y:int -> unit) * (x:int -> y:int -> unit)
-  type t = {
-    mutable size : size;
-    mutable view : ui;
-    mutable mouse_grab : grab_function option;
-  }
-
-  let make () = {
-    mouse_grab = None;
-    size = (0, 0);
-    view = Ui.empty;
-  }
 
-  let size t = t.size
+  type t =
+    { mutable size : size
+    ; mutable view : ui
+    ; mutable mouse_grab : grab_function option
+    }
 
+  let make () = { mouse_grab = None; size = 0, 0; view = Ui.empty }
+  let size t = t.size
 
   let solve_focus ui i =
     let rec aux ui =
@@ -477,95 +561,79 @@ struct
       | Focus.Conflict _ -> Ui.iter aux ui
     in
     aux ui
+  ;;
 
-(* this generates the share of a space between two ui elements *)
+  (* this generates the share of a space between two ui elements *)
   let split ~mA:aMax ~mB:bMax ~a ~sa ~b ~sb total =
     (*total stretch value*)
     let stretch = sa + sb in
     (*the free space the two elements have*)
     let flex = total - a - b in
     (*if we have a stretch value and space to stretch into*)
-    let canStretch=stretch > 0 && flex > 0 in
-
-    if canStretch then
-      let ratio =
-        if sa > sb then
-          flex * sa / stretch
-        else
-          flex - flex * sb / stretch
-   
-
-      in
+    let canStretch = stretch > 0 && flex > 0 in
+    if canStretch
+    then (
+      let ratio = if sa > sb then flex * sa / stretch else flex - (flex * sb / stretch) in
       (* this is way to complex but basically:
-      1. stretch a, if we hit max give the leftover to b
-      2. stretch b give the leftover to a
-      3. check if a is overstretched
+         1. stretch a, if we hit max give the leftover to b
+         2. stretch b give the leftover to a
+         3. check if a is overstretched
       *)
-      let aRatio,bRatio= ref (a+ratio), ref (b+flex-ratio) in
-
-      let aMaxed =ref false in
-      if !aRatio>aMax then 
-        (
-        bRatio:=!bRatio+(!aRatio-aMax); 
-        aRatio:=aMax ;
-        aMaxed:=true
-        );
-     if (!bRatio)>bMax  then
-     begin
-       if !aMaxed then
-         bRatio:=bMax
-       else
-        aRatio:=!aRatio+(!bRatio-bMax);
-        bRatio:=bMax;
-        end;
-      if !aRatio>aMax then 
-        aRatio:=aMax ;
-
-      (!aRatio,!bRatio)
-
-    else
-      (a, b)
+      let aRatio, bRatio = ref (a + ratio), ref (b + flex - ratio) in
+      let aMaxed = ref false in
+      if !aRatio > aMax
+      then (
+        bRatio := !bRatio + (!aRatio - aMax);
+        aRatio := aMax;
+        aMaxed := true);
+      if !bRatio > bMax
+      then (
+        if !aMaxed then bRatio := bMax else aRatio := !aRatio + (!bRatio - bMax);
+        bRatio := bMax);
+      if !aRatio > aMax then aRatio := aMax;
+      !aRatio, !bRatio)
+    else a, b
+  ;;
 
   let pack ~max ~fixed ~stretch total g1 g2 =
     (*flex is the space we should expand into if we stretch*)
     let flex = total - fixed in
-    if stretch > 0 && flex >= 0 && max >total then
-      (0, total)
-    else
-    (* If we can stretch and we have space to expand into and we got here we must have wanted to stretch beyond the max which means we should stretch to max and recalculate the flex*)
-      let (fixed,flex)=if stretch > 0 && total >= max then (max,total-max) else (fixed,flex) in
-
+    if stretch > 0 && flex >= 0 && max > total
+    then 0, total
+    else (
+      (* If we can stretch and we have space to expand into and we got here we must have wanted to stretch beyond the max which means we should stretch to max and recalculate the flex*)
+      let fixed, flex =
+        if stretch > 0 && total >= max then max, total - max else fixed, flex
+      in
       let gravity = if flex >= 0 then g1 else g2 in
-
       match gravity with
-      | `Negative -> (0, fixed)
-      | `Neutral  -> (flex / 2, fixed)
-      | `Positive -> (flex, fixed)
+      | `Negative -> 0, fixed
+      | `Neutral -> flex / 2, fixed
+      | `Positive -> flex, fixed)
+  ;;
 
   let has_transient_sensor flags = flags land flag_transient_sensor <> 0
   let has_permanent_sensor flags = flags land flag_permanent_sensor <> 0
 
   let rec update_sensors ox oy sw sh mw mh ui =
-    if has_transient_sensor ui.flags || (
-        has_permanent_sensor ui.flags &&
-        match ui.sensor_cache with
-        | None -> true
-        | Some (ox', oy', sw', sh') ->
-          not (ox = ox' && oy = oy' && sw = sw' && sh = sh')
-      )
+    if has_transient_sensor ui.flags
+       || (has_permanent_sensor ui.flags
+           &&
+           match ui.sensor_cache with
+           | None -> true
+           | Some (ox', oy', sw', sh') ->
+             not (ox = ox' && oy = oy' && sw = sw' && sh = sh'))
     then (
       ui.flags <- ui.flags land lnot flag_transient_sensor;
-      if has_permanent_sensor ui.flags then
-        ui.sensor_cache <- Some (ox, oy, sw, sh);
+      if has_permanent_sensor ui.flags then ui.sensor_cache <- Some (ox, oy, sw, sh);
       match ui.desc with
       | Atom _ -> ()
-      | Size_sensor (t, _) | Mouse_handler (t, _)
-      | Focus_area (t, _) | Event_filter (t, _) ->
-        update_sensors ox oy sw sh mw mh  t
+      | Size_sensor (t, _) | Mouse_handler (t, _) | Focus_area (t, _) | Event_filter (t, _)
+        -> update_sensors ox oy sw sh mw mh t
       | Transient_sensor (t, sensor) ->
         ui.desc <- t.desc;
         let sensor = sensor ~x:ox ~y:oy ~w:sw ~h:sh in
-        update_sensors ox oy sw sh  mw mh  t;
+        update_sensors ox oy sw sh mw mh t;
         sensor ()
       | Permanent_sensor (t, sensor) ->
         let sensor = sensor ~x:ox ~y:oy ~w:sw ~h:sh in
@@ -575,9 +643,8 @@ struct
         let open Gravity in
         let dx, rw = pack ~max:t.mw ~fixed:t.w ~stretch:t.sw sw (h (p1 g)) (h (p2 g)) in
         let dy, rh = pack ~max:t.mh ~fixed:t.h ~stretch:t.sh sh (v (p1 g)) (v (p2 g)) in
-        update_sensors (ox + dx) (oy + dy) rw rh  mw mh t
-      | Shift_area (t, sx, sy) ->
-        update_sensors (ox - sx) (oy - sy) sw sh  mw mh  t
+        update_sensors (ox + dx) (oy + dy) rw rh mw mh t
+      | Shift_area (t, sx, sy) -> update_sensors (ox - sx) (oy - sy) sw sh mw mh t
       | X (a, b) ->
         let aw, bw = split ~a:a.w ~sa:a.sw ~b:b.w ~sb:b.sw ~mA:a.mw ~mB:b.mw sw in
         update_sensors ox oy aw sh mw mh a;
@@ -585,73 +652,72 @@ struct
       | Y (a, b) ->
         let ah, bh = split ~a:a.h ~sa:a.sh ~b:b.h ~sb:b.sh ~mA:a.mh ~mB:b.mh sh in
         update_sensors ox oy sw ah mw mh a;
-        update_sensors ox (oy + ah) sw bh mw mh  b
+        update_sensors ox (oy + ah) sw bh mw mh b
       | Z (a, b) ->
         update_sensors ox oy sw sh mw mh a;
-        update_sensors ox oy sw sh mw mh b
-    )
+        update_sensors ox oy sw sh mw mh b)
+  ;;
 
   (** goes through all focuses and attempts to resolve any that have changed*)
   let update_focus ui =
     match ui.focus with
     | Focus.Empty | Focus.Handle _ -> ()
     | Focus.Conflict i -> solve_focus ui i
+  ;;
 
   let update t size ui =
     t.size <- size;
     t.view <- ui;
     (* TODO:I think i need to do something here*)
-    update_sensors 0 0 (fst size) (snd size)  (fst size) (snd size)ui;
+    update_sensors 0 0 (fst size) (snd size) (fst size) (snd size) ui;
     update_focus ui
+  ;;
 
   let dispatch_mouse st x y btn w h t =
     let handle ox oy f =
       match f ~x:(x - ox) ~y:(y - oy) btn with
       | `Unhandled -> false
       | `Handled -> true
-      | `Grab f -> st.mouse_grab <- Some f; true
+      | `Grab f ->
+        st.mouse_grab <- Some f;
+        true
     in
     let rec aux ox oy sw sh t =
       match t.desc with
       | Atom _ -> false
       | X (a, b) ->
         let aw, bw = split ~a:a.w ~sa:a.sw ~b:b.w ~sb:b.sw ~mA:a.mh ~mB:b.mh sw in
-        if x - ox < aw
-        then aux ox oy aw sh a
-        else aux (ox + aw) oy bw sh b
+        if x - ox < aw then aux ox oy aw sh a else aux (ox + aw) oy bw sh b
       | Y (a, b) ->
         let ah, bh = split ~a:a.h ~sa:a.sh ~b:b.h ~sb:b.sh ~mA:a.mh ~mB:b.mh sh in
-        if y - oy < ah
-        then aux ox oy sw ah a
-        else aux ox (oy + ah) sw bh b
-      | Z (a, b) ->
-        aux ox oy sw sh b || aux ox oy sw sh a
+        if y - oy < ah then aux ox oy sw ah a else aux ox (oy + ah) sw bh b
+      | Z (a, b) -> aux ox oy sw sh b || aux ox oy sw sh a
       | Mouse_handler (t, f) ->
         let _offsetx, rw = pack ~max:t.mw ~fixed:t.w ~stretch:t.sw sw `Negative `Negative
-        and _offsety, rh = pack  ~max:t.mh~fixed:t.h ~stretch:t.sh sh `Negative `Negative
+        and _offsety, rh =
+          pack ~max:t.mh ~fixed:t.h ~stretch:t.sh sh `Negative `Negative
         in
         assert (_offsetx = 0 && _offsety = 0);
-        (x - ox >= 0 && x - ox <= rw && y - oy >= 0 && y - oy <= rh) &&
-        (aux ox oy sw sh t || handle ox oy f)
+        (x - ox >= 0 && x - ox <= rw && y - oy >= 0 && y - oy <= rh)
+        && (aux ox oy sw sh t || handle ox oy f)
       | Size_sensor (desc, _)
-      | Transient_sensor (desc, _) | Permanent_sensor (desc, _)
-      | Focus_area (desc, _) ->
-        aux ox oy sw sh desc
-      | Shift_area (desc, sx, sy) ->
-        aux (ox - sx) (oy - sy) sw sh desc
+      | Transient_sensor (desc, _)
+      | Permanent_sensor (desc, _)
+      | Focus_area (desc, _) -> aux ox oy sw sh desc
+      | Shift_area (desc, sx, sy) -> aux (ox - sx) (oy - sy) sw sh desc
       | Resize (t, g, _bg) ->
         let open Gravity in
-        let dx, rw = pack  ~max:t.mw~fixed:t.w ~stretch:t.sw sw (h (p1 g)) (h (p2 g)) in
-        let dy, rh = pack  ~max:t.mh~fixed:t.h ~stretch:t.sh sh (v (p1 g)) (v (p2 g)) in
+        let dx, rw = pack ~max:t.mw ~fixed:t.w ~stretch:t.sw sw (h (p1 g)) (h (p2 g)) in
+        let dy, rh = pack ~max:t.mh ~fixed:t.h ~stretch:t.sh sh (v (p1 g)) (v (p2 g)) in
         aux (ox + dx) (oy + dy) rw rh t
       | Event_filter (n, f) ->
-        begin match f (`Mouse (`Press btn, (x, y), [])) with
-          | `Handled -> true
-          | `Unhandled -> aux ox oy sw sh n
-          | `Remap _ -> failwith "Cannot remap mouse events"
-        end
+        (match f (`Mouse (`Press btn, (x, y), [])) with
+         | `Handled -> true
+         | `Unhandled -> aux ox oy sw sh n
+         | `Remap _ -> failwith "Cannot remap mouse events")
     in
     aux 0 0 w h t
+  ;;
 
   let release_grab st x y =
     match st.mouse_grab with
@@ -659,56 +725,62 @@ struct
     | Some (_, release) ->
       st.mouse_grab <- None;
       release ~x ~y
+  ;;
 
   let dispatch_mouse t (event, (x, y), _mods) =
-    if
-      match event with
-      | `Press btn ->
-        release_grab t x y;
-        let w, h = t.size in
-        dispatch_mouse t x y btn w h t.view
-      | `Drag ->
-        begin match t.mouse_grab with
+    if match event with
+       | `Press btn ->
+         release_grab t x y;
+         let w, h = t.size in
+         dispatch_mouse t x y btn w h t.view
+       | `Drag ->
+         (match t.mouse_grab with
           | None -> false
-          | Some (drag, _) -> drag ~x ~y; true
-        end
-      | `Release ->
-        release_grab t x y; true
+          | Some (drag, _) ->
+            drag ~x ~y;
+            true)
+       | `Release ->
+         release_grab t x y;
+         true
     then `Handled
     else `Unhandled
+  ;;
 
   let resize_canvas rw rh image =
     let w = I.width image in
     let h = I.height image in
-    if w <> rw || h <> rh
-    then I.pad ~r:(rw - w) ~b:(rh - h) image
-    else image
+    if w <> rw || h <> rh then I.pad ~r:(rw - w) ~b:(rh - h) image else image
+  ;;
 
   let resize_canvas2 ox oy rw rh image =
     let w = I.width image in
     let h = I.height image in
     I.pad ~l:ox ~t:oy ~r:(rw - w - ox) ~b:(rh - h - oy) image
+  ;;
 
-  let same_size w h image =
-    w = I.width image &&
-    h = I.height image
+  let same_size w h image = w = I.width image && h = I.height image
 
   let rec render_node vx1 vy1 vx2 vy2 sw sh t : cache =
-    if
-      let cache = t.cache in
-      vx1 >= Interval.fst cache.vx && vy1 >= Interval.fst cache.vy &&
-      vx2 <= Interval.snd cache.vx && vy2 <= Interval.snd cache.vy &&
-      same_size sw sh cache.image
+    if let cache = t.cache in
+       vx1 >= Interval.fst cache.vx
+       && vy1 >= Interval.fst cache.vy
+       && vx2 <= Interval.snd cache.vx
+       && vy2 <= Interval.snd cache.vy
+       && same_size sw sh cache.image
     then t.cache
-    else if vx2 < 0 || vy2 < 0 || sw < vx1 || sh < vy1 then
-      let vx = Interval.make vx1 vx2 and vy = Interval.make vy1 vy2 in
-      { vx; vy; image = I.void sw sh }
-    else
-      let cache = match t.desc with
+    else if vx2 < 0 || vy2 < 0 || sw < vx1 || sh < vy1
+    then (
+      let vx = Interval.make vx1 vx2
+      and vy = Interval.make vy1 vy2 in
+      { vx; vy; image = I.void sw sh })
+    else (
+      let cache =
+        match t.desc with
         | Atom image ->
-          { vx = Interval.make 0 sw;
-            vy = Interval.make 0 sh;
-            image = resize_canvas sw sh image }
+          { vx = Interval.make 0 sw
+          ; vy = Interval.make 0 sh
+          ; image = resize_canvas sw sh image
+          }
         | Size_sensor (desc, handler) ->
           handler ~w:sw ~h:sh;
           render_node vx1 vy1 vx2 vy2 sw sh desc
@@ -717,121 +789,118 @@ struct
         | Focus_area (desc, _) | Mouse_handler (desc, _) ->
           render_node vx1 vy1 vx2 vy2 sw sh desc
         | Shift_area (t', sx, sy) ->
-          let cache = render_node
-              (vx1 + sx) (vy1 + sy) (vx2 + sx) (vy2 + sy) (sx + sw) (sy + sh) t'
+          let cache =
+            render_node (vx1 + sx) (vy1 + sy) (vx2 + sx) (vy2 + sy) (sx + sw) (sy + sh) t'
           in
-          let vx = Interval.make vx1 vx2 and vy = Interval.make vy1 vy2 in
+          let vx = Interval.make vx1 vx2
+          and vy = Interval.make vy1 vy2 in
           let image = resize_canvas sw sh (I.crop ~l:sx ~t:sy cache.image) in
           { vx; vy; image }
         | X (a, b) ->
           let aw, bw = split ~a:a.w ~sa:a.sw ~b:b.w ~sb:b.sw ~mA:a.mw ~mB:b.mw sw in
           let ca = render_node vx1 vy1 vx2 vy2 aw sh a in
           let cb = render_node (vx1 - aw) vy1 (vx2 - aw) vy2 bw sh b in
-          let vx = Interval.make
+          let vx =
+            Interval.make
               (maxi (Interval.fst ca.vx) (Interval.fst cb.vx + aw))
               (mini (Interval.snd ca.vx) (Interval.snd cb.vx + aw))
-          and vy = Interval.make
+          and vy =
+            Interval.make
               (maxi (Interval.fst ca.vy) (Interval.fst cb.vy))
               (mini (Interval.snd ca.vy) (Interval.snd cb.vy))
-          and image = resize_canvas sw sh (I.(<|>) ca.image cb.image) in
+          and image = resize_canvas sw sh (I.( <|> ) ca.image cb.image) in
           { vx; vy; image }
         | Y (a, b) ->
           let ah, bh = split ~a:a.h ~sa:a.sh ~b:b.h ~sb:b.sh ~mA:a.mh ~mB:b.mh sh in
           let ca = render_node vx1 vy1 vx2 vy2 sw ah a in
           let cb = render_node vx1 (vy1 - ah) vx2 (vy2 - ah) sw bh b in
-          let vx = Interval.make
+          let vx =
+            Interval.make
               (maxi (Interval.fst ca.vx) (Interval.fst cb.vx))
               (mini (Interval.snd ca.vx) (Interval.snd cb.vx))
-          and vy = Interval.make
+          and vy =
+            Interval.make
               (maxi (Interval.fst ca.vy) (Interval.fst cb.vy + ah))
               (mini (Interval.snd ca.vy) (Interval.snd cb.vy + ah))
-          and image = resize_canvas sw sh (I.(<->) ca.image cb.image) in
+          and image = resize_canvas sw sh (I.( <-> ) ca.image cb.image) in
           { vx; vy; image }
         | Z (a, b) ->
           let ca = render_node vx1 vy1 vx2 vy2 sw sh a in
           let cb = render_node vx1 vy1 vx2 vy2 sw sh b in
-          let vx = Interval.make
+          let vx =
+            Interval.make
               (maxi (Interval.fst ca.vx) (Interval.fst cb.vx))
               (mini (Interval.snd ca.vx) (Interval.snd cb.vx))
-          and vy = Interval.make
+          and vy =
+            Interval.make
               (maxi (Interval.fst ca.vy) (Interval.fst cb.vy))
               (mini (Interval.snd ca.vy) (Interval.snd cb.vy))
-          and image = resize_canvas sw sh (I.(</>) cb.image ca.image) in
+          and image = resize_canvas sw sh (I.( </> ) cb.image ca.image) in
           { vx; vy; image }
         | Resize (t, g, bg) ->
           let open Gravity in
           let dx, rw = pack ~max:t.mw ~fixed:t.w ~stretch:t.sw sw (h (p1 g)) (h (p2 g)) in
           let dy, rh = pack ~max:t.mh ~fixed:t.h ~stretch:t.sh sh (v (p1 g)) (v (p2 g)) in
-          let c =
-            render_node (vx1 - dx) (vy1 - dy) (vx2 - dx) (vy2 - dy) rw rh t
-          in
+          let c = render_node (vx1 - dx) (vy1 - dy) (vx2 - dx) (vy2 - dy) rw rh t in
           let image = resize_canvas2 dx dy sw sh c.image in
-          let image =
-            if bg != A.empty then
-              I.(image </> char bg ' ' sw sh)
-            else
-              image
-          in
+          let image = if bg != A.empty then I.(image </> char bg ' ' sw sh) else image in
           let vx = Interval.shift c.vx dx in
           let vy = Interval.shift c.vy dy in
           { vx; vy; image }
-        | Event_filter (t, _f) ->
-          render_node vx1 vy1 vx2 vy2 sw sh t
+        | Event_filter (t, _f) -> render_node vx1 vy1 vx2 vy2 sw sh t
       in
       t.cache <- cache;
-      cache
+      cache)
+  ;;
 
-  let image {size = (w, h); view; _}  =
+  let image { size = w, h; view; _ } =
     (*There is a weird quirk in how rending works that is fixed by having an empty top level node.
-    See when you resize you actually resize the parent node and then insert a resize node. That means that if you resize at the top level It doesn't have a parent node and the resize doesn't apply. This is a very odd quirk which can be fixed by ensuring there is always a top level node that doesn't actually do anything.
-    Hence we wrap everything in this resize node which does nothing.
+      See when you resize you actually resize the parent node and then insert a resize node. That means that if you resize at the top level It doesn't have a parent node and the resize doesn't apply. This is a very odd quirk which can be fixed by ensuring there is always a top level node that doesn't actually do anything.
+      Hence we wrap everything in this resize node which does nothing.
     *)
-    (render_node 0 0 w h w h (view|>resize)).image
+    (render_node 0 0 w h w h (view |> resize)).image
+  ;;
 
   let rec dispatch_raw_key st key =
-    let rec iter (sts: ui list) : [> `Unhandled] =
+    let rec iter (sts : ui list) : [> `Unhandled ] =
       match sts with
       | [] -> `Unhandled
       | ui :: tl ->
-        begin match ui.desc with
-          | Atom _ -> iter tl
-          | X (a, b) | Y (a, b) | Z (a, b) ->
-            (* Try left/top most branch first *)
-            let st' =
-              if Focus.has_focus b.focus&&Focus.has_focus a.focus 
-              then b::a :: tl
-              else if Focus.has_focus b.focus
-              then b :: tl
-              else if Focus.has_focus a.focus
-              then a :: tl
-              (*If neither branch has focus we can just go down both*)
-              else  b::a :: tl
-            in
-            iter st'
-          | Focus_area (t, f) ->
-            begin match iter [t] with
-              | `Unhandled ->
-                begin
-                match f key with
-                | `Unhandled -> iter tl
-                |other->other
-                end
-              |other->other
-            end
-          | Mouse_handler (t, _) | Size_sensor (t, _)
-          | Transient_sensor (t, _) | Permanent_sensor (t, _)
-          | Shift_area (t, _, _) | Resize (t, _, _) ->
-            iter (t :: tl)
-          | Event_filter (t, f) ->
-            begin match f (`Key key) with
-              | `Unhandled -> iter (t :: tl)
-              | `Handled -> `Handled
-              | `Remap key -> 
-                dispatch_raw_key st key
-            end
-        end
+        (match ui.desc with
+         | Atom _ -> iter tl
+         | X (a, b) | Y (a, b) | Z (a, b) ->
+           (* Try left/top most branch first *)
+           let st' =
+             if Focus.has_focus b.focus && Focus.has_focus a.focus
+             then b :: a :: tl
+             else if Focus.has_focus b.focus
+             then b :: tl
+             else if Focus.has_focus a.focus
+             then a :: tl (*If neither branch has focus we can just go down both*)
+             else b :: a :: tl
+           in
+           iter st'
+         | Focus_area (t, f) ->
+           (match iter [ t ] with
+            | `Unhandled ->
+              (match f key with
+               | `Unhandled -> iter tl
+               | other -> other)
+            | other -> other)
+         | Mouse_handler (t, _)
+         | Size_sensor (t, _)
+         | Transient_sensor (t, _)
+         | Permanent_sensor (t, _)
+         | Shift_area (t, _, _)
+         | Resize (t, _, _) -> iter (t :: tl)
+         | Event_filter (t, f) ->
+           (match f (`Key key) with
+            | `Unhandled -> iter (t :: tl)
+            | `Handled -> `Handled
+            | `Remap key -> dispatch_raw_key st key))
     in
-    iter [st.view]
+    iter [ st.view ]
+  ;;
 
   exception Acquired_focus
 
@@ -839,172 +908,200 @@ struct
     let rec aux ui =
       match ui.focus with
       | Focus.Empty -> ()
-      | Focus.Handle (_, v) -> Focus.request_var v; raise Acquired_focus
+      | Focus.Handle (_, v) ->
+        Focus.request_var v;
+        raise Acquired_focus
       | Focus.Conflict _ -> iter aux ui
     in
-    try aux ui; false with Acquired_focus -> true
-
+    try
+      aux ui;
+      false
+    with
+    | Acquired_focus -> true
+  ;;
 
   let rec dispatch_focus t dir =
     match t.desc with
     | Atom _ -> false
-    | Mouse_handler (t, _) | Size_sensor (t, _)
-    | Transient_sensor (t, _) | Permanent_sensor (t, _)
-    | Shift_area (t, _, _) | Resize (t, _, _) | Event_filter (t, _) ->
-      dispatch_focus t dir
+    | Mouse_handler (t, _)
+    | Size_sensor (t, _)
+    | Transient_sensor (t, _)
+    | Permanent_sensor (t, _)
+    | Shift_area (t, _, _)
+    | Resize (t, _, _)
+    | Event_filter (t, _) -> dispatch_focus t dir
     | Focus_area (t', _) ->
-      begin
-      match dir with
-      | `Out -> 
-        (*If my element doesn't have focus then I should let a child element take focus or grab focus for myself.
-        This should drill down until an element has focus and then let the next element up take the focus *)
-        if (Focus.has_focus t'.focus) && (Focus.has_focus t.focus)then
-          dispatch_focus t' dir ||grab_focus t
-        else if not (Focus.has_focus t'.focus) then
-          false
-        else 
-          true
-      |_->
-        if Focus.has_focus t'.focus then
-          dispatch_focus t' dir || grab_focus t
-        else if Focus.has_focus t.focus then
-          false
-        else
-          grab_focus t
-      end
+      (match dir with
+       | `Out ->
+         (*If my element doesn't have focus then I should let a child element take focus or grab focus for myself.
+           This should drill down until an element has focus and then let the next element up take the focus *)
+         if Focus.has_focus t'.focus && Focus.has_focus t.focus
+         then dispatch_focus t' dir || grab_focus t
+         else if not (Focus.has_focus t'.focus)
+         then false
+         else true
+       | _ ->
+         if Focus.has_focus t'.focus
+         then dispatch_focus t' dir || grab_focus t
+         else if Focus.has_focus t.focus
+         then false
+         else grab_focus t)
     | X (a, b) ->
-      begin if Focus.has_focus a.focus then
-          dispatch_focus a dir ||
-          (match dir with
-           | `Out|`Next | `Right -> dispatch_focus b dir
-           | _ -> false
-          )
-        else if Focus.has_focus b.focus then
-          dispatch_focus b dir ||
-          (match dir with
-           | `Out|`Prev | `Left -> dispatch_focus a dir
-           | _ -> false
-          )
-        else
-          match dir with
-          | `Out|`Prev | `Left | `Up -> dispatch_focus b dir || dispatch_focus a dir
-          | `Next | `Down | `Right -> dispatch_focus a dir || dispatch_focus b dir
-          |_->false
-      end
+      if Focus.has_focus a.focus
+      then
+        dispatch_focus a dir
+        ||
+        match dir with
+        | `Out | `Next | `Right -> dispatch_focus b dir
+        | _ -> false
+      else if Focus.has_focus b.focus
+      then
+        dispatch_focus b dir
+        ||
+        match dir with
+        | `Out | `Prev | `Left -> dispatch_focus a dir
+        | _ -> false
+      else (
+        match dir with
+        | `Out | `Prev | `Left | `Up -> dispatch_focus b dir || dispatch_focus a dir
+        | `Next | `Down | `Right -> dispatch_focus a dir || dispatch_focus b dir
+        | _ -> false)
     | Y (a, b) ->
-      begin if Focus.has_focus a.focus then
-          dispatch_focus a dir ||
-          (match dir with
-           | `Out|`Next | `Down -> dispatch_focus b dir
-           | _ -> false
-          )
-        else if Focus.has_focus b.focus then
-          dispatch_focus b dir ||
-          (match dir with
-           | `Out|`Prev | `Up -> dispatch_focus a dir
-           | _ -> false
-          )
-        else match dir with
-          |`Out| `Prev | `Up -> dispatch_focus b dir || dispatch_focus a dir
-          | `Next | `Left | `Down | `Right -> dispatch_focus a dir || dispatch_focus b dir
-          |_->false
-      end
-    | Z (a, b) ->
-      if Focus.has_focus a.focus then
+      if Focus.has_focus a.focus
+      then
         dispatch_focus a dir
-      else
-        dispatch_focus b dir || dispatch_focus a dir
+        ||
+        match dir with
+        | `Out | `Next | `Down -> dispatch_focus b dir
+        | _ -> false
+      else if Focus.has_focus b.focus
+      then
+        dispatch_focus b dir
+        ||
+        match dir with
+        | `Out | `Prev | `Up -> dispatch_focus a dir
+        | _ -> false
+      else (
+        match dir with
+        | `Out | `Prev | `Up -> dispatch_focus b dir || dispatch_focus a dir
+        | `Next | `Left | `Down | `Right -> dispatch_focus a dir || dispatch_focus b dir
+        | _ -> false)
+    | Z (a, b) ->
+      if Focus.has_focus a.focus
+      then dispatch_focus a dir
+      else dispatch_focus b dir || dispatch_focus a dir
+  ;;
 
   let rec dispatch_key st key =
     match dispatch_raw_key st key, key with
     | `Handled, _ -> `Handled
     | `Remap k, _ -> dispatch_key st k
-    | `Unhandled, (`Arrow dir, [`Meta]) ->
-      let dir : [`Down | `Left | `Right | `Up] :>
-          [`Down | `Left | `Right |`Out| `Up | `Next | `Prev] = dir in
-      dispatch_key st (`Focus dir, [`Meta])
+    | `Unhandled, (`Arrow dir, [ `Meta ]) ->
+      let dir : [ `Down | `Left | `Right | `Up ]
+        :> [ `Down | `Left | `Right | `Out | `Up | `Next | `Prev ]
+        =
+        dir
+      in
+      dispatch_key st (`Focus dir, [ `Meta ])
     | `Unhandled, (`Tab, mods) ->
       let dir = if List.mem `Shift mods then `Prev else `Next in
       dispatch_key st (`Focus dir, mods)
     | `Unhandled, (`Focus dir, _) ->
       if dispatch_focus st.view dir then `Handled else `Unhandled
     | `Unhandled, _ -> `Unhandled
+  ;;
 
   let dispatch_event t = function
     | `Key key -> dispatch_key t key
     | `Mouse mouse -> dispatch_mouse t mouse
     | `Paste _ -> `Unhandled
+  ;;
 end
 
-module Ui_loop =
-struct
+module Ui_loop = struct
   open Notty_unix
 
   (* FIXME Uses of [quick_sample] and [quick_release] should be replaced by
-           [sample] and [release] with the appropriate release management. *)
+     [sample] and [release] with the appropriate release management. *)
 
-  let step ?(process_event=true) ?(timeout=(-1.0)) ~renderer term root =
+  let step ?(process_event = true) ?(timeout = -1.0) ~renderer term root =
     let size = Term.size term in
     let image =
       let rec stabilize () =
         let tree = Lwd.quick_sample root in
         Renderer.update renderer size tree;
         let image = Renderer.image renderer in
-        if Lwd.is_damaged root
-        then stabilize ()
-        else image
+        if Lwd.is_damaged root then stabilize () else image
       in
       stabilize ()
     in
     Term.image term image;
-    if process_event then
+    if process_event
+    then (
       let wait_for_event () =
         let i, _ = Term.fds term in
         let rec select () =
-          match Unix.select [i] [] [i] timeout with
+          match Unix.select [ i ] [] [ i ] timeout with
           | [], [], [] -> Term.pending term
           | _ -> true
-          | exception (Unix.Unix_error (Unix.EINTR, _, _)) -> select ()
+          | exception Unix.Unix_error (Unix.EINTR, _, _) -> select ()
         in
         select ()
       in
       let has_event = timeout < 0.0 || Term.pending term || wait_for_event () in
-      if has_event then
+      if has_event
+      then (
         match Term.event term with
         | `End -> ()
         | `Resize _ -> ()
         | #Unescape.event as event ->
           let event = (event : Unescape.event :> Ui.event) in
-          ignore (Renderer.dispatch_event renderer event : [`Handled | `Unhandled])
+          ignore (Renderer.dispatch_event renderer event : [ `Handled | `Unhandled ])))
+  ;;
 
-  let run_with_term term ?tick_period ?(tick=ignore) ~renderer quit t =
+  let run_with_term term ?tick_period ?(tick = ignore) ~renderer quit t =
     let quit = Lwd.observe (Lwd.get quit) in
     let root = Lwd.observe t in
     let rec loop () =
       let quit = Lwd.quick_sample quit in
-      if not quit then (
+      if not quit
+      then (
         step ~process_event:true ?timeout:tick_period ~renderer term root;
         tick ();
-        loop ()
-      )
+        loop ())
     in
     loop ();
     ignore (Lwd.quick_release root);
     ignore (Lwd.quick_release quit)
+  ;;
 
-  let run ?tick_period ?tick ?term ?(renderer=Renderer.make ())
-          ?quit ?(quit_on_escape=true) ?(quit_on_ctrl_q=true) t =
-    let quit = match quit with
+  let run
+    ?tick_period
+    ?tick
+    ?term
+    ?(renderer = Renderer.make ())
+    ?quit
+    ?(quit_on_escape = true)
+    ?(quit_on_ctrl_q = true)
+    t
+    =
+    let quit =
+      match quit with
       | Some quit -> quit
       | None -> Lwd.var false
     in
-    let t = Lwd.map t ~f:(Ui.event_filter (function
-        | `Key (`ASCII 'Q', [`Ctrl]) when quit_on_ctrl_q ->
-          Lwd.set quit true; `Handled
-        | `Key (`Escape, []) when quit_on_escape ->
-          Lwd.set quit true; `Handled
-        | _ -> `Unhandled
-      ))
+    let t =
+      Lwd.map
+        t
+        ~f:
+          (Ui.event_filter (function
+            | `Key (`ASCII 'Q', [ `Ctrl ]) when quit_on_ctrl_q ->
+              Lwd.set quit true;
+              `Handled
+            | `Key (`Escape, []) when quit_on_escape ->
+              Lwd.set quit true;
+              `Handled
+            | _ -> `Unhandled))
     in
     match term with
     | Some term -> run_with_term term ?tick_period ?tick ~renderer quit t
@@ -1012,5 +1109,5 @@ struct
       let term = Term.create () in
       run_with_term term ?tick_period ?tick ~renderer quit t;
       Term.release term
-
+  ;;
 end
diff --git a/forks/nottui/lib/nottui/widgets/overlays.ml b/forks/nottui/lib/nottui/widgets/overlays.ml
index ff51e74..3f33807 100644
--- a/forks/nottui/lib/nottui/widgets/overlays.ml
+++ b/forks/nottui/lib/nottui/widgets/overlays.ml
@@ -219,14 +219,22 @@ let selection_list_prompt_filterable
   prompt_internal ?pad_w ?pad_h ~focus ~show_prompt:prompt_args ui
 ;;
 
-let popup ~show_popup_var ui =
+let popup ?(focus = Focus.make ()) ?on_key ~show_popup_var ui =
   let popup_ui =
     let$* show_popup = Lwd.get show_popup_var in
     match show_popup with
     | Some (content, label) ->
-      let prompt_field = content in
-      prompt_field |>$ Ui.resize ~w:5 ~sw:1 |> BB.box ~label_top:label |> clear_bg
-    | None -> Ui.empty |> Lwd.pure
+      let ui =
+        let$ status = Focus.status focus
+        and$ prompt_field = content in
+        if not (Focus.has_focus status) then Focus.request_reversable focus;
+        prompt_field |> Ui.resize ~w:5 ~sw:1
+      in
+      ui |> BB.focusable ~focus ~label_top:label ?on_key |> clear_bg
+    | None ->
+        let$ status = Focus.status focus in
+        if Focus.has_focus status then Focus.release_reversable focus;
+      Ui.empty 
   in
   W.zbox [ ui; popup_ui |>$ Ui.resize ~crop:neutral_grav ~pad:neutral_grav ]
 ;;
diff --git a/forks/nottui/lib/nottui/widgets/overlays.mli b/forks/nottui/lib/nottui/widgets/overlays.mli
index f331d22..3dc1c08 100644
--- a/forks/nottui/lib/nottui/widgets/overlays.mli
+++ b/forks/nottui/lib/nottui/widgets/overlays.mli
@@ -75,5 +75,7 @@ val selection_list_prompt_filterable :
 
   (**This is a simple popup that can show ontop of other ui elements *)
 val popup :
+  ?focus:Nottui_main.Focus.handle ->
+  ?on_key:(Nottui_main.Ui.key->Nottui_main.Ui.may_handle)->
   show_popup_var:(Nottui_main.ui Lwd.t * string) option Lwd.var ->
   Nottui_main.ui Lwd.t -> Nottui_main.ui Lwd.t
diff --git a/forks/nottui/lib/nottui/widgets/selection_list.ml b/forks/nottui/lib/nottui/widgets/selection_list.ml
index 5757c7b..864c74e 100644
--- a/forks/nottui/lib/nottui/widgets/selection_list.ml
+++ b/forks/nottui/lib/nottui/widgets/selection_list.ml
@@ -60,6 +60,7 @@ let get_selectable_items (items : 'a maybe_multi_selectable array Lwd.t) =
 
 let multi_selection_list_exclusions
   ?(focus = Focus.make ())
+  ?reset_selections
   ?(on_selection_change = fun ~hovered ~selected -> ())
   ~custom_handler
   (items : 'a maybe_multi_selectable array Lwd.t)
@@ -72,6 +73,10 @@ let multi_selection_list_exclusions
      4. offset by the scroll amount, apply size sensors and output final ui
   *)
   let selected_items_var = Lwd.var MyMap.empty in
+  (*provides a way to set this from the outside*)
+  reset_selections
+  |> Option.iter (Signal.sub (fun x -> selected_items_var $= MyMap.empty));
+  (*Lets external functions to reset the selection*)
   (*hovered var is a tuple of (id, overall_idx,selection_idx)*)
   (*we set it up this way so we can avoid double rendering. We sometimes wish to change the value of the hover var during rendering and that would not update till the next  render and cause a re-render*)
   let hovered_var = ref (0, 0, 0) in
@@ -132,7 +137,7 @@ let multi_selection_list_exclusions
         on_selection_change
           ~hovered:item.data
           ~selected:
-            (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_,a) -> a));
+            (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_, a) -> a));
         items, selectable_items)
       else items, selectable_items
     and$ _ = Lwd.get hover_changed
@@ -167,7 +172,7 @@ let multi_selection_list_exclusions
           on_selection_change
             ~hovered:(selectable_items.(hovered_idx) |> snd).data
             ~selected:
-              (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_,a) -> a));
+              (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_, a) -> a));
           `Handled
         | `Arrow `Down, [] ->
           let hovered_idx =
@@ -181,12 +186,12 @@ let multi_selection_list_exclusions
           on_selection_change
             ~hovered:(selectable_items.(hovered_idx) |> snd).data
             ~selected:
-              (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_,a) -> a));
+              (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_, a) -> a));
           `Handled
         | `ASCII ' ', [] ->
           let hovered_id, _, hovered_idx = !hovered_var in
-          let data=
-(selectable_items.(hovered_idx) |> snd).data in           let selected = Lwd.peek selected_items_var in
+          let data = (selectable_items.(hovered_idx) |> snd).data in
+          let selected = Lwd.peek selected_items_var in
           if selected |> MyMap.mem hovered_id
           then Lwd.set selected_items_var (MyMap.remove hovered_id selected)
           else Lwd.set selected_items_var (MyMap.add hovered_id data selected);
@@ -194,7 +199,10 @@ let multi_selection_list_exclusions
           on_selection_change
             ~hovered:data
             ~selected:
-              (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_,a)-> a));
+              (Lwd.peek selected_items_var |> MyMap.to_list |> List.map (fun (_, a) -> a));
+          `Handled
+        | `Escape, [] ->
+          Lwd.set selected_items_var MyMap.empty;
           `Handled
         | a -> custom_handler ~selected:(Lwd.peek selected_items_var) ~selectable_items a)
   in
@@ -382,12 +390,14 @@ let selectable_item_lwd ui ~selected ~hovered =
 
 let multi_selection_list_custom
   ?(focus = Focus.make ())
+  ?reset_selections
   ?(on_selection_change = fun ~hovered ~selected -> ())
   ~custom_handler
   (items : 'a multi_selectable_item list Lwd.t)
   =
   multi_selection_list_exclusions
     ~focus
+    ?reset_selections
     ~on_selection_change
     ~custom_handler
     (items
@@ -395,6 +405,7 @@ let multi_selection_list_custom
      let selectable_items = Array.make (List.length items) (Obj.magic ()) in
      items |> List.iteri (fun i x -> Array.set selectable_items i (Selectable x));
      selectable_items)
+;;
 
 let selection_list_custom
   ?(focus = Focus.make ())
diff --git a/forks/nottui/lib/nottui/widgets/selection_list.mli b/forks/nottui/lib/nottui/widgets/selection_list.mli
index 9742848..78c150d 100644
--- a/forks/nottui/lib/nottui/widgets/selection_list.mli
+++ b/forks/nottui/lib/nottui/widgets/selection_list.mli
@@ -16,6 +16,7 @@ type 'a maybe_multi_selectable =
 (** multi_selectable exclusions *)
 val multi_selection_list_exclusions
   :  ?focus:Nottui_main.Focus.handle
+  -> ?reset_selections:'s Signal.t
   -> ?on_selection_change:(hovered:'a -> selected:'a list -> unit)
   -> custom_handler:
        (selected:'a MyMap.t
@@ -56,6 +57,7 @@ val selectable_item_lwd
     Only handles up and down keyboard events. Use [~custom_handler] to do handle confirming your selection and such *)
 val multi_selection_list_custom
   :  ?focus:Nottui_main.Focus.handle
+  -> ?reset_selections:'s Signal.t
   -> ?on_selection_change:(hovered:'a -> selected:'a list -> unit)
   -> custom_handler:
        (selected:'a MyMap.t
diff --git a/jj_tui/bin/dune b/jj_tui/bin/dune
index a8b121b..a403ee0 100644
--- a/jj_tui/bin/dune
+++ b/jj_tui/bin/dune
@@ -1,7 +1,7 @@
 (executable
  (public_name jj_tui)
  (name main)
- (libraries jj_tui nottui base stdio picos_io picos_mux.multififo picos_std.sync picos_std.finally picos_std.structured eio_main eio-process spawn )
+ (libraries signal jj_tui nottui base stdio picos_io picos_mux.multififo picos_std.sync picos_std.finally picos_std.structured eio_main eio-process spawn )
 
 (preprocess
   (pps logs-ppx ppx_deriving.std))
diff --git a/jj_tui/bin/file_view.ml b/jj_tui/bin/file_view.ml
index 739c92d..2e70657 100644
--- a/jj_tui/bin/file_view.ml
+++ b/jj_tui/bin/file_view.ml
@@ -93,7 +93,7 @@ module Make (Vars : Global_vars.Vars) = struct
             (fun rev ->
               let selected = Lwd.peek active_files in
               confirm_prompt
-                ("discard all changes to '" ^ (selected|>String.concat "\n") ^ "' in rev " ^ rev)
+                ("discard all changes to:\n" ^ (selected|>String.concat "\n") ^ "\nin rev " ^ rev)
                 (Cmd (["restore"; "--to"; rev; "--from"; rev ^ "-"] @selected)))
       }
     ]
@@ -119,6 +119,7 @@ module Make (Vars : Global_vars.Vars) = struct
     *)
     file_uis|>
     W.Lists.multi_selection_list_custom
+      ~reset_selections:Vars.ui_state.reset_selection
       ~on_selection_change:(fun ~hovered ~selected ->
       let active=
         if selected|>List.length =0 then [hovered] else selected
diff --git a/jj_tui/bin/global_vars.ml b/jj_tui/bin/global_vars.ml
index f527046..fb931dc 100644
--- a/jj_tui/bin/global_vars.ml
+++ b/jj_tui/bin/global_vars.ml
@@ -4,6 +4,7 @@ open Eio.Std
 open Picos_std_structured
 open Lwd_infix
 open Jj_tui.Process
+open Jj_tui.Logging
 
 type cmd_args = string list
 
@@ -33,6 +34,7 @@ type ui_state_t = {
   ; selected_revisions : rev_id maybe_unique list Lwd.var
   ; revset : string option Lwd.var
   ; trigger_update : unit Lwd.var
+  ; reset_selection : unit Signal.t
 }
 
 let get_unique_id maybe_unique_rev =
@@ -61,6 +63,7 @@ module type Vars = sig
   val ui_state : ui_state_t
   val update_ui_state : (ui_state_t -> unit) -> unit
   val render_mutex : Eio.Mutex.t
+  val reset_selection : unit -> unit
 
   (**returns either a change_id or if their are change_id conflicts, a commit_id *)
   val get_hovered_rev : unit -> string
@@ -102,6 +105,7 @@ module Vars : Vars = struct
     ; show_string_selection_prompt = Lwd.var None
     ; command_log = Lwd.var []
     ; trigger_update = Lwd.var ()
+    ; reset_selection = Signal.make ~equal:(fun _ _ -> false) ()
     }
   ;;
 
@@ -125,6 +129,13 @@ module Vars : Vars = struct
   let get_eio_vars () = Option.get !eio
   let get_term () = Option.get !term
 
+  let reset_selection () =
+    Flock.fork(fun _ ->
+      Picos_std_structured.Control.sleep ~seconds:0.7;
+      [%log info "Resetting selection"];
+      ui_state.reset_selection |> Signal.trigger)
+  ;;
+
   (**Gets an id for the currently hovered revision. If the change_id is unique we use that, if it's not we return a commit_id instead*)
   let get_hovered_rev () = Lwd.peek ui_state.hovered_revision |> get_unique_id
 
diff --git a/jj_tui/bin/graph_view.ml b/jj_tui/bin/graph_view.ml
index 44dc6b8..2c38fb2 100644
--- a/jj_tui/bin/graph_view.ml
+++ b/jj_tui/bin/graph_view.ml
@@ -41,11 +41,11 @@ module Make (Vars : Global_vars.Vars) = struct
     ; {
         key = 'N'
       ; description = "Make a new change and insert it after the selected rev"
-      ; cmd = Dynamic_r (fun rev -> Cmd [ "new"; "--insert-after"; rev ])
+      ; cmd = Cmd_with_revs (Active [ "new"; "--insert-after"])
       }
     ; {
         key = 'n'
-      ; cmd = Dynamic_r (fun rev -> Cmd [ "new"; rev ])
+      ; cmd =  Cmd_with_revs (Active [ "new" ])
       ; description = "Make a new empty change as a child of the selected rev"
       }
     ; {
@@ -425,6 +425,7 @@ module Make (Vars : Global_vars.Vars) = struct
     let list_ui =
       items
       |> W.Lists.multi_selection_list_exclusions
+          ~reset_selections:Vars.ui_state.reset_selection
            ~on_selection_change:(fun ~hovered ~selected ->
              (*Respond to change in selected revision*)
              Lwd.set Vars.ui_state.hovered_revision hovered;
diff --git a/jj_tui/bin/jj_commands.ml b/jj_tui/bin/jj_commands.ml
index ad7551d..864f4e5 100644
--- a/jj_tui/bin/jj_commands.ml
+++ b/jj_tui/bin/jj_commands.ml
@@ -18,7 +18,7 @@ module Shared = struct
     | Cmd of cmd_args (** Regular jj command *)
     | Cmd_r of cmd_args
     (** Regular jj command that should operate on the hovered revison *)
-    | Cmd_ of cmd_args revision_type
+    | Cmd_with_revs of cmd_args revision_type
     (** Regular jj command that should operate on active revisions*)
     | Dynamic of (unit -> 'a command_variant)
     | Dynamic_r of (string -> 'a command_variant)
@@ -74,6 +74,17 @@ module Intern (Vars : Global_vars.Vars) = struct
       a, get_active_revs ()
   ;;
 
+  (**resets the selection if there was a selection and the command revision type used it*)
+  let reset_selection_post_cmd rev_type =
+    match rev_type with
+    | Selected _ ->
+      Vars.reset_selection ()
+    | Active _ ->
+      if Vars.get_selected_revs () |> List.length > 0 then Vars.reset_selection ()
+    | _ ->
+      ()
+  ;;
+
   let render_command_line ~indent_level key desc =
     let indent = String.init (indent_level * 2) (fun _ -> ' ') in
     I.hcat
@@ -189,10 +200,11 @@ module Intern (Vars : Global_vars.Vars) = struct
       ui_state.show_popup $= None;
       noOut (args @ [ "-r"; Vars.get_hovered_rev () ]);
       raise Handled
-    | Cmd_ rev_type ->
+    | Cmd_with_revs rev_type ->
       let args, revs = get_revs rev_type in
       ui_state.show_popup $= None;
       noOut (args @ ("-r" :: revs));
+      reset_selection_post_cmd rev_type;
       raise Handled
     | Prompt (str, args) ->
       ui_state.show_popup $= None;
@@ -200,7 +212,7 @@ module Intern (Vars : Global_vars.Vars) = struct
       raise Handled
     | Prompt_r (str, args) ->
       ui_state.show_popup $= None;
-      prompt str (`Cmd (args @ [ "-r"; Vars.get_hovered_rev() ]));
+      prompt str (`Cmd (args @ [ "-r"; Vars.get_hovered_rev () ]));
       raise Handled
     | PromptThen (label, next) ->
       ui_state.show_popup $= None;
diff --git a/jj_tui/bin/jj_ui.ml b/jj_tui/bin/jj_ui.ml
index 964c755..c62f6d5 100644
--- a/jj_tui/bin/jj_ui.ml
+++ b/jj_tui/bin/jj_ui.ml
@@ -141,9 +141,12 @@ module Make (Vars : Global_vars.Vars) = struct
     |> W.Overlay.selection_list_prompt_filterable
          ~show_prompt_var:ui_state.show_string_selection_prompt
     |> inputs ~custom:(function
+
       | `Enter, [] ->
         Focus.request_reversable summary_focus;
         `Handled
+      | `ASCII k, [] ->
+        Jj_commands.handleInputs Jj_commands.default_list k
       | _ ->
         `Unhandled)
   ;;