Unified · Split
| @@ -825,7 +825,7 @@ int main(int argc, char **argv) { · 824 unmodified lines | |||
| 825 | } | 825 | } |
| 826 | if (priv.keysym == XK_BackSpace && | 826 | if (priv.keysym == XK_BackSpace && |
| 827 | (priv.ev.xkey.state & ControlMask)) { | 827 | (priv.ev.xkey.state & ControlMask)) { |
| 828 | // Map Ctrl-Backspace to Ctrl-U. | 828 | // Map Ctrl-Backspace to Ctrl-U (clear entry line). |
| 829 | priv.buf[0] = '\025'; | 829 | priv.buf[0] = '\025'; |
| 830 | priv.buf[1] = 0; | 830 | priv.buf[1] = 0; |
| 831 | } else if (have_switch_user_command && priv.keysym == XK_l && | 831 | } else if (have_switch_user_command && priv.keysym == XK_l && |
| @@ -834,6 +834,9 @@ int main(int argc, char **argv) { · 2 unmodified lines | |||
| 834 | (priv.ev.xkey.state & Mod4Mask))) { | 834 | (priv.ev.xkey.state & Mod4Mask))) { |
| 835 | // Switch to greeter on Ctrl-Alt-L or Win-L. | 835 | // Switch to greeter on Ctrl-Alt-L or Win-L. |
| 836 | system("eval \"$XSECURELOCK_SWITCH_USER_COMMAND\" &"); | 836 | system("eval \"$XSECURELOCK_SWITCH_USER_COMMAND\" &"); |
| 837 | // And send a Ctrl-U (clear entry line). | ||
| 838 | priv.buf[0] = '\025'; | ||
| 839 | priv.buf[1] = 0; | ||
| 837 | } else if (have_key) { | 840 | } else if (have_key) { |
| 838 | // Map all newline-like things to newlines. | 841 | // Map all newline-like things to newlines. |
| 839 | if (priv.len == 1 && priv.buf[0] == '\r') { | 842 | if (priv.len == 1 && priv.buf[0] == '\r') { |