jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add a dsubmenu to reply/call on SMS windows

Browse source 
Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Stacy Harper 2021-03-27 14:40:54 +01:00 • committed by Maarten van Gompel
parent 18009c8378
commit 568eac7dd3
4 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/core/sxmo_appmenu.sh
View file

@ -298,6 +298,14 @@ programchoicesinit() {
$icon_trm Buffer ^ 0 ^ type '/buffer ' $icon_trm Buffer ^ 0 ^ type '/buffer '
" "
WINNAME=weechat WINNAME=weechat
elif echo "$WMNAME" | grep -i -w "sms"; then
number="$(echo "$WMNAME" | sed -e 's|^\"||' -e 's|\"$||' | cut -f1 -d' ')"
#sms
CHOICES="
$icon_msg Reply ^ 0 ^ sxmo_modemtext.sh $number
$icon_phn Call ^ 0 ^ sxmo_modemdial.sh $number
"
WINNAME=sms
else else
STSELMODEON="$( STSELMODEON="$(
echo "$XPROPOUT" | grep -E '^_ST_SELMODE.+=' | cut -d= -f2 | tr -d ' ' echo "$XPROPOUT" | grep -E '^_ST_SELMODE.+=' | cut -d= -f2 | tr -d ' '

33
scripts/modem/sxmo_modemdial.sh
View file

@ -17,20 +17,25 @@ modem_n() {
} }
dialmenu() { dialmenu() {
CONTACTS="$(sxmo_contacts.sh | grep -E "^\+?[0-9]+:")" if [ -n "$1" ]; then
NUMBER="$( NUMBER="$1"
printf %b "Close Menu\nMore contacts\n$CONTACTS" | else
grep . | CONTACTS="$(sxmo_contacts.sh | grep -E "^\+?[0-9]+:")"
sxmo_dmenu_with_kb.sh -l 10 -p Number -c -i NUMBER="$(
)" printf %b "Close Menu\nMore contacts\n$CONTACTS" |
echo "$NUMBER" | grep "Close Menu" && kill -9 0 grep . |
sxmo_dmenu_with_kb.sh -l 10 -p Number -c -i
)"
echo "$NUMBER" | grep "Close Menu" && kill -9 0
echo "$NUMBER" | grep -q "More contacts" && NUMBER="$(
printf %b "Close Menu\n$(sxmo_contacts.sh --all)" |
grep . |
sxmo_dmenu_with_kb.sh -l 10 -p Number -c -i
)"
NUMBER="$(echo "$NUMBER" | cut -d: -f1 | tr -d -- '- ')"
fi
echo "$NUMBER" | grep -q "More contacts" && NUMBER="$(
printf %b "Close Menu\n$(sxmo_contacts.sh --all)" |
grep . |
sxmo_dmenu_with_kb.sh -l 10 -p Number -c -i
)"
NUMBER="$(echo "$NUMBER" | cut -d: -f1 | tr -d -- '- ')"
if [ -z "$NUMBER" ] || [ "$NUMBER" = "CloseMenu" ]; then if [ -z "$NUMBER" ] || [ "$NUMBER" = "CloseMenu" ]; then
#no number selected (probably cancelled), silently discard #no number selected (probably cancelled), silently discard
exit 0 exit 0
@ -49,7 +54,7 @@ dialmenu() {
} }
modem_n || fatalerr "Couldn't determine modem number - is modem online?" modem_n || fatalerr "Couldn't determine modem number - is modem online?"
CREATEDCALLID="$(dialmenu)" CREATEDCALLID="$(dialmenu "$1")"
if [ -n "$CREATEDCALLID" ]; then if [ -n "$CREATEDCALLID" ]; then
sxmo_modemcall.sh pickup "$CREATEDCALLID" sxmo_modemcall.sh pickup "$CREATEDCALLID"
fi fi

2
scripts/modem/sxmo_modemmonitor.sh
View file

@ -172,7 +172,7 @@ checkfornewtexts() {
sxmo_notificationwrite.sh \ sxmo_notificationwrite.sh \
random \ random \
"st -e tail -n9999 -f '$LOGDIR/$NUM/sms.txt'" \ "st -T '$NUM SMS' -e less +F '$LOGDIR/$NUM/sms.txt'" \
"$LOGDIR/$NUM/sms.txt" \ "$LOGDIR/$NUM/sms.txt" \
"Message - $CONTACTNAME: $TEXT" "Message - $CONTACTNAME: $TEXT"

8
scripts/modem/sxmo_modemtext.sh
View file

@ -108,7 +108,7 @@ senddrafttextmenu() {
tailtextlog() { tailtextlog() {
if [ "$TERMMODE" != "true" ]; then if [ "$TERMMODE" != "true" ]; then
st -e less +F "$LOGDIR/$1/sms.txt" st -T "$1 SMS" -e less +F "$LOGDIR/$1/sms.txt"
else else
less +F "$LOGDIR/$1/sms.txt" less +F "$LOGDIR/$1/sms.txt"
fi fi
@ -131,4 +131,8 @@ main() {
tailtextlog "$(echo "$CONTACTIDANDNUM" | cut -d: -f1)" tailtextlog "$(echo "$CONTACTIDANDNUM" | cut -d: -f1)"
} }
main if [ -n "$1" ]; then
sendnewtextmenu "$1"
else
main
fi