Merge pull request #1377 from tokyovigilante/switch-events
Add support for libinput_switch input devicesmaster
emersion
6 years ago
committed by
GitHub
commit
6d4bfa3226
@ -0,0 +1,55 @@
|
||||
#include <assert.h>
|
||||
#include <libinput.h>
|
||||
#include <stdlib.h>
|
||||
#include <wlr/backend/session.h>
|
||||
#include <wlr/interfaces/wlr_switch.h>
|
||||
#include <wlr/types/wlr_input_device.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "backend/libinput.h"
|
||||
#include "util/signal.h"
|
||||
|
||||
struct wlr_switch *create_libinput_switch(
|
||||
struct libinput_device *libinput_dev) {
|
||||
assert(libinput_dev);
|
||||
struct wlr_switch *wlr_switch = calloc(1, sizeof(struct wlr_switch));
|
||||
if (!wlr_switch) {
|
||||
wlr_log(WLR_ERROR, "Unable to allocate wlr_switch");
|
||||
return NULL;
|
||||
}
|
||||
wlr_switch_init(wlr_switch, NULL);
|
||||
wlr_log(WLR_DEBUG, "Created switch for device %s", libinput_device_get_name(libinput_dev));
|
||||
return wlr_switch;
|
||||
}
|
||||
|
||||
void handle_switch_toggle(struct libinput_event *event,
|
||||
struct libinput_device *libinput_dev) {
|
||||
struct wlr_input_device *wlr_dev =
|
||||
get_appropriate_device(WLR_INPUT_DEVICE_SWITCH, libinput_dev);
|
||||
if (!wlr_dev) {
|
||||
wlr_log(WLR_DEBUG, "Got a switch event for a device with no switch?");
|
||||
return;
|
||||
}
|
||||
struct libinput_event_switch *sevent =
|
||||
libinput_event_get_switch_event (event);
|
||||
struct wlr_event_switch_toggle wlr_event = { 0 };
|
||||
wlr_event.device = wlr_dev;
|
||||
switch (libinput_event_switch_get_switch(sevent)) {
|
||||
case LIBINPUT_SWITCH_LID:
|
||||
wlr_event.switch_type = WLR_SWITCH_TYPE_LID;
|
||||
break;
|
||||
case LIBINPUT_SWITCH_TABLET_MODE:
|
||||
wlr_event.switch_type = WLR_SWITCH_TYPE_TABLET_MODE;
|
||||
break;
|
||||
}
|
||||
switch (libinput_event_switch_get_switch_state(sevent)) {
|
||||
case LIBINPUT_SWITCH_STATE_OFF:
|
||||
wlr_event.switch_state = WLR_SWITCH_STATE_OFF;
|
||||
break;
|
||||
case LIBINPUT_SWITCH_STATE_ON:
|
||||
wlr_event.switch_state = WLR_SWITCH_STATE_ON;
|
||||
break;
|
||||
}
|
||||
wlr_event.time_msec =
|
||||
usec_to_msec(libinput_event_switch_get_time_usec(sevent));
|
||||
wlr_signal_emit_safe(&wlr_dev->lid_switch->events.toggle, &wlr_event);
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
#ifndef ROOTSTON_BINDINGS_H
|
||||
#define ROOTSTON_BINDINGS_H
|
||||
|
||||
#include "rootston/seat.h"
|
||||
#include "rootston/input.h"
|
||||
|
||||
void execute_binding_command(struct roots_seat *seat, struct roots_input *input, const char *command);
|
||||
|
||||
#endif //ROOTSTON_BINDINGS_H
|
||||
@ -0,0 +1,18 @@
|
||||
#ifndef ROOTSTON_SWITCH_H
|
||||
#define ROOTSTON_SWITCH_H
|
||||
|
||||
#include "rootston/input.h"
|
||||
|
||||
struct roots_switch {
|
||||
struct roots_seat *seat;
|
||||
struct wlr_input_device *device;
|
||||
struct wl_listener device_destroy;
|
||||
|
||||
struct wl_listener toggle;
|
||||
struct wl_list link;
|
||||
};
|
||||
|
||||
void roots_switch_handle_toggle(struct roots_switch *lid_switch,
|
||||
struct wlr_event_switch_toggle *event);
|
||||
|
||||
#endif // ROOTSTON_SWITCH_H
|
||||
@ -0,0 +1,22 @@
|
||||
/*
|
||||
* This an unstable interface of wlroots. No guarantees are made regarding the
|
||||
* future consistency of this API.
|
||||
*/
|
||||
#ifndef WLR_USE_UNSTABLE
|
||||
#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
|
||||
#endif
|
||||
|
||||
#ifndef WLR_INTERFACES_WLR_SWITCH_H
|
||||
#define WLR_INTERFACES_WLR_SWITCH_H
|
||||
|
||||
#include <wlr/types/wlr_switch.h>
|
||||
|
||||
struct wlr_switch_impl {
|
||||
void (*destroy)(struct wlr_switch *lid_switch);
|
||||
};
|
||||
|
||||
void wlr_switch_init(struct wlr_switch *lid_switch,
|
||||
struct wlr_switch_impl *impl);
|
||||
void wlr_switch_destroy(struct wlr_switch *lid_switch);
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,47 @@
|
||||
/*
|
||||
* This an unstable interface of wlroots. No guarantees are made regarding the
|
||||
* future consistency of this API.
|
||||
*/
|
||||
#ifndef WLR_USE_UNSTABLE
|
||||
#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
|
||||
#endif
|
||||
|
||||
#ifndef WLR_TYPES_WLR_SWITCH_H
|
||||
#define WLR_TYPES_WLR_SWITCH_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/types/wlr_input_device.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
|
||||
struct wlr_switch_impl;
|
||||
|
||||
struct wlr_switch {
|
||||
struct wlr_switch_impl *impl;
|
||||
|
||||
struct {
|
||||
struct wl_signal toggle;
|
||||
} events;
|
||||
|
||||
void *data;
|
||||
};
|
||||
|
||||
enum wlr_switch_type {
|
||||
WLR_SWITCH_TYPE_LID = 1,
|
||||
WLR_SWITCH_TYPE_TABLET_MODE,
|
||||
};
|
||||
|
||||
enum wlr_switch_state {
|
||||
WLR_SWITCH_STATE_OFF = 0,
|
||||
WLR_SWITCH_STATE_ON,
|
||||
WLR_SWITCH_STATE_TOGGLE
|
||||
};
|
||||
|
||||
struct wlr_event_switch_toggle {
|
||||
struct wlr_input_device *device;
|
||||
uint32_t time_msec;
|
||||
enum wlr_switch_type switch_type;
|
||||
enum wlr_switch_state switch_state;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/interfaces/wlr_switch.h>
|
||||
#include <wlr/types/wlr_switch.h>
|
||||
|
||||
void wlr_switch_init(struct wlr_switch *lid_switch,
|
||||
struct wlr_switch_impl *impl) {
|
||||
lid_switch->impl = impl;
|
||||
wl_signal_init(&lid_switch->events.toggle);
|
||||
}
|
||||
|
||||
void wlr_switch_destroy(struct wlr_switch *lid_switch) {
|
||||
if (!lid_switch) {
|
||||
return;
|
||||
}
|
||||
if (lid_switch->impl && lid_switch->impl->destroy) {
|
||||
lid_switch->impl->destroy(lid_switch);
|
||||
} else {
|
||||
free(lid_switch);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue