Commented the fkey controls temporarily

This commit is contained in:
neauoire 2022-01-07 11:36:04 -08:00
parent 38334a633b
commit b328a4e87d
3 changed files with 45 additions and 3 deletions

View File

@ -67,7 +67,14 @@ BRK
@on-button ( -> ) @on-button ( -> )
.Controller/func DEI DEBUG .Controller/func DEI
DUP #02 ! ,&no-f2 JCN
;toggle-debugger JSR2
&no-f2
DUP #08 ! ,&no-f4 JCN
;reboot JSR2
&no-f4
POP
BRK BRK
@ -115,6 +122,20 @@ BRK
BRK BRK
@toggle-debugger ( -- )
( toggle debug ) #fd0e STH2k LDA #00 = STH2r STA
RTN
@reboot ( -- )
( clear devices/stacks )
#fd00 #0300 ;mclr JSR2
RTN
&boot-path "boot.rom $1
@draw-stacks ( -- ) @draw-stacks ( -- )
AUTO-YADDR AUTO-YADDR
@ -200,6 +221,16 @@ RTN
JMP2r JMP2r
@mclr ( addr* len* -- )
OVR2 ++ SWP2
&loop
STH2k #00 STH2r STA
INC2 GTH2k ,&loop JCN
POP2 POP2
JMP2r
@print-hex ( value* -- ) @print-hex ( value* -- )
SWP ,&byte JSR SWP ,&byte JSR
@ -212,6 +243,15 @@ JMP2r
JMP2r JMP2r
@print-str ( string* -- )
#0001 SUB2
&while
INC2 LDAk DUP #18 DEO ,&while JCN
POP2
JMP2r
@error-txts @error-txts
&0 "Working-stack 20 "underflow $1 &0 "Working-stack 20 "underflow $1
&1 "Return-stack 20 "underflow $1 &1 "Return-stack 20 "underflow $1

View File

@ -117,6 +117,8 @@ screen_dei(Device *d, Uint8 port)
case 0x3: return uxn_screen.width; case 0x3: return uxn_screen.width;
case 0x4: return uxn_screen.height >> 8; case 0x4: return uxn_screen.height >> 8;
case 0x5: return uxn_screen.height; case 0x5: return uxn_screen.height;
case 0x6:
default: return d->dat[port]; default: return d->dat[port];
} }
} }

View File

@ -459,8 +459,8 @@ run(Uxn *u)
controller_key(devctrl, get_key(&event)); controller_key(devctrl, get_key(&event));
else if(get_button(&event)) else if(get_button(&event))
controller_down(devctrl, get_button(&event)); controller_down(devctrl, get_button(&event));
else if(get_fkey(&event)) /* else if(get_fkey(&event))
controller_special(&supervisor.dev[0x8], get_fkey(&event)); controller_special(&supervisor.dev[0x8], get_fkey(&event)); */
else else
do_shortcut(u, &event); do_shortcut(u, &event);
ksym = event.key.keysym.sym; ksym = event.key.keysym.sym;