Merge pull request #1377 from tokyovigilante/switch-events

Add support for libinput_switch input devices

7 files changed, 215 insertions, 101 deletions

diff --git a/rootston/bindings.c b/rootston/bindings.c
new file mode 100644
index 00000000..9fdbb33b
--- /dev/null
+++ b/rootston/bindings.c
@@ -0,0 +1,107 @@
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <wlr/util/log.h>
+#include "rootston/bindings.h"
+
+static bool outputs_enabled = true;
+
+static const char *exec_prefix = "exec ";
+
+static void double_fork_shell_cmd(const char *shell_cmd) {
+    pid_t pid = fork();
+    if (pid < 0) {
+        wlr_log(WLR_ERROR, "cannot execute binding command: fork() failed");
+        return;
+    }
+
+    if (pid == 0) {
+        pid = fork();
+        if (pid == 0) {
+            execl("/bin/sh", "/bin/sh", "-c", shell_cmd, NULL);
+            _exit(EXIT_FAILURE);
+        } else {
+            _exit(pid == -1);
+        }
+    }
+
+    int status;
+    while (waitpid(pid, &status, 0) < 0) {
+        if (errno == EINTR) {
+            continue;
+        }
+        wlr_log_errno(WLR_ERROR, "waitpid() on first child failed");
+        return;
+    }
+
+    if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
+        return;
+    }
+
+    wlr_log(WLR_ERROR, "first child failed to fork command");
+}
+
+void execute_binding_command(struct roots_seat *seat, 
+        struct roots_input *input, const char *command) {
+    if (strcmp(command, "exit") == 0) {
+        wl_display_terminate(input->server->wl_display);
+    } else if (strcmp(command, "close") == 0) {
+        struct roots_view *focus = roots_seat_get_focus(seat);
+        if (focus != NULL) {
+            view_close(focus);
+        }
+    } else if (strcmp(command, "fullscreen") == 0) {
+        struct roots_view *focus = roots_seat_get_focus(seat);
+        if (focus != NULL) {
+            bool is_fullscreen = focus->fullscreen_output != NULL;
+            view_set_fullscreen(focus, !is_fullscreen, NULL);
+        }
+    } else if (strcmp(command, "next_window") == 0) {
+        roots_seat_cycle_focus(seat);
+    } else if (strcmp(command, "alpha") == 0) {
+        struct roots_view *focus = roots_seat_get_focus(seat);
+        if (focus != NULL) {
+            view_cycle_alpha(focus);
+        }
+    } else if (strncmp(exec_prefix, command, strlen(exec_prefix)) == 0) {
+        const char *shell_cmd = command + strlen(exec_prefix);
+        double_fork_shell_cmd(shell_cmd);
+    } else if (strcmp(command, "maximize") == 0) {
+        struct roots_view *focus = roots_seat_get_focus(seat);
+        if (focus != NULL) {
+            view_maximize(focus, !focus->maximized);
+        }
+    } else if (strcmp(command, "nop") == 0) {
+        wlr_log(WLR_DEBUG, "nop command");
+    } else if (strcmp(command, "toggle_outputs") == 0) {
+        outputs_enabled = !outputs_enabled;
+        struct roots_output *output;
+        wl_list_for_each(output, &input->server->desktop->outputs, link) {
+            wlr_output_enable(output->wlr_output, outputs_enabled);
+        }
+    } else if (strcmp(command, "toggle_decoration_mode") == 0) {
+        struct roots_view *focus = roots_seat_get_focus(seat);
+        if (focus != NULL && focus->type == ROOTS_XDG_SHELL_VIEW) {
+            struct roots_xdg_toplevel_decoration *decoration =
+                focus->roots_xdg_surface->xdg_toplevel_decoration;
+            if (decoration != NULL) {
+                enum wlr_xdg_toplevel_decoration_v1_mode mode =
+                    decoration->wlr_decoration->current_mode;
+                mode = mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE
+                    ? WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE
+                    : WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
+                wlr_xdg_toplevel_decoration_v1_set_mode(
+                    decoration->wlr_decoration, mode);
+            }
+        }
+    } else if (strcmp(command, "break_pointer_constraint") == 0) {
+        struct wl_list *list = &input->seats;
+        struct roots_seat *seat;
+        wl_list_for_each(seat, list, link) {
+            roots_cursor_constrain(seat->cursor, NULL, NAN, NAN);
+        }
+    } else {
+        wlr_log(WLR_ERROR, "unknown binding command: %s", command);
+    }
+}
diff --git a/rootston/config.c b/rootston/config.c
index 119a9e2c..198aaba6 100644
--- a/rootston/config.c
+++ b/rootston/config.c
@@ -201,6 +201,33 @@ void add_binding_config(struct wl_list *bindings, const char* combination,
 	}
 }
 
