Merge branch 'master' of /var/git/hackvr

9 files changed, 53 insertions, 49 deletions

diff --git a/share/hackvr/examples/calendar/Makefile b/share/hackvr/examples/calendar/Makefile
index 2027b18..1646279 100644
--- a/share/hackvr/examples/calendar/Makefile
+++ b/share/hackvr/examples/calendar/Makefile
@@ -1,8 +1,7 @@
 PREFIX:=/usr/local
 
-all: calvr hackvr_coproc
+all: calvr
 	@echo using PREFIX: $(PREFIX)
 
 install:
 	install -t $(PREFIX)/bin calvr
-	install -t $(PREFIX)/bin hackvr_coproc
diff --git a/share/hackvr/examples/calendar/hackvr_coproc b/share/hackvr/examples/calendar/hackvr_coproc
deleted file mode 100755
index 8d2e127..0000000
--- a/share/hackvr/examples/calendar/hackvr_coproc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec socat exec:hackvr "exec:$*"
diff --git a/share/hackvr/examples/hackvr_term/hackvr_data_decode.sh b/share/hackvr/examples/hackvr_term/hackvr_data_decode.sh
index 307b6ff..85c64af 100755
--- a/share/hackvr/examples/hackvr_term/hackvr_data_decode.sh
+++ b/share/hackvr/examples/hackvr_term/hackvr_data_decode.sh
@@ -1,2 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
+set -eo pipefail
 exec grep --line-buffered '^[^ ]* data ' | stdbuf -oL tr -s ' ' | stdbuf -oL cut '-d ' -f3- | stdbuf -o0 xxd -r -p
