mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pointer-constraints: refactoring

Browse source 
* Rename the constraint_create signal to new_constraint for
  consistency
* Move the constraint_destroy signal to the constraint itself
* Use rotate_child_position instead of duplicating logic
* Fix inert constraint resource handling
* Style fixes
This commit is contained in:
emersion 2018-09-27 10:25:59 +02:00
parent 31cc2fa4f9
commit dac4f8e19f
9 changed files with 130 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/rootston/desktop.h
View file

@ -68,8 +68,7 @@ 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;
struct wl_listener pointer_constraint;
#ifdef WLR_HAS_XWAYLAND
struct wlr_xwayland *xwayland;

3
include/rootston/output.h
View file

@ -28,6 +28,9 @@ struct roots_output {
struct wl_listener damage_destroy;
};
void rotate_child_position(double *sx, double *sy, double sw, double sh,
double pw, double ph, float rotation);
void handle_new_output(struct wl_listener *listener, void *data);
struct roots_view;

6
include/rootston/seat.h
View file

@ -122,6 +122,12 @@ struct roots_tablet_tool {
struct wl_listener tablet_destroy;
};
struct roots_pointer_constraint {
struct wlr_pointer_constraint_v1 *constraint;
struct wl_listener destroy;
};
struct roots_seat *roots_seat_create(struct roots_input *input, char *name);
void roots_seat_destroy(struct roots_seat *seat);

22
include/wlr/types/wlr_pointer_constraints_v1.h
View file

@ -48,6 +48,10 @@ struct wlr_pointer_constraint_v1 {
struct wl_list link; // wlr_pointer_constraints_v1::constraints
struct {
struct wl_signal destroy;
} events;
void *data;
};
@ -59,15 +63,9 @@ struct wlr_pointer_constraints_v1 {
/**
* Called when a new pointer constraint is created.
*
* data: wlr_pointer_constraint_v1*
* data: struct 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;
struct wl_signal new_constraint;
} events;
struct wl_list constraints; // wlr_pointer_constraint_v1::link
@ -78,10 +76,11 @@ struct wlr_pointer_constraints_v1 {
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_constraints_v1 *pointer_constraints);
struct wlr_pointer_constraint_v1 *wlr_pointer_constraints_v1_constraint_for_surface(
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 *pointer_constraints,
struct wlr_surface *surface, struct wlr_seat *seat);
void wlr_pointer_constraint_v1_send_activated(
@ -89,5 +88,4 @@ void wlr_pointer_constraint_v1_send_activated(
void wlr_pointer_constraint_v1_send_deactivated(
struct wlr_pointer_constraint_v1 *constraint);
#endif