commit dd02dff44a582fe95d2d4662a7ca537d6adebffb
parent 9b29ae7afd3f3827c107fb441ebcbbf73a1c1ced
Author: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 May 2012 16:08:12 +0200
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.
Diffstat:
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/i3lock.c b/i3lock.c
@@ -53,7 +53,6 @@ static bool modeswitch_active = false;
static bool iso_level3_shift_active = false;
static bool iso_level5_shift_active = false;
static int numlockmask;
-static int shiftlockmask;
static int capslockmask;
static bool beep = false;
bool debug_mode = false;
@@ -289,18 +288,12 @@ static void handle_key_press(xcb_key_press_event_t *event) {
* their uppercase variant) is active at the moment. */
bool capslock = (event->state & capslockmask);
- /* Whether Shift Lock (shift state is reversed) is active at the moment. */
- bool shiftlock = (event->state & shiftlockmask);
-
- /* Whether Caps Lock or Shift Lock is active at the moment. */
- bool lock = (capslock || shiftlock);
-
- DEBUG("shift = %d, lock = %d, capslock = %d, shiftlock = %d\n",
- shift, lock, capslock, shiftlock);
+ DEBUG("shift = %d, capslock = %d\n",
+ shift, capslock);
if ((event->state & numlockmask) && xcb_is_keypad_key(sym1)) {
/* this key was a keypad key */
- if (shift || shiftlock)
+ if (shift)
sym = sym0;
else sym = sym1;
} else {
@@ -313,16 +306,15 @@ static void handle_key_press(xcb_key_press_event_t *event) {
* for alphabetic keys, unlike Shift Lock. */
if (lower == upper) {
capslock = false;
- lock = (capslock || shiftlock);
- DEBUG("lower == upper, now shift = %d, lock = %d, capslock = %d, shiftlock = %d\n",
- shift, lock, capslock, shiftlock);
+ DEBUG("lower == upper, now shift = %d, capslock = %d\n",
+ shift, capslock);
}
/* In two different cases we need to use the uppercase keysym:
* 1) The user holds shift, no lock is active.
* 2) Any of the two locks is active.
*/
- if ((shift && !lock) || (!shift && lock))
+ if ((shift && !capslock) || (!shift && capslock))
sym = sym1;
else sym = sym0;
}
@@ -716,10 +708,9 @@ int main(int argc, char *argv[]) {
symbols = xcb_key_symbols_alloc(conn);
numlockmask = get_mod_mask(conn, symbols, XK_Num_Lock);
- shiftlockmask = get_mod_mask(conn, symbols, XK_Shift_Lock);
capslockmask = get_mod_mask(conn, symbols, XK_Caps_Lock);
- DEBUG("shift lock mask = %d\n", shiftlockmask);
+ DEBUG("numlock mask = %d\n", numlockmask);
DEBUG("caps lock mask = %d\n", capslockmask);
if (dpms)
