Commit Graph

80 Commits (ad47d80e22823322b7c5f5bc13dbaae87f0d07ee)

Author SHA1 Message Date
Michael Stapelberg ad47d80e22 Add -e to --help 2013-08-31 20:42:06 +02:00
Vincent Bernat 5627a11174 Add `-e` option to not validate empty password.
When the XF86ScreenSaver key is used to put a laptop to sleep (or to
trigger the screensaver), the key may "bounce" on resume. This is
annoying as i3lock will try to validate several empty passwords and
wait several seconds before accepting a legit password.

Some users may want to validate an empty password: PAM may rely on
other sources to unlock the screen, like the presence of a token or
the proximity of some Bluetooth device. Hence, we don't forbid this
possibility and provide an command-line option for users not willing
to validate empty passwords.
2013-08-31 20:41:12 +02:00
Bas Pape 3e136769be Use cairo_status_to_string for descriptive errors. 2013-07-30 20:08:21 +02:00
Michael Stapelberg d4d589a7dd fix ctrl-u handling 2013-03-29 10:13:01 +01:00
Sebastian Ullrich 1495903e5d Fix resetting the password after failed authentications
This has been broken by commit 661344.
2013-03-29 10:02:35 +01:00
Philip Dexter 661344463a Add ctrl+u password reset 2013-03-24 14:30:07 +01:00
Baptiste Daroussin d8a1da69fb Use ev_loop_fork after fork, this fix forking on kqueue based OSes 2013-03-20 21:28:14 +01:00
Quentin Glidic b1a6e2ebe3 Limit the debug print to the actual password size
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
2013-02-07 17:15:16 +01:00
Vivien Didelot 2c9e46dfee RGB color notation is 3-byte hexadecimal
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
2012-12-06 09:40:23 +01:00
Moritz Augsburger d6b9e33e28 Allow passwordless PAM conversations (e.g. fingerprint) 2012-11-04 19:01:52 +01:00
Moritz Augsburger e84a1203a6 Allow XKB_KEY_XF86ScreenSaver as synonm for enter
This keysym is generated on convertible tablets by pressing a hardware
lock/unlock button.
2012-11-04 19:01:48 +01:00
Michael Stapelberg fba88476dd remove support for NOLIBCAIRO, cairo-xcb is widespread by now 2012-10-26 20:42:26 +02:00
Michael Stapelberg e1d86a3279 use libxkbcommon for input handling
Thanks to Ran Benita and Daniel Stone (the libxkbcommon authors) for
answering my questions and reviewing this code.

With this commit, input handling should be more correct with using less
code (in i3lock, that is).
2012-10-26 20:39:59 +02:00
Michael Stapelberg 2cadf22c67 s/pam_message/pam_response/ (Thanks Tucos)
The previous code didn’t cause any issues since both types (currently!)
have the same size.
2012-10-15 22:40:29 +02:00
Michael Stapelberg 603c90e985 promote the "could not load image" message from debug to normal 2012-09-26 11:21:48 +02:00
Michael Stapelberg 1e55f0dc6f only use mlock() on Linux, FreeBSD (for example) requires root 2012-08-22 20:49:10 +02:00
Fernando Tarlá Cardoso Lemos 65795be0a9 getopt_long returns int, don't cast to char.
On ARM, casting -1 to char turns it into something else. Fixes
argument parsing on ARM. Thanks Chipaca for reporting.
2012-06-29 16:30:23 +02:00
Michael Stapelberg dd02dff44a revert shift lock handling (broke uppercase letters)
With some layouts, this broke uppercase letters in your passwords.

I think that explicit shiftlock handling is unnecessary. X11 seems to do
it on its own. Here is what leads me to that conclusion:

  $ setxkbmap de
  $ xmodmap -e 'keycode 66 = Shift_Lock'
  $ xev

Now enter a character, say "a", then press CapsLk (which is now
Shift_Lock), then press "a" again. The event state is 0x1, thereby
undistinguishable from normal shift.
2012-05-30 16:08:12 +02:00
Michael Stapelberg 9b29ae7afd Bugfix: Correctly center unlock indicator after reconfiguring screens (Thanks xn)
Fixes: #712
2012-05-19 21:13:03 +02:00
Michael Stapelberg dc2b6e5f39 Use (void) instead of () for functions without args (Thanks fernandotcl)
See also:
http://article.gmane.org/gmane.linux.kernel/1268792

The C compiler will handle (void) as "no arguments" and () as "variadic
function" (equivalent to (...)) which might lead to subtle errors, such
as the one which was fixed with commit 0ea64ae4.
2012-04-01 12:28:28 +02:00
Michael Stapelberg 3c2436cb71 Bugfix: fallback when the image cannot be loaded
If the specified file does not exist or is invalid, previously, the unlock
indicator wouldn’t show up at all, because the invalid surface was still used.