diff --git a/share/hackvr/examples/hackvr_term/hackvr_term.c b/share/hackvr/examples/hackvr_term/hackvr_term.c
index 40df2d1..b044498 100644
--- a/share/hackvr/examples/hackvr_term/hackvr_term.c
+++ b/share/hackvr/examples/hackvr_term/hackvr_term.c
@@ -60,7 +60,7 @@ void preload_glyphs() {
 void hackvr_draw_character(int c,int r,const TMTCHAR *ch) {
   char *line;
   int i,ret=0;
-  printf("term_%02d_%02d addshape %d 4  -1 -3 0  5 -3 0  5 7 0  -1 7 0\n",c,r,ch->a.bg+15);
+  //printf("term_%02d_%02d addshape %d 4  -1 -3 0  5 -3 0  5 7 0  -1 7 0\n",c,r,ch->a.bg+15);
   for(i=0,line=glyphs[ch->c][0];line[0];i++,line=glyphs[ch->c][i]) {
     ret=1;
     printf("term_%02d_%02d addshape %d %s",c,r,ch->a.fg == -1 ? 17 : ch->a.fg + 15,line+strlen("XX addshape X"));
diff --git a/share/hackvr/examples/tictactoe/board b/share/hackvr/examples/tictactoe/board
index 607ebf3..e7494fd 100644
--- a/share/hackvr/examples/tictactoe/board
+++ b/share/hackvr/examples/tictactoe/board
@@ -1,13 +1,13 @@
 _reset addshape 2 3 -4 6 4 -5 6 4 -4 5 4
 
-topleft addshape 2 4 -3 13 4 -1 13 4 -1 11 4 -3 11 4
-topcenter addshape 2 4 -1 13 4 1 13 4 1 11 4 -1 11 4
-topright addshape 2 4 1 13 4 3 13 4 3 11 4 1 11 4
+boardtopleft addshape 2 4 -3 13 4 -1 13 4 -1 11 4 -3 11 4
+boardtopcenter addshape 2 4 -1 13 4 1 13 4 1 11 4 -1 11 4
+boardtopright addshape 2 4 1 13 4 3 13 4 3 11 4 1 11 4
 
-middleleft addshape 2 4 -3 11 4 -1 11 4 -1 9 4 -3 9 4
-middlecenter addshape 2 4 -1 11 4 1 11 4 1 9 4 -1 9 4
-middleright addshape 2 4 1 11 4 3 11 4 3 9 4 1 9 4
+boardmiddleleft addshape 2 4 -3 11 4 -1 11 4 -1 9 4 -3 9 4
+boardmiddlecenter addshape 2 4 -1 11 4 1 11 4 1 9 4 -1 9 4
+boardmiddleright addshape 2 4 1 11 4 3 11 4 3 9 4 1 9 4
 
-bottomleft addshape 2 4 -3 9 4 -1 9 4 -1 7 4 -3 7 4
-bottomcenter addshape 2 4 -1 9 4 1 9 4 1 7 4 -1 7 4
-bottomright addshape 2 4 1 9 4 3 9 4 3 7 4 1 7 4
+boardbottomleft addshape 2 4 -3 9 4 -1 9 4 -1 7 4 -3 7 4
+boardbottomcenter addshape 2 4 -1 9 4 1 9 4 1 7 4 -1 7 4
+boardbottomright addshape 2 4 1 9 4 3 9 4 3 7 4 1 7 4
diff --git a/share/hackvr/examples/tictactoe/board_orig b/share/hackvr/examples/tictactoe/board_orig
index bc97ee4..2fff3ba 100644
--- a/share/hackvr/examples/tictactoe/board_orig
+++ b/share/hackvr/examples/tictactoe/board_orig
@@ -1,14 +1,14 @@
 _reset addshape 2 3 -4 -4 4 -5 -4 4 -4 -5 4
 _exit addshape 2 3 4 -4 4 5 -4 4 4 -5 4
 
-topleft addshape 2 4 -3 3 4 -1 3 4 -1 1 4 -3 1 4
-topcenter addshape 2 4 -1 3 4 1 3 4 1 1 4 -1 1 4
-topright addshape 2 4 1 3 4 3 3 4 3 1 4 1 1 4
+boardtopleft addshape 2 4 -3 3 4 -1 3 4 -1 1 4 -3 1 4
+boardtopcenter addshape 2 4 -1 3 4 1 3 4 1 1 4 -1 1 4
+boardtopright addshape 2 4 1 3 4 3 3 4 3 1 4 1 1 4
 
-middleleft addshape 2 4 -3 1 4 -1 1 4 -1 -1 4 -3 -1 4
-middlecenter addshape 2 4 -1 1 4 1 1 4 1 -1 4 -1 -1 4
-middleright addshape 2 4 1 1 4 3 1 4 3 -1 4 1 -1 4
+boardmiddleleft addshape 2 4 -3 1 4 -1 1 4 -1 -1 4 -3 -1 4
+boardmiddlecenter addshape 2 4 -1 1 4 1 1 4 1 -1 4 -1 -1 4
+boardmiddleright addshape 2 4 1 1 4 3 1 4 3 -1 4 1 -1 4
 
-bottomleft addshape 2 4 -3 -1 4 -1 -1 4 -1 -3 4 -3 -3 4
-bottomcenter addshape 2 4 -1 -1 4 1 -1 4 1 -3 4 -1 -3 4
-bottomright addshape 2 4 1 -1 4 3 -1 4 3 -3 4 1 -3 4
+boardbottomleft addshape 2 4 -3 -1 4 -1 -1 4 -1 -3 4 -3 -3 4
+boardbottomcenter addshape 2 4 -1 -1 4 1 -1 4 1 -3 4 -1 -3 4
+boardbottomright addshape 2 4 1 -1 4 3 -1 4 3 -3 4 1 -3 4
diff --git a/share/hackvr/examples/tictactoe/game.sh b/share/hackvr/examples/tictactoe/game.sh
index b4187dd..92192cc 100755
--- a/share/hackvr/examples/tictactoe/game.sh
+++ b/share/hackvr/examples/tictactoe/game.sh
@@ -4,30 +4,34 @@ BOARDFILE=board_orig
 cat camera.pos $BOARDFILE
 echo "go. player: $turn" >&2
 grep --line-buffered action \
-  | while read user derp group;do
-#    echo FUCK >&2
-    if grep "_reset" <<<$group >/dev/null;then
-     printf "%s deleteallexcept .\n" "$user"
-     cat $BOARDFILE
-     continue
-    elif grep "_exit" <<<$group >/dev/null;then #this doesn't work in local games. :/
-     exit 0
-    elif grep "_" <<<$group >/dev/null;then
-#     xmessage "CUT IT OUT"
-     echo CUT IT OUT > /dev/stderr
-     continue
-    else
-     turn=$(expr \( $turn + 1 \) % 2)
-     #printf "# turn: %d\n" "$turn" > /dev/stderr
-     printf "$user deletegroup %s\n" "$group"
-     #printf "$user deletegroup %s\n" "$group" > /dev/stderr
+  | while read user action group;do
+    if [ $action = "action" ];then
+      if grep "_reset" <<<$group >/dev/null;then
+       printf "%s deleteallexcept %s\n" "$user" "$user"
+       cat $BOARDFILE
+       continue
+      elif grep "_exit" <<<$group >/dev/null;then
+       #if a program wants to exit, it should just exit.
+       #the program may have been ran by some other program.
+       #maybe just filter out server-side quit messages for your own username?
+       #any user quit will cause any hackvr to quit?
+       #printf "%s quit\n" "$user"
+       exit 0
+      elif grep "_" <<<$group >/dev/null;then
+       echo CUT IT OUT > /dev/stderr
+       continue
+      elif grep "^board" <<<$group >/dev/null;then
+       turn=$(expr \( $turn + 1 \) % 2)
+       #printf "# turn: %d\n" "$turn" > /dev/stderr
+       printf "%s deletegroup %s\n" "$user" "$group"
+       #printf "$user deletegroup %s\n" "$group" > /dev/stderr
 #need to get the first point of the group clicked and translate the new shape by that much
-     translatex="$(grep "$group" $BOARDFILE | grep -v '^#' | tr -s ' ' | cut '-d ' -f5)"
-     translatey="$(grep "$group" $BOARDFILE | grep -v '^#' | tr -s ' ' | cut '-d ' -f6)"
-     cat "marker$turn" | offsetshape.sh $translatex "$(expr "$translatey" - 2 )" 0
-#     printf "%s move %s %s 2\n" "_marker" "$(expr "$translatex")" "$(expr "$translatey" - 2 )"
-     #printf "%s move %s %s 2\n" "_marker" "$(expr "$translatex")" "$(expr "$translatey" - 2 )" >/dev/stderr
-     grep "$group" $BOARDFILE | sed "s/$group/_marker2/g" #this is to make it still show the square around it.
-     printf "%s renamegroup _marker _marker%s%s\n" "$user" "$(date +%s)" "$RANDOM"
+       translatex="$(grep "$group" $BOARDFILE | grep -v '^#' | tr -s ' ' | cut '-d ' -f5)"
+       translatey="$(grep "$group" $BOARDFILE | grep -v '^#' | tr -s ' ' | cut '-d ' -f6)"
+       cat "marker$turn" | offsetshape.sh $translatex "$(expr "$translatey" - 2 )" 0
+       grep "$group" $BOARDFILE | sed "s/$group/_marked/g"
+      else
+       xmessage "what? $group"
+      fi
     fi
   done
diff --git a/share/hackvr/examples/tictactoe/run b/share/hackvr/examples/tictactoe/run
index bf9c87a..54d712a 100755
--- a/share/hackvr/examples/tictactoe/run
+++ b/share/hackvr/examples/tictactoe/run
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 turn=$( expr $RANDOM % 2)
-echo "go. player: $turn"
+echo "# go. player: $turn" >&2
 hackvr_coproc ./game.sh
diff --git a/share/hackvr/examples/uristart.conf b/share/hackvr/examples/uristart.conf
new file mode 100644
index 0000000..d48e8d1
--- /dev/null
+++ b/share/hackvr/examples/uristart.conf
@@ -0,0 +1,2 @@
+hackvr:         if [ "%u" ];then USER="%u";fi;ncat '%d' '%P' -c "echo $USER action %p;hackvr_uri"
+hackvr+ssh:     if [ '%u' ];then u='%u@';fi ; if [ "%P" ];then P='-p %P';fi; hackvr_coproc ssh "$u"'%d' $P "/var/hackvr/hackvr-subsystem" '%p'