From d3a0940612e8e523d0c91f27519140da9421848d Mon Sep 17 00:00:00 2001 From: Derek Stevens Date: Fri, 15 Oct 2021 00:00:46 -0600 Subject: [PATCH] client: adjust resolution; server: set DISPLAY if unset --- server/xrxs-srv.sh | 4 ++++ uxn-client/xrxs.tal | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/xrxs-srv.sh b/server/xrxs-srv.sh index 993c81d..aba2a13 100755 --- a/server/xrxs-srv.sh +++ b/server/xrxs-srv.sh @@ -2,6 +2,10 @@ PORT=5460 +if [ -z "${DISPLAY}"]; then + export DISPLAY=:0 +fi + case $1 in start) ./xrxs -s xrxs & sleep 1 diff --git a/uxn-client/xrxs.tal b/uxn-client/xrxs.tal index 1b1b610..7347993 100644 --- a/uxn-client/xrxs.tal +++ b/uxn-client/xrxs.tal @@ -69,6 +69,8 @@ #02cd .System/g DEO2 #02cb .System/b DEO2 + #0200 .Screen/width DEO2 + #0110 .Screen/height DEO2 ( initialize state ) #00 .ticker STZ #00 .state STZ @@ -591,7 +593,7 @@ RTN .Mouse/y DEI2 #0028 SUB2 8// TOB .list-top LDZ ADD .select-index STZ .Mouse/state DEI #00 EQU ,&no-click JCN - .select-index LDZ .ncarts GTH ,&no-click JCN + .select-index LDZ .ncarts LDZ GTH ,&no-click JCN .state LDZ INC .state STZ ;set-button-state-by-key .Controller/vector DEO2 ;set-button-state-by-mouse .Mouse/vector DEO2 @@ -949,8 +951,6 @@ RTN @no-instr BRK ( constants ) -@spritesheet "xrxs.chr 00 -@fontsheet "zz.chr 00 @carts-file "n/carts 00 @slot-file "n/slot 00 @ctl-file "n/ctl 00