Commit graph

88 commits

Author SHA1 Message Date
Basti
0d4b898324
Merge pull request #320 from ti-mo/postlock-race
Run prelock and postlock synchronously to avoid race condition
2022-02-23 23:00:41 +01:00
Sebastian Sellmeier
321b3ebcea
Fix Shellcheck by also quoting the inner variable (reference: https://github-wiki-see.page/m/koalaman/shellcheck/wiki/SC2295) 2022-02-22 21:27:01 +01:00
Timo Beckers
1093ce51e6
Run prelock and postlock synchronously to avoid race condition
As reported in issue #285, running postlock in a subshell and immediately
returning from lockselect() has a high chance of hitting `exit 0` before
xset and dunstctl get a chance to execute.

Run both prelock and postlock synchronously within lockselect().
2022-01-14 14:43:32 +01:00
Timo Beckers
1900cd5b23
Copyright year 2022, update repository URL 2022-01-14 14:39:00 +01:00
Jeff M. Hubbard
806866de57
Fix DPI scaling (#287) 2021-10-11 17:49:13 +02:00
atagen
de7bcdc2b5
Added quiet-mode (#288) 2021-10-11 17:48:56 +02:00
Sebastian Sellmeier
70f08f9032
Prepare release for v4.0.3 2021-08-21 21:38:58 +02:00
Sebastian Sellmeier
f8f897f758
Prepare beta-release for v4.0.3-beta1 2021-08-21 02:18:26 +02:00
Sebastian Sellmeier
46dc2ae6c4
Fix missing dollar for variable in cmd_exists check (thanks to @hrhino for pointing out) 2021-08-10 22:25:31 +02:00
Sebastian Sellmeier
c3fcd2d6f7
Prepare release for stable v4.0.0 2021-08-09 23:11:04 +02:00
Sebastian Sellmeier
f452ef0ec4
Prepare release v4.0.0-beta2 with autodetection of i3lock-color binary-name (i3lock-color/i3lock) 2021-08-07 01:25:30 +02:00
Sebastian Sellmeier
583ad3468f
Add code to autodetect if i3lock-color is available under its name or i3lock and validate custom values from config, extend copyright matching LICENSE 2021-08-07 01:18:44 +02:00
Sebastian Sellmeier
6ac1f74a94
Prepare for release v4.0.0-beta1 2021-07-21 01:04:41 +02:00
Sebastian Sellmeier
0a81e77d8d
Improve --version command 2021-07-21 01:04:41 +02:00
Jeff M. Hubbard
7c1f480a4d
Reworked loginbox (#249)
* Redesigned loginbox, theme errors, add keylayout

    See #225 and #229
    Always display --keylayout
    Wrong, verif, and modif messages are displayed
    Added all pass-thru keys options

* Adjust positioning of verif/wrong-pos according feedback

Co-authored-by: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
2021-07-21 01:04:41 +02:00
Sebastian Sellmeier
be2d9a90dd
Fix i3lockcolor_bin (#251) 2021-07-21 01:04:40 +02:00
Basti
682e056aec
Fix default feh-command to match doc behaviour (#257) 2021-07-21 01:04:40 +02:00
Basti
906259dd2b
Fixes --lock not working with autodetection when started from zsh, avoids autodetect because of stability issues (#254) 2021-07-21 01:04:39 +02:00
Basti
2b31627d59
Reformat and improve documentation, add install-script (#242) 2021-07-21 01:04:38 +02:00
Basti
8ab40b5af2
Determinate i3lock-color binary automatically with i3lock-color/i3lock or quit with error (#252) 2021-07-21 01:03:48 +02:00
Basti
709933350c
Check for dunstctl once as dunst is optional dependency (#250) 2021-07-21 01:03:48 +02:00
Jeff M. Hubbard
3c76a7ebfe
Fixed issue with --update failing due to quoting 2021-07-21 01:03:47 +02:00
Basti
6cc1fc16df
Issue-231: Add -v/--version (#246) 2021-07-21 01:03:47 +02:00
Basti
95bd5767ae
Use XDG_* variables for directories and /home/sebtm* only as fallback (ported from #184) (#244) 2021-07-21 01:03:47 +02:00
Jeff M. Hubbard
d1d19e1ff0
Clear shellcheck errors 2021-07-21 01:03:47 +02:00
Sourav Das
321b8e8c5f
Don't change state of dunst on unlock if paused on lock (#233)
* Fix: Don't change state of dunst on unlock if paused on lock (credits to @souravdas142)
2021-07-21 01:03:46 +02:00
Jeff M. Hubbard
a64ce8f441
Left-align time string (#238) 2021-07-21 01:03:46 +02:00
Jeff M. Hubbard
66d9759159
Get DPI from xrdb, fixes #236 (#237)
`multi-monitor` branch did not check for user set DPI in Xresources.
It does now. Also, rather than parsing .Xresources file, we instead
query xrdb to get the current value.
2021-07-21 01:03:46 +02:00
Jeff M. Hubbard
741567fa3e
Prepare to merge (#228)
* Fix loginbox position for vertical arrangements

* Fix tabs everywhere

* 110 Automatically deduce DPI

* 118 Add description for Void Linux installation

* 119 Add Timeout Option

* Update README for multi-monitor

* Keep original directory

* Update README

* Rename project files

* Always use defaults

* Rewrite update() and get_display_list()

* Add lock_timeout to defaults

* Fix ExecStart in systemd unit

* Update README

* Fix bad variable name in wallpaper()

* Remove quoting, it breaks things

* Fix paths and canvas color

* Effects now are optional to speed up updating cache

* Fix fx_dimblur()

* Add shadow to loginbox (#3)

* Add create_loginbox(), add loginshadow option
* Add loginshadow option to example config

* Add solid color background effect (#4)

* Use array and fix quoting

* Add color effect, create solid color backgrounds

* Update README

* Add more arguments and options (#5)

* New arguments and config options

* Update usage more

* Update README

* Minor text edits

* Relocate config and cache (#6)

* Move config and cache directories
* Make sure cache dir exists
* Reorder defaults, clarify options and theme
* Reformat example config
* Moved example config
* Update header info
* Fix quoting in DEFAULT_TIMEOUT

* Rewrite usage()

* Touch up comments and some syntax

* Update README, fix usage

* Fix passing arguments to i3lock

lockargs needs to be an array so that it can expand to multiple
arguments (preferable to using wordsplitting or eval instead).

* Scale loginbox based on DPI

Fixes jeffmhubbard/multilockscreen#7.

* Add failsafe to lock screen when images not found (#13)

* Add optional description box (#10)

* Add optional description box

The box is located in the bottom right corner
of the lock screen image and contains a
custom  description message
(e.g. to present a name for random images
or to display additional information)

Added option: --desc <DESCRIPTION>

* Adapt description to i3lock date font

* Description font queried like in i3lock-color

* description: force normal upright font style

* added support for dimpixel effect (#16)

* added support for using different images on different displays (#17)

* added support for using different images on different displays

* fixed list creation when passed a single image

* reworked how WALL_LIST is generated

* Fix span output (#19)

* Make output reflect one set of images is processed

* Return only 1 image when spanning

* Correct output in a few spots

* Add fancy output (#20)

* Add echo wrapper to prefix output

* Fix typo

* Update README.md (#21)

* Fixes misspelled fn (#22)

* Escape spaces in path for IM (#24)

* Minor fixes (#26)

* Better parsing --lock args

* Add --pass-media-keys

* Add --pass-screen-keys and --pass-power-keys

* Fix insanely short default timeout

* Make error text transparent

* Call init_config later, update example config (#27)

Reading config file later allows users to define
custom functions in config (prelock, postlock, etc)
Updated docs with example usage

* Fix suspend (#30)

* Fix borked logic in --lock arg that breaks suspend

* Don't check  before all arguments read

* Use `dunstctl` to (un)pause the dunst pre/post-lock. (#31)

Please be aware that, the use of dunstctl means that users will be forced to have dunst v1.5.0 or newer installed.

* Update LICENSE

* Disable DPMS after unlocking if it was originally disabled (#32)

* feat[multilockscreen]: Add --show-layout option (#36)

* Only change DPMS timeout if Enabled (#38)

* Fix #40 (#41)

Don't wait for `prelock()` and `postlock()` to complete

* Add bgcolor option to set i3lock --color (#44)

Closes #43

* Update systemd unit (#45)

* Fix options name for i3color-lock release 2.13.c.3 (#49)

With release 2.13.c.3 i3color-lock has added dashes before color, pos, size, etc.
https://github.com/Raymo111/i3lock-color/releases/tag/2.13.c.3

* Add checklist

* Rename script

* Extra files from upstream

* Update README

Keep most of betterlockscreen README. Replaced configuration,
usage, and usage examples.

* Update example config

* Fix branding, paths, etc

* Add wallpaper_cmd and time_format, long arg only

* Fix quoting, remove unused variable

Co-authored-by: Fox Kiester <noct@posteo.net>
Co-authored-by: Richard <fr34q@users.noreply.github.com>
Co-authored-by: Sheeets <31318683+sheeets@users.noreply.github.com>
Co-authored-by: Paul Zeinlinger <paul.zeinlinger@gmail.com>
Co-authored-by: Luc Caspar <casparluc@users.noreply.github.com>
Co-authored-by: R. David Dunphy <rdd.dunphy@gmail.com>
Co-authored-by: Artem Vasenin <vasart169@gmail.com>
Co-authored-by: Nicolas Serafini <serafini.nicolas@gmail.com>
2021-07-21 01:03:44 +02:00
Jeff M. Hubbard
dcc9166703
Fix loginbox position for vertical arrangements (#123) 2021-07-21 01:01:15 +02:00
Jeff M. Hubbard
49ce9ae7fa
add pixel effect 2021-07-21 01:01:15 +02:00
Jeff M. Hubbard
c6064ff970
Fix for wallpaper(), always span multi-monitor 2021-07-21 00:59:48 +02:00
Jeff M. Hubbard
e74dec7848
Removed commented code and fix spacing issues 2021-07-21 00:59:48 +02:00
Jeff M. Hubbard
e5e891786e
Multi-monitor rewrite
* init_filenames -> init_config
- remove -t from i3lock call since we make image for total resolution
+ add --screen to i3lock call to show time and ring on that screen
* rec_get_random -> get_user_wall
+ get_total_size retuns total combined resolution
+ get_display_list returns list of screens (number name geometry)
+ resize_and_render resize, dim, blur, dimblur image for each screen
+ purge_cache delete and recreate cache directories
* update completely rewritten to support multi-monitor
- arg --resolution; isn't needed
+ arg --display; screen to display loginbox (default: 0)
+ rc display_on; screen to display loginbox (default: 0)
+ arg --span; span image across all screens (default: false)
+ rc span_image; span image across all screens (default: false)
2021-07-21 00:59:48 +02:00
Pavan Jadhaw
3df1808280
[main] add ability to choose on which screen clock is shown for multimonitor setup 2021-07-21 00:59:46 +02:00
Basti
1c36673ecb
Should fix #218 and #175 (#227) 2021-05-29 18:48:38 +02:00
Raymond Li
bbf8840fd8
Fix i3lock-color args for new standardized version (#220)
* Update required i3lock-color version
* Fix i3lock-color args for new standardized version
2021-05-28 22:21:50 +02:00
Sebastian Sellmeier
ee1a64375e
Change back to i3lock-command. Fixes #210 (#211) 2021-05-18 17:26:53 +02:00
Sebastian Sellmeier
929205022c
Add shellcheck-action, fix shellcheck-errors (#206) 2021-05-15 12:43:43 +02:00
Sebastian Sellmeier
3be77f6854
Add option for time-format (with default-config) from #185 (#205)
* Add an option to change the time format
* Add option to example-config

Co-authored-by: Addison Bean <addisonbean@gmail.com>
2021-05-15 11:36:48 +02:00
E. Almqvist
2d1a53e245 Added i3lock option
Added `-c 00000000` to make the backgrounds opacity to 0.
2021-04-17 01:30:30 +05:30
AUTplayed
66411bc8da Added config & cmd arg to change wallpaper setter; don't create .fehbg 2020-05-15 10:15:18 +02:00
Aicaya
7774266ee6 Restore previous DPMS setting if turned off (#151)
* Restore previous DPMS setting if turned off

Added the variable 'default_dpms', which reads the last element of line
26 ("DPMS is Enabled/Disabled").  If it's disabled, it restores that
setting upon login.

This fixes an issue where if the user had manually turned off DPMS, the
screen will still turn itself off after a while.

* Look for string instead of line number

(also use tabs for indents to match code)
2020-01-23 21:27:29 +01:00
Kieran Siek
82d1a7280e Fix typo when getting DPI from .Xresources (#140) 2019-09-14 17:53:22 +02:00
Yanze Li
6c66db535f fix scaling when Xft.dpi are set (#114) 2019-09-02 21:52:00 +02:00
yurisuki
69ae265a40 add the --pass-media-keys argument (#120) 2019-09-02 21:48:02 +02:00
Ibrahim Jarif
11bb4e1c6d Fix null check for lock_timeout
This commit fixes an issue with the validating the `lock_timeout` value. The current implementation would complain if `lock_timeout` value is null.
2019-09-02 21:31:49 +02:00
ettom
89f7dcd2be Make compatible with shellcheck
Add double quotes for variables, fix minor semantic problems.
2019-06-14 10:17:09 +05:30
Vivek R
643ea70aa7 Add Timeout Option (#119)
This adds an opton to set custom monitor timeout in seconds.
Timeout only applicable during lockscreen.
Reverts back to normal timeout after logging back in.

Closes https://github.com/pavanjadhaw/betterlockscreen/issues/116
2019-05-28 23:18:22 +05:30
Andre Schröder
cdb603a3f2 Automatically deduce DPI (#110)
With this commit the DPI doesn't have to be listed in the ~/.Xresources and will be deduced automatically.
2019-03-31 13:15:31 +00:00