dustinswan/cg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing keydown events.

Browse source
This commit is contained in:
Dustin Swan 2026-02-09 20:35:17 -07:00
parent 3fe7750290
commit 0a60d472ea
No known key found for this signature in database
GPG key ID: 30D46587E2100467
5 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/cg/03-ui-components.cg
View file

@ -95,31 +95,32 @@ textInput = config \ ui.stateful {
# update : State \ Event \ State
update = state event \ event
| ArrowLeft \
newCursorPos = max 0 (state.cursorPos - 1);
newScroll = calcScrollOffset state.text newCursorPos state.scrollOffset config.w;
newState = state.{ text = state.text, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [config.onKeyDown] }
| ArrowRight \
newCursorPos = min (len state.text) (state.cursorPos + 1);
newScroll = calcScrollOffset state.text newCursorPos state.scrollOffset config.w;
newState = state.{ text = state.text, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [config.onKeyDown] }
| Backspace \
newText = deleteChar state.text state.cursorPos;
newCursorPos = max 0 (state.cursorPos - 1);
newScroll = calcScrollOffset newText newCursorPos state.scrollOffset config.w;
newState = state.{ text = newText, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [config.onChange newText, config.onKeyDown] }
| Char c \
| Key { key = c, printable = True } \
_ = debug "text keydown" c;
newText = insertChar state.text state.cursorPos c;
newCursorPos = state.cursorPos + 1;
newScroll = calcScrollOffset newText newCursorPos state.scrollOffset config.w;
newState = state.{ text = newText, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [config.onChange newText, config.onKeyDown] }
{ state = newState, emit = [config.onChange newText] }
| Key { key = "ArrowLeft" } \
newCursorPos = max 0 (state.cursorPos - 1);
newScroll = calcScrollOffset state.text newCursorPos state.scrollOffset config.w;
newState = state.{ text = state.text, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [] }
| Key { key = "ArrowRight" } \
newCursorPos = min (len state.text) (state.cursorPos + 1);
newScroll = calcScrollOffset state.text newCursorPos state.scrollOffset config.w;
newState = state.{ text = state.text, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [] }
| Key { key = "Backspace" } \
newText = deleteChar state.text state.cursorPos;
newCursorPos = max 0 (state.cursorPos - 1);
newScroll = calcScrollOffset newText newCursorPos state.scrollOffset config.w;
newState = state.{ text = newText, cursorPos = newCursorPos, scrollOffset = newScroll };
{ state = newState, emit = [config.onChange newText] }
| Clicked coords \
newCursorPos = findCursorPos state.text coords.x state.scrollOffset 8;
@ -129,7 +130,8 @@ textInput = config \ ui.stateful {
| Focused \ { state = state.{ focused = True }, emit = [] }
| Blurred \ { state = state.{ focused = False }, emit = [] }
| event \ { state = state, emit = [config.onKeyDown event] },
| Key { key = k } \ { state = state, emit = [\ config.onKeyDown k ] }
| _ \ { state = state, emit = [] },
view = state \
textBeforeCursor = slice state.text 0 state.cursorPos;

10
src/cg/05-palette.cg
View file

@ -52,10 +52,12 @@ palette = config \
w = contentWidth,
h = textInputHeight,
onChange = text \ batch [config.state.query := text, config.state.focusedIndex := 0],
onKeyDown = key \ key
| ArrowUp \ config.state.focusedIndex := max 0 (config.state.focusedIndex - 1)
| ArrowDown \ config.state.focusedIndex := (config.state.focusedIndex + 1)
| Enter \ (\ config.onSelect (unwrapOr "" (nth config.state.focusedIndex results)))
onKeyDown = key \
_ = debug "palette key" key;
key
| "ArrowUp" \ config.state.focusedIndex := max 0 (config.state.focusedIndex - 1)
| "ArrowDown" \ config.state.focusedIndex := (config.state.focusedIndex + 1)
| "Enter" \ (\ config.onSelect (unwrapOr "" (nth config.state.focusedIndex results)))
| _ \ noOp
},
ui.clip {

2
src/cg/10-os.cg
View file

@ -9,6 +9,8 @@ osState = {
init = {};
update = state event \ event
| Key { key = "p", meta = True } \ togglePalette
| Key { key = k } \ debug "key" k
| _ \ state;
view = state viewport \

3
src/parser.ts
View file

@ -298,7 +298,8 @@ export class Parser {
return kind === 'underscore' || kind === 'ident' ||
kind === 'type-ident' || kind === 'int' ||
kind === 'float' || kind === 'string' ||
kind === 'open-paren';
kind === 'open-paren' || kind === 'open-brace' ||
kind === 'open-bracket';
}
private parseLambda(): AST {

18
src/runtime-compiled.ts
View file

@ -205,13 +205,17 @@ export function runAppCompiled(app: App, canvas: HTMLCanvasElement, rt: any) {
});
window.addEventListener('keydown', (e) => {
let event: any;
if (e.key.length === 1 && !e.ctrlKey && !e.metaKey && !e.altKey) {
event = { _tag: 'Char', _0: e.key };
} else {
event = { _tag: e.key };
}
const event = {
_tag: 'Key',
_0: {
key: e.key,
ctrl: { _tag: e.ctrlKey ? 'True' : 'False' },
meta: { _tag: e.metaKey ? 'True' : 'False' },
alt: { _tag: e.altKey ? 'True' : 'False' },
shift: { _tag: e.shiftKey ? 'True' : 'False' },
printable: { _tag: e.key.length === 1 ? 'True' : 'False' }
}
};
if (focusedComponentKey) {
handleComponentEvent(focusedComponentKey, event);