aditya/betterlockscreen-openrc
1
0
Fork 0
mirror of https://git.adityakumar.xyz/betterlockscreen-openrc.git synced 2024-09-19 09:43:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Should fix #218 and #175 (#227)

Browse source
This commit is contained in:
Basti 2021-05-29 18:48:38 +02:00 committed by GitHub
parent bbe277c0db
commit 1c36673ecb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
betterlockscreen
View file

@ -81,6 +81,9 @@ prelock() {
if [ -n "$(pidof dunst)" ]; then if [ -n "$(pidof dunst)" ]; then
pkill -u "$USER" -USR1 dunst pkill -u "$USER" -USR1 dunst
fi fi
if [[ "$runsuspend" = "true" ]]; then
lockargs="$lockargs -n"
fi
} }
@ -124,10 +127,9 @@ rec_get_random() {
user_input="$dir" user_input="$dir"
return return
fi fi
dirs=("$dir"*) dirs=("$dir"/*)
random_dir="${dirs[RANDOM % ${#dirs[@]}]}" random_dir="${dirs[RANDOM % ${#dirs[@]}]}"
rec_get_random "$random_dir" rec_get_random "$random_dir"
exit 1
} }
@ -168,7 +170,7 @@ logical_px() {
# get dpi value from xrdb # get dpi value from xrdb
local DPI local DPI
DPI=$(grep -oP 'Xft.dpi:\s*\K\d+' ~/.Xresources | bc) DPI=$(grep -oP 'Xft.dpi:\s*\K\d+' ~/.Xresources | bc)
if [ -n "$DPI" ]; then if [ -z "$DPI" ]; then
DPI=$(xdpyinfo | sed -En "s/\s*resolution:\s*([0-9]*)x([0-9]*)\s.*/\\$2/p" | head -n1) DPI=$(xdpyinfo | sed -En "s/\s*resolution:\s*([0-9]*)x([0-9]*)\s.*/\\$2/p" | head -n1)
fi fi
@ -198,7 +200,9 @@ update() {
rectangles=" " rectangles=" "
SR=$(xrandr --query | grep ' connected' | grep -o '[0-9][0-9]*x[0-9][0-9]*[^ ]*') SR=$(xrandr --query | grep ' connected' | grep -o '[0-9][0-9]*x[0-9][0-9]*[^ ]*')
for RES in $SR; do for RES in $SR; do
SRA=("${RES//[x+]/ }") # shellcheck disable=SC2206
SRA=(${RES//[x+]/ })
CX=$((SRA[2] + $(logical_px 25 1))) CX=$((SRA[2] + $(logical_px 25 1)))
CY=$((SRA[1] - $(logical_px 30 2))) CY=$((SRA[1] - $(logical_px 30 2)))
rectangles+="rectangle $CX,$CY $((CX+$(logical_px 300 1))),$((CY-$(logical_px 80 2))) " rectangles+="rectangle $CX,$CY $((CX+$(logical_px 300 1))),$((CY-$(logical_px 80 2))) "
@ -438,7 +442,7 @@ for arg in "$@"; do
-l | --lock) -l | --lock)
runlock=true runlock=true
[[ $runsuspend ]] || lockargs="$lockargs -n"
if [[ ${2:0:1} = '-' ]]; then if [[ ${2:0:1} = '-' ]]; then
shift 1 shift 1
else else