Fixed issue with padding

etc/controller.tal

@@ -0,0 +1,162 @@
+( Controller: Buttons should highlight on press and display the button and key bytes. )
+
+|00 @System &vector $2 &wst $1 &rst $1 &pad $4 &r $2 &g $2 &b $2 &debug $1 &halt $1
+|20 @Screen &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1
+|80 @Controller &vector $2 &button $1 &key $1
+
+|0000
+
+	@center &x $2 &y $2
+	@frame &w $2 &h $2 &x0 $2 &y0 $2 &x1 $2 &y1 $2
+
+|0100
+
+@on-reset ( -> )
+	( | theme )
+	#2fff .System/r DEO2
+	#2f0f .System/g DEO2
+	#2f0f .System/b DEO2
+	( | find center )
+	.Screen/width DEI2 #01 SFT2 .center/x STZ2
+	.Screen/height DEI2 #01 SFT2 .center/y STZ2
+	( | place controller )
+	#0068 .frame/w STZ2
+	#0030 .frame/h STZ2
+	.center/x LDZ2 .frame/w LDZ2 #01 SFT2 SUB2 .frame/x0 STZ2
+	.center/y LDZ2 .frame/h LDZ2 #01 SFT2 SUB2 .frame/y0 STZ2
+	.frame/x0 LDZ2 .frame/w LDZ2 ADD2 .frame/x1 STZ2
+	.frame/y0 LDZ2 .frame/h LDZ2 ADD2 .frame/y1 STZ2
+	( | vectors )
+	;on-button .Controller/vector DEO2
+	( | frame )
+	.frame/x0 LDZ2 .frame/y0 LDZ2 .frame/x1 LDZ2 .frame/y1 LDZ2 #03 <line-rect>
+	<draw-controller>
+	BRK
+
+@on-button ( -> )
+	<draw-controller>
+	( | print stack on start button )
+	[ LIT2 08 -Controller/button ] DEI NEQ ?{ #010e DEO }
+	BRK
+
+(
+@|drawing )
+
+@<draw-controller> ( -- )
+	.Controller/button DEI STH
+	( | d-pad )
+	.frame/x0 LDZ2 #0010 ADD2 .Screen/x DEO2
+	.frame/y0 LDZ2 #0010 ADD2 .Screen/y DEO2
+	;dpad-up-icn .Screen/addr DEO2
+	#03 STHkr #04 SFT #01 AND SUB .Screen/sprite DEO
+	.Screen/y DEI2 #0010 ADD2 .Screen/y DEO2
+	;dpad-down-icn .Screen/addr DEO2
+	#03 STHkr #05 SFT #01 AND SUB .Screen/sprite DEO
+	.Screen/y DEI2 #0008 SUB2 .Screen/y DEO2
+	.Screen/x DEI2 #0008 SUB2 .Screen/x DEO2
+	;dpad-left-icn .Screen/addr DEO2
+	#03 STHkr #06 SFT #01 AND SUB .Screen/sprite DEO
+	.Screen/x DEI2 #0010 ADD2 .Screen/x DEO2
+	;dpad-right-icn .Screen/addr DEO2
+	#03 STHkr #07 SFT #01 AND SUB .Screen/sprite DEO
+	.Screen/x DEI2 #0008 SUB2 .Screen/x DEO2
+	;fill-icn .Screen/addr DEO2
+	[ LIT2 03 -Screen/sprite ] DEO
+	( | options )
+	.center/y LDZ2 #0009 ADD2 .Screen/y DEO2
+	.center/x LDZ2 #0009 SUB2 .Screen/x DEO2
+	;option-icn .Screen/addr DEO2
+	#03 STHkr #03 SFT #01 AND SUB .Screen/sprite DEO
+	.center/x LDZ2 #0004 ADD2 .Screen/x DEO2
+	;option-icn .Screen/addr DEO2
+	#03 STHkr #02 SFT #01 AND SUB .Screen/sprite DEO
+	( | buttons )
+	.center/y LDZ2 .Screen/y DEO2
+	.center/x LDZ2 #0018 ADD2 .Screen/x DEO2
+	;button-icn .Screen/addr DEO2
+	#03 STHkr #01 SFT #01 AND SUB .Screen/sprite DEO
+	.Screen/y DEI2 #000a ADD2 .Screen/y DEO2
+	;font-hex/b .Screen/addr DEO2
+	[ LIT2 03 -Screen/sprite ] DEO
+	.center/y LDZ2 .Screen/y DEO2
+	.center/x LDZ2 #0024 ADD2 .Screen/x DEO2
+	;button-icn .Screen/addr DEO2
+	#03 STHr #01 AND SUB .Screen/sprite DEO
+	.Screen/y DEI2 #000a ADD2 .Screen/y DEO2
+	;font-hex/a .Screen/addr DEO2
+	[ LIT2 03 -Screen/sprite ] DEO
+	.center/x LDZ2 #0010 SUB2 .Screen/x DEO2
+	.center/y LDZ2 #0010 SUB2 .Screen/y DEO2
+	[ LIT2 01 -Screen/auto ] DEO
+	.Controller/button DEI2 <draw-short>
+	[ LIT2 00 -Screen/auto ] DEO
+	JMP2r
+
+@<draw-short> ( short* -- )
+	SWP <draw-byte>
+
+@<draw-byte> ( byte -- )
+	DUP #04 SFT <draw-hex>
+
+@<draw-hex> ( char -- )
+	#00 SWP #0f AND #30 SFT2 ;font-hex ADD2 .Screen/addr DEO2
+	[ LIT2 03 -Screen/sprite ] DEO
+	JMP2r
+
+@<line-rect> ( x1* y1* x2* y2* color -- )
+	STH
+	DUP2 ,&ver-y2 STR2
+	,&hor-y2 STR2
+	DUP2 ,&ver-x2 STR2
+	,&hor-x2 STR2
+	DUP2 ,&ver-y1 STR2
+	,&hor-y1 STR2
+	DUP2 ,&ver-x1 STR2
+	,&hor-x1 STR2
+	( | horizontal )
+	[ LIT2 &hor-x2 $2 ] INC2 [ LIT2 &hor-x1 $2 ]
+	&hor ( -- )
+		DUP2 .Screen/x DEO2
+		[ LIT2 &hor-y1 $2 ] .Screen/y DEO2
+		STHkr .Screen/pixel DEOk [ LIT2 &hor-y2 $2 ] .Screen/y DEO2
+		DEO
+		INC2 GTH2k ?&hor
+	POP2 POP2
+	( | vertical )
+	[ LIT2 &ver-y2 $2 ] [ LIT2 &ver-y1 $2 ]
+	&ver ( -- )
+		DUP2 .Screen/y DEO2
+		[ LIT2 &ver-x1 $2 ] .Screen/x DEO2
+		STHkr .Screen/pixel DEOk [ LIT2 &ver-x2 $2 ] .Screen/x DEO2
+		DEO
+		INC2 GTH2k ?&ver
+	POP2 POP2 POPr JMP2r
+
+(
+@|assets )
+
+@fill-icn [ ffff ffff ffff ffff ]
+
+@dpad-up-icn [ 7eff e7c3 ffff ffff ]
+
+@dpad-down-icn [ ffff ffff c3e7 ff7e ]
+
+@dpad-left-icn [ 7fff efcf cfef ff7f ]
+
+@dpad-right-icn [ feff f7f3 f3f7 fffe ]
+
+@option-icn [ 0000 7eff ff7e 0000 ]
+
+@button-icn [ 3c7e ffff ffff 7e3c ]
+
+@font-hex [
+	007c 8282 8282 827c 0030 1010 1010 1010
+	007c 8202 7c80 80fe 007c 8202 1c02 827c
+	000c 1424 4484 fe04 00fe 8080 7c02 827c
+	007c 8280 fc82 827c 00fe 0202 0408 1010
+	007c 8282 7c82 827c 007c 8282 7e02 827c
+	&a 007c 8202 7e82 827e &b 00fc 8282
+	fc82 82fc 007c 8280 8080 827c 00fc 8282
+	8282 82fc 00fe 8080 fe80 80fe 00fe 8080
+	f080 8080 ]
+

makefile

@@ -12,9 +12,9 @@ all: dest bin/uxnasm bin/uxncli bin/uxn11
 dest:
 	@ mkdir -p bin
 rom:
-	@ ./bin/uxnasm etc/screen.bounds.tal bin/screen.bounds.rom
+	@ ./bin/uxnasm etc/controller.tal bin/res.rom
 run: all bin/uxnasm bin/uxncli bin/uxn11 rom
-	@ ./bin/uxn11 bin/screen.bounds.rom
+	@ ./bin/uxn11 bin/res.rom
 test: bin/uxnasm bin/uxncli bin/uxn11
 	@ ./bin/uxnasm && ./bin/uxncli && ./bin/uxn11 && ./bin/uxnasm -v && ./bin/uxncli -v && ./bin/uxn11 -v
 	@ ./bin/uxnasm etc/opctest.tal bin/opctest.rom

src/uxn11.c

@@ -80,7 +80,7 @@ emu_resize(int w, int h)
 		w *= uxn_screen.scale, h *= uxn_screen.scale;
 		visual = DefaultVisual(display, 0);
 		ximage = XCreateImage(display, visual, DefaultDepth(display, DefaultScreen(display)), ZPixmap, 0, (char *)uxn_screen.pixels, w, h, 32, 0);
-		XResizeWindow(display, window, w, h);
+		XResizeWindow(display, window, w + PAD * 2, h + PAD * 2);
 		XMapWindow(display, window);
 	}
 	return 1;
@@ -146,11 +146,11 @@ emu_event(Uxn *u)
 		KeySym sym;
 		char buf[7];
 		XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
-		switch(sym){
+		switch(sym) {
-			case XK_F1: toggle_scale(); break;
+		case XK_F1: toggle_scale(); break;
-			case XK_F2: u->dev[0x0e] = !u->dev[0x0e]; break;
+		case XK_F2: u->dev[0x0e] = !u->dev[0x0e]; break;
-			case XK_F4: emu_restart(u, boot_rom, 0); break;
+		case XK_F4: emu_restart(u, boot_rom, 0); break;
-			case XK_F5: emu_restart(u, boot_rom, 1); break;
+		case XK_F5: emu_restart(u, boot_rom, 1); break;
 		}
 		controller_down(u, &u->dev[0x80], get_button(sym));
 		controller_key(u, &u->dev[0x80], sym < 0x80 ? sym : (Uint8)buf[0]);