Commit Graph

251 Commits

Author SHA1 Message Date
v44r
ecc8402c43 Fix vertical align of text inside the circle 2019-01-28 14:28:08 -05:00
Drew DeVault
6a7e3a16f2
Merge pull request #36 from c-edw/feature/ShadowBackendSleep
Sleep on incorrect password with shadow backend.
2019-01-27 18:03:29 -05:00
Connor E
6fd9cd2246 Sleep on incorrect password with shadow backend. 2019-01-27 18:12:54 +00:00
Drew DeVault
368f53e4f1
Merge pull request #35 from bendooru/fix-image-bg-color
Allow setting both background image and colour
2019-01-25 09:48:32 -05:00
Dominik Bendle
c2b99768e9 Allow setting both background image and colour
The -c/--color option no longer sets BACKGROUND_MODE_SOLID_COLOR (which
disables the background image) and the background color is now set in
all cases. One can still use --scaling solid_color to disable display of
a background image.

As a consequence, there is now only one possible default background
colour (white), regardless of whether a background image is given or not.
2019-01-25 10:30:13 +01:00
Jan Beich
c163f0a0c7 Add man-pages option like swaywm/sway@ba16f16e4d 2019-01-24 23:23:30 +01:00
John Axel Eriksson
3d94a60924 Include stdlib.h in shadow.c 2019-01-23 21:31:49 +01:00
Drew DeVault
5d60610cb0
Merge pull request #30 from ianyfan/cleanup
Cleanup
2019-01-23 09:16:34 -05:00
Ian Fan
b87e2a4916 Remove references to pango 2019-01-23 12:20:24 +00:00
Ian Fan
f698711ddc background-image.c: remove stdbool header 2019-01-23 12:18:22 +00:00
Ian Fan
2de6b5083a unicode.c: remove utf8_decode 2019-01-22 17:38:34 +00:00
Drew DeVault
f0353900ae
Merge pull request #22 from swaywm/meson-options
Add Meson feature options
2019-01-22 09:11:36 -05:00
Connor E
2e330473eb Remove unused pango.c 2019-01-22 14:59:39 +01:00
Brian Ashworth
4e72a36edc
Merge pull request #26 from swaywm/simplify-config-path
Simplify XDG_CONFIG_HOME handling
2019-01-19 02:54:49 -05:00
emersion
d98ada0efd
Simplify XDG_CONFIG_HOME handling 2019-01-19 08:36:09 +01:00
Drew DeVault
52eeb9fc1e
Merge pull request #24 from c-edw/feature/AbortSUIDWithPAM
Log error and exit if swaylock is suid with PAM backend.
2019-01-18 09:07:17 -05:00
Connor E
648b0ccd64 Make setuid error clearer. 2019-01-18 13:52:17 +00:00
Drew DeVault
63fb6c0d96
Merge pull request #23 from c-edw/feature/RemoveVLAs
Remove VLAs.
2019-01-18 08:48:41 -05:00
Connor E
7c0ba89197 Handle alloc failures. 2019-01-18 13:45:34 +00:00
Connor E
ccefa54bb7 Log error and exit if swaylock is suid with PAM backend. 2019-01-18 12:56:00 +00:00
Connor E
291bae1e44 Remove VLAs. 2019-01-18 12:27:42 +00:00
emersion
667fea6a8f
Add Meson feature options 2019-01-18 08:58:57 +01:00
Drew DeVault
af03502384
Merge pull request #21 from primeos/replace-old-sway-references
Replace old Sway references with swaylock
2019-01-17 11:27:58 -05:00
Michael Weiss
710a711fd7
Replace old Sway references with swaylock 2019-01-17 17:18:20 +01:00
Drew DeVault
79dd99cb3c
Merge pull request #19 from swaywm/async
Async password verification
2019-01-17 08:12:03 -05:00
Drew DeVault
db577f8e67
Merge pull request #20 from attente/allow-image-file-colons
Allow image file paths to contain colons
2019-01-17 08:04:49 -05:00
William Hua
8de5a06883 Allow image file paths to contain colons
Colon characters are allowed in file paths, so if an image file named
'foo:bar.png' is passed as an --image argument, it's currently parsed as
image 'bar.png' on output 'foo'.

