mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: move cursor event listeners from tablet to seat

Browse source 
Otherwise we would subscribe multiple times to the
same event when having multiple tablets.
This commit is contained in:
Jens Peters 2024-08-09 09:25:00 +02:00 • committed by Consolatis
parent 538eb3ee83
commit dd0cee02a4
9 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/input/cursor.c
View file

@ -13,12 +13,13 @@
#include "common/scene-helpers.h"
#include "common/surface-helpers.h"
#include "config/mousebind.h"
#include "config/tablet-tool.h"
#include "dnd.h"
#include "idle.h"
#include "input/gestures.h"
#include "input/touch.h"
#include "input/tablet.h"
#include "input/tablet-tool.h"
#include "input/tablet-pad.h"
#include "labwc.h"
#include "layers.h"
#include "menu/menu.h"
@ -1450,6 +1451,8 @@ cursor_init(struct seat *seat)
gestures_init(seat);
touch_init(seat);
tablet_init(seat);
seat->request_cursor.notify = request_cursor_notify;
wl_signal_add(&seat->seat->events.request_set_cursor,
&seat->request_cursor);
@ -1488,6 +1491,8 @@ void cursor_finish(struct seat *seat)
gestures_finish(seat);
touch_finish(seat);
tablet_finish(seat);
wl_list_remove(&seat->request_cursor.link);
wl_list_remove(&seat->request_set_shape.link);
wl_list_remove(&seat->request_set_selection.link);

2
src/input/tablet-pad.c
View file

@ -175,7 +175,7 @@ handle_destroy(struct wl_listener *listener, void *data)
}
void
tablet_pad_init(struct seat *seat, struct wlr_input_device *wlr_device)
tablet_pad_create(struct seat *seat, struct wlr_input_device *wlr_device)
{
wlr_log(WLR_DEBUG, "setting up tablet pad");
struct drawing_tablet_pad *pad = znew(*pad);

2
src/input/tablet-tool.c
View file

@ -60,7 +60,7 @@ handle_destroy(struct wl_listener *listener, void *data)
}
void
tablet_tool_init(struct seat *seat,
tablet_tool_create(struct seat *seat,
struct wlr_tablet_tool *wlr_tablet_tool)
{
wlr_log(WLR_DEBUG, "setting up tablet tool");

30
src/input/tablet.c
View file

@ -266,7 +266,7 @@ handle_tablet_tool_proximity(struct wl_listener *listener, void *data)
* Unfortunately `wlr_tool` is only present in the events, so
* use proximity for creating a `wlr_tablet_v2_tablet_tool`.
*/
tablet_tool_init(tablet->seat, ev->tool);
tablet_tool_create(tablet->seat, ev->tool);
}
/*
@ -604,16 +604,12 @@ handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&tablet->link);
tablet_pad_attach_tablet(tablet->seat);
wl_list_remove(&tablet->handlers.tablet_tool_tip.link);
wl_list_remove(&tablet->handlers.tablet_tool_button.link);
wl_list_remove(&tablet->handlers.tablet_tool_proximity.link);
wl_list_remove(&tablet->handlers.tablet_tool_axis.link);
wl_list_remove(&tablet->handlers.destroy.link);
free(tablet);
}
void
tablet_init(struct seat *seat, struct wlr_input_device *wlr_device)
tablet_create(struct seat *seat, struct wlr_input_device *wlr_device)
{
wlr_log(WLR_DEBUG, "setting up tablet");
struct drawing_tablet *tablet = znew(*tablet);
@ -636,12 +632,26 @@ tablet_init(struct seat *seat, struct wlr_input_device *wlr_device)
tablet->wheel_delta = 0.0;
wlr_log(WLR_INFO, "tablet dimensions: %.2fmm x %.2fmm",
tablet->tablet->width_mm, tablet->tablet->height_mm);
CONNECT_SIGNAL(seat->cursor, &tablet->handlers, tablet_tool_axis);
CONNECT_SIGNAL(seat->cursor, &tablet->handlers, tablet_tool_proximity);
CONNECT_SIGNAL(seat->cursor, &tablet->handlers, tablet_tool_tip);
CONNECT_SIGNAL(seat->cursor, &tablet->handlers, tablet_tool_button);
CONNECT_SIGNAL(wlr_device, &tablet->handlers, destroy);
wl_list_insert(&seat->tablets, &tablet->link);
tablet_pad_attach_tablet(tablet->seat);
}
void
tablet_init(struct seat *seat)
{
CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_axis);
CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_proximity);
CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_tip);
CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_button);
}
void
tablet_finish(struct seat *seat)
{
wl_list_remove(&seat->tablet_tool_axis.link);
wl_list_remove(&seat->tablet_tool_proximity.link);
wl_list_remove(&seat->tablet_tool_tip.link);
wl_list_remove(&seat->tablet_tool_button.link);
}