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

Merge pull request #1669 from emersion/workspace-pointer-events

Browse source 
Fix pointer events for hidden workspaces
This commit is contained in:
Drew DeVault 2018-03-30 18:49:18 -04:00 committed by GitHub
parent 6907a2f2cf eb716c6c43
commit e6fa7a722e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
sway/input/cursor.c
View file

@ -6,10 +6,11 @@
#endif #endif
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xcursor_manager.h>
#include "sway/input/cursor.h"
#include "sway/tree/view.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "sway/input/cursor.h"
#include "sway/output.h"
#include "sway/tree/view.h"
static void cursor_update_position(struct sway_cursor *cursor) { static void cursor_update_position(struct sway_cursor *cursor) {
double x = cursor->cursor->x; double x = cursor->cursor->x;
@ -19,16 +20,16 @@ static void cursor_update_position(struct sway_cursor *cursor) {
cursor->y = y; cursor->y = y;
} }
static void cursor_send_pointer_motion(struct sway_cursor *cursor, /**
uint32_t time) { * Returns the container at the cursor's position. If the container is a view,
struct wlr_seat *seat = cursor->seat->wlr_seat; * stores the surface at the cursor's position in `*surface`.
struct wlr_surface *surface = NULL; */
double sx, sy; static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
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 sway_view *view; struct sway_view *view;
wl_list_for_each_reverse(view, &root_container.sway_root->unmanaged_views, wl_list_for_each_reverse(view, unmanaged, unmanaged_view_link) {
unmanaged_view_link) {
if (view->type == SWAY_XWAYLAND_VIEW) { if (view->type == SWAY_XWAYLAND_VIEW) {
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
struct wlr_box box = { struct wlr_box box = {
@ -39,19 +40,48 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
}; };
if (wlr_box_contains_point(&box, cursor->x, cursor->y)) { if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
surface = xsurface->surface; *surface = xsurface->surface;
sx = cursor->x - box.x; *sx = cursor->x - box.x;
sy = cursor->y - box.y; *sy = cursor->y - box.y;
wlr_seat_pointer_notify_enter(seat, surface, sx, sy); return view->swayc;
wlr_seat_pointer_notify_motion(seat, time, sx, sy);
return;
} }
} }
} }
struct sway_container *swayc = // find the output the cursor is on
container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy); struct wlr_output_layout *output_layout =
if (swayc) { root_container.sway_root->output_layout;
struct wlr_output *wlr_output =
wlr_output_layout_output_at(output_layout, cursor->x, cursor->y);
if (wlr_output == NULL) {
return NULL;
}
struct sway_output *output = wlr_output->data;
// find the focused workspace on the output for this seat
struct sway_container *workspace_cont =
sway_seat_get_focus_inactive(cursor->seat, output->swayc);
if (workspace_cont != NULL && workspace_cont->type != C_WORKSPACE) {
workspace_cont = container_parent(workspace_cont, C_WORKSPACE);
}
if (workspace_cont == NULL) {
return output->swayc;
}
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,
uint32_t time) {
struct wlr_seat *seat = cursor->seat->wlr_seat;
struct wlr_surface *surface = NULL;
double sx, sy;
struct sway_container *cont =
container_at_cursor(cursor, &surface, &sx, &sy);
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 {
@ -60,8 +90,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
} }
static void handle_cursor_motion(struct wl_listener *listener, void *data) { static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, motion);
wl_container_of(listener, cursor, motion);
struct wlr_event_pointer_motion *event = data; struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(cursor->cursor, event->device, wlr_cursor_move(cursor->cursor, event->device,
event->delta_x, event->delta_y); event->delta_x, event->delta_y);
@ -80,17 +109,15 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
} }
static void handle_cursor_button(struct wl_listener *listener, void *data) { static void handle_cursor_button(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
wl_container_of(listener, cursor, button);
struct wlr_event_pointer_button *event = data; struct wlr_event_pointer_button *event = 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 = struct sway_container *cont =
container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy); container_at_cursor(cursor, &surface, &sx, &sy);
sway_seat_set_focus(cursor->seat, cont);
sway_seat_set_focus(cursor->seat, swayc);
} }
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,
@ -98,23 +125,20 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
} }
static void handle_cursor_axis(struct wl_listener *listener, void *data) { static void handle_cursor_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);
wl_container_of(listener, cursor, axis);
struct wlr_event_pointer_axis *event = data; struct wlr_event_pointer_axis *event = data;
wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec, wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec,
event->orientation, event->delta); event->orientation, event->delta);
} }
static void handle_touch_down(struct wl_listener *listener, void *data) { static void handle_touch_down(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
wl_container_of(listener, cursor, touch_down);
struct wlr_event_touch_down *event = data; struct wlr_event_touch_down *event = data;
wlr_log(L_DEBUG, "TODO: handle touch down event: %p", event); wlr_log(L_DEBUG, "TODO: handle touch down event: %p", event);
} }
static void handle_touch_up(struct wl_listener *listener, void *data) { static void handle_touch_up(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
wl_container_of(listener, cursor, touch_up);
struct wlr_event_touch_up *event = data; struct wlr_event_touch_up *event = data;
wlr_log(L_DEBUG, "TODO: handle touch up event: %p", event); wlr_log(L_DEBUG, "TODO: handle touch up event: %p", event);
} }
@ -127,15 +151,13 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
} }
static void handle_tool_axis(struct wl_listener *listener, void *data) { static void handle_tool_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis);
wl_container_of(listener, cursor, tool_axis);
struct wlr_event_tablet_tool_axis *event = data; struct wlr_event_tablet_tool_axis *event = data;
wlr_log(L_DEBUG, "TODO: handle tool axis event: %p", event); wlr_log(L_DEBUG, "TODO: handle tool axis event: %p", event);
} }
static void handle_tool_tip(struct wl_listener *listener, void *data) { static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip);
wl_container_of(listener, cursor, tool_tip);
struct wlr_event_tablet_tool_tip *event = data; struct wlr_event_tablet_tool_tip *event = data;
wlr_log(L_DEBUG, "TODO: handle tool tip event: %p", event); wlr_log(L_DEBUG, "TODO: handle tool tip event: %p", event);
} }

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;