Module Name: src
Committed By: khorben
Date: Mon Dec 24 01:27:23 UTC 2012
Modified Files:
src/sbin/wsconsctl: mouse.c
Log Message:
Added read-only support for touchscreen calibration (see PR kern/45872).
Tested with the uts(4) driver, as well as with mice without calibration
support.
Reviewed by uwe@ (thank you!)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/wsconsctl/mouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/wsconsctl/mouse.c
diff -u src/sbin/wsconsctl/mouse.c:1.8 src/sbin/wsconsctl/mouse.c:1.9
--- src/sbin/wsconsctl/mouse.c:1.8 Mon Apr 28 20:23:09 2008
+++ src/sbin/wsconsctl/mouse.c Mon Dec 24 01:27:23 2012
@@ -1,7 +1,7 @@
-/* $NetBSD: mouse.c,v 1.8 2008/04/28 20:23:09 martin Exp $ */
+/* $NetBSD: mouse.c,v 1.9 2012/12/24 01:27:23 khorben Exp $ */
/*-
- * Copyright (c) 1998, 2006 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2006, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -45,8 +45,12 @@
static int mstype;
static int resolution;
static int samplerate;
+static struct wsmouse_calibcoords calibration;
+static char *calibration_samples;
static struct wsmouse_repeat repeat;
+static void mouse_get_calibration(int);
+
static void mouse_get_repeat(int);
static void mouse_put_repeat(int);
@@ -54,6 +58,16 @@ struct field mouse_field_tab[] = {
{ "resolution", &resolution, FMT_UINT, FLG_WRONLY },
{ "samplerate", &samplerate, FMT_UINT, FLG_WRONLY },
{ "type", &mstype, FMT_MSTYPE, FLG_RDONLY },
+ { "calibration.minx", &calibration.minx,
+ FMT_INT, FLG_RDONLY },
+ { "calibration.miny", &calibration.miny,
+ FMT_INT, FLG_RDONLY },
+ { "calibration.maxx", &calibration.maxx,
+ FMT_INT, FLG_RDONLY },
+ { "calibration.maxy", &calibration.maxy,
+ FMT_INT, FLG_RDONLY },
+ { "calibration.samples", &calibration_samples,
+ FMT_STRING, FLG_RDONLY },
{ "repeat.buttons", &repeat.wr_buttons,
FMT_BITFIELD, FLG_MODIFY },
{ "repeat.delay.first", &repeat.wr_delay_first,
@@ -75,6 +89,13 @@ mouse_get_values(int fd)
if (ioctl(fd, WSMOUSEIO_GTYPE, &mstype) < 0)
err(EXIT_FAILURE, "WSMOUSEIO_GTYPE");
+ if (field_by_value(&calibration.minx)->flags & FLG_GET ||
+ field_by_value(&calibration.miny)->flags & FLG_GET ||
+ field_by_value(&calibration.maxx)->flags & FLG_GET ||
+ field_by_value(&calibration.maxy)->flags & FLG_GET ||
+ field_by_value(&calibration_samples)->flags & FLG_GET)
+ mouse_get_calibration(fd);
+
if (field_by_value(&repeat.wr_buttons)->flags & FLG_GET ||
field_by_value(&repeat.wr_delay_first)->flags & FLG_GET ||
field_by_value(&repeat.wr_delay_decrement)->flags & FLG_GET ||
@@ -83,11 +104,63 @@ mouse_get_values(int fd)
}
static void
+mouse_get_calibration(int fd)
+{
+ struct wsmouse_calibcoords tmp;
+ char *samples;
+ char buf[48];
+ int i;
+
+ if (ioctl(fd, WSMOUSEIO_GCALIBCOORDS, &tmp) < 0) {
+ field_disable_by_value(&calibration.minx);
+ field_disable_by_value(&calibration.miny);
+ field_disable_by_value(&calibration.maxx);
+ field_disable_by_value(&calibration.maxy);
+ field_disable_by_value(&calibration_samples);
+ return;
+ }
+
+ if (field_by_value(&calibration.minx)->flags & FLG_GET)
+ calibration.minx = tmp.minx;
+ if (field_by_value(&calibration.miny)->flags & FLG_GET)
+ calibration.miny = tmp.miny;
+ if (field_by_value(&calibration.maxx)->flags & FLG_GET)
+ calibration.maxx = tmp.maxx;
+ if (field_by_value(&calibration.maxy)->flags & FLG_GET)
+ calibration.maxy = tmp.maxy;
+ if (field_by_value(&calibration_samples)->flags & FLG_GET) {
+ free(calibration_samples);
+ if (tmp.samplelen <= 0) {
+ calibration_samples = strdup("");
+ if (calibration_samples == NULL)
+ err(EXIT_FAILURE, "could not list calibration"
+ " samples");
+ } else {
+ samples = malloc(tmp.samplelen * sizeof(buf));
+ if (samples == NULL)
+ err(EXIT_FAILURE, "could not list calibration"
+ " samples");
+ samples[0] = '\0';
+ for (i = 0; i < tmp.samplelen; i++) {
+ snprintf(buf, sizeof(buf), "%s%d,%d,%d,%d",
+ (i == 0) ? "" : ":",
+ tmp.samples[i].rawx,
+ tmp.samples[i].rawy,
+ tmp.samples[i].x,
+ tmp.samples[i].y);
+ strcat(samples, buf);
+ }
+ calibration_samples = samples;
+ }
+ }
+}
+
+static void
mouse_get_repeat(int fd)
{
struct wsmouse_repeat tmp;
- if (ioctl(fd, WSMOUSEIO_GETREPEAT, &tmp) == -1)
+ if (ioctl(fd, WSMOUSEIO_GETREPEAT, &tmp) < 0)
err(EXIT_FAILURE, "WSMOUSEIO_GETREPEAT");
if (field_by_value(&repeat.wr_buttons)->flags & FLG_GET)
@@ -132,7 +205,7 @@ mouse_put_repeat(int fd)
struct wsmouse_repeat tmp;
/* Fetch current values into the temporary structure. */
- if (ioctl(fd, WSMOUSEIO_GETREPEAT, &tmp) == -1)
+ if (ioctl(fd, WSMOUSEIO_GETREPEAT, &tmp) < 0)
err(EXIT_FAILURE, "WSMOUSEIO_GETREPEAT");
/* Overwrite the desired values in the temporary structure. */
@@ -146,7 +219,7 @@ mouse_put_repeat(int fd)
tmp.wr_delay_minimum = repeat.wr_delay_minimum;
/* Set new values for repeating events. */
- if (ioctl(fd, WSMOUSEIO_SETREPEAT, &tmp) == -1)
+ if (ioctl(fd, WSMOUSEIO_SETREPEAT, &tmp) < 0)
err(EXIT_FAILURE, "WSMOUSEIO_SETREPEAT");
/* Now print what changed. */
