fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-04 14:00:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tablet: Remove tablet_notify_tool() and add tablet_get_tool()

Browse source 
Signed-off-by: Stephen Chandler Paul <thatslyude@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Stephen Chandler Paul 2014-06-26 21:31:50 -04:00 • committed by Peter Hutterer
parent 62a0995d19
commit e18f713289
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/evdev-tablet.c
View file

@ -263,37 +263,35 @@ tablet_process_misc(struct tablet_dispatch *tablet,
}
}
static void
tablet_notify_tool(struct tablet_dispatch *tablet,
struct evdev_device *device,
uint32_t time)
static struct libinput_tool *
tablet_get_tool(struct libinput *li,
enum libinput_tool_type type,
uint32_t serial)
{
struct libinput_device *base = &device->base;
struct libinput_tool *tool;
struct libinput_tool *new_tool = NULL;
struct libinput_tool *tool = NULL, *t;
/* Check if we already have the tool in our list of tools */
list_for_each(tool, &base->seat->libinput->tool_list, link) {
if (tablet->current_tool_type == tool->type &&
tablet->current_tool_serial == tool->serial) {
new_tool = tool;
list_for_each(t, &li->tool_list, link) {
if (type == t->type && serial == t->serial) {
tool = t;
break;
}
}
/* If we didn't already have the tool in our list of tools, add it */
if (new_tool == NULL) {
new_tool = zalloc(sizeof *new_tool);
*new_tool = (struct libinput_tool) {
.type = tablet->current_tool_type,
.serial = tablet->current_tool_serial,
/* If we didn't already have the new_tool in our list of tools,
* add it */
if (!tool) {
tool = zalloc(sizeof *tool);
*tool = (struct libinput_tool) {
.type = type,
.serial = serial,
.refcount = 1,
};
list_insert(&base->seat->libinput->tool_list, &new_tool->link);
list_insert(&li->tool_list, &tool->link);
}
tablet_notify_tool_update(base, time, new_tool);
return tool;
}
static void
@ -379,12 +377,17 @@ tablet_flush(struct tablet_dispatch *tablet,
struct evdev_device *device,
uint32_t time)
{
struct libinput_tool *tool =
tablet_get_tool(device->base.seat->libinput,
tablet->current_tool_type,
tablet->current_tool_serial);
if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) {
/* Release all stylus buttons */
tablet->button_state.stylus_buttons = 0;
tablet_set_status(tablet, TABLET_BUTTONS_RELEASED);
} else if (tablet_has_status(tablet, TABLET_TOOL_UPDATED)) {
tablet_notify_tool(tablet, device, time);
tablet_notify_tool_update(&device->base, time, tool);
tablet_unset_status(tablet, TABLET_TOOL_UPDATED);
}