fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-01-07 07:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename an internal struct to scroll_state

Browse source 
To avoid future name clashes.
This commit is contained in:
Peter Hutterer 2023-04-13 13:47:19 +10:00
parent 6215eecfbd
commit a157cbfa42
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libei-device.c
View file

@ -1104,12 +1104,12 @@ static inline void
ei_device_resume_scrolling(struct ei_device *device, double x, double y)
{
if (x) {
device->scroll.x_is_stopped = false;
device->scroll.x_is_cancelled = false;
device->scroll_state.x_is_stopped = false;
device->scroll_state.x_is_cancelled = false;
}
if (y) {
device->scroll.y_is_stopped = false;
device->scroll.y_is_cancelled = false;
device->scroll_state.y_is_stopped = false;
device->scroll_state.y_is_cancelled = false;
}
}
@ -1331,13 +1331,13 @@ ei_device_pointer_scroll_stop(struct ei_device *device, bool x, bool y)
}
/* Filter out duplicate scroll stop requests */
if (x && !device->scroll.x_is_stopped)
device->scroll.x_is_stopped = true;
if (x && !device->scroll_state.x_is_stopped)
device->scroll_state.x_is_stopped = true;
else
x = false;
if (y && !device->scroll.y_is_stopped)
device->scroll.y_is_stopped = true;
if (y && !device->scroll_state.y_is_stopped)
device->scroll_state.y_is_stopped = true;
else
y = false;
@ -1361,16 +1361,16 @@ ei_device_pointer_scroll_cancel(struct ei_device *device, bool x, bool y)
}
/* Filter out duplicate scroll cancelled requests */
if (x && !device->scroll.x_is_cancelled) {
device->scroll.x_is_stopped = true;
device->scroll.x_is_cancelled = true;
if (x && !device->scroll_state.x_is_cancelled) {
device->scroll_state.x_is_stopped = true;
device->scroll_state.x_is_cancelled = true;
} else {
x = false;
}
if (y && !device->scroll.y_is_cancelled) {
device->scroll.y_is_stopped = true;
device->scroll.y_is_cancelled = true;
if (y && !device->scroll_state.y_is_cancelled) {
device->scroll_state.y_is_stopped = true;
device->scroll_state.y_is_cancelled = true;
} else {
y = false;
}

2
src/libei-device.h
View file

@ -80,7 +80,7 @@ struct ei_device {
struct {
bool x_is_stopped, y_is_stopped;
bool x_is_cancelled, y_is_cancelled;
} scroll;
} scroll_state;
struct ei_keymap *keymap;
};

28
src/libeis-device.c
View file

@ -973,12 +973,12 @@ static inline void
eis_device_resume_scrolling(struct eis_device *device, double x, double y)
{
if (x) {
device->scroll.x_is_stopped = false;
device->scroll.x_is_cancelled = false;
device->scroll_state.x_is_stopped = false;
device->scroll_state.x_is_cancelled = false;
}
if (y) {
device->scroll.y_is_stopped = false;
device->scroll.y_is_cancelled = false;
device->scroll_state.y_is_stopped = false;
device->scroll_state.y_is_cancelled = false;
}
}
@ -1014,13 +1014,13 @@ eis_device_pointer_scroll_stop(struct eis_device *device, bool x, bool y)
return;
/* Filter out duplicate scroll stop requests */
if (x && !device->scroll.x_is_stopped)
device->scroll.x_is_stopped = true;
if (x && !device->scroll_state.x_is_stopped)
device->scroll_state.x_is_stopped = true;
else
x = false;
if (y && !device->scroll.y_is_stopped)
device->scroll.y_is_stopped = true;
if (y && !device->scroll_state.y_is_stopped)
device->scroll_state.y_is_stopped = true;
else
y = false;
@ -1042,16 +1042,16 @@ eis_device_pointer_scroll_cancel(struct eis_device *device, bool x, bool y)
return;
/* Filter out duplicate scroll cancelled requests */
if (x && !device->scroll.x_is_cancelled) {
device->scroll.x_is_stopped = true;
device->scroll.x_is_cancelled = true;
if (x && !device->scroll_state.x_is_cancelled) {
device->scroll_state.x_is_stopped = true;
device->scroll_state.x_is_cancelled = true;
} else {
x = false;
}
if (y && !device->scroll.y_is_cancelled) {
device->scroll.y_is_stopped = true;
device->scroll.y_is_cancelled = true;
if (y && !device->scroll_state.y_is_cancelled) {
device->scroll_state.y_is_stopped = true;
device->scroll_state.y_is_cancelled = true;
} else {
y = false;
}

2
src/libeis-device.h
View file

@ -69,7 +69,7 @@ struct eis_device {
struct {
bool x_is_stopped, y_is_stopped;
bool x_is_cancelled, y_is_cancelled;
} scroll;
} scroll_state;
};