With this commit, i3lock will react like if you didn’t specify an image at all.
2012-03-28 21:00:49 +02:00
Michael Stapelberg be21951062 Only output text when in debug mode (fixes problems with xautolock) 2012-03-26 19:54:47 +02:00
Michael Stapelberg b5bbd2fe04 Properly handle Caps Lock (Thanks Damien) 2012-03-10 16:42:10 +01:00
Michael Stapelberg 34c8108c06 Bugfix: Check for waiting X11 events before entering the event loop 2012-01-05 22:27:01 +00:00
Michael Stapelberg cab5e6b1de Change the unlock indicator properly after pressing the 'escape' key 2012-01-05 01:07:29 +00:00
Michael Stapelberg fd64bde0cb Implement Xinerama support (not used yet) 2012-01-03 23:10:56 +00:00
Michael Stapelberg 0e7e009f45 Properly free timeouts, move one of the timeouts to unlock_indicator.c 2012-01-03 22:18:33 +00:00
Michael Stapelberg f94fb9b5f8 remove the dead variable modeswitchmask 2012-01-03 21:01:16 +00:00
Michael Stapelberg 6ea3fbdc21 Properly free the reply of xcb_get_geometry 2012-01-03 21:01:05 +00:00
Michael Stapelberg 57585bef70 Refactor the unlock indicator into its own source code file 2012-01-03 20:56:05 +00:00
Michael Stapelberg 009a0b1a51 Fork after the window is visible, not before 2012-01-03 20:19:17 +00:00
Michael Stapelberg 6f50a997b8 change ALL the copyrights! 2012-01-03 18:20:37 +00:00
Michael Stapelberg 52f96e78f2 Lock the password buffer in memory, clear it in RAM after verifying 2012-01-03 18:06:59 +00:00
Michael Stapelberg 2dd03ce7db support ISO_Level5_Shift (Thanks roland) 2011-12-30 03:13:24 +01:00
Michael Stapelberg 7fdda76a51 Fix the timeouts for hiding the unlock indicator (Thanks Merovius) 2011-12-29 02:56:28 +01:00
Michael Stapelberg 1b757b2aa9 Properly free X11 resources (fixes DoS bug) (Thanks Merovius) 2011-12-28 23:05:02 +01:00
Michael Stapelberg f216517bb0 Implement a visual unlock indicator 2011-12-28 20:28:18 +01:00
Michael Stapelberg 8e3c506c90 Properly implement -h (fixes error message about unknown option) 2011-11-06 14:11:20 +00:00
Michael Stapelberg 409025c7cc Get rid of superfluous \n in --version 2011-11-06 14:08:33 +00:00
Michael Stapelberg 28fe00c765 Bugfix: Properly detect the release of ISO_Level3_Shift (Thanks bacardi55) 2011-10-30 13:22:50 +00:00
Michael Stapelberg 9f6ef91337 Introduce --debug and some debugging options related to the Mode_switch / ISO_Level3_Shift thing 2011-10-29 23:28:11 +01:00
Michael Stapelberg 8e153411b5 Correctly handle Mode_switch/ISO_Level3_Shift (Thanks bacardi55)
I tested this with the following experiment:
$ setxkbmap 'us(intl)'
$ xmodmap ~/configfiles/midna/Xmodmap
$ xmodmap -e 'keycode 38 = a A adiaeresis Adiaeresis o O'
$ xmodmap -e 'keycode 49 = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift'
Then, Mode_switch + a yields ä, but ` + a yields o.

In i3lock, these were swapped (Mode_switch + a yielded o, while ä was not
reachable at all). The comment in the code explains it

(See http://code.stapelberg.de/git/configfiles for the Xmodmap)
2011-10-29 23:23:41 +01:00
Michael Stapelberg a803ba931e Bugfix: Don’t re-grab pointer/keyboard on MappingNotify (Thanks wilmer)
This fixes bug http://bugs.i3wm.org/545, where characters (of your password)
would rarely slip through when entering your password (especially) after
resuming your notebook from suspend to RAM.

The reason is that when resuming, X triggers one or more MappingNotify events.
At the same time, CPU load is high. This leads to a race-condition between the
ungrab and re-grab in which i3lock temporarily does not grab the keyboard.

One way to fix this is using xcb_grab_server() before and xcb_ungrab_server()
after the ungrab/re-grab. However, I think we actually don’t need to
ungrab/re-grab at all. I seem to have put that code in here by mistake – in i3,
we re-grab after MappingNotify, but there we only grab specific keys. In
i3lock, we grab the whole pointer/keyboard, so there should be no need.

If I’m incorrect and this breaks some subtle use-cases for people with strange
layout setup, at least we can properly document on why we need it, after we put
it back in ;).
2011-10-24 21:23:33 +01:00
Michael Stapelberg 5932ee24a7 Throw an error when specifying an invalid pointer argument (-p) (Thanks TrickSTer) 2011-09-25 13:26:51 +01:00
Thorsten Töpper c81f8e8284 Fixed handle_screen_resize to build with NOLIBCAIRO enabled 2011-08-24 01:26:45 +02:00
Stefan Breunig c8eecefe83 handle screen resolution images and redraw the lock window 2011-08-17 15:46:52 +02:00
Michael Stapelberg e03e93fd1b optimization: render to pixmap which is used as background for the window
Before this commit, the background color (white by default) was visible for
about 100ms until the image was drawn. This flickering is now eliminated.

Also, we don’t need to handle Expose-events anymore, as X11 will use the
window’s background pixmap automatically.
2011-04-02 19:49:38 +02:00
Michael Stapelberg e7201e2df5 Mark handle_visibility_notify and handle_mapping_notify as static 2011-04-02 19:32:59 +02:00
Michael Stapelberg 6b0ce0d5aa cleanup indention left-overs 2011-03-13 20:24:25 +01:00
Michael Stapelberg 7128f80020 bump copyright 2011-03-13 20:23:39 +01:00