Lots of bugfixes related to calling/modem and various script fixes

This commit is contained in:
Miles Alan 2020-05-09 20:32:55 -05:00
parent 22d974f22f
commit e5877059ff
16 changed files with 285 additions and 160 deletions

View file

@ -10,11 +10,11 @@ programchoicesinit() {
Apps ^ 0 ^ sxmo_appmenu.sh applications
Volume ↑ ^ 1 ^ sxmo_vol.sh up
Volume ↓ ^ 1 ^ sxmo_vol.sh down
Dialer ^ 1 ^ sxmo_modemcall.sh dial
Texts ^ 0 ^ sxmo_readtexts.sh
Dialer ^ 0 ^ sxmo_modemcall.sh dial
Texts ^ 0 ^ sxmo_modemtext.sh
Camera ^ 0 ^ sxmo_camera.sh
Wifi ^ 0 ^ st -e "nmtui"
System Config ^ 0 ^ sxmo_appmenu.sh control
Config ^ 0 ^ sxmo_appmenu.sh config
Logout ^ 0 ^ pkill -9 dwm
")" && WINNAME=Sys
@ -32,24 +32,25 @@ programchoicesinit() {
# Scripts menu
echo $WMCLASS | grep -i "scripts" && CHOICES="$(echo "
Timer ^ 0 ^ sxmo_timermenu.sh
Youtube ^ 0 ^ sxmo_youtube.sh
Youtube (Audio) ^ 0 ^ sxmo_youtube.sh --no-video
Youtube ^ 0 ^ sxmo_youtube.sh video
Youtube (Audio) ^ 0 ^ sxmo_youtube.sh audio
Weather ^ 0 ^ sxmo_weather.sh
RSS ^ 0 ^ sxmo_rss.sh
")" && WINNAME=Scripts && return
# System Control menu
echo $WMCLASS | grep -i "control" && CHOICES="$(echo "
echo $WMCLASS | grep -i "config" && CHOICES="$(echo "
Volume ↑ ^ 1 ^ sxmo_vol.sh up
Volume ↓ ^ 1 ^ sxmo_vol.sh down
Brightesss ↑ ^ 1 ^ sxmo_brightness.sh up
Brightness ↓ ^ 1 ^ sxmo_brightness.sh down
Modem $(pgrep -f sxmo_modemmonitor.sh >/dev/null && echo -n "On → Off" || echo -n "Off → On") ^ 1 ^ sxmo_modemmonitortoggle.sh
Modem Info ^ 1 ^ sxmo_modeminfo.sh
Modem Info ^ 0 ^ sxmo_modeminfo.sh
Modem Log ^ 0 ^ sxmo_modemlog.sh
Rotate ^ 1 ^ rotate
Wifi ^ 0 ^ st -e "nmtui"
Upgrade Pkgs ^ 0 ^ st -e sxmo_upgrade.sh
")" && WINNAME=Control && return
")" && WINNAME=Config && return
# MPV
echo $WMCLASS | grep -i "mpv" && CHOICES="$(echo "
@ -68,8 +69,8 @@ programchoicesinit() {
# St
echo $WMCLASS | grep -i "st-256color" && CHOICES="$(echo "
Pastecomplete ^ 0 ^ key Ctrl+Shift+u
Copycomplete ^ 0 ^ key Ctrl+Shift+i
Type complete ^ 0 ^ key Ctrl+Shift+u
Copy complete ^ 0 ^ key Ctrl+Shift+i
Paste ^ 0 ^ key Ctrl+Shift+v
Zoom + ^ 1 ^ key Ctrl+Shift+Prior
Zoom - ^ 1 ^ key Ctrl+Shift+Next
@ -117,7 +118,7 @@ programchoicesinit() {
Zoom - ^ 1 ^ key Ctrl+minus
History ← ^ 1 ^ key Alt+Left
History → ^ 1 ^ key Alt+Right
")" && WINNAME=netsurf && return
")" && WINNAME=firefox && return
# Foxtrot GPS
echo $WMCLASS | grep -i foxtrot && CHOICES="$(echo "
@ -162,8 +163,8 @@ rotate() {
}
key() {
xdotool windowactivate $WIN
xdotool key --clearmodifiers $1
xdotool windowactivate "$WIN"
xdotool key --clearmodifiers "$1"
#--window $WIN
}

View file

@ -4,7 +4,8 @@
MAX=$(cat $DEV/max_brightness)
MIN=2
STEP=$(echo "($MAX - $MIN) / 10" | bc)
MINSTEP=1
STEP=$(echo "($MAX - $MIN) / 10" | bc | xargs -ISTP echo -e "$MINSTEP\nSTP" | sort -r | head -n1)
setdelta() {
sxmo_setpinebacklight $(

View file

@ -1,6 +1,6 @@
#!/usr/bin/env sh
pidof svkbd-sxmo >&2 || svkbd-sxmo &
OUTPUT="$(cat | dmenu -t $@)"
OUTPUT="$(cat | dmenu $@)"
pkill svkbd-sxmo >&2
echo "$OUTPUT"

View file

@ -1,38 +1,35 @@
#!/usr/bin/env sh
INPUT="$(cat)"
STWIN="$(xprop -root | sed -n '/^_NET_ACTIVE_WINDOW/ s/.* //p')"
pidof svkbd-sxmo || svkbd-sxmo &
capfirstchar() {
awk -F -vOFS= {$1=toupper($1);print $0}
menu() {
pidof svkbd-sxmo || svkbd-sxmo &
RESULT="$(
echo "$(
echo "Close Menu" &&
echo "$INPUT" | grep -Eo '\S+' | tr -d '[:blank:]' | sort | uniq
)" | dmenu -p "$PROMPT" -l 10 -i -c -fn Terminus-20
)"
pkill svkbd-sxmo
}
RESULT="$(
echo "$(
echo "Close Menu" &&
echo "$INPUT" |\
grep -Eo '\S+' |\
tr -d '[:blank:]' |\
sort |\
uniq
)" | dmenu -p $(echo $1 | capfirstchar) -l 10 -i -c -fn Terminus-20
)"
pkill svkbd-sxmo
copy() {
PROMPT=Copy
menu
if [[ "$RESULT" = "Close Menu" ]]; then
exit 0
else
echo "$RESULT" | xsel -i
echo "$RESULT" | xclip -i
fi
}
type() {
PROMPT=Type
menu
if [[ "$RESULT" = "Close Menu" ]]; then
exit 0
else
xdotool type "$RESULT"
xdotool type --window $STWIN "$RESULT"
fi
}

View file

@ -1,6 +1,11 @@
#!/usr/bin/env sh
pgrep -f sxmo_statusbar.sh | grep -v $$ | xargs kill -9
audiodevice() {
amixer sget Earpiece | grep -E [[]on[]] && echo Earpiece > /dev/null && return
amixer sget Headphone > /dev/null && echo Headphone || echo Speaker
}
UPDATEFILE=/tmp/sxmo_bar
touch $UPDATEFILE
@ -19,7 +24,7 @@ do
# Volume
VOL=$(
echo "$(amixer sget Headphone || amixer sget Speaker)" |
echo "$(audiodevice)" |
grep -oE '([0-9]+)%' |
tr -d ' %' |
awk '{ s += $1; c++ } END { print s/c }' |

View file

@ -1,5 +1,6 @@
#!/usr/bin/env sh
device() {
amixer sget Earpiece | grep -E '[[]on[]]' > /dev/null && echo Earpiece && return
amixer sget Headphone > /dev/null && echo Headphone || echo Speaker
}
@ -22,5 +23,8 @@ down() {
amixer set $(device) 1-
notify
}
setvol() {
amixer set $(device) $1
}
$@