blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make (wlr_)seat_client_from_pointer_resource public

This commit is contained in:
Las 2018-08-08 12:39:33 +02:00
parent cf9debf82e
commit d446c53fe1
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wlr/types/wlr_seat.h
View File

@ -568,6 +568,9 @@ bool wlr_seat_touch_has_grab(struct wlr_seat *seat);
bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial); bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial);
struct wlr_seat_client *wlr_seat_client_from_resource( struct wlr_seat_client *wlr_seat_client_from_resource(
struct wl_resource *resource); struct wl_resource *resource);
struct wlr_seat_client *wlr_seat_client_from_pointer_resource(
struct wl_resource *resource);
#endif #endif

16
types/seat/wlr_seat_pointer.c
View File

@ -53,7 +53,7 @@ static void pointer_send_frame(struct wl_resource *resource) {
static const struct wl_pointer_interface pointer_impl; static const struct wl_pointer_interface pointer_impl;
static struct wlr_seat_client *seat_client_from_pointer_resource( struct wlr_seat_client *wlr_seat_client_from_pointer_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, &wl_pointer_interface, assert(wl_resource_instance_of(resource, &wl_pointer_interface,
&pointer_impl)); &pointer_impl));
@ -69,7 +69,7 @@ static void pointer_set_cursor(struct wl_client *client,
struct wl_resource *surface_resource, struct wl_resource *surface_resource,
int32_t hotspot_x, int32_t hotspot_y) { int32_t hotspot_x, int32_t hotspot_y) {
struct wlr_seat_client *seat_client = struct wlr_seat_client *seat_client =
seat_client_from_pointer_resource(pointer_resource); wlr_seat_client_from_pointer_resource(pointer_resource);
if (seat_client == NULL) { if (seat_client == NULL) {
return; return;
} }
@ -146,7 +146,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &focused_client->pointers) { wl_resource_for_each(resource, &focused_client->pointers) {
if (seat_client_from_pointer_resource(resource) == NULL) { if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue; continue;
} }
@ -160,7 +160,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) { wl_resource_for_each(resource, &client->pointers) {
if (seat_client_from_pointer_resource(resource) == NULL) { if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue; continue;
} }
@ -206,7 +206,7 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) { wl_resource_for_each(resource, &client->pointers) {
if (seat_client_from_pointer_resource(resource) == NULL) { if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue; continue;
} }
@ -226,7 +226,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) { wl_resource_for_each(resource, &client->pointers) {
if (seat_client_from_pointer_resource(resource) == NULL) { if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue; continue;
} }
@ -246,7 +246,7 @@ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) { wl_resource_for_each(resource, &client->pointers) {
if (seat_client_from_pointer_resource(resource) == NULL) { if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue; continue;
} }
@ -356,7 +356,7 @@ void seat_client_create_pointer(struct wlr_seat_client *seat_client,
void seat_client_destroy_pointer(struct wl_resource *resource) { void seat_client_destroy_pointer(struct wl_resource *resource) {
struct wlr_seat_client *seat_client = struct wlr_seat_client *seat_client =
seat_client_from_pointer_resource(resource); wlr_seat_client_from_pointer_resource(resource);
if (seat_client == NULL) { if (seat_client == NULL) {
return; return;
} }