console/boot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactored all keybindings

Browse Source
This commit is contained in:
cqc
2021-09-03 09:24:24 -05:00
parent 335d864a8b
commit 5d96ed12d2
1 changed files with 58 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
main.ml
View File

@ -27,7 +27,7 @@ module Input = struct
(** Type of key code. *) (** Type of key code. *)
type code = type code =
| Char of UChar.t (** A unicode character. *) | UChar of UChar.t (** A unicode character. *)
| Enter | Enter
| Escape | Escape
| Tab | Tab
@ -57,6 +57,8 @@ module Input = struct
| Unknown | Unknown
| None | None
type key = Char of char | Code of code
module KeymodSet = struct module KeymodSet = struct
type t = Shift | Ctrl | Meta | Fn type t = Shift | Ctrl | Meta | Fn
@ -67,10 +69,10 @@ module Input = struct
let modset = Keymod.of_list let modset = Keymod.of_list
type key = {mods: Keymod.t; code: code} type keystate = {mods: Keymod.t; code: code}
module Key = struct module Key = struct
type t = key type t = keystate
let compare = compare let compare = compare
end end
@ -88,14 +90,18 @@ module Input = struct
type state = type state =
{ mutable bindings: t { mutable bindings: t
; mutable state: result ; mutable state: result
; mutable last_keyseq: key list ; mutable last_keyseq: keystate list
; mutable last_actions: action list } ; mutable last_actions: action list }
let add events action bindings = let add events action bindings =
let events = let events =
List.map List.map
(fun (m, k) -> (fun (m, k) ->
{mods= Keymod.of_list m; code= Char (UChar.of_char k)} ) { mods= Keymod.of_list m
; code=
( match k with
| Char c -> UChar (UChar.of_char c)
| Code c -> c ) } )
events in events in
S.add events action bindings S.add events action bindings
@ -111,7 +117,7 @@ module Input = struct
(* stolen from lambda-term/src/lTerm_{edit,key}.ml{,i} *) (* stolen from lambda-term/src/lTerm_{edit,key}.ml{,i} *)
let string_of_code = function let string_of_code = function
| Char ch -> Printf.sprintf "Char 0x%02x" (UChar.code ch) | UChar ch -> Printf.sprintf "Char 0x%02x" (UChar.code ch)
| Enter -> "Enter" | Enter -> "Enter"
| Escape -> "Escape" | Escape -> "Escape"
| Tab -> "Tab" | Tab -> "Tab"
@ -157,7 +163,7 @@ module Input = struct
if Keymod.mem Shift key.mods then Buffer.add_string buffer "S-" ; if Keymod.mem Shift key.mods then Buffer.add_string buffer "S-" ;
if Keymod.mem Fn key.mods then Buffer.add_string buffer "Fn-" ; if Keymod.mem Fn key.mods then Buffer.add_string buffer "Fn-" ;
( match key.code with ( match key.code with
| Char ch -> | UChar ch ->
let code = UChar.code ch in let code = UChar.code ch in
if code <= 255 then if code <= 255 then
match Char.chr code with match Char.chr code with
@ -191,8 +197,8 @@ module Event = struct
type mouse = int * int type mouse = int * int
type t = type t =
[ `Key_down of Input.key [ `Key_down of Input.keystate
| `Key_up of Input.key | `Key_up of Input.keystate
| `Text_editing of string | `Text_editing of string
| `Text_input of string | `Text_input of string
| `Mouse of mouse | `Mouse of mouse
@ -270,7 +276,7 @@ module Event = struct
|'&' | '$' | '*' | '%' | '!' | '?' | ',' | ';' | ':' |'&' | '$' | '*' | '%' | '!' | '?' | ',' | ';' | ':'
|'/' | '\\' | '.' | '@' | '=' | '+' | '-' | ' ' | '"' |'/' | '\\' | '.' | '@' | '=' | '+' | '-' | ' ' | '"'
|'\'' | '>' | '<' | '^' | '`' | '|' -> |'\'' | '>' | '<' | '^' | '`' | '|' ->
Char (UChar.of_int k) UChar (UChar.of_int k)
| _ -> None ) in | _ -> None ) in
let mods = let mods =
List.filter_map List.filter_map
@ -353,7 +359,7 @@ module Event = struct
let open Input.Bind in let open Input.Bind in
List.iter List.iter
(function (function
| `Key_down (k : Input.key) -> | `Key_down (k : Input.keystate) ->
( match state.state with ( match state.state with
| Continue _ -> () | Continue _ -> ()
| _ -> state.last_keyseq <- [] ) ; | _ -> state.last_keyseq <- [] ) ;
@ -789,82 +795,44 @@ module Panel = struct
let default_bindings = let default_bindings =
let open Input.Bind in let open Input.Bind in
let open CamomileLibrary in add [([], Code Left)] [Zed Prev_char]
let open Zed_edit in @@ add [([], Code Right)] [Zed Next_char]
let m = Input.Keymod.of_list in @@ add [([], Code Up)] [Zed Prev_line]
let b = ref empty in @@ add [([], Code Down)] [Zed Next_line]
let add e a = b := Input.Bind.S.add e a !b in @@ add [([], Code Home)] [Zed Goto_bol]
add [{mods= m []; code= Left}] [Zed Prev_char] ; @@ add [([], Code End)] [Zed Goto_eol]
add [{mods= m []; code= Right}] [Zed Next_char] ; @@ add [([], Code Insert)] [Zed Switch_erase_mode]
add [{mods= m []; code= Up}] [Zed Prev_line] ; @@ add [([], Code Delete)] [Zed Delete_next_char]
add [{mods= m []; code= Down}] [Zed Next_line] ; @@ add [([], Code Enter)] [Zed Newline]
add [{mods= m []; code= Home}] [Zed Goto_bol] ; @@ add [([Ctrl], Char ' ')] [Zed Set_mark]
add [{mods= m []; code= End}] [Zed Goto_eol] ; @@ add [([Ctrl], Char 'a')] [Zed Goto_bol]
add [{mods= m []; code= Insert}] [Zed Switch_erase_mode] ; @@ add [([Ctrl], Char 'e')] [Zed Goto_eol]
add [{mods= m []; code= Delete}] [Zed Delete_next_char] ; @@ add [([Ctrl], Char 'd')] [Zed Delete_next_char]
add [{mods= m []; code= Enter}] [Zed Newline] ; @@ add [([Ctrl], Char 'h')] [Zed Delete_prev_char]
add @@ add [([Ctrl], Char 'k')] [Zed Kill_next_line]
[{mods= m [Ctrl]; code= Char (UChar.of_char ' ')}] @@ add [([Ctrl], Char 'u')] [Zed Kill_prev_line]
[Zed Set_mark] ; @@ add [([Ctrl], Char 'n')] [Zed Next_line]
add @@ add [([Ctrl], Char 'p')] [Zed Prev_line]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'a')}] @@ add [([Ctrl], Char 'w')] [Zed Kill]
[Zed Goto_bol] ; @@ add [([Ctrl], Char 'y')] [Zed Yank]
add @@ add [([], Code Backspace)] [Zed Delete_prev_char]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'e')}] @@ add [([Meta], Char 'w')] [Zed Copy]
[Zed Goto_eol] ; @@ add [([Meta], Char 'c')] [Zed Capitalize_word]
add @@ add [([Meta], Char 'l')] [Zed Lowercase_word]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'd')}] @@ add [([Meta], Char 'u')] [Zed Uppercase_word]
[Zed Delete_next_char] ; @@ add [([Meta], Char 'b')] [Zed Prev_word]
add @@ add [([Meta], Char 'f')] [Zed Next_word]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'h')}] @@ add [([Meta], Code Right)] [Zed Next_word]
[Zed Delete_prev_char] ; @@ add [([Meta], Code Left)] [Zed Prev_word]
add @@ add [([Ctrl], Code Right)] [Zed Next_word]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'k')}] @@ add [([Ctrl], Code Left)] [Zed Prev_word]
[Zed Kill_next_line] ; @@ add [([Meta], Code Backspace)] [Zed Kill_prev_word]
add @@ add [([Meta], Code Delete)] [Zed Kill_prev_word]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'u')}] @@ add [([Ctrl], Code Delete)] [Zed Kill_next_word]
[Zed Kill_prev_line] ; @@ add [([Meta], Char 'd')] [Zed Kill_next_word]
add @@ add [([Ctrl], Char '/')] [Zed Undo]
[{mods= m [Ctrl]; code= Char (UChar.of_char 'n')}] @@ add [([Ctrl], Char 'x'); ([], Char 'u')] [Zed Undo]
[Zed Next_line] ; @@ empty
add
[{mods= m [Ctrl]; code= Char (UChar.of_char 'p')}]
[Zed Prev_line] ;
add [{mods= m [Ctrl]; code= Char (UChar.of_char 'w')}] [Zed Kill] ;
add [{mods= m [Ctrl]; code= Char (UChar.of_char 'y')}] [Zed Yank] ;
add [{mods= m []; code= Backspace}] [Zed Delete_prev_char] ;
add [{mods= m [Meta]; code= Char (UChar.of_char 'w')}] [Zed Copy] ;
add
[{mods= m [Meta]; code= Char (UChar.of_char 'c')}]
[Zed Capitalize_word] ;
add
[{mods= m [Meta]; code= Char (UChar.of_char 'l')}]
[Zed Lowercase_word] ;
add
[{mods= m [Meta]; code= Char (UChar.of_char 'u')}]
[Zed Uppercase_word] ;
add
[{mods= m [Meta]; code= Char (UChar.of_char 'b')}]
[Zed Prev_word] ;
add
[{mods= m [Meta]; code= Char (UChar.of_char 'f')}]
[Zed Next_word] ;
add [{mods= m [Meta]; code= Right}] [Zed Next_word] ;
add [{mods= m [Meta]; code= Left}] [Zed Prev_word] ;
add [{mods= m [Ctrl]; code= Right}] [Zed Next_word] ;
add [{mods= m [Ctrl]; code= Left}] [Zed Prev_word] ;
add [{mods= m [Meta]; code= Backspace}] [Zed Kill_prev_word] ;
add [{mods= m [Meta]; code= Delete}] [Zed Kill_prev_word] ;
add [{mods= m [Ctrl]; code= Delete}] [Zed Kill_next_word] ;
add
[{mods= m [Meta]; code= Char (UChar.of_char 'd')}]
[Zed Kill_next_word] ;
add [{mods= m [Ctrl]; code= Char (UChar.of_char '/')}] [Zed Undo] ;
add
[ {mods= m [Ctrl]; code= Char (UChar.of_char 'x')}
; {mods= m []; code= Char (UChar.of_char 'u')} ]
[Zed Undo] ;
!b
type textedit = type textedit =
{ze: unit Zed_edit.t; zc: Zed_cursor.t; keybind: Input.Bind.state} {ze: unit Zed_edit.t; zc: Zed_cursor.t; keybind: Input.Bind.state}
@ -885,7 +853,7 @@ module Panel = struct
(* collect events and update Zed context *) (* collect events and update Zed context *)
List.iter List.iter
(function (function
| `Key_down (k : Input.key) -> ( | `Key_down (k : Input.keystate) -> (
let open Input.Bind in let open Input.Bind in
( match te.keybind.state with ( match te.keybind.state with
| Accepted _ | Rejected -> | Accepted _ | Rejected ->
@ -1055,8 +1023,8 @@ module Store = struct
let keybinds = let keybinds =
let open CamomileLibrary in let open CamomileLibrary in
let open Input.Bind in let open Input.Bind in
add [([], 'n')] [Custom (navigate sv `Next)] add [([], Char 'n')] [Custom (navigate sv `Next)]
@@ add [([], 'p')] [Custom (navigate sv `Prev)] empty in @@ add [([], Char 'p')] [Custom (navigate sv `Prev)] empty in
let bindstate = Input.Bind.init keybinds in let bindstate = Input.Bind.init keybinds in
{ act= { act=
(fun panel events -> (fun panel events ->