fix: recover macOS helper input after wake

Reset stale grab state before sleep or session deactivation, repair the event tap on wake, and cancel active modes through an explicit input interrupt so keyboard input is not left suppressed after unlock.

Author: GGJdevelope

.gitignore

@@ -14,3 +14,7 @@ dist/
 *.exe
 tests/cursor_style_test
 tests/cursor_style_test.dSYM/
+tests/input_interrupt_test
+tests/input_interrupt_test.dSYM/
+tests/mode_interrupt_test
+tests/mode_interrupt_test.dSYM/

Makefile

@@ -35,11 +35,19 @@ endif
 
 .PHONY: test
 
-test: tests/cursor_style_test
+test: tests/cursor_style_test tests/input_interrupt_test tests/mode_interrupt_test
 	./tests/cursor_style_test
+	./tests/input_interrupt_test
+	./tests/mode_interrupt_test
 
 tests/cursor_style_test: tests/cursor_style_test.c src/cursor.c src/config.c src/warpd.h src/platform.h
 	$(CC) -o tests/cursor_style_test tests/cursor_style_test.c src/cursor.c src/config.c $(CFLAGS)
 
+tests/input_interrupt_test: tests/input_interrupt_test.c src/input.c src/warpd.h src/platform.h
+	$(CC) -o tests/input_interrupt_test tests/input_interrupt_test.c src/input.c $(CFLAGS)
+
+tests/mode_interrupt_test: tests/mode_interrupt_test.c src/normal.c src/warpd.h src/platform.h
+	$(CC) -o tests/mode_interrupt_test tests/mode_interrupt_test.c src/normal.c $(CFLAGS)
+
 man:
 	scdoc < warpd.1.md | gzip > files/warpd.1.gz

README.md

@@ -119,6 +119,9 @@ On first run, you will be prompted to grant accessibility permissions. If you ar
 *Note 3:* Some programs (e.g iTerm) have a 'secure input mode' that may need to be
 disabled in order for warpd to work properly.
 
+*Note 4:* On macOS, locking or sleeping the machine while a warpd mode is active
+cancels that mode and restores keyboard input after unlock or wake.
+
 The service can be disabled with
 
 ```

codesign/sign.sh

@@ -3,8 +3,15 @@
 export KEYCHAIN_NAME=warpd-temp-keychain
 export KEYCHAIN_PASSWORD=
 
-# Allow passing binary or bundle path as argument
-TARGET_PATH="${1:-../bin/warpd-bin}"
+# Allow passing binary or bundle path as argument.
+if [ "$#" -gt 0 ]; then
+  case "$1" in
+    /*) TARGET_PATH="$1" ;;
+    *) TARGET_PATH="$(pwd)/$1" ;;
+  esac
+else
+  TARGET_PATH="../bin/warpd-bin"
+fi
 
 cd "$(dirname "$0")"
 

docs/plans/2026-07-08-001-fix-macos-helper-wake-keyboard-plan.md

@@ -129,6 +129,9 @@ struct input_event *grid_mode()
 		ev = platform->input_next_event(10);
 		platform->mouse_get_position(NULL, &mx, &my);
 
+		if (input_event_is_interrupt(ev))
+			goto exit;
+
 		if (mouse_process_key(ev, "grid_up", "grid_down", "grid_left", "grid_right")) {
 			redraw(mx, my, 0);
 			continue;

src/grid.c

@@ -122,6 +122,14 @@ static int hint_selection(screen_t scr, struct hint *_hints, size_t _nr_hints)
 
 		ev = platform->input_next_event(0);
 
+		if (input_event_is_interrupt(ev)) {
+			rc = -1;
+			break;
+		}
+
+		if (!ev)
+			continue;
+
 		if (!ev->pressed)
 			continue;
 

src/hint.c

@@ -86,6 +86,11 @@ const char *input_event_tostr(struct input_event *ev)
 	return s;
 }
 
+int input_event_is_interrupt(struct input_event *ev)
+{
+	return ev && ev->code == 0 && ev->mods == 0;
+}
+
 /*
  * Returns:
  * 0 on no match

src/input.c

@@ -53,12 +53,15 @@ int mode_loop(int initial_mode, int oneshot, int record_history)
 			break;
 		case MODE_GRID:
 			ev = grid_mode();
+			if (input_event_is_interrupt(ev))
+				goto exit;
 			if (config_input_match(ev, "grid_exit"))
 				ev = NULL;
 			mode = MODE_NORMAL;
 			break;
 		case MODE_SCREEN_SELECTION:
-			screen_selection_mode();
+			if (screen_selection_mode() < 0)
+				goto exit;
 			mode = MODE_NORMAL;
 			ev = NULL;
 			break;
@@ -86,4 +89,3 @@ int mode_loop(int initial_mode, int oneshot, int record_history)
 exit:
 	return rc;
 }
-

src/mode-loop.c

@@ -119,6 +119,11 @@ struct input_event *normal_mode(struct input_event *start_ev, int oneshot)
 
 		platform->mouse_get_position(&scr, &mx, &my);
 
+		if (input_event_is_interrupt(ev)) {
+			ev = NULL;
+			goto exit;
+		}
+
 		if (!system_cursor && on_time) {
 			if (show_cursor && (time - last_blink_update) >= on_time) {
 				show_cursor = 0;
@@ -251,6 +256,8 @@ struct input_event *normal_mode(struct input_event *start_ev, int oneshot)
 	}
 
 exit:
+	if (dragging)
+		platform->mouse_up(config_get_int("drag_button"));
 	platform->mouse_show();
 	platform->screen_clear(scr);