|
|
|
@ -1,4 +1,4 @@
|
|
|
|
From badaa13b7193344a3dd1a81b03baa4bc540faa92 Mon Sep 17 00:00:00 2001
|
|
|
|
From be5220b31e77b1a3f723def32f69e6aee9f3c7e9 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
|
Date: Thu, 18 May 2017 14:45:18 +1000
|
|
|
|
Date: Thu, 18 May 2017 14:45:18 +1000
|
|
|
|
Subject: [PATCH xf86-input-libinput] Add a DPIScaleFactor option as temporary
|
|
|
|
Subject: [PATCH xf86-input-libinput] Add a DPIScaleFactor option as temporary
|
|
|
|
@ -11,13 +11,13 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1413306
|
|
|
|
2 files changed, 47 insertions(+)
|
|
|
|
2 files changed, 47 insertions(+)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/man/libinput.man b/man/libinput.man
|
|
|
|
diff --git a/man/libinput.man b/man/libinput.man
|
|
|
|
index c9fec4e..888891c 100644
|
|
|
|
index 7c83ccb..76572f8 100644
|
|
|
|
--- a/man/libinput.man
|
|
|
|
--- a/man/libinput.man
|
|
|
|
+++ b/man/libinput.man
|
|
|
|
+++ b/man/libinput.man
|
|
|
|
@@ -401,6 +401,27 @@ This driver does not work with \fBOption \*qDevice\*q\fR set to an event
|
|
|
|
@@ -454,6 +454,27 @@ This driver does not work with \fBOption \*qDevice\*q\fR set to an event
|
|
|
|
node in \fI/dev/input/by-id\fR and \fI/dev/input/by-path\fR. This can be
|
|
|
|
node in \fI/dev/input/by-id\fR and \fI/dev/input/by-path\fR. This can be
|
|
|
|
usually be worked by using \fBSection \*qInputClass\*q\fR with an
|
|
|
|
usually be worked by using \fBSection \*qInputClass\*q\fR with an
|
|
|
|
appropriate \fBMatch*\fR statement in the __xconfigfile__(__filemansuffix__).
|
|
|
|
appropriate \fBMatch*\fR statement in the xorg.conf(5).
|
|
|
|
+.PP
|
|
|
|
+.PP
|
|
|
|
+This driver does not know about the display pixel density and submits motion
|
|
|
|
+This driver does not know about the display pixel density and submits motion
|
|
|
|
+events assuming an approximate display density of 96dpi. On high-dpi
|
|
|
|
+events assuming an approximate display density of 96dpi. On high-dpi
|
|
|
|
@ -43,10 +43,10 @@ index c9fec4e..888891c 100644
|
|
|
|
.SH AUTHORS
|
|
|
|
.SH AUTHORS
|
|
|
|
Peter Hutterer
|
|
|
|
Peter Hutterer
|
|
|
|
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
|
|
|
|
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
|
|
|
|
index 92817a5..dd600e6 100644
|
|
|
|
index 642f95f..cfee922 100644
|
|
|
|
--- a/src/xf86libinput.c
|
|
|
|
--- a/src/xf86libinput.c
|
|
|
|
+++ b/src/xf86libinput.c
|
|
|
|
+++ b/src/xf86libinput.c
|
|
|
|
@@ -182,6 +182,8 @@ struct xf86libinput {
|
|
|
|
@@ -214,6 +214,8 @@ struct xf86libinput {
|
|
|
|
struct scale_factor {
|
|
|
|
struct scale_factor {
|
|
|
|
double x, y;
|
|
|
|
double x, y;
|
|
|
|
} area_scale_factor;
|
|
|
|
} area_scale_factor;
|
|
|
|
@ -55,7 +55,7 @@ index 92817a5..dd600e6 100644
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
enum event_handling {
|
|
|
|
enum event_handling {
|
|
|
|
@@ -1448,6 +1450,11 @@ xf86libinput_handle_motion(InputInfoPtr pInfo, struct libinput_event_pointer *ev
|
|
|
|
@@ -1571,6 +1573,11 @@ xf86libinput_handle_motion(InputInfoPtr pInfo, struct libinput_event_pointer *ev
|
|
|
|
x = libinput_event_pointer_get_dx(event);
|
|
|
|
x = libinput_event_pointer_get_dx(event);
|
|
|
|
y = libinput_event_pointer_get_dy(event);
|
|
|
|
y = libinput_event_pointer_get_dy(event);
|
|
|
|
|
|
|
|
|
|
|
|
@ -67,7 +67,7 @@ index 92817a5..dd600e6 100644
|
|
|
|
valuator_mask_zero(mask);
|
|
|
|
valuator_mask_zero(mask);
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@@ -3448,6 +3455,25 @@ xf86libinput_pre_init(InputDriverPtr drv,
|
|
|
|
@@ -3951,6 +3958,25 @@ xf86libinput_pre_init(InputDriverPtr drv,
|
|
|
|
|
|
|
|
|
|
|
|
xf86libinput_parse_options(pInfo, driver_data, device);
|
|
|
|
xf86libinput_parse_options(pInfo, driver_data, device);
|
|
|
|
|
|
|
|
|
|
|
|
@ -94,5 +94,5 @@ index 92817a5..dd600e6 100644
|
|
|
|
* this device, create a separate device instead */
|
|
|
|
* this device, create a separate device instead */
|
|
|
|
if (!is_subdevice &&
|
|
|
|
if (!is_subdevice &&
|
|
|
|
--
|
|
|
|
--
|
|
|
|
2.31.1
|
|
|
|
2.40.0
|
|
|
|
|
|
|
|
|
|
|
|
|
Arkady L. Shane