alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

seat: fix segfault in sway_input_method_relay_set_focus

Browse source 
sway_input_method_relay_set_focus was called before
sway_input_method_relay_init.

Closes: https://github.com/swaywm/sway/issues/5503
This commit is contained in:
Simon Ser 2020-07-02 10:59:16 +02:00 committed by Tudor Brindus
parent 92891fb1ed
commit 1bfbf262cc
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/input/seat.c
View file

@ -572,14 +572,6 @@ struct sway_seat *seat_create(const char *seat_name) {
seat->deferred_bindings = create_list(); seat->deferred_bindings = create_list();
if (!wl_list_empty(&server.input->seats)) {
// Since this is not the first seat, attempt to set initial focus
struct sway_seat *current_seat = input_manager_current_seat();
struct sway_node *current_focus =
seat_get_focus_inactive(current_seat, &root->node);
seat_set_focus(seat, current_focus);
}
wl_signal_add(&root->events.new_node, &seat->new_node); wl_signal_add(&root->events.new_node, &seat->new_node);
seat->new_node.notify = handle_new_node; seat->new_node.notify = handle_new_node;
@ -604,8 +596,17 @@ struct sway_seat *seat_create(const char *seat_name) {
sway_input_method_relay_init(seat, &seat->im_relay); sway_input_method_relay_init(seat, &seat->im_relay);
bool first = wl_list_empty(&server.input->seats);
wl_list_insert(&server.input->seats, &seat->link); wl_list_insert(&server.input->seats, &seat->link);
if (!first) {
// Since this is not the first seat, attempt to set initial focus
struct sway_seat *current_seat = input_manager_current_seat();
struct sway_node *current_focus =
seat_get_focus_inactive(current_seat, &root->node);
seat_set_focus(seat, current_focus);
}
seatop_begin_default(seat); seatop_begin_default(seat);
return seat; return seat;