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

Removed explicit font from most dmenu calls, dmenu font is read from Xresources now and kept as uniform as possible

Browse source
This commit is contained in:
Maarten van Gompel 2021-01-31 12:41:53 +01:00
parent 9d1527218a
commit 24905884ee
20 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/core/sxmo_appmenu.sh
View file

@ -440,7 +440,7 @@ mainloop() {
getprogchoices "$ARGS"
echo "$PROGCHOICES" |
cut -d'^' -f1 |
dmenu -idx "$DMENUIDX" -l 16 -c -fn "Terminus-30" -p "$WINNAME" | (
dmenu -idx "$DMENUIDX" -l 16 -c -p "$WINNAME" | (
PICKED="$(cat)"
echo "$PICKED" | grep . || quit
LOOP="$(echo "$PROGCHOICES" | grep -m1 -F "$PICKED" | cut -d '^' -f2)"

6
scripts/core/sxmo_gpsutil.sh
View file

@ -166,7 +166,7 @@ menuregionsearch() {
printf %b "$POIS" |
sed '/^[[:space:]]*$/d' |
awk '{$1=$1};1' |
sxmo_dmenu_with_kb.sh -i -c -l 10 -fn Terminus-18 -p Search
sxmo_dmenu_with_kb.sh -i -c -l 10 -p Search
)"
if [ "$QUERY" = "Close Menu" ]; then
@ -192,7 +192,7 @@ menulocations() {
)" |
grep -vE '^#' |
sed "s/\t/: /g" |
sxmo_dmenu_with_kb.sh -i -c -l 10 -fn Terminus-18 -p "Locations"
sxmo_dmenu_with_kb.sh -i -c -l 10 -p "Locations"
)"
ZOOM=14
if [ "$CHOICE" = "Close Menu" ]; then
@ -218,7 +218,7 @@ menumaptype() {
CHOICE="$(
echo "$CHOICES" |
awk -F^ '{ print $1 }' |
dmenu -idx "$IDX" -c -l 10 -fn Terminus-18 -p "Map Type" |
dmenu -idx "$IDX" -c -l 10 -p "Map Type" |
awk '{$1=$1};1'
)"
echo "$CHOICE" | grep "Close Menu" && exit 0

12
scripts/core/sxmo_networks.sh
View file

@ -20,7 +20,7 @@ toggleconnection() {
deletenetworkmenu() {
CHOICE="$(
printf %b "Close Menu\n$(connections)" |
dmenu -c -p "Delete Network" -l 14 -fn "Terminus-20"
dmenu -c -p "Delete Network" -l 14
)"
if [ "$CHOICE" = "Close Menu" ]; then
return
@ -34,13 +34,13 @@ deletenetworkmenu() {
addnetworkgsmmenu() {
CONNNAME="$(
echo "Close Menu" |
sxmo_dmenu_with_kb.sh -c -p "Add GSM: Alias" -fn "Terminus-20" -l 20
sxmo_dmenu_with_kb.sh -c -p "Add GSM: Alias" -l 20
)"
[ "$CONNNAME" = "Close Menu" ] && return
APN="$(
echo "Close Menu" |
sxmo_dmenu_with_kb.sh -c -p "Add GSM: APN" -fn "Terminus-20" -l 20
sxmo_dmenu_with_kb.sh -c -p "Add GSM: APN" -l 20
)"
[ "$APN" = "Close Menu" ] && return
@ -56,13 +56,13 @@ addnetworkwpamenu() {
SSID="$(
nmcli d wifi list | tail -n +2 | grep -v '^\*' | awk -F' ' '{ print $6 }' | grep -v '\-\-' |
xargs -0 printf 'Close Menu\n%s' |
sxmo_dmenu_with_kb.sh -c -p "Add WPA: SSID" -fn "Terminus-20" -l 20
sxmo_dmenu_with_kb.sh -c -p "Add WPA: SSID" -l 20
)"
[ "$SSID" = "Close Menu" ] && return
PASSPHRASE="$(
echo "Close Menu" |
sxmo_dmenu_with_kb.sh -c -p "Add WPA: Passpharse" -fn "Terminus-20" -l 20
sxmo_dmenu_with_kb.sh -c -p "Add WPA: Passphrase" -l 20
)"
[ "$PASSPHRASE" = "Close Menu" ] && return
@ -89,7 +89,7 @@ networksmenu() {
Scan Wifi Networks
Close Menu
" |
awk '{$1=$1};1' | grep '\w' | dmenu -c -p 'Networks' -l 14 -fn 'Terminus-20'
awk '{$1=$1};1' | grep '\w' | dmenu -c -p 'Networks' -l 14
)"
if [ "$CHOICE" = "Close Menu" ]; then
exit

2
scripts/core/sxmo_pipecomplete.sh
View file

@ -8,7 +8,7 @@ menu() {
printf %b "$(
echo "Close Menu";
echo "$INPUT" | grep -Eo '\S+' | tr -d '[:blank:]' | sort | uniq
)" | dmenu -p "$PROMPT" -l 10 -i -c -fn Terminus-20
)" | dmenu -p "$PROMPT" -l 10 -i -c
)"
pkill "$KEYBOARD"
}

2
scripts/core/sxmo_timezonechange.sh
View file

@ -13,7 +13,7 @@ menu() {
find /usr/share/zoneinfo -type f |
sed 's#^/usr/share/zoneinfo/##g' |
sort |
sxmo_dmenu_with_kb.sh -p Timezone -c -l 10 -fn Terminus-20 -i
sxmo_dmenu_with_kb.sh -p Timezone -c -l 10 -i
)"
st -e "$0" change "$T"
}

1
scripts/core/sxmo_xinit.sh
View file

@ -35,6 +35,7 @@ xdefaults() {
xsetroot -mod 29 29 -fg '#0b3a4c' -bg '#082430'
xset s off -dpms
xrdb /usr/share/sxmo/appcfg/xresources_xcalc.xr
xrdb /usr/share/sxmo/appcfg/xresources_dmenu.xr
synclient TapButton1=1 TapButton2=3 TapButton3=2 MinSpeed=0.25
}