diff --git a/overlay/rootfs/usr/bin/snake b/overlay/rootfs/usr/bin/snake index 5ef421a..3ac5d64 100755 Binary files a/overlay/rootfs/usr/bin/snake and b/overlay/rootfs/usr/bin/snake differ diff --git a/overlay/rootfs/usr/bin/sxmo_appmenu.sh b/overlay/rootfs/usr/bin/sxmo_appmenu.sh index c337f28..abadf47 100755 --- a/overlay/rootfs/usr/bin/sxmo_appmenu.sh +++ b/overlay/rootfs/usr/bin/sxmo_appmenu.sh @@ -236,15 +236,17 @@ $icon_cfg Suspend Blockers^0^sxmo_terminal.sh sxmo_debug_suspend.sh $icon_inf Log^0^sxmo_terminal.sh tail -n 100 -f ${XDG_STATE_HOME:-$HOME}/sxmo.log $icon_inf Version^0^sxmo_terminal.sh sxmo_version.sh --block" ;; - *) - RES="$(sxmo_hook_contextmenu.sh "$WMCLASS" "$WMNAME")" - if [ -n "$RES" ]; then - nl=' + *) + RES="$(sxmo_hook_contextmenu.sh "$WMCLASS" "$WMNAME")" + if [ -n "$RES" ]; then + nl=' ' - WINNAME="${RES%%"$nl"*}" - CHOICES="${RES#*"$nl"}" - fi - ;; + WINNAME="${RES%%"$nl"*}" + CHOICES="${RES#*"$nl"}" + fi + CHOICES="$CHOICES +$icon_gam Games^0^sxmo_appmenu.sh games" + ;; esac if [ "$WINNAME" = "Sys" ]; then diff --git a/overlay/rootfs/usr/bin/tetris b/overlay/rootfs/usr/bin/tetris index fe144d5..7a3ec41 100755 Binary files a/overlay/rootfs/usr/bin/tetris and b/overlay/rootfs/usr/bin/tetris differ diff --git a/prebuilt/games/usr/bin/snake b/prebuilt/games/usr/bin/snake index 5ef421a..3ac5d64 100755 Binary files a/prebuilt/games/usr/bin/snake and b/prebuilt/games/usr/bin/snake differ diff --git a/prebuilt/games/usr/bin/tetris b/prebuilt/games/usr/bin/tetris index fe144d5..7a3ec41 100755 Binary files a/prebuilt/games/usr/bin/tetris and b/prebuilt/games/usr/bin/tetris differ diff --git a/src/games/snake.cpp b/src/games/snake.cpp index fcde3e8..0e59680 100644 --- a/src/games/snake.cpp +++ b/src/games/snake.cpp @@ -22,8 +22,8 @@ #include #include -static const int WIN_W = 239; -static const int WIN_H = 295; +static const int WIN_W = 220; +static const int WIN_H = 268; static const int COLS = 24; static const int ROWS = 28; @@ -112,8 +112,8 @@ static unsigned long now_ms() { } static void compute_grid() { - int m = 4; - int topH = 16; // reserved status strip for SCORE/BEST + int m = 2; + int topH = 14; // reserved status strip for SCORE/BEST int aw = winW - 2 * m; int ah = winH - topH - m; cell = aw / COLS; diff --git a/src/games/tetris.cpp b/src/games/tetris.cpp index 8a7b83b..2c53c9a 100644 --- a/src/games/tetris.cpp +++ b/src/games/tetris.cpp @@ -23,8 +23,8 @@ #include #include -static const int WIN_W = 239; -static const int WIN_H = 295; +static const int WIN_W = 224; +static const int WIN_H = 292; static const int PCOLS = 10; static const int PROWS = 20; static const int CELL = 14; @@ -255,10 +255,10 @@ static void render() { XSetForeground(dpy, gc, C_BG); XFillRectangle(dpy, back, gc, 0, 0, winW, winH); - // playfield border (single clean frame around the well) + // single border framing the whole game (playfield + side panel) at the + // window edges, so it is visible on all four sides including right/bottom XSetForeground(dpy, gc, C_DIM); - XDrawRectangle(dpy, back, gc, px0 - 1, py0 - 1, PCOLS * CELL + 2, PROWS * CELL + 2); - + XDrawRectangle(dpy, back, gc, 2, 2, winW - 4, winH - 4); // settled blocks for (int x = 0; x < PCOLS; x++) for (int y = 0; y < PROWS; y++)