SWMO - SXMO over Wayland

This is a huge patch for Swmo, Sxmo over Sway.

It is Dwm backward compatible so dwm users should not expect regressions.

If you install all dependencies, you then can toggle between Sway and Dwm using a new config entry. It will reboot the phone.

This commit also contains:
    * Make the modemmonitor bullet proof
    * various other smaller fixes

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-08-22 12:49:51 +02:00 committed by Maarten van Gompel
parent b1403f983e
commit 8a27933c47
54 changed files with 1500 additions and 545 deletions

View file

@ -16,7 +16,7 @@ sort_loop() {
PICKED="$(
printf %b "$CHOICES" |
dmenu -c -p "Sort" -l 10 -i
sxmo_dmenu.sh -p "Sort" -i
)"
echo "$PICKED" | grep -q "date" && SORT="--sort=t"
@ -39,7 +39,7 @@ while true; do
PICKED="$(
echo "$CHOICES" |
dmenu -c -p "$DIR" -l 20 -i
sxmo_dmenu.sh -p "$DIR" -i
)" || exit
echo "$PICKED" | grep "Sort By" && sort_loop

View file

@ -43,13 +43,13 @@ recordconfirm() {
Delete Recording
" |
xargs -0 echo | sed '/^[[:space:]]*$/d' | awk '{$1=$1};1' |
dmenu -p "$DUR" -c -l 10
sxmo_dmenu.sh -p "$DUR"
)"
if echo "$PICK" | grep "Playback"; then
sxmo_terminal.sh mpv -ao=alsa -v "$FILE"
elif echo "$PICK" | grep "Delete Recording"; then
rm "$FILE"
echo "File deleted." | dmenu -c -l 10
echo "File deleted." | sxmo_dmenu.sh
return
else
return
@ -72,7 +72,7 @@ recordmenu() {
xargs -0 echo |
sed '/^[[:space:]]*$/d' |
awk '{$1=$1};1' |
dmenu -c -p "Record" -l 20
sxmo_dmenu.sh -p "Record"
)"
if [ "$OPTION" = "Line Jack" ]; then

View file

@ -10,7 +10,7 @@ menu() {
sxmo_keyboard.sh open
SUBREDDIT="$(
printf %b "Close Menu\n$(echo "$SXMO_SUBREDDITS" | tr " " '\n')" |
dmenu -p "Subreddit:" -c -l 10
sxmo_dmenu.sh -p "Subreddit:"
)"
sxmo_keyboard.sh close
[ "Close Menu" = "$SUBREDDIT" ] && exit 0
@ -29,7 +29,7 @@ menu() {
while true; do
RESULT="$(
printf %b "Close Menu\n$REDDITRESULTS" |
dmenu -c -l 10 -fn Terminus-20
sxmo_dmenu.sh -fn Terminus-20
)"
[ "Close Menu" = "$RESULT" ] && exit 0

View file

@ -66,7 +66,7 @@ rsstimespanmenu() {
echo "$CHOICES" |
sed '/^[[:space:]]*$/d' |
awk '{$1=$1};1' |
dmenu -p "RSS Timespan" -c -l 10
sxmo_dmenu.sh -p "RSS Timespan"
)"
if echo "$CHOICE" | grep "Fetch"; then
@ -101,7 +101,7 @@ rssreadmenu() {
DMENUIDX=1
while true; do
# Show list of items
PICKED="$(printf %b "$CHOICES" | dmenu -idx $DMENUIDX -p "RSS ($TIMESPANABBR)" -c -l 20 -fn Terminus-15)"
PICKED="$(printf %b "$CHOICES" | sxmo_dmenu.sh -ix $DMENUIDX -p "RSS ($TIMESPANABBR)" -fn Terminus-15)"
DMENUIDX="$(echo "$CHOICES" | grep -m1 -F -n "$PICKED" | cut -d ':' -f1)"
if [ "$PICKED" = "Close Menu" ]; then
die Closed Menu

View file

@ -45,11 +45,11 @@ menu() {
1m
30s
Close Menu
" | awk 'NF' | awk '{$1=$1};1' | dmenu -p Timer -c -l 20
" | awk 'NF' | awk '{$1=$1};1' | sxmo_dmenu.sh -p Timer
)"
sxmo_keyboard.sh close
[ "Close Menu" = "$TIMEINPUT" ] && exit 0
st -f Monospace-50 -e "$0" timerrun "$TIMEINPUT"
sxmo_terminal.sh -f Monospace-50 "$0" timerrun "$TIMEINPUT"
}
if [ $# -gt 0 ]; then "$@"; else menu; fi

View file

@ -6,7 +6,7 @@
sxmo_keyboard.sh open
SEARCHQUERY="$(
echo "Close Menu" | dmenu -t -p "Search:" -c -l 20
echo "Close Menu" | sxmo_dmenu.sh -p "Search:"
)"
sxmo_keyboard.sh close
[ "Close Menu" = "$SEARCHQUERY" ] && exit 0

View file

@ -32,7 +32,7 @@ searchmenu() {
xargs -0 echo |
sed '/^[[:space:]]*$/d' |
awk '{$1=$1};1' |
sxmo_dmenu_with_kb.sh -p "Yt Search" -c -l 10
sxmo_dmenu_with_kb.sh -p "Yt Search"
)"
if [ "Close Menu" = "$ENTRY" ]; then
@ -58,7 +58,7 @@ resultsmenu() {
xargs -0 echo |
sed '/^[[:space:]]*$/d' |
awk '{$1=$1};1' |
dmenu -c -l 10 -p "Results"
sxmo_dmenu.sh -p "Results"
)"
if [ "Change Search" = "$PICKED" ]; then