mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-29 11:08:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

types/wlr_pointer: add base wlr_input_device

Browse source 
wlr_pointer owns its wlr_input_device. It will be initialized when the
pointer is initialized, and finished when the pointer is destroyed.
This commit is contained in:
Simon Zeni 2022-01-31 10:20:01 -05:00 • committed by Kirill Primak
parent a1978b1299
commit d5480efc7a
10 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
types/wlr_pointer.c
View file

@ -1,11 +1,15 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/types/wlr_pointer.h>
void wlr_pointer_init(struct wlr_pointer *pointer,
const struct wlr_pointer_impl *impl) {
const struct wlr_pointer_impl *impl, const char *name) {
wlr_input_device_init(&pointer->base, WLR_INPUT_DEVICE_POINTER, NULL, name);
pointer->base.pointer = pointer;
pointer->impl = impl;
wl_signal_init(&pointer->events.motion);
wl_signal_init(&pointer->events.motion_absolute);
@ -26,6 +30,7 @@ void wlr_pointer_destroy(struct wlr_pointer *pointer) {
if (!pointer) {
return;
}
wlr_input_device_finish(&pointer->base);
if (pointer->impl && pointer->impl->destroy) {
pointer->impl->destroy(pointer);
} else {

55
types/wlr_virtual_pointer_v1.c
View file

@ -1,5 +1,6 @@
#include <assert.h>
#include <stdlib.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/types/wlr_virtual_pointer_v1.h>
#include <wlr/types/wlr_pointer.h>
@ -7,17 +8,18 @@
#include "util/signal.h"
#include "wlr-virtual-pointer-unstable-v1-protocol.h"
static void input_device_destroy(struct wlr_input_device *dev) {
struct wlr_virtual_pointer_v1 *pointer =
(struct wlr_virtual_pointer_v1 *)dev;
wl_resource_set_user_data(pointer->resource, NULL);
wlr_signal_emit_safe(&pointer->events.destroy, pointer);
wl_list_remove(&pointer->link);
free(pointer);
static void pointer_destroy(struct wlr_pointer *pointer) {
struct wlr_virtual_pointer_v1 *virtual_pointer =
(struct wlr_virtual_pointer_v1 *)pointer;
wl_resource_set_user_data(virtual_pointer->resource, NULL);
wlr_signal_emit_safe(&virtual_pointer->events.destroy, virtual_pointer);
wl_list_remove(&virtual_pointer->link);
free(virtual_pointer);
}
static const struct wlr_input_device_impl input_device_impl = {
.destroy = input_device_destroy
static const struct wlr_pointer_impl pointer_impl = {
.destroy = pointer_destroy,
};
static const struct zwlr_virtual_pointer_v1_interface virtual_pointer_impl;
@ -37,7 +39,7 @@ static void virtual_pointer_motion(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
struct wlr_event_pointer_motion event = {
.device = wlr_dev,
.time_msec = time,
@ -46,7 +48,7 @@ static void virtual_pointer_motion(struct wl_client *client,
.unaccel_dx = wl_fixed_to_double(dx),
.unaccel_dy = wl_fixed_to_double(dy),
};
wlr_signal_emit_safe(&wlr_dev->pointer->events.motion, &event);
wlr_signal_emit_safe(&pointer->pointer.events.motion, &event);
}
static void virtual_pointer_motion_absolute(struct wl_client *client,
@ -60,7 +62,7 @@ static void virtual_pointer_motion_absolute(struct wl_client *client,
if (x_extent == 0 || y_extent == 0) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
struct wlr_event_pointer_motion_absolute event = {
.device = wlr_dev,
.time_msec = time,
@ -78,7 +80,7 @@ static void virtual_pointer_button(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
struct wlr_event_pointer_button event = {
.device = wlr_dev,
.time_msec = time,
@ -102,7 +104,7 @@ static void virtual_pointer_axis(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis = axis;
pointer->axis_valid[pointer->axis] = true;
pointer->axis_event[pointer->axis].device = wlr_dev;
@ -118,7 +120,7 @@ static void virtual_pointer_frame(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
for (size_t i = 0;
i < sizeof(pointer->axis_valid) / sizeof(pointer->axis_valid[0]);
@ -148,7 +150,7 @@ static void virtual_pointer_axis_source(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis_event[pointer->axis].device = wlr_dev;
pointer->axis_event[pointer->axis].source = source;
}
@ -166,7 +168,7 @@ static void virtual_pointer_axis_stop(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis = axis;
pointer->axis_valid[pointer->axis] = true;
pointer->axis_event[pointer->axis].device = wlr_dev;
@ -190,7 +192,7 @@ static void virtual_pointer_axis_discrete(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->input_device;
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis = axis;
pointer->axis_valid[pointer->axis] = true;
pointer->axis_event[pointer->axis].device = wlr_dev;
@ -204,7 +206,7 @@ static void virtual_pointer_destroy_resource(struct wl_resource *resource) {
struct wlr_virtual_pointer_v1 *pointer =
virtual_pointer_from_resource(resource);
if (pointer != NULL) {
wlr_input_device_destroy(&pointer->input_device);
wlr_pointer_destroy(&pointer->pointer);
}
}
@ -247,20 +249,13 @@ static void virtual_pointer_manager_create_virtual_pointer_with_output(
return;
}
struct wlr_pointer *pointer = calloc(1, sizeof(struct wlr_pointer));
if (!pointer) {
wlr_log(WLR_ERROR, "Cannot allocate wlr_pointer");
free(virtual_pointer);
wl_client_post_no_memory(client);
return;
}
wlr_pointer_init(pointer, NULL);
wlr_pointer_init(&virtual_pointer->pointer, &pointer_impl,
"virtual-pointer");
struct wl_resource *pointer_resource = wl_resource_create(client,
&zwlr_virtual_pointer_v1_interface, wl_resource_get_version(resource),
id);
if (!pointer_resource) {
free(pointer);
free(virtual_pointer);
wl_client_post_no_memory(client);
return;
@ -269,9 +264,6 @@ static void virtual_pointer_manager_create_virtual_pointer_with_output(
wl_resource_set_implementation(pointer_resource, &virtual_pointer_impl,
virtual_pointer, virtual_pointer_destroy_resource);
wlr_input_device_init(&virtual_pointer->input_device,
WLR_INPUT_DEVICE_POINTER, &input_device_impl, "virtual pointer");
struct wlr_virtual_pointer_v1_new_pointer_event event = {
.new_pointer = virtual_pointer,
};
@ -287,7 +279,6 @@ static void virtual_pointer_manager_create_virtual_pointer_with_output(
event.suggested_output = wlr_output;
}
virtual_pointer->input_device.pointer = pointer;
virtual_pointer->resource = pointer_resource;
wl_signal_init(&virtual_pointer->events.destroy);