+void add_switch_config(struct wl_list *switches, const char *switch_name, const char *action,
+		const char* command) {
+	struct roots_switch_config *sc = calloc(1, sizeof(struct roots_switch_config));
+
+	if (strcmp(switch_name, "tablet") == 0) {
+		sc->switch_type = WLR_SWITCH_TYPE_TABLET_MODE;
+	} else if (strcmp(switch_name, "lid") == 0) {
+		sc->switch_type = WLR_SWITCH_TYPE_LID;
+	} else {
+		sc->switch_type = -1;
+		sc->name = strdup(switch_name);
+	}
+	if (strcmp(action, "on") == 0) {
+		sc->switch_state = WLR_SWITCH_STATE_ON;
+	} else if (strcmp(action, "off") == 0) {
+		sc->switch_state = WLR_SWITCH_STATE_OFF;
+	} else if (strcmp(action, "toggle") == 0) {
+		sc->switch_state = WLR_SWITCH_STATE_TOGGLE;
+	} else {
+		wlr_log(WLR_ERROR, "Invalid switch action %s/n for switch %s:%s",
+		        action, switch_name, action);
+		return;
+	}
+	sc->command = strdup(command);
+	wl_list_insert(switches, &sc->link);
+}
+
 static void config_handle_cursor(struct roots_config *config,
 		const char *seat_name, const char *name, const char *value) {
 	struct roots_cursor_config *cc;
@@ -280,6 +307,7 @@ static const char *output_prefix = "output:";
 static const char *device_prefix = "device:";
 static const char *keyboard_prefix = "keyboard:";
 static const char *cursor_prefix = "cursor:";
+static const char *switch_prefix = "switch:";
 
 static int config_ini_handler(void *user, const char *section, const char *name,
 		const char *value) {
@@ -436,6 +464,9 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 		config_handle_keyboard(config, device_name, name, value);
 	} else if (strcmp(section, "bindings") == 0) {
 		add_binding_config(&config->bindings, name, value);
+	} else if (strncmp(switch_prefix, section, strlen(switch_prefix)) == 0) {
+		const char *switch_name = section + strlen(switch_prefix);
+		add_switch_config(&config->switches, switch_name, name, value);
 	} else {
 		wlr_log(WLR_ERROR, "got unknown config section: %s", section);
 	}
@@ -456,6 +487,7 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
 	wl_list_init(&config->keyboards);
 	wl_list_init(&config->cursors);
 	wl_list_init(&config->bindings);
+	wl_list_init(&config->switches);
 
 	int c;
 	unsigned int log_verbosity = WLR_DEBUG;
diff --git a/rootston/input.c b/rootston/input.c
index 7b4001b3..a863b919 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -23,6 +23,8 @@ static const char *device_type(enum wlr_input_device_type type) {
 		return "keyboard";
 	case WLR_INPUT_DEVICE_POINTER:
 		return "pointer";
+	case WLR_INPUT_DEVICE_SWITCH:
+		return "switch";
 	case WLR_INPUT_DEVICE_TOUCH:
 		return "touch";
 	case WLR_INPUT_DEVICE_TABLET_TOOL:
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index 66c373cf..9d3fadf6 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -2,8 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sys/wait.h>
-#include <unistd.h>
 #include <wayland-server.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
@@ -11,6 +9,7 @@
 #include <wlr/types/wlr_pointer.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
+#include "rootston/bindings.h"
 #include "rootston/input.h"
 #include "rootston/keyboard.h"
 #include "rootston/seat.h"
@@ -85,107 +84,9 @@ static void pressed_keysyms_update(xkb_keysym_t *pressed_keysyms,
 	}
 }
 
-static void double_fork_shell_cmd(const char *shell_cmd) {
-	pid_t pid = fork();
-	if (pid < 0) {
-		wlr_log(WLR_ERROR, "cannot execute binding command: fork() failed");
-		return;
-	}
-
-	if (pid == 0) {
-		pid = fork();
-		if (pid == 0) {
-			execl("/bin/sh", "/bin/sh", "-c", shell_cmd, NULL);
-			_exit(EXIT_FAILURE);
-		} else {
-			_exit(pid == -1);
-		}
-	}
-
-	int status;
-	while (waitpid(pid, &status, 0) < 0) {
-		if (errno == EINTR) {
-			continue;
-		}
-		wlr_log_errno(WLR_ERROR, "waitpid() on first child failed");
-		return;
-	}
-
-	if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
-		return;
-	}
-
-	wlr_log(WLR_ERROR, "first child failed to fork command");
-}
-
-static const char *exec_prefix = "exec ";
-
-static bool outputs_enabled = true;
-
 static void keyboard_binding_execute(struct roots_keyboard *keyboard,
 		const char *command) {
-	struct roots_seat *seat = keyboard->seat;
-	if (strcmp(command, "exit") == 0) {
-		wl_display_terminate(keyboard->input->server->wl_display);
-	} else if (strcmp(command, "close") == 0) {
-		struct roots_view *focus = roots_seat_get_focus(seat);
-		if (focus != NULL) {
-			view_close(focus);
-		}
-	} else if (strcmp(command, "fullscreen") == 0) {
-		struct roots_view *focus = roots_seat_get_focus(seat);
-		if (focus != NULL) {
-			bool is_fullscreen = focus->fullscreen_output != NULL;
-			view_set_fullscreen(focus, !is_fullscreen, NULL);
-		}
-	} else if (strcmp(command, "next_window") == 0) {
-		roots_seat_cycle_focus(seat);
-	} else if (strcmp(command, "alpha") == 0) {
-		struct roots_view *focus = roots_seat_get_focus(seat);
-		if (focus != NULL) {
-			view_cycle_alpha(focus);
-		}
-	} else if (strncmp(exec_prefix, command, strlen(exec_prefix)) == 0) {
-		const char *shell_cmd = command + strlen(exec_prefix);
-		double_fork_shell_cmd(shell_cmd);
-	} else if (strcmp(command, "maximize") == 0) {
-		struct roots_view *focus = roots_seat_get_focus(seat);
-		if (focus != NULL) {
-			view_maximize(focus, !focus->maximized);
-		}
-	} else if (strcmp(command, "nop") == 0) {
-		wlr_log(WLR_DEBUG, "nop command");
-	} else if (strcmp(command, "toggle_outputs") == 0) {
-		outputs_enabled = !outputs_enabled;
-		struct roots_output *output;
-		wl_list_for_each(output, &keyboard->input->server->desktop->outputs, link) {
-			wlr_output_enable(output->wlr_output, outputs_enabled);
-		}
-	} else if (strcmp(command, "toggle_decoration_mode") == 0) {
-		struct roots_view *focus = roots_seat_get_focus(seat);
-		if (focus != NULL && focus->type == ROOTS_XDG_SHELL_VIEW) {
-			struct roots_xdg_toplevel_decoration *decoration =
-				focus->roots_xdg_surface->xdg_toplevel_decoration;
-			if (decoration != NULL) {
-				enum wlr_xdg_toplevel_decoration_v1_mode mode =
-					decoration->wlr_decoration->current_mode;
-				mode = mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE
-					? WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE
-					: WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
-				wlr_xdg_toplevel_decoration_v1_set_mode(
-					decoration->wlr_decoration, mode);
-			}
-		}
-	} else if (strcmp(command, "break_pointer_constraint") == 0) {
-		struct wl_list *list =
-			&keyboard->input->seats;
-		struct roots_seat *seat;
-		wl_list_for_each(seat, list, link) {
-			roots_cursor_constrain(seat->cursor, NULL, NAN, NAN);
-		}
-	} else {
-		wlr_log(WLR_ERROR, "unknown binding command: %s", command);
-	}
+	execute_binding_command(keyboard->seat, keyboard->input, command);
 }
 
 /**
diff --git a/rootston/meson.build b/rootston/meson.build
index d41e00b0..db90a508 100644
--- a/rootston/meson.build
+++ b/rootston/meson.build
@@ -1,4 +1,5 @@
 sources = [
+	'bindings.c',
 	'config.c',
 	'cursor.c',
 	'desktop.c',
@@ -9,6 +10,7 @@ sources = [
 	'main.c',
 	'output.c',
 	'seat.c',
+	'switch.c',
 	'text_input.c',
 	'virtual_keyboard.c',
 	'wl_shell.c',
diff --git a/rootston/seat.c b/rootston/seat.c
index e91278c5..dda2f8df 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -9,6 +9,7 @@
 #include <wlr/config.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include "wlr/types/wlr_switch.h"
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/log.h>
@@ -75,6 +76,15 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
 	roots_cursor_handle_axis(cursor, event);
 }
 
+static void handle_switch_toggle(struct wl_listener *listener, void *data) {
+	struct roots_switch *lid_switch =
+		wl_container_of(listener, lid_switch, toggle);
+	struct roots_desktop *desktop = lid_switch->seat->input->server->desktop;
+	wlr_idle_notify_activity(desktop->idle, lid_switch->seat->seat);
+	struct wlr_event_switch_toggle *event = data;
+	roots_switch_handle_toggle(lid_switch, event);
+}
+
 static void handle_touch_down(struct wl_listener *listener, void *data) {
 	struct roots_cursor *cursor =
 		wl_container_of(listener, cursor, touch_down);
@@ -587,6 +597,7 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
 	wl_list_init(&seat->touch);
 	wl_list_init(&seat->tablets);
 	wl_list_init(&seat->tablet_pads);
+	wl_list_init(&seat->switches);
 	wl_list_init(&seat->views);
 	wl_list_init(&seat->drag_icons);
 
@@ -710,6 +721,36 @@ static void seat_add_pointer(struct roots_seat *seat,
 	roots_seat_configure_cursor(seat);
 }
 
+static void handle_switch_destroy(struct wl_listener *listener, void *data) {
+	struct roots_switch *lid_switch =
+		wl_container_of(listener, lid_switch, device_destroy);
+	struct roots_seat *seat = lid_switch->seat;
+
+	wl_list_remove(&lid_switch->link);
+	wl_list_remove(&lid_switch->device_destroy.link);
+	free(lid_switch);
+
+	seat_update_capabilities(seat);
+}
+
+static void seat_add_switch(struct roots_seat *seat,
+		struct wlr_input_device *device) {
+	assert(device->type == WLR_INPUT_DEVICE_SWITCH);
+		struct roots_switch *lid_switch = calloc(1, sizeof(struct roots_switch));
+	if (!lid_switch) {
+		wlr_log(WLR_ERROR, "could not allocate switch for seat");
+		return;
+	}
+	device->data = lid_switch;
+	lid_switch->device = device;
+	lid_switch->seat = seat;
+	wl_list_insert(&seat->switches, &lid_switch->link);
+	lid_switch->device_destroy.notify = handle_switch_destroy;
+
+	lid_switch->toggle.notify = handle_switch_toggle;
+	wl_signal_add(&lid_switch->device->lid_switch->events.toggle, &lid_switch->toggle);
+}
+
 static void handle_touch_destroy(struct wl_listener *listener, void *data) {
 	struct roots_pointer *touch =
 		wl_container_of(listener, touch, device_destroy);
@@ -953,6 +994,9 @@ void roots_seat_add_device(struct roots_seat *seat,
 	case WLR_INPUT_DEVICE_POINTER:
 		seat_add_pointer(seat, device);
 		break;
+	case WLR_INPUT_DEVICE_SWITCH:
+		seat_add_switch(seat, device);
+		break;
 	case WLR_INPUT_DEVICE_TOUCH:
 		seat_add_touch(seat, device);
 		break;
diff --git a/rootston/switch.c b/rootston/switch.c
new file mode 100644
index 00000000..65c5e627
--- /dev/null
+++ b/rootston/switch.c
@@ -0,0 +1,26 @@
+#include <stdlib.h>
+
+#include <wlr/util/log.h>
+
+#include "rootston/bindings.h"
+#include "rootston/config.h"
+#include "rootston/input.h"
+#include "rootston/seat.h"
+#include "rootston/switch.h"
+
+void roots_switch_handle_toggle(struct roots_switch *lid_switch,
+        struct wlr_event_switch_toggle *event) {
+    struct wl_list *bound_switches = &lid_switch->seat->input->server->config->switches;
+    struct roots_switch_config *sc;
+    wl_list_for_each(sc, bound_switches, link) {
+        if ((sc->name != NULL && strcmp(event->device->name, sc->name) != 0) &&
+                (sc->name == NULL && event->switch_type != sc->switch_type)) {
+            continue;
+        }
+        if (sc->switch_state != WLR_SWITCH_STATE_TOGGLE &&
+                event->switch_state != sc->switch_state) {
+            continue;
+        }
+        execute_binding_command(lid_switch->seat, lid_switch->seat->input, sc->command);
+    }
+}