mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-17 06:59:43 -05:00
Implement pointer-constraints protocol in wlroots and rootston
This commit is contained in:
parent
437f538772
commit
fa2e6e7d9d
23 changed files with 1134 additions and 20 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef ROOTSTON_CURSOR_H
|
||||
#define ROOTSTON_CURSOR_H
|
||||
|
||||
#include <wlr/types/wlr_pointer_constraints_v1.h>
|
||||
#include "rootston/seat.h"
|
||||
|
||||
enum roots_cursor_mode {
|
||||
|
|
@ -14,6 +15,9 @@ struct roots_cursor {
|
|||
struct roots_seat *seat;
|
||||
struct wlr_cursor *cursor;
|
||||
|
||||
struct wlr_pointer_constraint_v1 *active_constraint;
|
||||
pixman_region32_t confine; // invalid if active_constraint == NULL
|
||||
|
||||
const char *default_xcursor;
|
||||
|
||||
enum roots_cursor_mode mode;
|
||||
|
|
@ -45,6 +49,10 @@ struct roots_cursor {
|
|||
struct wl_listener tool_button;
|
||||
|
||||
struct wl_listener request_set_cursor;
|
||||
|
||||
struct wl_listener focus_change;
|
||||
|
||||
struct wl_listener constraint_commit;
|
||||
};
|
||||
|
||||
struct roots_cursor *roots_cursor_create(struct roots_seat *seat);
|
||||
|
|
@ -81,9 +89,17 @@ void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
|
|||
void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
|
||||
struct wlr_seat_pointer_request_set_cursor_event *event);
|
||||
|
||||
void roots_cursor_handle_focus_change(struct roots_cursor *cursor,
|
||||
struct wlr_seat_pointer_focus_change_event *event);
|
||||
|
||||
void roots_cursor_handle_constraint_commit(struct roots_cursor *cursor);
|
||||
|
||||
void roots_cursor_update_position(struct roots_cursor *cursor,
|
||||
uint32_t time);
|
||||
|
||||
void roots_cursor_update_focus(struct roots_cursor *cursor);
|
||||
|
||||
void roots_cursor_constrain(struct roots_cursor *cursor,
|
||||
struct wlr_pointer_constraint_v1 *constraint, double sx, double sy);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ struct roots_desktop {
|
|||
struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
|
||||
struct wlr_screencopy_manager_v1 *screencopy;
|
||||
struct wlr_tablet_manager_v2 *tablet_v2;
|
||||
struct wlr_pointer_constraints_v1 *pointer_constraints;
|
||||
|
||||
struct wl_listener new_output;
|
||||
struct wl_listener layout_change;
|
||||
|
|
@ -67,6 +68,8 @@ struct roots_desktop {
|
|||
struct wl_listener input_inhibit_activate;
|
||||
struct wl_listener input_inhibit_deactivate;
|
||||
struct wl_listener virtual_keyboard_new;
|
||||
struct wl_listener constraint_create;
|
||||
struct wl_listener constraint_destroy;
|
||||
|
||||
#ifdef WLR_HAS_XWAYLAND
|
||||
struct wlr_xwayland *xwayland;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ struct roots_input {
|
|||
|
||||
struct wl_listener new_input;
|
||||
|
||||
struct wl_list seats;
|
||||
struct wl_list seats; // roots_seat::link
|
||||
};
|
||||
|
||||
struct roots_input *input_create(struct roots_server *server,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ struct roots_seat {
|
|||
struct roots_input *input;
|
||||
struct wlr_seat *seat;
|
||||
struct roots_cursor *cursor;
|
||||
struct wl_list link;
|
||||
struct wl_list link; // roots_input::seats
|
||||
|
||||
// coordinates of the first touch point if it exists
|
||||
int32_t touch_id;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#ifndef WLR_TYPES_WLR_BOX_H
|
||||
#define WLR_TYPES_WLR_BOX_H
|
||||
|
||||
#include <pixman.h>
|
||||
#include <stdbool.h>
|
||||
#include <wayland-server.h>
|
||||
|
||||
|
|
@ -40,4 +41,6 @@ void wlr_box_transform(const struct wlr_box *box,
|
|||
void wlr_box_rotated_bounds(const struct wlr_box *box, float rotation,
|
||||
struct wlr_box *dest);
|
||||
|
||||
void wlr_box_from_pixman_box32(const pixman_box32_t box, struct wlr_box *dest);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -91,6 +91,18 @@ bool wlr_cursor_warp(struct wlr_cursor *cur, struct wlr_input_device *dev,
|
|||
void wlr_cursor_absolute_to_layout_coords(struct wlr_cursor *cur,
|
||||
struct wlr_input_device *dev, double x, double y, double *lx, double *ly);
|
||||
|
||||
|
||||
/**
|
||||
* Warp the cursor to the given x and y coordinates. If the given point is out
|
||||
* of the layout boundaries or constraints, the closest point will be used.
|
||||
* If one coordinate is NAN, it will be ignored.
|
||||
*
|
||||
* `dev` may be passed to respect device mapping constraints. If `dev` is NULL,
|
||||
* device mapping constraints will be ignored.
|
||||
*/
|
||||
void wlr_cursor_warp_closest(struct wlr_cursor *cur,
|
||||
struct wlr_input_device *dev, double x, double y);
|
||||
|
||||
/**
|
||||
* Warp the cursor to the given x and y in absolute 0..1 coordinates. If the
|
||||
* given point is out of the layout boundaries or constraints, the closest point
|
||||
|
|
|
|||
88
include/wlr/types/wlr_pointer_constraints_v1.h
Normal file
88
include/wlr/types/wlr_pointer_constraints_v1.h
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
#ifndef WLR_TYPES_WLR_POINTER_CONSTRAINTS_V1_H
|
||||
#define WLR_TYPES_WLR_POINTER_CONSTRAINTS_V1_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <wayland-server.h>
|
||||
#include <pixman.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include <wlr/types/wlr_seat.h>
|
||||
#include "pointer-constraints-unstable-v1-protocol.h"
|
||||
|
||||
struct wlr_seat;
|
||||
|
||||
enum wlr_pointer_constraint_v1_type {
|
||||
WLR_POINTER_CONSTRAINT_V1_LOCKED,
|
||||
WLR_POINTER_CONSTRAINT_V1_CONFINED,
|
||||
};
|
||||
|
||||
struct wlr_pointer_constraint_v1_state {
|
||||
pixman_region32_t *region;
|
||||
|
||||
// only valid for locked_pointer
|
||||
struct {
|
||||
double x, y;
|
||||
bool valid;
|
||||
} cursor_hint;
|
||||
};
|
||||
|
||||
struct wlr_pointer_constraint_v1 {
|
||||
struct wlr_pointer_constraints_v1 *pointer_constraints;
|
||||
|
||||
struct wl_resource *resource;
|
||||
struct wlr_surface *surface;
|
||||
struct wlr_seat *seat;
|
||||
enum zwp_pointer_constraints_v1_lifetime lifetime;
|
||||
enum wlr_pointer_constraint_v1_type type;
|
||||
pixman_region32_t region;
|
||||
|
||||
struct wlr_pointer_constraint_v1_state current, pending;
|
||||
|
||||
struct wl_listener surface_commit;
|
||||
struct wl_listener surface_destroy;
|
||||
struct wl_listener seat_destroy;
|
||||
|
||||
struct wl_list link; // wlr_pointer_constraints_v1::constraints
|
||||
|
||||
void *data;
|
||||
};
|
||||
|
||||
struct wlr_pointer_constraints_v1 {
|
||||
struct wl_list wl_resources; // wl_resource_get_link
|
||||
struct wl_global *wl_global;
|
||||
|
||||
struct {
|
||||
/**
|
||||
* Called when a new pointer constraint is created.
|
||||
*
|
||||
* data: wlr_pointer_constraint_v1*
|
||||
*/
|
||||
struct wl_signal constraint_create;
|
||||
/**
|
||||
* Called when a pointer constraint is destroyed.
|
||||
*
|
||||
* data: wlr_pointer_constraint_v1*
|
||||
*/
|
||||
struct wl_signal constraint_destroy;
|
||||
} events;
|
||||
|
||||
struct wl_list constraints; // wlr_pointer_constraint_v1::link
|
||||
|
||||
void *data;
|
||||
};
|
||||
|
||||
struct wlr_pointer_constraints_v1 *wlr_pointer_constraints_v1_create(
|
||||
struct wl_display *display);
|
||||
void wlr_pointer_constraints_v1_destroy(
|
||||
struct wlr_pointer_constraints_v1 *wlr_pointer_constraints_v1);
|
||||
|
||||
struct wlr_pointer_constraint_v1 *wlr_pointer_constraints_v1_constraint_for_surface(
|
||||
struct wlr_pointer_constraints_v1 *wlr_pointer_constraints_v1,
|
||||
struct wlr_surface *surface, struct wlr_seat *seat);
|
||||
|
||||
void wlr_pointer_constraint_v1_send_activated(
|
||||
struct wlr_pointer_constraint_v1 *constraint);
|
||||
void wlr_pointer_constraint_v1_send_deactivated(
|
||||
struct wlr_pointer_constraint_v1 *constraint);
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -10,8 +10,7 @@
|
|||
#define WLR_TYPES_WLR_REGION_H
|
||||
|
||||
#include <pixman.h>
|
||||
|
||||
struct wl_resource;
|
||||
#include <wayland-server-protocol.h>
|
||||
|
||||
/*
|
||||
* Creates a new region resource with the provided new ID. If `resource_list` is
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
#ifndef WLR_UTIL_REGION_H
|
||||
#define WLR_UTIL_REGION_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <pixman.h>
|
||||
#include <wayland-server.h>
|
||||
|
||||
|
|
@ -48,4 +50,7 @@ void wlr_region_expand(pixman_region32_t *dst, pixman_region32_t *src,
|
|||
void wlr_region_rotated_bounds(pixman_region32_t *dst, pixman_region32_t *src,
|
||||
float rotation, int ox, int oy);
|
||||
|
||||
bool wlr_region_confine(pixman_region32_t *region, double x1, double y1, double x2,
|
||||
double y2, double *x2_out, double *y2_out);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue