3 files changed, 19 insertions, 28 deletions

diff --git a/swaylock/main.c b/swaylock/main.c
index 9aeb4e64..9a4f3b58 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -23,7 +23,6 @@
 #include "cairo.h"
 #include "log.h"
 #include "loop.h"
-#include "readline.h"
 #include "stringop.h"
 #include "util.h"
 #include "wlr-input-inhibitor-unstable-v1-client-protocol.h"
@@ -808,36 +807,32 @@ static int load_config(char *path, struct swaylock_state *state,
 		wlr_log(WLR_ERROR, "Failed to read config. Running without it.");
 		return 0;
 	}
-	char *line;
+	char *line = NULL;
+	size_t line_size = 0;
+	ssize_t nread;
 	int line_number = 0;
-	while (!feof(config)) {
-		line = read_line(config);
-		if (!line) {
-			continue;
-		}
-
+	int result = 0;
+	while ((nread = getline(&line, &line_size, config)) != -1) {
 		line_number++;
-		if (line[0] == '#') {
-			free(line);
-			continue;
+
+		if (line[nread - 1] == '\n') {
+			line[--nread] = '\0';
 		}
-		if (strlen(line) == 0) {
-			free(line);
+
+		if (!*line || line[0] == '#') {
 			continue;
 		}
 
 		wlr_log(WLR_DEBUG, "Config Line #%d: %s", line_number, line);
-		char flag[strlen(line) + 3];
+		char flag[nread + 3];
 		sprintf(flag, "--%s", line);
 		char *argv[] = {"swaylock", flag};
-		int result = parse_options(2, argv, state, line_mode, NULL);
+		result = parse_options(2, argv, state, line_mode, NULL);
 		if (result != 0) {
-			free(line);
-			fclose(config);
-			return result;
+			break;
 		}
-		free(line);
 	}
+	free(line);
 	fclose(config);
 	return 0;
 }
diff --git a/swaylock/password.c b/swaylock/password.c
index 3059203a..3bd113ad 100644
--- a/swaylock/password.c
+++ b/swaylock/password.c
@@ -146,14 +146,6 @@ void swaylock_handle_key(struct swaylock_state *state,
 		schedule_indicator_clear(state);
 		break;
 	case XKB_KEY_Caps_Lock:
-		/* The state is getting active after this
-		 * so we need to manually toggle it */
-		state->xkb.caps_lock = !state->xkb.caps_lock;
-		state->auth_state = AUTH_STATE_INPUT_NOP;
-		damage_state(state);
-		schedule_indicator_clear(state);
-		schedule_password_clear(state);
-		break;
 	case XKB_KEY_Shift_L:
 	case XKB_KEY_Shift_R:
 	case XKB_KEY_Control_L:
diff --git a/swaylock/seat.c b/swaylock/seat.c
index 7b72114f..f0b1385e 100644
--- a/swaylock/seat.c
+++ b/swaylock/seat.c
@@ -63,8 +63,12 @@ static void keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard,
 	struct swaylock_state *state = data;
 	xkb_state_update_mask(state->xkb.state,
 		mods_depressed, mods_latched, mods_locked, 0, 0, group);
-	state->xkb.caps_lock = xkb_state_mod_name_is_active(state->xkb.state,
+	int caps_lock = xkb_state_mod_name_is_active(state->xkb.state,
 		XKB_MOD_NAME_CAPS, XKB_STATE_MODS_LOCKED);
+	if (caps_lock != state->xkb.caps_lock) {
+		state->xkb.caps_lock = caps_lock;
+		damage_state(state);
+	}
 	state->xkb.control = xkb_state_mod_name_is_active(state->xkb.state,
 		XKB_MOD_NAME_CTRL,
 		XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED);