|
|
|
|
#define _POSIX_C_SOURCE 200809L
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <float.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <libinput.h>
|
|
|
|
|
#include <math.h>
|
|
|
|
|
#include <wlr/backend/libinput.h>
|
|
|
|
|
#include <wlr/types/wlr_input_inhibitor.h>
|
|
|
|
|
#include <wlr/types/wlr_virtual_keyboard_v1.h>
|
|
|
|
|
#include "sway/config.h"
|
|
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
|
#include "sway/server.h"
|
|
|
|
|
#include "stringop.h"
|
|
|
|
|
#include "list.h"
|
|
|
|
|
#include "log.h"
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_SEAT "seat0"
|
|
|
|
|
|
|
|
|
|
struct input_config *current_input_config = NULL;
|
|
|
|
|
struct seat_config *current_seat_config = NULL;
|
|
|
|
|
|
|
|
|
|
struct sway_seat *input_manager_current_seat(void) {
|
|
|
|
|
struct sway_seat *seat = config->handler_context.seat;
|
|
|
|
|
if (!seat) {
|
|
|
|
|
seat = input_manager_get_default_seat();
|
|
|
|
|
}
|
|
|
|
|
return seat;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *input_manager_get_default_seat(void) {
|
|
|
|
|
return input_manager_get_seat(DEFAULT_SEAT, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *input_manager_get_seat(const char *seat_name, bool create) {
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
if (strcmp(seat->wlr_seat->name, seat_name) == 0) {
|
|
|
|
|
return seat;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return create ? seat_create(seat_name) : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *input_device_get_identifier(struct wlr_input_device *device) {
|
|
|
|
|
int vendor = device->vendor;
|
|
|
|
|
int product = device->product;
|
|
|
|
|
char *name = strdup(device->name);
|
|
|
|
|
strip_whitespace(name);
|
|
|
|
|
|
|
|
|
|
char *p = name;
|
|
|
|
|
for (; *p; ++p) {
|
|
|
|
|
if (*p == ' ') {
|
|
|
|
|
*p = '_';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *fmt = "%d:%d:%s";
|
|
|
|
|
int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
|
|
|
|
|
char *identifier = malloc(len);
|
|
|
|
|
if (!identifier) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Unable to allocate unique input device name");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
snprintf(identifier, len, fmt, vendor, product, name);
|
|
|
|
|
free(name);
|
|
|
|
|
return identifier;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct sway_input_device *input_sway_device_from_wlr(
|
|
|
|
|
struct wlr_input_device *device) {
|
|
|
|
|
struct sway_input_device *input_device = NULL;
|
|
|
|
|
wl_list_for_each(input_device, &server.input->devices, link) {
|
|
|
|
|
if (input_device->wlr_device == device) {
|
|
|
|
|
return input_device;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
Revamp seat configs
This makes seat configs work like output and input configs do. This also
adds support for wildcard seat configs. A seat config is still created
in the main seat command handler, but instead of creating a new one in
the subcommands and destroying the main seat command's instance, the
seat subcommands modify the main one. The seat config is then stored,
where it is merged appropriately. The seat config returned from
`store_seat_config` is then applied. When attempting to apply a wildcard
seat config, a seat specific config is queried for and if found, that is
used. Otherwise, the wildcard config is applied directly.
Additionally, instead of adding input devices to the default seat
directly when there is no seat configs, a seat config for the default
seat is created with only fallback set to true, which is more explicit.
It also fixes an issue where running a seat command at runtime (with no
seat config in the sway config), would result in all input devices being
removed from the default seat and leaving sway in an unusable state.
Also, instead of checking for any seat config, the search is for a seat
config with a fallback option seat. This makes it so if there are only
seat configs with fallback set to -1, the default seat is still created
since there is no explicit notion on what to do regarding fallbacks.
However, if there is even a single fallback 0, then the default seat is
not used as a fallback. This will be needed for seat subcommands like
hide_cursor where the user may only want to set that property without
effecting anything else.
6 years ago
|
|
|
static bool input_has_seat_fallback_configuration(void) {
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
struct seat_config *seat_config = seat_get_config(seat);
|
Revamp seat configs
This makes seat configs work like output and input configs do. This also
adds support for wildcard seat configs. A seat config is still created
in the main seat command handler, but instead of creating a new one in
the subcommands and destroying the main seat command's instance, the
seat subcommands modify the main one. The seat config is then stored,
where it is merged appropriately. The seat config returned from
`store_seat_config` is then applied. When attempting to apply a wildcard
seat config, a seat specific config is queried for and if found, that is
used. Otherwise, the wildcard config is applied directly.
Additionally, instead of adding input devices to the default seat
directly when there is no seat configs, a seat config for the default
seat is created with only fallback set to true, which is more explicit.
It also fixes an issue where running a seat command at runtime (with no
seat config in the sway config), would result in all input devices being
removed from the default seat and leaving sway in an unusable state.
Also, instead of checking for any seat config, the search is for a seat
config with a fallback option seat. This makes it so if there are only
seat configs with fallback set to -1, the default seat is still created
since there is no explicit notion on what to do regarding fallbacks.
However, if there is even a single fallback 0, then the default seat is
not used as a fallback. This will be needed for seat subcommands like
hide_cursor where the user may only want to set that property without
effecting anything else.
6 years ago
|
|
|
if (seat_config && strcmp(seat_config->name, "*") != 0
|
|
|
|
|
&& seat_config->fallback != -1) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void input_manager_verify_fallback_seat(void) {
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
if (!input_has_seat_fallback_configuration()) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "no fallback seat config - creating default");
|
|
|
|
|
seat = input_manager_get_default_seat();
|
|
|
|
|
struct seat_config *sc = new_seat_config(seat->wlr_seat->name);
|
|
|
|
|
sc->fallback = true;
|
|
|
|
|
sc = store_seat_config(sc);
|
|
|
|
|
input_manager_apply_seat_config(sc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void log_libinput_config_status(enum libinput_config_status status) {
|
|
|
|
|
if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Failed to apply libinput config: %s",
|
|
|
|
|
libinput_config_status_to_str(status));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_config_keyboard(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct input_config *ic = input_device_get_config(input_device);
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "input_manager_libinput_config_keyboard(%s)",
|
|
|
|
|
ic->identifier);
|
|
|
|
|
|
|
|
|
|
if (ic->send_events != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_keyboard(%s) send_events_set_mode(%d)",
|
|
|
|
|
ic->identifier, ic->send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, ic->send_events));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_reset_keyboard(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
|
|
|
|
|
uint32_t send_events =
|
|
|
|
|
libinput_device_config_send_events_get_default_mode(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_keyboard(%s) send_events_set_mode(%d)",
|
|
|
|
|
input_device->identifier, send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, send_events));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_config_switch(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct input_config *ic = input_device_get_config(input_device);
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "input_manager_libinput_config_switch(%s)",
|
|
|
|
|
ic->identifier);
|
|
|
|
|
|
|
|
|
|
if (ic->send_events != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_switch(%s) send_events_set_mode(%d)",
|
|
|
|
|
ic->identifier, ic->send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, ic->send_events));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_reset_switch(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
|
|
|
|
|
uint32_t send_events =
|
|
|
|
|
libinput_device_config_send_events_get_default_mode(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_switch(%s) send_events_set_mode(%d)",
|
|
|
|
|
input_device->identifier, send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, send_events));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_config_touch(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct input_config *ic = input_device_get_config(input_device);
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "input_manager_libinput_config_touch(%s)",
|
|
|
|
|
ic->identifier);
|
|
|
|
|
|
|
|
|
|
if (ic->send_events != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_touch(%s) send_events_set_mode(%d)",
|
|
|
|
|
ic->identifier, ic->send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, ic->send_events));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_reset_touch(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
|
|
|
|
|
uint32_t send_events =
|
|
|
|
|
libinput_device_config_send_events_get_default_mode(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_touch(%s) send_events_set_mode(%d)",
|
|
|
|
|
input_device->identifier, send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, send_events));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_config_pointer(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
struct input_config *ic = input_device_get_config(input_device);
|
|
|
|
|
struct libinput_device *libinput_device;
|
|
|
|
|
|
|
|
|
|
if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "input_manager_libinput_config_pointer(%s)",
|
|
|
|
|
ic->identifier);
|
|
|
|
|
|
|
|
|
|
if (ic->accel_profile != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
|
|
|
|
|
ic->identifier, ic->accel_profile);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_accel_set_profile(
|
|
|
|
|
libinput_device, ic->accel_profile));
|
|
|
|
|
}
|
|
|
|
|
if (ic->click_method != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
|
|
|
|
|
ic->identifier, ic->click_method);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_click_set_method(
|
|
|
|
|
libinput_device, ic->click_method));
|
|
|
|
|
}
|
|
|
|
|
if (ic->drag != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_config_pointer(%s) tap_set_drag_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->drag);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_tap_set_drag_enabled(
|
|
|
|
|
libinput_device, ic->drag));
|
|
|
|
|
}
|
|
|
|
|
if (ic->drag_lock != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->drag_lock);
|
|
|
|
|
log_libinput_config_status(
|
|
|
|
|
libinput_device_config_tap_set_drag_lock_enabled(
|
|
|
|
|
libinput_device, ic->drag_lock));
|
|
|
|
|
}
|
|
|
|
|
if (ic->dwt != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->dwt);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_dwt_set_enabled(
|
|
|
|
|
libinput_device, ic->dwt));
|
|
|
|
|
}
|
|
|
|
|
if (ic->left_handed != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_config_pointer(%s) left_handed_set_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->left_handed);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_left_handed_set(
|
|
|
|
|
libinput_device, ic->left_handed));
|
|
|
|
|
}
|
|
|
|
|
if (ic->middle_emulation != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->middle_emulation);
|
|
|
|
|
log_libinput_config_status(
|
|
|
|
|
libinput_device_config_middle_emulation_set_enabled(
|
|
|
|
|
libinput_device, ic->middle_emulation));
|
|
|
|
|
}
|
|
|
|
|
if (ic->natural_scroll != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->natural_scroll);
|
|
|
|
|
log_libinput_config_status(
|
|
|
|
|
libinput_device_config_scroll_set_natural_scroll_enabled(
|
|
|
|
|
libinput_device, ic->natural_scroll));
|
|
|
|
|
}
|
|
|
|
|
if (ic->pointer_accel != FLT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
|
|
|
|
|
ic->identifier, ic->pointer_accel);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_accel_set_speed(
|
|
|
|
|
libinput_device, ic->pointer_accel));
|
|
|
|
|
}
|
|
|
|
|
if (ic->scroll_button != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)",
|
|
|
|
|
ic->identifier, ic->scroll_button);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_scroll_set_button(
|
|
|
|
|
libinput_device, ic->scroll_button));
|
|
|
|
|
}
|
|
|
|
|
if (ic->scroll_method != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
|
|
|
|
|
ic->identifier, ic->scroll_method);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_scroll_set_method(
|
|
|
|
|
libinput_device, ic->scroll_method));
|
|
|
|
|
}
|
|
|
|
|
if (ic->send_events != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
|
|
|
|
|
ic->identifier, ic->send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, ic->send_events));
|
|
|
|
|
}
|
|
|
|
|
if (ic->tap != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
|
|
|
|
|
ic->identifier, ic->tap);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_tap_set_enabled(
|
|
|
|
|
libinput_device, ic->tap));
|
|
|
|
|
}
|
|
|
|
|
if (ic->tap_button_map != INT_MIN) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_config_pointer(%s) tap_set_button_map(%d)",
|
|
|
|
|
ic->identifier, ic->tap_button_map);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_tap_set_button_map(
|
|
|
|
|
libinput_device, ic->tap_button_map));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void input_manager_libinput_reset_pointer(
|
|
|
|
|
struct sway_input_device *input_device) {
|
|
|
|
|
struct wlr_input_device *wlr_device = input_device->wlr_device;
|
|
|
|
|
|
|
|
|
|
if (!wlr_input_device_is_libinput(wlr_device)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct libinput_device *libinput_device =
|
|
|
|
|
wlr_libinput_get_device_handle(wlr_device);
|
|
|
|
|
|
|
|
|
|
enum libinput_config_accel_profile accel_profile =
|
|
|
|
|
libinput_device_config_accel_get_default_profile(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) accel_set_profile(%d)",
|
|
|
|
|
input_device->identifier, accel_profile);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_accel_set_profile(
|
|
|
|
|
libinput_device, accel_profile));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_click_method click_method =
|
|
|
|
|
libinput_device_config_click_get_default_method(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) click_set_method(%d)",
|
|
|
|
|
input_device->identifier, click_method);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_click_set_method(
|
|
|
|
|
libinput_device, click_method));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_drag_state drag =
|
|
|
|
|
libinput_device_config_tap_get_default_drag_enabled(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) tap_set_drag_enabled(%d)",
|
|
|
|
|
input_device->identifier, drag);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_tap_set_drag_enabled(
|
|
|
|
|
libinput_device, drag));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_drag_lock_state drag_lock =
|
|
|
|
|
libinput_device_config_tap_get_default_drag_lock_enabled(
|
|
|
|
|
libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_reset_pointer(%s) tap_set_drag_lock_enabled(%d)",
|
|
|
|
|
input_device->identifier, drag_lock);
|
|
|
|
|
log_libinput_config_status(
|
|
|
|
|
libinput_device_config_tap_set_drag_lock_enabled(
|
|
|
|
|
libinput_device, drag_lock));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_dwt_state dwt =
|
|
|
|
|
libinput_device_config_dwt_get_default_enabled(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) dwt_set_enabled(%d)",
|
|
|
|
|
input_device->identifier, dwt);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_dwt_set_enabled(
|
|
|
|
|
libinput_device, dwt));
|
|
|
|
|
|
|
|
|
|
int left_handed =
|
|
|
|
|
libinput_device_config_left_handed_get_default(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_reset_pointer(%s) left_handed_set_enabled(%d)",
|
|
|
|
|
input_device->identifier, left_handed);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_left_handed_set(
|
|
|
|
|
libinput_device, left_handed));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_middle_emulation_state middle_emulation =
|
|
|
|
|
libinput_device_config_middle_emulation_get_default_enabled(
|
|
|
|
|
libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_reset_pointer(%s) middle_emulation_set_enabled(%d)",
|
|
|
|
|
input_device->identifier, middle_emulation);
|
|
|
|
|
log_libinput_config_status(
|
|
|
|
|
libinput_device_config_middle_emulation_set_enabled(
|
|
|
|
|
libinput_device, middle_emulation));
|
|
|
|
|
|
|
|
|
|
int natural_scroll =
|
|
|
|
|
libinput_device_config_scroll_get_default_natural_scroll_enabled(
|
|
|
|
|
libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"libinput_reset_pointer(%s) natural_scroll_set_enabled(%d)",
|
|
|
|
|
input_device->identifier, natural_scroll);
|
|
|
|
|
log_libinput_config_status(
|
|
|
|
|
libinput_device_config_scroll_set_natural_scroll_enabled(
|
|
|
|
|
libinput_device, natural_scroll));
|
|
|
|
|
|
|
|
|
|
double pointer_accel =
|
|
|
|
|
libinput_device_config_accel_get_default_speed(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) accel_set_speed(%f)",
|
|
|
|
|
input_device->identifier, pointer_accel);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_accel_set_speed(
|
|
|
|
|
libinput_device, pointer_accel));
|
|
|
|
|
|
|
|
|
|
uint32_t scroll_button =
|
|
|
|
|
libinput_device_config_scroll_get_default_button(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) scroll_set_button(%d)",
|
|
|
|
|
input_device->identifier, scroll_button);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_scroll_set_button(
|
|
|
|
|
libinput_device, scroll_button));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_scroll_method scroll_method =
|
|
|
|
|
libinput_device_config_scroll_get_default_method(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) scroll_set_method(%d)",
|
|
|
|
|
input_device->identifier, scroll_method);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_scroll_set_method(
|
|
|
|
|
libinput_device, scroll_method));
|
|
|
|
|
|
|
|
|
|
uint32_t send_events =
|
|
|
|
|
libinput_device_config_send_events_get_default_mode(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) send_events_set_mode(%d)",
|
|
|
|
|
input_device->identifier, send_events);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_send_events_set_mode(
|
|
|
|
|
libinput_device, send_events));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_tap_state tap =
|
|
|
|
|
libinput_device_config_tap_get_default_enabled(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) tap_set_enabled(%d)",
|
|
|
|
|
input_device->identifier, tap);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_tap_set_enabled(
|
|
|
|
|
libinput_device, tap));
|
|
|
|
|
|
|
|
|
|
enum libinput_config_tap_button_map tap_button_map =
|
|
|
|
|
libinput_device_config_tap_get_button_map(libinput_device);
|
|
|
|
|
sway_log(SWAY_DEBUG, "libinput_reset_pointer(%s) tap_set_button_map(%d)",
|
|
|
|
|
input_device->identifier, tap_button_map);
|
|
|
|
|
log_libinput_config_status(libinput_device_config_tap_set_button_map(
|
|
|
|
|
libinput_device, tap_button_map));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_device_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct wlr_input_device *device = data;
|
|
|
|
|
|
|
|
|
|
struct sway_input_device *input_device = input_sway_device_from_wlr(device);
|
|
|
|
|
|
|
|
|
|
if (!sway_assert(input_device, "could not find sway device")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "removing device: '%s'",
|
|
|
|
|
input_device->identifier);
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
seat_remove_device(seat, input_device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&input_device->link);
|
|
|
|
|
wl_list_remove(&input_device->device_destroy.link);
|
|
|
|
|
free(input_device->identifier);
|
|
|
|
|
free(input_device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_new_input(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_input_manager *input =
|
|
|
|
|
wl_container_of(listener, input, new_input);
|
|
|
|
|
struct wlr_input_device *device = data;
|
|
|
|
|
|
|
|
|
|
struct sway_input_device *input_device =
|
|
|
|
|
calloc(1, sizeof(struct sway_input_device));
|
|
|
|
|
if (!sway_assert(input_device, "could not allocate input device")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
device->data = input_device;
|
|
|
|
|
|
|
|
|
|
input_device->wlr_device = device;
|
|
|
|
|
input_device->identifier = input_device_get_identifier(device);
|
|
|
|
|
wl_list_insert(&input->devices, &input_device->link);
|
|
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "adding device: '%s'",
|
|
|
|
|
input_device->identifier);
|
|
|
|
|
|
|
|
|
|
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
|
|
|
|
|
input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
|
|
|
|
|
input_manager_libinput_config_pointer(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) {
|
|
|
|
|
input_manager_libinput_config_keyboard(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_SWITCH) {
|
|
|
|
|
input_manager_libinput_config_switch(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_TOUCH) {
|
|
|
|
|
input_manager_libinput_config_touch(input_device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&device->events.destroy, &input_device->device_destroy);
|
|
|
|
|
input_device->device_destroy.notify = handle_device_destroy;
|
|
|
|
|
|
|
|
|
|
input_manager_verify_fallback_seat();
|
|
|
|
|
|
|
|
|
|
bool added = false;
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &input->seats, link) {
|
|
|
|
|
struct seat_config *seat_config = seat_get_config(seat);
|
|
|
|
|
bool has_attachment = seat_config &&
|
|
|
|
|
(seat_config_get_attachment(seat_config, input_device->identifier) ||
|
|
|
|
|
seat_config_get_attachment(seat_config, "*"));
|
|
|
|
|
|
|
|
|
|
if (has_attachment) {
|
|
|
|
|
seat_add_device(seat, input_device);
|
|
|
|
|
added = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!added) {
|
|
|
|
|
wl_list_for_each(seat, &input->seats, link) {
|
|
|
|
|
struct seat_config *seat_config = seat_get_config(seat);
|
|
|
|
|
if (seat_config && seat_config->fallback == 1) {
|
|
|
|
|
seat_add_device(seat, input_device);
|
|
|
|
|
added = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!added) {
|
|
|
|
|
sway_log(SWAY_DEBUG,
|
|
|
|
|
"device '%s' is not configured on any seats",
|
|
|
|
|
input_device->identifier);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_inhibit_activate(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_input_manager *input_manager = wl_container_of(
|
|
|
|
|
listener, input_manager, inhibit_activate);
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &input_manager->seats, link) {
|
|
|
|
|
seat_set_exclusive_client(seat, input_manager->inhibit->active_client);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_inhibit_deactivate(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_input_manager *input_manager = wl_container_of(
|
|
|
|
|
listener, input_manager, inhibit_deactivate);
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &input_manager->seats, link) {
|
|
|
|
|
seat_set_exclusive_client(seat, NULL);
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
struct sway_node *previous = seat_get_focus(seat);
|
|
|
|
|
if (previous) {
|
|
|
|
|
// Hack to get seat to re-focus the return value of get_focus
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
seat_set_focus(seat, NULL);
|
|
|
|
|
seat_set_focus(seat, previous);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void handle_virtual_keyboard(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_input_manager *input_manager =
|
|
|
|
|
wl_container_of(listener, input_manager, virtual_keyboard_new);
|
|
|
|
|
struct wlr_virtual_keyboard_v1 *keyboard = data;
|
|
|
|
|
struct wlr_input_device *device = &keyboard->input_device;
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat = input_manager_get_default_seat();
|
|
|
|
|
|
|
|
|
|
// TODO: The user might want this on a different seat
|
|
|
|
|
struct sway_input_device *input_device =
|
|
|
|
|
calloc(1, sizeof(struct sway_input_device));
|
|
|
|
|
if (!sway_assert(input_device, "could not allocate input device")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
device->data = input_device;
|
|
|
|
|
|
|
|
|
|
input_device->wlr_device = device;
|
|
|
|
|
input_device->identifier = input_device_get_identifier(device);
|
|
|
|
|
wl_list_insert(&input_manager->devices, &input_device->link);
|
|
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "adding virtual keyboard: '%s'",
|
|
|
|
|
input_device->identifier);
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&device->events.destroy, &input_device->device_destroy);
|
|
|
|
|
input_device->device_destroy.notify = handle_device_destroy;
|
|
|
|
|
|
|
|
|
|
seat_add_device(seat, input_device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_input_manager *input_manager_create(struct sway_server *server) {
|
|
|
|
|
struct sway_input_manager *input =
|
|
|
|
|
calloc(1, sizeof(struct sway_input_manager));
|
|
|
|
|
if (!input) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl_list_init(&input->devices);
|
|
|
|
|
wl_list_init(&input->seats);
|
|
|
|
|
|
|
|
|
|
input->new_input.notify = handle_new_input;
|
|
|
|
|
wl_signal_add(&server->backend->events.new_input, &input->new_input);
|
|
|
|
|
|
|
|
|
|
input->virtual_keyboard = wlr_virtual_keyboard_manager_v1_create(
|
|
|
|
|
server->wl_display);
|
|
|
|
|
wl_signal_add(&input->virtual_keyboard->events.new_virtual_keyboard,
|
|
|
|
|
&input->virtual_keyboard_new);
|
|
|
|
|
input->virtual_keyboard_new.notify = handle_virtual_keyboard;
|
|
|
|
|
|
|
|
|
|
input->inhibit = wlr_input_inhibit_manager_create(server->wl_display);
|
|
|
|
|
input->inhibit_activate.notify = handle_inhibit_activate;
|
|
|
|
|
wl_signal_add(&input->inhibit->events.activate,
|
|
|
|
|
&input->inhibit_activate);
|
|
|
|
|
input->inhibit_deactivate.notify = handle_inhibit_deactivate;
|
|
|
|
|
wl_signal_add(&input->inhibit->events.deactivate,
|
|
|
|
|
&input->inhibit_deactivate);
|
|
|
|
|
|
|
|
|
|
return input;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool input_manager_has_focus(struct sway_node *node) {
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (seat_get_focus(seat) == node) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void input_manager_set_focus(struct sway_node *node) {
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
seat_set_focus(seat, node);
|
|
|
|
|
seat_consider_warp_to_focus(seat);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void input_manager_apply_input_config(struct input_config *input_config) {
|
|
|
|
|
struct sway_input_device *input_device = NULL;
|
|
|
|
|
bool wildcard = strcmp(input_config->identifier, "*") == 0;
|
|
|
|
|
wl_list_for_each(input_device, &server.input->devices, link) {
|
|
|
|
|
if (strcmp(input_device->identifier, input_config->identifier) == 0
|
|
|
|
|
|| wildcard) {
|
|
|
|
|
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
|
|
|
|
|
input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
|
|
|
|
|
input_manager_libinput_config_pointer(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) {
|
|
|
|
|
input_manager_libinput_config_keyboard(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_SWITCH) {
|
|
|
|
|
input_manager_libinput_config_switch(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_TOUCH) {
|
|
|
|
|
input_manager_libinput_config_touch(input_device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
seat_configure_device(seat, input_device);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void input_manager_reset_input(struct sway_input_device *input_device) {
|
|
|
|
|
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
|
|
|
|
|
input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
|
|
|
|
|
input_manager_libinput_reset_pointer(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) {
|
|
|
|
|
input_manager_libinput_reset_keyboard(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_SWITCH) {
|
|
|
|
|
input_manager_libinput_reset_switch(input_device);
|
|
|
|
|
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_TOUCH) {
|
|
|
|
|
input_manager_libinput_reset_touch(input_device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
seat_reset_device(seat, input_device);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void input_manager_reset_all_inputs() {
|
|
|
|
|
struct sway_input_device *input_device = NULL;
|
|
|
|
|
wl_list_for_each(input_device, &server.input->devices, link) {
|
|
|
|
|
input_manager_reset_input(input_device);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void input_manager_apply_seat_config(struct seat_config *seat_config) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "applying seat config for seat %s", seat_config->name);
|
Revamp seat configs
This makes seat configs work like output and input configs do. This also
adds support for wildcard seat configs. A seat config is still created
in the main seat command handler, but instead of creating a new one in
the subcommands and destroying the main seat command's instance, the
seat subcommands modify the main one. The seat config is then stored,
where it is merged appropriately. The seat config returned from
`store_seat_config` is then applied. When attempting to apply a wildcard
seat config, a seat specific config is queried for and if found, that is
used. Otherwise, the wildcard config is applied directly.
Additionally, instead of adding input devices to the default seat
directly when there is no seat configs, a seat config for the default
seat is created with only fallback set to true, which is more explicit.
It also fixes an issue where running a seat command at runtime (with no
seat config in the sway config), would result in all input devices being
removed from the default seat and leaving sway in an unusable state.
Also, instead of checking for any seat config, the search is for a seat
config with a fallback option seat. This makes it so if there are only
seat configs with fallback set to -1, the default seat is still created
since there is no explicit notion on what to do regarding fallbacks.
However, if there is even a single fallback 0, then the default seat is
not used as a fallback. This will be needed for seat subcommands like
hide_cursor where the user may only want to set that property without
effecting anything else.
6 years ago
|
|
|
if (strcmp(seat_config->name, "*") == 0) {
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
// Only apply the wildcard config directly if there is no seat
|
|
|
|
|
// specific config
|
|
|
|
|
struct seat_config *sc = seat_get_config(seat);
|
|
|
|
|
if (!sc) {
|
|
|
|
|
sc = seat_config;
|
|
|
|
|
}
|
|
|
|
|
seat_apply_config(seat, sc);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
struct sway_seat *seat =
|
|
|
|
|
input_manager_get_seat(seat_config->name, true);
|
Revamp seat configs
This makes seat configs work like output and input configs do. This also
adds support for wildcard seat configs. A seat config is still created
in the main seat command handler, but instead of creating a new one in
the subcommands and destroying the main seat command's instance, the
seat subcommands modify the main one. The seat config is then stored,
where it is merged appropriately. The seat config returned from
`store_seat_config` is then applied. When attempting to apply a wildcard
seat config, a seat specific config is queried for and if found, that is
used. Otherwise, the wildcard config is applied directly.
Additionally, instead of adding input devices to the default seat
directly when there is no seat configs, a seat config for the default
seat is created with only fallback set to true, which is more explicit.
It also fixes an issue where running a seat command at runtime (with no
seat config in the sway config), would result in all input devices being
removed from the default seat and leaving sway in an unusable state.
Also, instead of checking for any seat config, the search is for a seat
config with a fallback option seat. This makes it so if there are only
seat configs with fallback set to -1, the default seat is still created
since there is no explicit notion on what to do regarding fallbacks.
However, if there is even a single fallback 0, then the default seat is
not used as a fallback. This will be needed for seat subcommands like
hide_cursor where the user may only want to set that property without
effecting anything else.
6 years ago
|
|
|
if (!seat) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
seat_apply_config(seat, seat_config);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// for every device, try to add it to a seat and if no seat has it
|
|
|
|
|
// attached, add it to the fallback seats.
|
|
|
|
|
struct sway_input_device *input_device = NULL;
|
|
|
|
|
wl_list_for_each(input_device, &server.input->devices, link) {
|
|
|
|
|
list_t *seat_list = create_list();
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
struct seat_config *seat_config = seat_get_config(seat);
|
|
|
|
|
if (!seat_config) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (seat_config_get_attachment(seat_config, "*") ||
|
|
|
|
|
seat_config_get_attachment(seat_config,
|
|
|
|
|
input_device->identifier)) {
|
|
|
|
|
list_add(seat_list, seat);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (seat_list->length) {
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
bool attached = false;
|
|
|
|
|
for (int i = 0; i < seat_list->length; ++i) {
|
|
|
|
|
if (seat == seat_list->items[i]) {
|
|
|
|
|
attached = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (attached) {
|
|
|
|
|
seat_add_device(seat, input_device);
|
|
|
|
|
} else {
|
|
|
|
|
seat_remove_device(seat, input_device);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
struct seat_config *seat_config = seat_get_config(seat);
|
|
|
|
|
if (seat_config && seat_config->fallback == 1) {
|
|
|
|
|
seat_add_device(seat, input_device);
|
|
|
|
|
} else {
|
|
|
|
|
seat_remove_device(seat, input_device);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
list_free(seat_list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void input_manager_configure_xcursor(void) {
|
|
|
|
|
struct sway_seat *seat = NULL;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
seat_configure_xcursor(seat);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct input_config *input_device_get_config(struct sway_input_device *device) {
|
|
|
|
|
struct input_config *wildcard_config = NULL;
|
|
|
|
|
struct input_config *input_config = NULL;
|
|
|
|
|
for (int i = 0; i < config->input_configs->length; ++i) {
|
|
|
|
|
input_config = config->input_configs->items[i];
|
|
|
|
|
if (strcmp(input_config->identifier, device->identifier) == 0) {
|
|
|
|
|
return input_config;
|
|
|
|
|
} else if (strcmp(input_config->identifier, "*") == 0) {
|
|
|
|
|
wildcard_config = input_config;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return wildcard_config;
|
|
|
|
|
}
|
