mirror of
https://github.com/swaywm/sway.git
synced 2025-11-21 06:59:48 -05:00
Merge branch 'wlroots' into split-containers
This commit is contained in:
commit
d434da5632
32 changed files with 804 additions and 241 deletions
|
|
@ -84,7 +84,7 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
|
|||
|
||||
// find the focused workspace on the output for this seat
|
||||
struct sway_container *ws =
|
||||
sway_seat_get_focus_inactive(cursor->seat, output->swayc);
|
||||
seat_get_focus_inactive(cursor->seat, output->swayc);
|
||||
if (ws && ws->type != C_WORKSPACE) {
|
||||
ws = container_parent(ws, C_WORKSPACE);
|
||||
}
|
||||
|
|
@ -129,7 +129,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
|
|||
double sx, sy;
|
||||
struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
|
||||
if (c && config->focus_follows_mouse) {
|
||||
sway_seat_set_focus_warp(cursor->seat, c, false);
|
||||
seat_set_focus_warp(cursor->seat, c, false);
|
||||
}
|
||||
|
||||
// reset cursor if switching between clients
|
||||
|
|
@ -191,15 +191,15 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
|
|||
if (new_ws && new_ws->type != C_WORKSPACE) {
|
||||
new_ws = container_parent(new_ws, C_WORKSPACE);
|
||||
}
|
||||
struct sway_container *old_ws = sway_seat_get_focus(cursor->seat);
|
||||
struct sway_container *old_ws = seat_get_focus(cursor->seat);
|
||||
if (old_ws && old_ws->type != C_WORKSPACE) {
|
||||
old_ws = container_parent(old_ws, C_WORKSPACE);
|
||||
}
|
||||
if (new_ws != old_ws) {
|
||||
sway_seat_set_focus(cursor->seat, cont);
|
||||
seat_set_focus(cursor->seat, cont);
|
||||
}
|
||||
} else {
|
||||
sway_seat_set_focus(cursor->seat, cont);
|
||||
seat_set_focus(cursor->seat, cont);
|
||||
}
|
||||
|
||||
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ struct seat_config *current_seat_config = NULL;
|
|||
struct sway_seat *input_manager_current_seat(struct sway_input_manager *input) {
|
||||
struct sway_seat *seat = config->handler_context.seat;
|
||||
if (!seat) {
|
||||
seat = sway_input_manager_get_default_seat(input_manager);
|
||||
seat = input_manager_get_default_seat(input_manager);
|
||||
}
|
||||
return seat;
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ struct sway_seat *input_manager_get_seat(
|
|||
}
|
||||
}
|
||||
|
||||
return sway_seat_create(input, seat_name);
|
||||
return seat_create(input, seat_name);
|
||||
}
|
||||
|
||||
static char *get_device_identifier(struct wlr_input_device *device) {
|
||||
|
|
@ -83,7 +83,8 @@ static struct sway_input_device *input_sway_device_from_wlr(
|
|||
static bool input_has_seat_configuration(struct sway_input_manager *input) {
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (seat->config) {
|
||||
struct seat_config *seat_config = seat_get_config(seat);
|
||||
if (seat_config) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -91,9 +92,10 @@ static bool input_has_seat_configuration(struct sway_input_manager *input) {
|
|||
return false;
|
||||
}
|
||||
|
||||
static void sway_input_manager_libinput_config_pointer(struct sway_input_device *input_device) {
|
||||
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->config;
|
||||
struct input_config *ic = input_device_get_config(input_device);
|
||||
struct libinput_device *libinput_device;
|
||||
|
||||
if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
|
||||
|
|
@ -101,22 +103,27 @@ static void sway_input_manager_libinput_config_pointer(struct sway_input_device
|
|||
}
|
||||
|
||||
libinput_device = wlr_libinput_get_device_handle(wlr_device);
|
||||
wlr_log(L_DEBUG, "sway_input_manager_libinput_config_pointer(%s)", ic->identifier);
|
||||
wlr_log(L_DEBUG, "input_manager_libinput_config_pointer(%s)",
|
||||
ic->identifier);
|
||||
|
||||
if (ic->accel_profile != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
|
||||
ic->identifier, ic->accel_profile);
|
||||
libinput_device_config_accel_set_profile(libinput_device, ic->accel_profile);
|
||||
libinput_device_config_accel_set_profile(libinput_device,
|
||||
ic->accel_profile);
|
||||
}
|
||||
if (ic->click_method != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
|
||||
ic->identifier, ic->click_method);
|
||||
libinput_device_config_click_set_method(libinput_device, ic->click_method);
|
||||
libinput_device_config_click_set_method(libinput_device,
|
||||
ic->click_method);
|
||||
}
|
||||
if (ic->drag_lock != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
|
||||
wlr_log(L_DEBUG,
|
||||
"libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
|
||||
ic->identifier, ic->click_method);
|
||||
libinput_device_config_tap_set_drag_lock_enabled(libinput_device, ic->drag_lock);
|
||||
libinput_device_config_tap_set_drag_lock_enabled(libinput_device,
|
||||
ic->drag_lock);
|
||||
}
|
||||
if (ic->dwt != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
|
||||
|
|
@ -124,34 +131,43 @@ static void sway_input_manager_libinput_config_pointer(struct sway_input_device
|
|||
libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt);
|
||||
}
|
||||
if (ic->left_handed != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) left_handed_set_enabled(%d)",
|
||||
wlr_log(L_DEBUG,
|
||||
"libinput_config_pointer(%s) left_handed_set_enabled(%d)",
|
||||
ic->identifier, ic->left_handed);
|
||||
libinput_device_config_left_handed_set(libinput_device, ic->left_handed);
|
||||
libinput_device_config_left_handed_set(libinput_device,
|
||||
ic->left_handed);
|
||||
}
|
||||
if (ic->middle_emulation != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
|
||||
wlr_log(L_DEBUG,
|
||||
"libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
|
||||
ic->identifier, ic->middle_emulation);
|
||||
libinput_device_config_middle_emulation_set_enabled(libinput_device, ic->middle_emulation);
|
||||
libinput_device_config_middle_emulation_set_enabled(libinput_device,
|
||||
ic->middle_emulation);
|
||||
}
|
||||
if (ic->natural_scroll != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
|
||||
wlr_log(L_DEBUG,
|
||||
"libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
|
||||
ic->identifier, ic->natural_scroll);
|
||||
libinput_device_config_scroll_set_natural_scroll_enabled(libinput_device, ic->natural_scroll);
|
||||
libinput_device_config_scroll_set_natural_scroll_enabled(
|
||||
libinput_device, ic->natural_scroll);
|
||||
}
|
||||
if (ic->pointer_accel != FLT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
|
||||
ic->identifier, ic->pointer_accel);
|
||||
libinput_device_config_accel_set_speed(libinput_device, ic->pointer_accel);
|
||||
libinput_device_config_accel_set_speed(libinput_device,
|
||||
ic->pointer_accel);
|
||||
}
|
||||
if (ic->scroll_method != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
|
||||
ic->identifier, ic->scroll_method);
|
||||
libinput_device_config_scroll_set_method(libinput_device, ic->scroll_method);
|
||||
libinput_device_config_scroll_set_method(libinput_device,
|
||||
ic->scroll_method);
|
||||
}
|
||||
if (ic->send_events != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
|
||||
ic->identifier, ic->send_events);
|
||||
libinput_device_config_send_events_set_mode(libinput_device, ic->send_events);
|
||||
libinput_device_config_send_events_set_mode(libinput_device,
|
||||
ic->send_events);
|
||||
}
|
||||
if (ic->tap != INT_MIN) {
|
||||
wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
|
||||
|
|
@ -175,12 +191,11 @@ static void handle_device_destroy(struct wl_listener *listener, void *data) {
|
|||
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input_manager->seats, link) {
|
||||
sway_seat_remove_device(seat, input_device);
|
||||
seat_remove_device(seat, input_device);
|
||||
}
|
||||
|
||||
wl_list_remove(&input_device->link);
|
||||
wl_list_remove(&input_device->device_destroy.link);
|
||||
free_input_config(input_device->config);
|
||||
free(input_device->identifier);
|
||||
free(input_device);
|
||||
}
|
||||
|
|
@ -203,44 +218,36 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
|
|||
wlr_log(L_DEBUG, "adding device: '%s'",
|
||||
input_device->identifier);
|
||||
|
||||
// find config
|
||||
for (int i = 0; i < config->input_configs->length; ++i) {
|
||||
struct input_config *input_config = config->input_configs->items[i];
|
||||
if (strcmp(input_config->identifier, input_device->identifier) == 0) {
|
||||
free_input_config(input_device->config);
|
||||
input_device->config = copy_input_config(input_config);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
|
||||
sway_input_manager_libinput_config_pointer(input_device);
|
||||
input_manager_libinput_config_pointer(input_device);
|
||||
}
|
||||
|
||||
struct sway_seat *seat = NULL;
|
||||
if (!input_has_seat_configuration(input)) {
|
||||
wlr_log(L_DEBUG, "no seat configuration, using default seat");
|
||||
seat = input_manager_get_seat(input, default_seat);
|
||||
sway_seat_add_device(seat, input_device);
|
||||
seat_add_device(seat, input_device);
|
||||
return;
|
||||
}
|
||||
|
||||
bool added = false;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
bool has_attachment = seat->config &&
|
||||
(seat_config_get_attachment(seat->config, input_device->identifier) ||
|
||||
seat_config_get_attachment(seat->config, "*"));
|
||||
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) {
|
||||
sway_seat_add_device(seat, input_device);
|
||||
seat_add_device(seat, input_device);
|
||||
added = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!added) {
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (seat->config && seat->config->fallback == 1) {
|
||||
sway_seat_add_device(seat, input_device);
|
||||
struct seat_config *seat_config = seat_get_config(seat);
|
||||
if (seat_config && seat_config->fallback == 1) {
|
||||
seat_add_device(seat, input_device);
|
||||
added = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -256,7 +263,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
|
|||
input_device->device_destroy.notify = handle_device_destroy;
|
||||
}
|
||||
|
||||
struct sway_input_manager *sway_input_manager_create(
|
||||
struct sway_input_manager *input_manager_create(
|
||||
struct sway_server *server) {
|
||||
struct sway_input_manager *input =
|
||||
calloc(1, sizeof(struct sway_input_manager));
|
||||
|
|
@ -277,11 +284,11 @@ struct sway_input_manager *sway_input_manager_create(
|
|||
return input;
|
||||
}
|
||||
|
||||
bool sway_input_manager_has_focus(struct sway_input_manager *input,
|
||||
bool input_manager_has_focus(struct sway_input_manager *input,
|
||||
struct sway_container *container) {
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (sway_seat_get_focus(seat) == container) {
|
||||
if (seat_get_focus(seat) == container) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -289,35 +296,32 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
|
|||
return false;
|
||||
}
|
||||
|
||||
void sway_input_manager_set_focus(struct sway_input_manager *input,
|
||||
void input_manager_set_focus(struct sway_input_manager *input,
|
||||
struct sway_container *container) {
|
||||
struct sway_seat *seat ;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
sway_seat_set_focus(seat, container);
|
||||
seat_set_focus(seat, container);
|
||||
}
|
||||
}
|
||||
|
||||
void sway_input_manager_apply_input_config(struct sway_input_manager *input,
|
||||
void input_manager_apply_input_config(struct sway_input_manager *input,
|
||||
struct input_config *input_config) {
|
||||
struct sway_input_device *input_device = NULL;
|
||||
wl_list_for_each(input_device, &input->devices, link) {
|
||||
if (strcmp(input_device->identifier, input_config->identifier) == 0) {
|
||||
free_input_config(input_device->config);
|
||||
input_device->config = copy_input_config(input_config);
|
||||
|
||||
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
|
||||
sway_input_manager_libinput_config_pointer(input_device);
|
||||
input_manager_libinput_config_pointer(input_device);
|
||||
}
|
||||
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
sway_seat_configure_device(seat, input_device);
|
||||
seat_configure_device(seat, input_device);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
|
||||
void input_manager_apply_seat_config(struct sway_input_manager *input,
|
||||
struct seat_config *seat_config) {
|
||||
wlr_log(L_DEBUG, "applying new seat config for seat %s",
|
||||
seat_config->name);
|
||||
|
|
@ -326,7 +330,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
|
|||
return;
|
||||
}
|
||||
|
||||
sway_seat_set_config(seat, seat_config);
|
||||
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.
|
||||
|
|
@ -335,11 +339,12 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
|
|||
list_t *seat_list = create_list();
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (!seat->config) {
|
||||
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,
|
||||
if (seat_config_get_attachment(seat_config, "*") ||
|
||||
seat_config_get_attachment(seat_config,
|
||||
input_device->identifier)) {
|
||||
list_add(seat_list, seat);
|
||||
}
|
||||
|
|
@ -355,17 +360,18 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
|
|||
}
|
||||
}
|
||||
if (attached) {
|
||||
sway_seat_add_device(seat, input_device);
|
||||
seat_add_device(seat, input_device);
|
||||
} else {
|
||||
sway_seat_remove_device(seat, input_device);
|
||||
seat_remove_device(seat, input_device);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (seat->config && seat->config->fallback == 1) {
|
||||
sway_seat_add_device(seat, input_device);
|
||||
struct seat_config *seat_config = seat_get_config(seat);
|
||||
if (seat_config && seat_config->fallback == 1) {
|
||||
seat_add_device(seat, input_device);
|
||||
} else {
|
||||
sway_seat_remove_device(seat, input_device);
|
||||
seat_remove_device(seat, input_device);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -373,14 +379,14 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
|
|||
}
|
||||
}
|
||||
|
||||
void sway_input_manager_configure_xcursor(struct sway_input_manager *input) {
|
||||
void input_manager_configure_xcursor(struct sway_input_manager *input) {
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
sway_seat_configure_xcursor(seat);
|
||||
seat_configure_xcursor(seat);
|
||||
}
|
||||
}
|
||||
|
||||
struct sway_seat *sway_input_manager_get_default_seat(
|
||||
struct sway_seat *input_manager_get_default_seat(
|
||||
struct sway_input_manager *input) {
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
|
|
@ -390,3 +396,15 @@ struct sway_seat *sway_input_manager_get_default_seat(
|
|||
}
|
||||
return seat;
|
||||
}
|
||||
|
||||
struct input_config *input_device_get_config(struct sway_input_device *device) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -428,7 +428,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
|
|||
struct xkb_rule_names rules;
|
||||
memset(&rules, 0, sizeof(rules));
|
||||
struct input_config *input_config =
|
||||
keyboard->seat_device->input_device->config;
|
||||
input_device_get_config(keyboard->seat_device->input_device);
|
||||
struct wlr_input_device *wlr_device =
|
||||
keyboard->seat_device->input_device->wlr_device;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
|
|||
free(seat_device);
|
||||
}
|
||||
|
||||
void sway_seat_destroy(struct sway_seat *seat) {
|
||||
// TODO destroy seat containers
|
||||
void seat_destroy(struct sway_seat *seat) {
|
||||
struct sway_seat_device *seat_device, *next;
|
||||
wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
|
||||
seat_device_destroy(seat_device);
|
||||
|
|
@ -90,7 +89,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
|
|||
struct sway_seat *seat = seat_con->seat;
|
||||
struct sway_container *con = seat_con->container;
|
||||
struct sway_container *parent = con->parent;
|
||||
struct sway_container *focus = sway_seat_get_focus(seat);
|
||||
struct sway_container *focus = seat_get_focus(seat);
|
||||
|
||||
bool set_focus =
|
||||
focus != NULL &&
|
||||
|
|
@ -102,7 +101,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
|
|||
if (set_focus) {
|
||||
struct sway_container *next_focus = NULL;
|
||||
while (next_focus == NULL) {
|
||||
next_focus = sway_seat_get_focus_by_type(seat, parent, C_VIEW);
|
||||
next_focus = seat_get_focus_by_type(seat, parent, C_VIEW);
|
||||
|
||||
if (next_focus == NULL && parent->type == C_WORKSPACE) {
|
||||
next_focus = parent;
|
||||
|
|
@ -114,10 +113,10 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
|
|||
|
||||
// the structure change might have caused it to move up to the top of
|
||||
// the focus stack without sending focus notifications to the view
|
||||
if (sway_seat_get_focus(seat) == next_focus) {
|
||||
if (seat_get_focus(seat) == next_focus) {
|
||||
seat_send_focus(seat, next_focus);
|
||||
} else {
|
||||
sway_seat_set_focus(seat, next_focus);
|
||||
seat_set_focus(seat, next_focus);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -171,7 +170,7 @@ static void collect_focus_iter(struct sway_container *con, void *data) {
|
|||
wl_list_insert(&seat->focus_stack, &seat_con->link);
|
||||
}
|
||||
|
||||
struct sway_seat *sway_seat_create(struct sway_input_manager *input,
|
||||
struct sway_seat *seat_create(struct sway_input_manager *input,
|
||||
const char *seat_name) {
|
||||
struct sway_seat *seat = calloc(1, sizeof(struct sway_seat));
|
||||
if (!seat) {
|
||||
|
|
@ -194,7 +193,8 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
|
|||
// init the focus stack
|
||||
wl_list_init(&seat->focus_stack);
|
||||
|
||||
container_for_each_descendant_dfs(&root_container, collect_focus_iter, seat);
|
||||
container_for_each_descendant_dfs(&root_container,
|
||||
collect_focus_iter, seat);
|
||||
|
||||
wl_signal_add(&root_container.sway_root->events.new_container,
|
||||
&seat->new_container);
|
||||
|
|
@ -208,7 +208,7 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
|
|||
WL_SEAT_CAPABILITY_POINTER |
|
||||
WL_SEAT_CAPABILITY_TOUCH);
|
||||
|
||||
sway_seat_configure_xcursor(seat);
|
||||
seat_configure_xcursor(seat);
|
||||
|
||||
wl_list_insert(&input->seats, &seat->link);
|
||||
|
||||
|
|
@ -226,11 +226,12 @@ static void seat_configure_keyboard(struct sway_seat *seat,
|
|||
if (!seat_device->keyboard) {
|
||||
sway_keyboard_create(seat, seat_device);
|
||||
}
|
||||
struct wlr_keyboard *wlr_keyboard = seat_device->input_device->wlr_device->keyboard;
|
||||
struct wlr_keyboard *wlr_keyboard =
|
||||
seat_device->input_device->wlr_device->keyboard;
|
||||
sway_keyboard_configure(seat_device->keyboard);
|
||||
wlr_seat_set_keyboard(seat->wlr_seat,
|
||||
seat_device->input_device->wlr_device);
|
||||
struct sway_container *focus = sway_seat_get_focus(seat);
|
||||
struct sway_container *focus = seat_get_focus(seat);
|
||||
if (focus && focus->type == C_VIEW) {
|
||||
// force notify reenter to pick up the new configuration
|
||||
wlr_seat_keyboard_clear_focus(seat->wlr_seat);
|
||||
|
|
@ -240,7 +241,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
|
|||
}
|
||||
}
|
||||
|
||||
static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat,
|
||||
static struct sway_seat_device *seat_get_device(struct sway_seat *seat,
|
||||
struct sway_input_device *input_device) {
|
||||
struct sway_seat_device *seat_device = NULL;
|
||||
wl_list_for_each(seat_device, &seat->devices, link) {
|
||||
|
|
@ -252,19 +253,14 @@ static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
void sway_seat_configure_device(struct sway_seat *seat,
|
||||
void seat_configure_device(struct sway_seat *seat,
|
||||
struct sway_input_device *input_device) {
|
||||
struct sway_seat_device *seat_device =
|
||||
sway_seat_get_device(seat, input_device);
|
||||
seat_get_device(seat, input_device);
|
||||
if (!seat_device) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (seat->config) {
|
||||
seat_device->attachment_config =
|
||||
seat_config_get_attachment(seat->config, input_device->identifier);
|
||||
}
|
||||
|
||||
switch (input_device->wlr_device->type) {
|
||||
case WLR_INPUT_DEVICE_POINTER:
|
||||
seat_configure_pointer(seat, seat_device);
|
||||
|
|
@ -280,10 +276,10 @@ void sway_seat_configure_device(struct sway_seat *seat,
|
|||
}
|
||||
}
|
||||
|
||||
void sway_seat_add_device(struct sway_seat *seat,
|
||||
void seat_add_device(struct sway_seat *seat,
|
||||
struct sway_input_device *input_device) {
|
||||
if (sway_seat_get_device(seat, input_device)) {
|
||||
sway_seat_configure_device(seat, input_device);
|
||||
if (seat_get_device(seat, input_device)) {
|
||||
seat_configure_device(seat, input_device);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -301,13 +297,13 @@ void sway_seat_add_device(struct sway_seat *seat,
|
|||
seat_device->input_device = input_device;
|
||||
wl_list_insert(&seat->devices, &seat_device->link);
|
||||
|
||||
sway_seat_configure_device(seat, input_device);
|
||||
seat_configure_device(seat, input_device);
|
||||
}
|
||||
|
||||
void sway_seat_remove_device(struct sway_seat *seat,
|
||||
void seat_remove_device(struct sway_seat *seat,
|
||||
struct sway_input_device *input_device) {
|
||||
struct sway_seat_device *seat_device =
|
||||
sway_seat_get_device(seat, input_device);
|
||||
seat_get_device(seat, input_device);
|
||||
|
||||
if (!seat_device) {
|
||||
return;
|
||||
|
|
@ -319,7 +315,7 @@ void sway_seat_remove_device(struct sway_seat *seat,
|
|||
seat_device_destroy(seat_device);
|
||||
}
|
||||
|
||||
void sway_seat_configure_xcursor(struct sway_seat *seat) {
|
||||
void seat_configure_xcursor(struct sway_seat *seat) {
|
||||
// TODO configure theme and size
|
||||
const char *cursor_theme = NULL;
|
||||
|
||||
|
|
@ -334,7 +330,8 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
|
|||
}
|
||||
|
||||
for (int i = 0; i < root_container.children->length; ++i) {
|
||||
struct sway_container *output_container = root_container.children->items[i];
|
||||
struct sway_container *output_container =
|
||||
root_container.children->items[i];
|
||||
struct wlr_output *output =
|
||||
output_container->sway_output->wlr_output;
|
||||
bool result =
|
||||
|
|
@ -353,9 +350,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
|
|||
seat->cursor->cursor->y);
|
||||
}
|
||||
|
||||
void sway_seat_set_focus_warp(struct sway_seat *seat,
|
||||
void seat_set_focus_warp(struct sway_seat *seat,
|
||||
struct sway_container *container, bool warp) {
|
||||
struct sway_container *last_focus = sway_seat_get_focus(seat);
|
||||
struct sway_container *last_focus = seat_get_focus(seat);
|
||||
|
||||
if (container && last_focus == container) {
|
||||
return;
|
||||
|
|
@ -409,7 +406,7 @@ void sway_seat_set_focus_warp(struct sway_seat *seat,
|
|||
}
|
||||
|
||||
if (last_focus && last_focus->type == C_VIEW &&
|
||||
!sway_input_manager_has_focus(seat->input, last_focus)) {
|
||||
!input_manager_has_focus(seat->input, last_focus)) {
|
||||
struct sway_view *view = last_focus->sway_view;
|
||||
view_set_activated(view, false);
|
||||
}
|
||||
|
|
@ -417,24 +414,24 @@ void sway_seat_set_focus_warp(struct sway_seat *seat,
|
|||
seat->has_focus = (container != NULL);
|
||||
}
|
||||
|
||||
void sway_seat_set_focus(struct sway_seat *seat,
|
||||
void seat_set_focus(struct sway_seat *seat,
|
||||
struct sway_container *container) {
|
||||
sway_seat_set_focus_warp(seat, container, true);
|
||||
seat_set_focus_warp(seat, container, true);
|
||||
}
|
||||
|
||||
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat,
|
||||
struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
|
||||
struct sway_container *container) {
|
||||
return sway_seat_get_focus_by_type(seat, container, C_TYPES);
|
||||
return seat_get_focus_by_type(seat, container, C_TYPES);
|
||||
}
|
||||
|
||||
struct sway_container *sway_seat_get_focus(struct sway_seat *seat) {
|
||||
if (!seat->has_focus) {
|
||||
return NULL;
|
||||
}
|
||||
return sway_seat_get_focus_inactive(seat, &root_container);
|
||||
return seat_get_focus_inactive(seat, &root_container);
|
||||
}
|
||||
|
||||
struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
|
||||
struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
|
||||
struct sway_container *container, enum sway_container_type type) {
|
||||
struct sway_seat_container *current = NULL;
|
||||
struct sway_container *parent = NULL;
|
||||
|
|
@ -458,25 +455,34 @@ struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
void sway_seat_set_config(struct sway_seat *seat,
|
||||
struct seat_config *seat_config) {
|
||||
// clear configs
|
||||
free_seat_config(seat->config);
|
||||
seat->config = NULL;
|
||||
|
||||
struct sway_seat_device *seat_device = NULL;
|
||||
wl_list_for_each(seat_device, &seat->devices, link) {
|
||||
seat_device->attachment_config = NULL;
|
||||
struct sway_container *seat_get_focus(struct sway_seat *seat) {
|
||||
if (!seat->has_focus) {
|
||||
return NULL;
|
||||
}
|
||||
return seat_get_focus_inactive(seat, &root_container);
|
||||
}
|
||||
|
||||
void seat_apply_config(struct sway_seat *seat,
|
||||
struct seat_config *seat_config) {
|
||||
struct sway_seat_device *seat_device = NULL;
|
||||
|
||||
if (!seat_config) {
|
||||
return;
|
||||
}
|
||||
|
||||
// add configs
|
||||
seat->config = copy_seat_config(seat_config);
|
||||
|
||||
wl_list_for_each(seat_device, &seat->devices, link) {
|
||||
sway_seat_configure_device(seat, seat_device->input_device);
|
||||
seat_configure_device(seat, seat_device->input_device);
|
||||
}
|
||||
}
|
||||
|
||||
struct seat_config *seat_get_config(struct sway_seat *seat) {
|
||||
struct seat_config *seat_config = NULL;
|
||||
for (int i = 0; i < config->seat_configs->length; ++i ) {
|
||||
seat_config = config->seat_configs->items[i];
|
||||
if (strcmp(seat->wlr_seat->name, seat_config->name) == 0) {
|
||||
return seat_config;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue