Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-29 22:23:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
sway-patched-tray-menu/sway/input/input-manager.c

557 lines
17 KiB
C
Raw Normal View History

Replace _XOPEN_SOURCE with _POSIX_C_SOURCE And make sure we don't define both in the same source file.
2018-11-25 12:12:48 +01:00
#define _POSIX_C_SOURCE 200809L
libinput
2016-01-17 11:53:37 +01:00
#include <ctype.h>
#include <float.h>
#include <limits.h>
#include <stdio.h>
#include <string.h>
#include <libinput.h>
get device id correctly
2017-12-16 20:00:23 +01:00
#include <math.h>
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
#include <wlr/backend/libinput.h>
Add input inhibitor to input manager
2018-04-03 22:16:42 +02:00
#include <wlr/types/wlr_input_inhibitor.h>
Add virtual keyboard protocol Ref #2373
2018-07-29 02:47:56 +02:00
#include <wlr/types/wlr_virtual_keyboard_v1.h>
Reorganize includes
2016-09-01 14:18:37 +02:00
#include "sway/config.h"
input include directory
2017-12-08 14:07:47 +01:00
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
Establish sway input submodule
2017-10-22 17:38:30 +02:00
#include "sway/server.h"
strip whitespace for device id
2017-12-16 19:00:31 +01:00
#include "stringop.h"
libinput
2016-01-17 11:53:37 +01:00
#include "list.h"
#include "log.h"
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
#define DEFAULT_SEAT "seat0"
sway input device
2017-12-12 14:29:37 +01:00
Establish sway input submodule
2017-10-22 17:38:30 +02:00
struct input_config *current_input_config = NULL;
basic configuration
2017-12-14 17:11:56 +01:00
struct seat_config *current_seat_config = NULL;
Establish sway input submodule
2017-10-22 17:38:30 +02:00
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
struct sway_seat *input_manager_current_seat(void) {
Implement workspaces
2018-01-31 05:09:21 +01:00
struct sway_seat *seat = config->handler_context.seat;
if (!seat) {
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
seat = input_manager_get_default_seat();
Implement workspaces
2018-01-31 05:09:21 +01:00
}
return seat;
}
Fix crash when defaut seat is not created Function input_manager_get_default_seat should always return a seat.
2018-10-20 10:48:49 +02:00
struct sway_seat *input_manager_get_default_seat(void) {
return input_manager_get_seat(DEFAULT_SEAT);
}
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
struct sway_seat *input_manager_get_seat(const char *seat_name) {
basic input manager and seat
2017-12-07 15:58:32 +01:00
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
basic configuration
2017-12-14 17:11:56 +01:00
if (strcmp(seat->wlr_seat->name, seat_name) == 0) {
basic input manager and seat
2017-12-07 15:58:32 +01:00
return seat;
}
}
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
return seat_create(seat_name);
sway input device
2017-12-12 14:29:37 +01:00
}
cmd_bind{sym,code}: Implement per-device bindings bindsym --input-device=<identifier> ... bindcode --input-device=<identifier> ...
2018-10-18 19:13:40 +02:00
char *input_device_get_identifier(struct wlr_input_device *device) {
sway input device
2017-12-12 14:29:37 +01:00
int vendor = device->vendor;
int product = device->product;
char *name = strdup(device->name);
strip whitespace for device id
2017-12-16 19:00:31 +01:00
name = strip_whitespace(name);
sway input device
2017-12-12 14:29:37 +01:00
char *p = name;
for (; *p; ++p) {
if (*p == ' ') {
*p = '_';
}
}
use snprintf to get identifier len
2017-12-19 10:57:42 +01:00
const char *fmt = "%d:%d:%s";
int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
sway input device
2017-12-12 14:29:37 +01:00
char *identifier = malloc(len);
if (!identifier) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_ERROR, "Unable to allocate unique input device name");
sway input device
2017-12-12 14:29:37 +01:00
return NULL;
}
snprintf(identifier, len, fmt, vendor, product, name);
free(name);
return identifier;
}
basic input manager and seat
2017-12-07 15:58:32 +01:00
basic configuration
2017-12-14 17:11:56 +01:00
static struct sway_input_device *input_sway_device_from_wlr(
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
struct wlr_input_device *device) {
basic configuration
2017-12-14 17:11:56 +01:00
struct sway_input_device *input_device = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(input_device, &server.input->devices, link) {
basic configuration
2017-12-14 17:11:56 +01:00
if (input_device->wlr_device == device) {
return input_device;
sway input device
2017-12-12 14:29:37 +01:00
}
}
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.
2018-12-27 06:46:55 +01:00
static bool input_has_seat_fallback_configuration(void) {
basic configuration
2017-12-14 17:11:56 +01:00
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
dont copy seat config on the seat
2018-04-02 16:37:31 +02:00
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.
2018-12-27 06:46:55 +01:00
if (seat_config && strcmp(seat_config->name, "*") != 0
&& seat_config->fallback != -1) {
basic configuration
2017-12-14 17:11:56 +01:00
return true;
}
}
return false;
}
Verify seat fallback settings on reload This fixes an issue where on reload, all input devices that were added via an implicit fallback to the default seat would be removed from the default seat and applications would crash due to the seat having no capabilities. On reload, there is a query for a seat config with the fallback setting set (it can either be true or false). If no such seat config exists, the default seat is created (if needed) and has the implicit fallback true applied to its seat config. This is the same procedure that occurs when a new input is detected.
2018-12-30 03:50:03 +01:00
void input_manager_verify_fallback_seat(void) {
struct sway_seat *seat = NULL;
if (!input_has_seat_fallback_configuration()) {
wlr_log(WLR_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;
store_seat_config(sc);
}
}
add libinput config for keyboard add send_events support
2018-10-09 15:19:02 +02:00
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);
wlr_log(WLR_DEBUG, "input_manager_libinput_config_keyboard(%s)",
ic->identifier);
if (ic->send_events != INT_MIN) {
wlr_log(WLR_DEBUG, "libinput_config_keyboard(%s) send_events_set_mode(%d)",
ic->identifier, ic->send_events);
libinput_device_config_send_events_set_mode(libinput_device,
ic->send_events);
}
}
Add libinput send_events config for touch
2018-10-10 23:15:31 +02:00
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);
wlr_log(WLR_DEBUG, "input_manager_libinput_config_touch(%s)",
ic->identifier);
if (ic->send_events != INT_MIN) {
wlr_log(WLR_DEBUG, "libinput_config_touch(%s) send_events_set_mode(%d)",
ic->identifier, ic->send_events);
libinput_device_config_send_events_set_mode(libinput_device,
ic->send_events);
}
}
80col
2018-04-02 17:44:42 +02:00
static void input_manager_libinput_config_pointer(
struct sway_input_device *input_device) {
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
struct wlr_input_device *wlr_device = input_device->wlr_device;
dont copy input config
2018-04-02 19:19:58 +02:00
struct input_config *ic = input_device_get_config(input_device);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
struct libinput_device *libinput_device;
if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
return;
}
libinput_device = wlr_libinput_get_device_handle(wlr_device);
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "input_manager_libinput_config_pointer(%s)",
80col
2018-04-02 17:44:42 +02:00
ic->identifier);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
if (ic->accel_profile != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->accel_profile);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_accel_set_profile(libinput_device,
ic->accel_profile);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->click_method != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->click_method);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_click_set_method(libinput_device,
ic->click_method);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
add tap-and-drag setting to sway-input
2018-09-29 11:49:41 +02:00
if (ic->drag != INT_MIN) {
wlr_log(WLR_DEBUG,
"libinput_config_pointer(%s) tap_set_drag_enabled(%d)",
ic->identifier, ic->click_method);
libinput_device_config_tap_set_drag_enabled(libinput_device,
ic->drag);
}
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
if (ic->drag_lock != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG,
80col
2018-04-02 17:44:42 +02:00
"libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->click_method);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_tap_set_drag_lock_enabled(libinput_device,
ic->drag_lock);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->dwt != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->dwt);
libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt);
}
if (ic->left_handed != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG,
80col
2018-04-02 17:44:42 +02:00
"libinput_config_pointer(%s) left_handed_set_enabled(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->left_handed);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_left_handed_set(libinput_device,
ic->left_handed);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->middle_emulation != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG,
80col
2018-04-02 17:44:42 +02:00
"libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->middle_emulation);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_middle_emulation_set_enabled(libinput_device,
ic->middle_emulation);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->natural_scroll != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG,
80col
2018-04-02 17:44:42 +02:00
"libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->natural_scroll);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_scroll_set_natural_scroll_enabled(
libinput_device, ic->natural_scroll);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->pointer_accel != FLT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->pointer_accel);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_accel_set_speed(libinput_device,
ic->pointer_accel);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
add scroll button option This commit introduces a scroll_button option, which is intended to be used with scroll_method. Now user can edit his sway config and add an scroll_button option to device section.
2018-07-11 22:03:06 +02:00
if (ic->scroll_button != INT_MIN) {
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)",
ic->identifier, ic->scroll_button);
libinput_device_config_scroll_set_button(libinput_device,
ic->scroll_button);
}
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
if (ic->scroll_method != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->scroll_method);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_scroll_set_method(libinput_device,
ic->scroll_method);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->send_events != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->send_events);
80col
2018-04-02 17:44:42 +02:00
libinput_device_config_send_events_set_mode(libinput_device,
ic->send_events);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
if (ic->tap != INT_MIN) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
ic->identifier, ic->tap);
libinput_device_config_tap_set_enabled(libinput_device, ic->tap);
}
Implement tap_button_map for input devices
2018-07-14 07:01:47 +02:00
if (ic->tap_button_map != INT_MIN) {
wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_button_map(%d)",
ic->identifier, ic->tap);
libinput_device_config_tap_set_button_map(libinput_device,
ic->tap_button_map);
}
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
input device destroy
2018-02-14 20:42:06 +01:00
static void handle_device_destroy(struct wl_listener *listener, void *data) {
struct wlr_input_device *device = data;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
struct sway_input_device *input_device = input_sway_device_from_wlr(device);
input device destroy
2018-02-14 20:42:06 +01:00
if (!sway_assert(input_device, "could not find sway device")) {
return;
}
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "removing device: '%s'",
input device destroy
2018-02-14 20:42:06 +01:00
input_device->identifier);
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_remove_device(seat, input_device);
input device destroy
2018-02-14 20:42:06 +01:00
}
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) {
basic input manager and seat
2017-12-07 15:58:32 +01:00
struct sway_input_manager *input =
rename new_input listener on input-manager
2018-02-21 01:09:38 +01:00
wl_container_of(listener, input, new_input);
basic input manager and seat
2017-12-07 15:58:32 +01:00
struct wlr_input_device *device = data;
basic configuration
2017-12-14 17:11:56 +01:00
struct sway_input_device *input_device =
sway input device
2017-12-12 14:29:37 +01:00
calloc(1, sizeof(struct sway_input_device));
basic configuration
2017-12-14 17:11:56 +01:00
if (!sway_assert(input_device, "could not allocate input device")) {
sway input device
2017-12-12 14:29:37 +01:00
return;
}
Add map_from_region command
2018-04-24 20:39:29 +02:00
device->data = input_device;
sway input device
2017-12-12 14:29:37 +01:00
basic configuration
2017-12-14 17:11:56 +01:00
input_device->wlr_device = device;
cmd_bind{sym,code}: Implement per-device bindings bindsym --input-device=<identifier> ... bindcode --input-device=<identifier> ...
2018-10-18 19:13:40 +02:00
input_device->identifier = input_device_get_identifier(device);
basic configuration
2017-12-14 17:11:56 +01:00
wl_list_insert(&input->devices, &input_device->link);
sway input device
2017-12-12 14:29:37 +01:00
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG, "adding device: '%s'",
device add/remove logging
2017-12-16 19:16:58 +01:00
input_device->identifier);
input: enable configuring tablets with libinput
2018-09-24 13:46:52 +02:00
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
rename input-manager functions
2018-04-02 14:49:38 +02:00
input_manager_libinput_config_pointer(input_device);
add libinput config for keyboard add send_events support
2018-10-09 15:19:02 +02:00
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) {
input_manager_libinput_config_keyboard(input_device);
Add libinput send_events config for touch
2018-10-10 23:15:31 +02:00
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_TOUCH) {
input_manager_libinput_config_touch(input_device);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
Attach destroy handler earlier This prevents it from being bypassed when the device has no seat configuration
2018-07-06 15:13:45 +02:00
wl_signal_add(&device->events.destroy, &input_device->device_destroy);
input_device->device_destroy.notify = handle_device_destroy;
Verify seat fallback settings on reload This fixes an issue where on reload, all input devices that were added via an implicit fallback to the default seat would be removed from the default seat and applications would crash due to the seat having no capabilities. On reload, there is a query for a seat config with the fallback setting set (it can either be true or false). If no such seat config exists, the default seat is created (if needed) and has the implicit fallback true applied to its seat config. This is the same procedure that occurs when a new input is detected.
2018-12-30 03:50:03 +01:00
input_manager_verify_fallback_seat();
basic configuration
2017-12-14 17:11:56 +01:00
seat fallback config
2017-12-17 16:39:22 +01:00
bool added = false;
Verify seat fallback settings on reload This fixes an issue where on reload, all input devices that were added via an implicit fallback to the default seat would be removed from the default seat and applications would crash due to the seat having no capabilities. On reload, there is a query for a seat config with the fallback setting set (it can either be true or false). If no such seat config exists, the default seat is created (if needed) and has the implicit fallback true applied to its seat config. This is the same procedure that occurs when a new input is detected.
2018-12-30 03:50:03 +01:00
struct sway_seat *seat = NULL;
basic configuration
2017-12-14 17:11:56 +01:00
wl_list_for_each(seat, &input->seats, link) {
fix segfault
2018-04-02 19:56:35 +02:00
struct seat_config *seat_config = seat_get_config(seat);
bool has_attachment = seat_config &&
dont copy seat config on the seat
2018-04-02 16:37:31 +02:00
(seat_config_get_attachment(seat_config, input_device->identifier) ||
seat_config_get_attachment(seat_config, "*"));
cleanup
2017-12-20 12:12:08 +01:00
if (has_attachment) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_add_device(seat, input_device);
seat fallback config
2017-12-17 16:39:22 +01:00
added = true;
basic configuration
2017-12-14 17:11:56 +01:00
}
}
seat fallback config
2017-12-17 16:39:22 +01:00
if (!added) {
wl_list_for_each(seat, &input->seats, link) {
fix segfault
2018-04-02 19:56:35 +02:00
struct seat_config *seat_config = seat_get_config(seat);
dont copy seat config on the seat
2018-04-02 16:37:31 +02:00
if (seat_config && seat_config->fallback == 1) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_add_device(seat, input_device);
seat fallback config
2017-12-17 16:39:22 +01:00
added = true;
}
}
}
if (!added) {
Update for swaywm/wlroots#1126
2018-07-09 23:54:30 +02:00
wlr_log(WLR_DEBUG,
seat fallback config
2017-12-17 16:39:22 +01:00
"device '%s' is not configured on any seats",
input_device->identifier);
}
basic input manager and seat
2017-12-07 15:58:32 +01:00
}
Add input inhibitor to input manager
2018-04-03 22:16:42 +02:00
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.
2018-08-30 13:00:10 +02:00
struct sway_node *previous = seat_get_focus(seat);
Implement input-inhibit in sway, swaylock
2018-04-03 23:03:29 +02:00
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.
2018-08-30 13:00:10 +02:00
seat_set_focus(seat, NULL);
Implement input-inhibit in sway, swaylock
2018-04-03 23:03:29 +02:00
seat_set_focus(seat, previous);
}
Add input inhibitor to input manager
2018-04-03 22:16:42 +02:00
}
}
Add virtual keyboard protocol Ref #2373
2018-07-29 02:47:56 +02:00
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;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
struct sway_seat *seat = input_manager_get_default_seat();
Add virtual keyboard protocol Ref #2373
2018-07-29 02:47:56 +02:00
// 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;
cmd_bind{sym,code}: Implement per-device bindings bindsym --input-device=<identifier> ... bindcode --input-device=<identifier> ...
2018-10-18 19:13:40 +02:00
input_device->identifier = input_device_get_identifier(device);
Add virtual keyboard protocol Ref #2373
2018-07-29 02:47:56 +02:00
wl_list_insert(&input_manager->devices, &input_device->link);
wlr_log(WLR_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);
}
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
struct sway_input_manager *input_manager_create(struct sway_server *server) {
rename input to input-manager
2017-12-07 13:31:49 +01:00
struct sway_input_manager *input =
calloc(1, sizeof(struct sway_input_manager));
Establish sway input submodule
2017-10-22 17:38:30 +02:00
if (!input) {
return NULL;
}
basic input manager and seat
2017-12-07 15:58:32 +01:00
sway input device
2017-12-12 14:29:37 +01:00
wl_list_init(&input->devices);
wl_list_init(&input->seats);
basic input manager and seat
2017-12-07 15:58:32 +01:00
rename new_input listener on input-manager
2018-02-21 01:09:38 +01:00
input->new_input.notify = handle_new_input;
wl_signal_add(&server->backend->events.new_input, &input->new_input);
basic input manager and seat
2017-12-07 15:58:32 +01:00
Add virtual keyboard protocol Ref #2373
2018-07-29 02:47:56 +02:00
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;
Add input inhibitor to input manager
2018-04-03 22:16:42 +02:00
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);
Establish sway input submodule
2017-10-22 17:38:30 +02:00
return input;
}
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
bool input_manager_has_focus(struct sway_node *node) {
sway input device
2017-12-12 14:29:37 +01:00
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
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.
2018-08-30 13:00:10 +02:00
if (seat_get_focus(seat) == node) {
sway input device
2017-12-12 14:29:37 +01:00
return true;
}
Handle calloc failures
2016-12-16 00:26:53 +01:00
}
libinput
2016-01-17 11:53:37 +01:00
sway input device
2017-12-12 14:29:37 +01:00
return false;
libinput
2016-01-17 11:53:37 +01:00
}
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
void input_manager_set_focus(struct sway_node *node) {
Give keyboard focus to unmanaged xwayland surfaces This fixes dmenu
2018-04-07 20:03:30 +02:00
struct sway_seat *seat;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
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.
2018-08-30 13:00:10 +02:00
seat_set_focus(seat, node);
input-manager: consider cursor warping on input_manager_set_focus input_manager_set_focus is used to set the focus after mapping the view in view_map. This needs to consider to warp the cursor as well, since for WARP_CONTAINER, the cursor should warp to the newly created view.
2018-10-28 10:29:10 +01:00
seat_consider_warp_to_focus(seat);
libinput
2016-01-17 11:53:37 +01:00
}
sway input device
2017-12-12 14:29:37 +01:00
}
libinput
2016-01-17 11:53:37 +01:00
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
void input_manager_apply_input_config(struct input_config *input_config) {
remove assumption of one device per identifier
2017-12-18 16:44:51 +01:00
struct sway_input_device *input_device = NULL;
Implement support for input wildcard
2018-09-24 01:56:52 +02:00
bool wildcard = strcmp(input_config->identifier, "*") == 0;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(input_device, &server.input->devices, link) {
Implement support for input wildcard
2018-09-24 01:56:52 +02:00
if (strcmp(input_device->identifier, input_config->identifier) == 0
|| wildcard) {
input: enable configuring tablets with libinput
2018-09-24 13:46:52 +02:00
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
rename input-manager functions
2018-04-02 14:49:38 +02:00
input_manager_libinput_config_pointer(input_device);
add libinput config for keyboard add send_events support
2018-10-09 15:19:02 +02:00
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) {
input_manager_libinput_config_keyboard(input_device);
Add libinput send_events config for touch
2018-10-10 23:15:31 +02:00
} else if (input_device->wlr_device->type == WLR_INPUT_DEVICE_TOUCH) {
input_manager_libinput_config_touch(input_device);
seat_configure_pointer: apply libinput config Restore the code that used to be in config.c:apply_input_config() pre-wlroots
2017-12-24 14:53:00 +01:00
}
remove assumption of one device per identifier
2017-12-18 16:44:51 +01:00
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_configure_device(seat, input_device);
remove assumption of one device per identifier
2017-12-18 16:44:51 +01:00
}
}
basic configuration
2017-12-14 17:11:56 +01:00
}
}
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
void input_manager_apply_seat_config(struct seat_config *seat_config) {
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.
2018-12-27 06:46:55 +01:00
wlr_log(WLR_DEBUG, "applying seat config for seat %s", seat_config->name);
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);
if (!seat) {
return;
}
seat_apply_config(seat, seat_config);
seat fallback config
2017-12-17 16:39:22 +01:00
}
// for every device, try to add it to a seat and if no seat has it
// attached, add it to the fallback seats.
basic configuration
2017-12-14 17:11:56 +01:00
struct sway_input_device *input_device = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(input_device, &server.input->devices, link) {
seat fallback config
2017-12-17 16:39:22 +01:00
list_t *seat_list = create_list();
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
dont copy seat config on the seat
2018-04-02 16:37:31 +02:00
struct seat_config *seat_config = seat_get_config(seat);
if (!seat_config) {
seat fallback config
2017-12-17 16:39:22 +01:00
continue;
}
dont copy seat config on the seat
2018-04-02 16:37:31 +02:00
if (seat_config_get_attachment(seat_config, "*") ||
seat_config_get_attachment(seat_config,
cleanup input-manager
2017-12-17 16:44:53 +01:00
input_device->identifier)) {
seat fallback config
2017-12-17 16:39:22 +01:00
list_add(seat_list, seat);
}
basic configuration
2017-12-14 17:11:56 +01:00
}
seat fallback config
2017-12-17 16:39:22 +01:00
if (seat_list->length) {
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
seat fallback config
2017-12-17 16:39:22 +01:00
bool attached = false;
for (int i = 0; i < seat_list->length; ++i) {
if (seat == seat_list->items[i]) {
attached = true;
break;
}
}
if (attached) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_add_device(seat, input_device);
seat fallback config
2017-12-17 16:39:22 +01:00
} else {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_remove_device(seat, input_device);
seat fallback config
2017-12-17 16:39:22 +01:00
}
}
} else {
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
dont copy seat config on the seat
2018-04-02 16:37:31 +02:00
struct seat_config *seat_config = seat_get_config(seat);
if (seat_config && seat_config->fallback == 1) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_add_device(seat, input_device);
seat fallback config
2017-12-17 16:39:22 +01:00
} else {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_remove_device(seat, input_device);
seat fallback config
2017-12-17 16:39:22 +01:00
}
basic configuration
2017-12-14 17:11:56 +01:00
}
}
cleanup input-manager
2017-12-17 16:44:53 +01:00
list_free(seat_list);
Handle some more memory allocation failures
2016-12-16 00:03:59 +01:00
}
libinput
2016-01-17 11:53:37 +01:00
}
seat focus on button press
2017-12-10 17:11:47 +01:00
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
void input_manager_configure_xcursor(void) {
sway input device
2017-12-12 14:29:37 +01:00
struct sway_seat *seat = NULL;
Minor refactor of input manager The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
2018-10-18 13:20:00 +02:00
wl_list_for_each(seat, &server.input->seats, link) {
rename seat functions
2018-04-02 14:45:37 +02:00
seat_configure_xcursor(seat);
seat focus on button press
2017-12-10 17:11:47 +01:00
}
}
add kill command
2018-01-20 20:10:11 +01:00
dont copy input config
2018-04-02 19:19:58 +02:00
struct input_config *input_device_get_config(struct sway_input_device *device) {
Implement support for input wildcard
2018-09-24 01:56:52 +02:00
struct input_config *wildcard_config = NULL;
dont copy input config
2018-04-02 19:19:58 +02:00
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;
Implement support for input wildcard
2018-09-24 01:56:52 +02:00
} else if (strcmp(input_config->identifier, "*") == 0) {
wildcard_config = input_config;
dont copy input config
2018-04-02 19:19:58 +02:00
}
}
Implement support for input wildcard
2018-09-24 01:56:52 +02:00
return wildcard_config;
dont copy input config
2018-04-02 19:19:58 +02:00
}
Reference in a new issue Copy permalink