diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2015-06-23 00:18:40 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2015-06-23 00:18:40 -0700 |
| commit | 9f484946cc340264b9a038d3b30369ee0d71338b (patch) | |
| tree | b80c86b0e9e1c2e8b113f8597b524ce25569a7e9 | |
| parent | c0f217d4b11da81367fb50516e65c29a3caded96 (diff) | |
| download | mu-9f484946cc340264b9a038d3b30369ee0d71338b.tar.gz | |
1625
| -rw-r--r-- | 074keyboard.mu | 4 | ||||
| -rw-r--r-- | 075scenario_console.cc | 2 | ||||
| -rw-r--r-- | edit.mu | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/074keyboard.mu b/074keyboard.mu index 2d82a3d9..5f92428d 100644 --- a/074keyboard.mu +++ b/074keyboard.mu @@ -4,11 +4,11 @@ exclusive-container event [ text:character keycode:number # keys on keyboard without a unicode representation - pointer:single-touch-event # mouse, track ball, etc. + touch:touch-event # mouse, track ball, etc. # update the assume-console handler if you add more variants ] -container single-touch-event [ +container touch-event [ type:number row:number column:number diff --git a/075scenario_console.cc b/075scenario_console.cc index 046dd69f..2dc730af 100644 --- a/075scenario_console.cc +++ b/075scenario_console.cc @@ -61,7 +61,7 @@ case ASSUME_CONSOLE: { for (long long int i = 0; i < SIZE(r.steps); ++i) { const instruction& curr = r.steps.at(i); if (curr.name == "left-click") { - Memory[Current_routine->alloc] = /*tag for 'single-touch-event' variant of 'event' exclusive-container*/2; + Memory[Current_routine->alloc] = /*tag for 'touch-event' variant of 'event' exclusive-container*/2; Memory[Current_routine->alloc+1+/*offset of 'type' in 'mouse-event'*/0] = TB_KEY_MOUSE_LEFT; Memory[Current_routine->alloc+1+/*offset of 'row' in 'mouse-event'*/1] = to_integer(curr.ingredients.at(0).name); Memory[Current_routine->alloc+1+/*offset of 'column' in 'mouse-event'*/2] = to_integer(curr.ingredients.at(1).name); diff --git a/edit.mu b/edit.mu index bbb55ab4..c507f449 100644 --- a/edit.mu +++ b/edit.mu @@ -282,9 +282,9 @@ recipe event-loop [ break-if quit?:boolean # only in tests trace [app], [next-event] { - p:address:single-touch-event <- maybe-convert e:event, pointer:variant - break-unless p:address:single-touch-event - editor:address:editor-data <- move-cursor-in-editor editor:address:editor-data, p:address:single-touch-event + t:address:touch-event <- maybe-convert e:event, touch:variant + break-unless t:address:touch-event + editor:address:editor-data <- move-cursor-in-editor editor:address:editor-data, t:address:touch-event loop +next-event:label } c:address:character <- maybe-convert e:event, text:variant @@ -296,11 +296,11 @@ recipe event-loop [ recipe move-cursor-in-editor [ default-space:address:array:location <- new location:type, 30:literal editor:address:editor-data <- next-ingredient - p:address:single-touch-event <- next-ingredient + t:address:touch-event <- next-ingredient row:address:number <- get-address editor:address:editor-data/deref, cursor-row:offset - row:address:number/deref <- get p:address:single-touch-event/deref, row:offset + row:address:number/deref <- get t:address:touch-event/deref, row:offset column:address:number <- get-address editor:address:editor-data/deref, cursor-column:offset - column:address:number/deref <- get p:address:single-touch-event/deref, column:offset + column:address:number/deref <- get t:address:touch-event/deref, column:offset # todo: adjust 'cursor' pointer into editor data ] |