This fix allows the caller to pass the argument ':foo:bar.png' and treat
an output of '' the same as NULL. This is assuming there will never be
an output named '' however...
2019-01-17 07:41:10 -05:00
emersion
c77f0eb4ed
Check password without blocking 2019-01-17 12:42:13 +01:00
emersion
28c0abbc57
loop: fix loop_add_fd when called multiple times 2019-01-17 12:39:33 +01:00
emersion
0c7932a3af
Move PAM into a child process 2019-01-17 09:53:23 +01:00
emersion
0c1f193083
shadow: fix return in initialize_pw_backend 2019-01-17 09:41:12 +01:00
Drew DeVault
5303a5f300
Merge pull request #14 from swaywm/shadow-fortify-drop-root
Make sure we can't restore root after setuid
2019-01-16 19:05:41 -05:00
Drew DeVault
b44d7a0e48
Merge pull request #17 from swaywm/pam-option
Add a pam Meson option
2019-01-16 19:05:25 -05:00
Drew DeVault
e1f10eac6a
Merge pull request #13 from swaywm/detailed-error-messages
Print more detailed error messages
2019-01-16 19:04:56 -05:00
emersion
3bdf58a455
Make sure we can't restore root after setuid 2019-01-16 22:59:15 +01:00
emersion
2e50a3cb96
Add a pam Meson option 2019-01-16 22:45:38 +01:00
emersion
7b0af55e94
Print more detailed error messages 2019-01-16 22:24:02 +01:00
Drew DeVault
762e3f32ef
Merge pull request #12 from swaywm/ci
ci: add .build.yml
2019-01-16 13:22:31 -05:00
emersion
6b4ee68866
ci: add .build.yml 2019-01-16 17:55:26 +01:00
Drew DeVault
d37a9ff776
Merge pull request #9 from johnae/master
Fix swaylock.h include directive
2019-01-15 10:46:08 -05:00
John Axel Eriksson
f801164b9f
Fix swaylock.h include directive 2019-01-15 16:00:51 +01:00
Brian Ashworth
dff6b63725 Remove list.c
This replaces all occurrences of `list_t` with `wl_list` to eliminate
the need for `list.c`
2019-01-15 09:26:18 +01:00
emersion
56b672a16c
Merge pull request #7 from RedSoxFan/remove-wlroots
Implement logging and remove wlroots dependency
2019-01-15 09:16:06 +01:00
Brian Ashworth
e3935ad143 Implement logging and remove wlroots dependency
This implements a simpler version of the wlroots logger for swaylock.
With this logger, the dependency on wlroots can be dropped. This also
adds a debug flag and disables debugging output by default
2019-01-14 23:30:54 -05:00
Drew DeVault
fcf1bd4ebe Add datadir
And actually tested it as if I weren't a dumbass
2019-01-14 19:48:31 -05:00
Drew DeVault
1409f16aa6 Remove enable-tray properly 2019-01-14 19:44:09 -05:00
Drew DeVault
eba966c92b Add completions 2019-01-14 19:38:03 -05:00
Drew DeVault
54a8a33381
Merge pull request #5 from Robinhuett/caps_indicator
Add caps lock state to indicator
2019-01-14 13:08:50 -05:00
Robinhuett
1e7696fceb Add caps lock state to indicator
This implements customization for the indicator as proposed in sway#2788 with comments from sway#3367 in mind.
The default behaviour does not change exept for the caps lock text color.
Since these changes seem to be lost in the split I've remade them.
2019-01-14 16:51:04 +01:00
Drew DeVault
aab44dfaa5 Correct references to swayidle in readme 2019-01-13 21:30:20 -05:00