aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
Diffstat (limited to 'rootston')
-rw-r--r--rootston/cursor.c29
-rw-r--r--rootston/desktop.c56
-rw-r--r--rootston/output.c24
-rw-r--r--rootston/xdg_shell_v6.c11
4 files changed, 107 insertions, 13 deletions
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 9c4b0dd8..8eb22459 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -68,8 +68,8 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
view = view_at(desktop, input->cursor->x, input->cursor->y, &surface,
&sx, &sy);
if (view) {
- wlr_seat_pointer_enter(input->wl_seat, surface, sx, sy);
- wlr_seat_pointer_send_motion(input->wl_seat, time, sx, sy);
+ wlr_seat_pointer_notify_enter(input->wl_seat, surface, sx, sy);
+ wlr_seat_pointer_notify_motion(input->wl_seat, time, sx, sy);
} else {
wlr_seat_pointer_clear_focus(input->wl_seat);
}
@@ -156,7 +156,7 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(input->cursor, event->device,
event->delta_x, event->delta_y);
- cursor_update_position(input, (uint32_t)event->time_usec);
+ cursor_update_position(input, (uint32_t)(event->time_usec / 1000));
}
static void handle_cursor_motion_absolute(struct wl_listener *listener,
@@ -166,14 +166,14 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(input->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
- cursor_update_position(input, (uint32_t)event->time_usec);
+ cursor_update_position(input, (uint32_t)(event->time_usec / 1000));
}
static void handle_cursor_axis(struct wl_listener *listener, void *data) {
struct roots_input *input =
wl_container_of(listener, input, cursor_axis);
struct wlr_event_pointer_axis *event = data;
- wlr_seat_pointer_send_axis(input->wl_seat, event->time_sec,
+ wlr_seat_pointer_notify_axis(input->wl_seat, event->time_sec,
event->orientation, event->delta);
}
@@ -221,7 +221,7 @@ static void do_cursor_button_press(struct roots_input *input,
return;
}
- uint32_t serial = wlr_seat_pointer_send_button(input->wl_seat, time, button,
+ uint32_t serial = wlr_seat_pointer_notify_button(input->wl_seat, time, button,
state);
int i;
@@ -238,7 +238,7 @@ static void do_cursor_button_press(struct roots_input *input,
% (sizeof(input->input_events) / sizeof(input->input_events[0]));
set_view_focus(input, desktop, view);
if (view) {
- wlr_seat_keyboard_enter(input->wl_seat, surface);
+ wlr_seat_keyboard_notify_enter(input->wl_seat, surface);
}
break;
}
@@ -248,7 +248,7 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
struct roots_input *input = wl_container_of(listener, input, cursor_button);
struct wlr_event_pointer_button *event = data;
do_cursor_button_press(input, input->cursor, event->device,
- (uint32_t)event->time_usec, event->button, event->state);
+ (uint32_t)(event->time_usec / 1000), event->button, event->state);
}
static void handle_tool_axis(struct wl_listener *listener, void *data) {
@@ -258,7 +258,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
wlr_cursor_warp_absolute(input->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
- cursor_update_position(input, (uint32_t)event->time_usec);
+ cursor_update_position(input, (uint32_t)(event->time_usec / 1000));
}
}
@@ -266,7 +266,13 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct roots_input *input = wl_container_of(listener, input, cursor_tool_tip);
struct wlr_event_tablet_tool_tip *event = data;
do_cursor_button_press(input, input->cursor, event->device,
- (uint32_t)event->time_usec, BTN_LEFT, event->state);
+ (uint32_t)(event->time_usec / 1000), BTN_LEFT, event->state);
+}
+
+static void handle_pointer_grab_end(struct wl_listener *listener, void *data) {
+ struct roots_input *input =
+ wl_container_of(listener, input, pointer_grab_end);
+ cursor_update_position(input, 0);
}
void cursor_initialize(struct roots_input *input) {
@@ -296,6 +302,9 @@ void cursor_initialize(struct roots_input *input) {
wl_list_init(&input->cursor_tool_tip.link);
wl_signal_add(&cursor->events.tablet_tool_tip, &input->cursor_tool_tip);
input->cursor_tool_tip.notify = handle_tool_tip;
+
+ wl_signal_add(&input->wl_seat->events.pointer_grab_end, &input->pointer_grab_end);
+ input->pointer_grab_end.notify = handle_pointer_grab_end;
}
static void reset_device_mappings(struct roots_config *config,
diff --git a/rootston/desktop.c b/rootston/desktop.c
index c10cd641..3d9b2120 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -51,6 +51,15 @@ void view_get_input_bounds(struct roots_view *view, struct wlr_box *box) {
view->get_input_bounds(view, box);
return;
}
+
+ if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+ box->x = view->xdg_surface_v6->geometry->x;
+ box->y = view->xdg_surface_v6->geometry->y;
+ box->width = view->xdg_surface_v6->geometry->width;
+ box->height = view->xdg_surface_v6->geometry->height;
+ return;
+ }
+
box->x = box->y = 0;
box->width = view->wlr_surface->current->width;
box->height = view->wlr_surface->current->height;
@@ -91,7 +100,7 @@ static struct wlr_subsurface *subsurface_at(struct wlr_surface *surface,
int sub_width = subsurface->surface->current->buffer_width;
int sub_height = subsurface->surface->current->buffer_height;
if ((sx > _sub_x && sx < _sub_x + sub_width) &&
- (sy > _sub_y && sub_y < sub_y + sub_height)) {
+ (sy > _sub_y && sy < _sub_y + sub_height)) {
*sub_x = _sub_x;
*sub_y = _sub_y;
return subsurface;
@@ -101,6 +110,36 @@ static struct wlr_subsurface *subsurface_at(struct wlr_surface *surface,
return NULL;
}
+static struct wlr_xdg_surface_v6 *xdg_v6_popup_at(
+ struct wlr_xdg_surface_v6 *surface, double sx, double sy,
+ double *popup_sx, double *popup_sy) {
+ struct wlr_xdg_surface_v6 *popup;
+ wl_list_for_each(popup, &surface->popups, popup_link) {
+ double _popup_sx = surface->geometry->x + popup->popup_state->geometry.x;
+ double _popup_sy = surface->geometry->y + popup->popup_state->geometry.y;
+ int popup_width = popup->popup_state->geometry.width;
+ int popup_height = popup->popup_state->geometry.height;
+
+ struct wlr_xdg_surface_v6 *_popup =
+ xdg_v6_popup_at(popup, sx - _popup_sx + popup->geometry->x,
+ sy - _popup_sy + popup->geometry->y, popup_sx, popup_sy);
+ if (_popup) {
+ *popup_sx = *popup_sx + _popup_sx - popup->geometry->x;
+ *popup_sy = *popup_sy + _popup_sy - popup->geometry->y;
+ return _popup;
+ }
+
+ if ((sx > _popup_sx && sx < _popup_sx + popup_width) &&
+ (sy > _popup_sy && sy < _popup_sy + popup_height)) {
+ *popup_sx = _popup_sx - popup->geometry->x;
+ *popup_sy = _popup_sy - popup->geometry->y;
+ return popup;
+ }
+ }
+
+ return NULL;
+}
+
struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
for (int i = desktop->views->length - 1; i >= 0; --i) {
@@ -122,6 +161,21 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
view_sy = ry + (double)box.height/2;
}
+ if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+ // TODO: test if this works with rotated views
+ double popup_sx, popup_sy;
+ struct wlr_xdg_surface_v6 *popup =
+ xdg_v6_popup_at(view->xdg_surface_v6, view_sx, view_sy,
+ &popup_sx, &popup_sy);
+
+ if (popup) {
+ *sx = view_sx - popup_sx;
+ *sy = view_sy - popup_sy;
+ *surface = popup->surface;
+ return view;
+ }
+ }
+
double sub_x, sub_y;
struct wlr_subsurface *subsurface =
subsurface_at(view->wlr_surface, view_sx, view_sy, &sub_x, &sub_y);
diff --git a/rootston/output.c b/rootston/output.c
index c6627182..6c7fbf51 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -78,10 +78,34 @@ static void render_surface(struct wlr_surface *surface,
}
}
+static void render_xdg_v6_popups(struct wlr_xdg_surface_v6 *surface,
+ struct roots_desktop *desktop, struct wlr_output *wlr_output,
+ struct timespec *when, double base_x, double base_y, float rotation) {
+ // TODO: make sure this works with view rotation
+ struct wlr_xdg_surface_v6 *popup;
+ wl_list_for_each(popup, &surface->popups, popup_link) {
+ if (!popup->configured) {
+ continue;
+ }
+
+ double popup_x = base_x + surface->geometry->x +
+ popup->popup_state->geometry.x - popup->geometry->x;
+ double popup_y = base_y + surface->geometry->y +
+ popup->popup_state->geometry.y - popup->geometry->y;
+ render_surface(popup->surface, desktop, wlr_output, when, popup_x,
+ popup_y, rotation);
+ render_xdg_v6_popups(popup, desktop, wlr_output, when, popup_x, popup_y, rotation);
+ }
+}
+
static void render_view(struct roots_view *view, struct roots_desktop *desktop,
struct wlr_output *wlr_output, struct timespec *when) {
render_surface(view->wlr_surface, desktop, wlr_output, when,
view->x, view->y, view->rotation);
+ if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+ render_xdg_v6_popups(view->xdg_surface_v6, desktop, wlr_output,
+ when, view->x, view->y, view->rotation);
+ }
}
static void output_frame_notify(struct wl_listener *listener, void *data) {
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index c7072354..c0124d60 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -81,11 +81,18 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
}
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
+ struct wlr_xdg_surface_v6 *surface = data;
+ assert(surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE);
+
+ if (surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
+ wlr_log(L_DEBUG, "new xdg popup");
+ return;
+ }
+
struct roots_desktop *desktop =
wl_container_of(listener, desktop, xdg_shell_v6_surface);
- struct wlr_xdg_surface_v6 *surface = data;
- wlr_log(L_DEBUG, "new xdg surface: title=%s, app_id=%s",
+ wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
surface->title, surface->app_id);
wlr_xdg_surface_v6_ping(surface);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 04:51:03 +0000