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

Fix segfaults when focusing a workspace

Browse source
This commit is contained in:
emersion 2018-03-30 16:12:02 -04:00
parent 03255fd202
commit eb716c6c43
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/input/cursor.c
View file

@ -20,7 +20,11 @@ static void cursor_update_position(struct sway_cursor *cursor) {
cursor->y = y; cursor->y = y;
} }
static struct sway_container *cursor_at(struct sway_cursor *cursor, /**
* Returns the container at the cursor's position. If the container is a view,
* stores the surface at the cursor's position in `*surface`.
*/
static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
// check for unmanaged views first // check for unmanaged views first
struct wl_list *unmanaged = &root_container.sway_root->unmanaged_views; struct wl_list *unmanaged = &root_container.sway_root->unmanaged_views;
@ -55,13 +59,18 @@ static struct sway_container *cursor_at(struct sway_cursor *cursor,
struct sway_output *output = wlr_output->data; struct sway_output *output = wlr_output->data;
// find the focused workspace on the output for this seat // find the focused workspace on the output for this seat
struct sway_container *workspace = struct sway_container *workspace_cont =
sway_seat_get_focus_inactive(cursor->seat, output->swayc); sway_seat_get_focus_inactive(cursor->seat, output->swayc);
if (workspace->type != C_WORKSPACE) { if (workspace_cont != NULL && workspace_cont->type != C_WORKSPACE) {
workspace = container_parent(workspace, C_WORKSPACE); workspace_cont = container_parent(workspace_cont, C_WORKSPACE);
}
if (workspace_cont == NULL) {
return output->swayc;
} }
return container_at(workspace, cursor->x, cursor->y, surface, sx, sy); struct sway_container *view_cont = container_at(workspace_cont,
cursor->x, cursor->y, surface, sx, sy);
return view_cont != NULL ? view_cont : workspace_cont;
} }
static void cursor_send_pointer_motion(struct sway_cursor *cursor, static void cursor_send_pointer_motion(struct sway_cursor *cursor,
@ -69,9 +78,10 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
struct wlr_seat *seat = cursor->seat->wlr_seat; struct wlr_seat *seat = cursor->seat->wlr_seat;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
double sx, sy; double sx, sy;
struct sway_container *cont = cursor_at(cursor, &surface, &sx, &sy); struct sway_container *cont =
container_at_cursor(cursor, &surface, &sx, &sy);
if (cont) { if (cont != NULL && surface != NULL) {
wlr_seat_pointer_notify_enter(seat, surface, sx, sy); wlr_seat_pointer_notify_enter(seat, surface, sx, sy);
wlr_seat_pointer_notify_motion(seat, time, sx, sy); wlr_seat_pointer_notify_motion(seat, time, sx, sy);
} else { } else {
@ -105,8 +115,9 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
if (event->button == BTN_LEFT) { if (event->button == BTN_LEFT) {
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
double sx, sy; double sx, sy;
struct sway_container *swayc = cursor_at(cursor, &surface, &sx, &sy); struct sway_container *cont =
sway_seat_set_focus(cursor->seat, swayc); container_at_cursor(cursor, &surface, &sx, &sy);
sway_seat_set_focus(cursor->seat, cont);
} }
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,

2
sway/ipc-server.c
View file

@ -390,7 +390,7 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace,
struct sway_seat *seat = struct sway_seat *seat =
sway_input_manager_get_default_seat(input_manager); sway_input_manager_get_default_seat(input_manager);
struct sway_container *focused_ws = sway_seat_get_focus(seat); struct sway_container *focused_ws = sway_seat_get_focus(seat);
if (focused_ws->type != C_WORKSPACE) { if (focused_ws != NULL && focused_ws->type != C_WORKSPACE) {
focused_ws = container_parent(focused_ws, C_WORKSPACE); focused_ws = container_parent(focused_ws, C_WORKSPACE);
} }
bool focused = workspace == focused_ws; bool focused = workspace == focused_ws;