From d50ac287e7cc00793657422dbfa36d9c71e659be Mon Sep 17 00:00:00 2001 From: David Vazgenovich Shakaryan Date: Sat, 23 Apr 2022 07:25:41 -0700 Subject: web: add undo ability; simplify prompt handlers Undo currently works only for ongoing matches. --- web/dartboat_wasm.c | 28 +++++++++++++++++++++--- web/static/dartboat.js | 59 ++++++++++++++++++++++++++------------------------ web/static/index.html | 26 ++++++++++++---------- web/static/style.css | 19 +++++++++++++++- 4 files changed, 88 insertions(+), 44 deletions(-) diff --git a/web/dartboat_wasm.c b/web/dartboat_wasm.c index d52f15f..0e59312 100644 --- a/web/dartboat_wasm.c +++ b/web/dartboat_wasm.c @@ -82,7 +82,8 @@ EMSCRIPTEN_KEEPALIVE void draw_match() { EM_ASM({drawVisit($0, $1, $2, $3, $4, $5)}, "0", "", "501", "", "501", ""); - int n_visits = l1->n_visits > l2->n_visits ? l1->n_visits : l2->n_visits; + //int n_visits = l1->n_visits > l2->n_visits ? l1->n_visits : l2->n_visits; + int n_visits = l1->n_visits; for (int i = 0; i < n_visits; ++i) { sprintf(visit_no, "%d", i + 1); @@ -223,7 +224,7 @@ EMSCRIPTEN_KEEPALIVE bool user_visit(int points) { EM_ASM({clearVisits()}); draw_match(); - if (!is_match_over()) { + if (!is_match_over() && l->n_visits > state->l2->n_visits) { set_boat_active(); boat_visit(); } @@ -236,6 +237,27 @@ EMSCRIPTEN_KEEPALIVE void user_visit_to_rem(int rem) { user_visit(state->l1->rem - rem); } +EMSCRIPTEN_KEEPALIVE bool user_undo() { + if (!state->l1->n_visits) { + EM_ASM(oi()); + return false; + } + + struct leg *l = state->l1; + struct visit *v = l->visits + --l->n_visits; + l->rem += v->points; + + EM_ASM({updatePlayerAvg($0, $1)}, P_USER, + l->n_visits ? (double)(l->start-l->rem)/l->n_visits : 0); + + memcpy(v, 0, sizeof(*v)); + + EM_ASM({clearVisits()}); + draw_match(); + + return true; +} + EMSCRIPTEN_KEEPALIVE void draw_boat_throwing(int pts, char *str) { char buf[10]; sprintf(buf, "%d", pts); @@ -298,7 +320,7 @@ EMSCRIPTEN_KEEPALIVE void start_match() { if (state) free_match(); init_boat(); - state = calloc(1, sizeof(struct match_state)); + state = calloc(1, sizeof(*state)); state->l1 = leg_init(501, "User"); state->l2 = leg_init(501, "Bot"); diff --git a/web/static/dartboat.js b/web/static/dartboat.js index 07c8997..6a0d07b 100644 --- a/web/static/dartboat.js +++ b/web/static/dartboat.js @@ -32,7 +32,7 @@ function _promptGet() { function _promptGetAndClear() { let val = _promptGet(); - promptClear(); + promptHandle('clear'); return val; } @@ -78,6 +78,19 @@ let prompt_handlers = { Module.ccall('user_visit_to_rem', 'number', ['number'], [rem]); }, + undo() { + let cl = document.getElementById('key_undo').classList; + if (cl.contains('active')) + Module.ccall('user_undo'); + cl.toggle('active'); + }, + + pre(action) { + clearOi(); + if (action != 'undo') + document.getElementById('key_undo').classList.remove('active'); + }, + _update_rem(val) { Module.ccall('update_user_rem_from_pts', null, ['number'], [val || _promptGet()]); @@ -103,12 +116,20 @@ let prompt_handlers = { let n = _promptGetAndClear(); if (n) Module.ccall('resp_numdarts', null, ['number'], [n]); + }, + + pre(action) { + clearOi(); } }, init: { submit() { Module.ccall('start_match'); + }, + + pre(action) { + clearOi(); } } } @@ -117,29 +138,9 @@ function setPromptHandler(ptr) { prompt_handler = prompt_handlers[UTF8ToString(ptr)]; } -function promptAppend(...args) { - clearOi(); - prompt_handler?.append?.(...args); -} - -function promptClear(...args) { - clearOi(); - prompt_handler?.clear?.(...args); -} - -function promptBackspace(...args) { - clearOi(); - prompt_handler?.backspace?.(...args); -} - -function promptSubmit(...args) { - clearOi(); - prompt_handler?.submit?.(...args); -} - -function promptSubmitRem(...args) { - clearOi(); - prompt_handler?.submit_rem?.(...args); +function promptHandle(action, ...args) { + prompt_handler?.pre?.(action); + prompt_handler?.[action]?.(...args); } function setPromptInput(ptr) { @@ -239,11 +240,13 @@ document.addEventListener('keydown', e => { return; if (isFinite(e.key)) - promptAppend(e.key); + promptHandle('append', e.key); else if (e.key == 'Enter') - promptSubmit(); + promptHandle('submit'); else if (e.key == 'Backspace') - promptBackspace(); + promptHandle('backspace'); else if (e.key == 'r') - promptSubmitRem(); + promptHandle('submit_rem'); + else if (e.key == 'u') + promptHandle('undo'); }); diff --git a/web/static/index.html b/web/static/index.html index fdfa0ee..d2d6bb4 100644 --- a/web/static/index.html +++ b/web/static/index.html @@ -31,18 +31,20 @@
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
CLEAR
-
0
-
OK
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
CLEAR
+
0
+
OK
+
UNDO
+
REM
dartboat™
diff --git a/web/static/style.css b/web/static/style.css index e418ef7..b644439 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -21,7 +21,7 @@ div#main { display: grid; grid-template-columns: 1fr; - grid-template-rows: min-content min-content 2fr 2fr; + grid-template-rows: min-content min-content 2fr 3fr; grid-template-areas: "settings-bar" "rem-bar" "visits" "keypad"; } @@ -170,11 +170,28 @@ div.key:active { background-color: #3b500e; } +div.key.active { + background-color: #3d2466; +} + +div.key.active:hover { + background-color: #5c3699; +} + +div.key.active:active { + color: #fff; + background-color: #6e41b8; +} + div.key.num { font-size: 2.5em; font-weight: 700; } +div.key.ok { + grid-row-end: span 2; +} + div#settings-bar { grid-area: settings-bar; -- cgit v1.2.3-70-g09d2