diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe
index 7766d6f..176f049 100755
--- a/usr/bin/jgtint2-pipe
+++ b/usr/bin/jgtint2-pipe
@@ -252,16 +252,16 @@ qactions () {
read TF2 <<< "$(grep "time2_format" ${TINT} | cut -d'=' -f2)"
out+=("^sep($CLOCK)")
- out+=("$CLOCK_LINE1 [ $(date "+${TF1}") ],^checkout(cl1)")
- out+=("$CLOCK_LINE2 [ $(date "+${TF2}") ],^checkout(cl2)")
- out2+=("^tag(cl1)")
+ out+=("$CLOCK_LINE1 [ $(date "+${TF1}") ],^checkout(cl1$i)")
+ out+=("$CLOCK_LINE2 [ $(date "+${TF2}") ],^checkout(cl2$i)")
+ out2+=("^tag(cl1$i)")
out2+=("^sep($CLOCK_LINE1)")
out2+=("$(date +"%H:%M") (%H:%M),t2ctl clockline1 '%H:%M' ${TINT};$me")
out2+=("$(date +"%I:%M %p") (%I:%M %p),t2ctl clockline1 '%I:%M %p' ${TINT};$me")
out2+=("$(date +"%-I:%M %p") (%I-:%M %p),t2ctl clockline1 '%-I:%M %p' ${TINT};$me")
out2+=("$(date +"%H:%M:%S") (%H:%M:%S),t2ctl clockline1 '%H:%M:%S' ${TINT};$me")
- out2+=("^tag(cl2)")
+ out2+=("^tag(cl2$i)")
out2+=("^sep($CLOCK_LINE2)")
out2+=("$NONE,t2ctl clockline2 none ${TINT};$me")
out2+=("^sep()")
@@ -296,25 +296,25 @@ qactions () {
out2+=("^sep($MOUSE_EVENTS)")
out2+=("$RESETMOUSE,t2ctl mousereset ${TINT};$me")
out2+=("^sep()")
- out2+=("$(printf "%-16s %1s" "$MOUSE_LEFT" "[ $MLEFT ]"),^checkout(mleft)")
- out2+=("$(printf "%-16s %1s" "$MOUSE_RIGHT" "[ $MRIGHT ]"),^checkout(mright)")
- out2+=("$(printf "%-16s %1s" "$MOUSE_MIDDLE" "[ $MMIDDLE ]"),^checkout(mmiddle)")
- out2+=("$(printf "%-16s %1s" "$MOUSE_UP" "[ $MUP ]"),^checkout(mup)")
- out2+=("$(printf "%-16s %1s" "$MOUSE_DOWN" "[ $MDOWN ]"),^checkout(mdown)")
+ out2+=("$(printf "%-16s %1s" "$MOUSE_LEFT" "[ $MLEFT ]"),^checkout(mleft$i)")
+ out2+=("$(printf "%-16s %1s" "$MOUSE_RIGHT" "[ $MRIGHT ]"),^checkout(mright$i)")
+ out2+=("$(printf "%-16s %1s" "$MOUSE_MIDDLE" "[ $MMIDDLE ]"),^checkout(mmiddle$i)")
+ out2+=("$(printf "%-16s %1s" "$MOUSE_UP" "[ $MUP ]"),^checkout(mup$i)")
+ out2+=("$(printf "%-16s %1s" "$MOUSE_DOWN" "[ $MDOWN ]"),^checkout(mdown$i)")
- out3+=("^tag(mleft)" "^sep($MOUSE_LEFT)")
+ out3+=("^tag(mleft$i)" "^sep($MOUSE_LEFT)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mleft $n ${TINT};$me"); done
- out3+=("^tag(mright)" "^sep($MOUSE_RIGHT)")
+ out3+=("^tag(mright$i)" "^sep($MOUSE_RIGHT)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mright $n ${TINT};$me"); done
- out3+=("^tag(mmiddle)" "^sep($MOUSE_MIDDLE)")
+ out3+=("^tag(mmiddle$i)" "^sep($MOUSE_MIDDLE)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mmiddle $n ${TINT};$me"); done
- out3+=("^tag(mup)" "^sep($MOUSE_UP)")
+ out3+=("^tag(mup$i)" "^sep($MOUSE_UP)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mup $n ${TINT};$me"); done
- out3+=("^tag(mdown)" "^sep($MOUSE_DOWN)")
+ out3+=("^tag(mdown$i)" "^sep($MOUSE_DOWN)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mdown $n ${TINT};$me"); done
@@ -326,8 +326,8 @@ qactions () {
out2+=("^sep()")
[[ "$CENTERED" = 1 ]] && out2+=(" $CENTER_TEXT,t2ctl tb_centered 0 ${TINT};$me")||out2+=(" $CENTER_TEXT,t2ctl tb_centered 1 ${TINT};$me")
out2+=("^sep()")
- out2+=("$BUTTON_WIDTH [ $TB_WIDTH ],^checkout(tbwidth)")
- out3+=("^tag(tbwidth)")
+ out2+=("$BUTTON_WIDTH [ $TB_WIDTH ],^checkout(tbwidth$i)")
+ out3+=("^tag(tbwidth$i)")
out3+=("^sep($BUTTON_WIDTH)")
out3+=("$FILL,t2ctl tb_width 0 ${TINT};$me")
out3+=("^sep()")