Offsets: Introduce cfg->pad_xmin and ymin, and cap_get_xmin, ymin

These are going to be needed to cope properly with pads whose origins
are not at (0,0).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/include/capabilities.h b/include/capabilities.h
index 65777d38fe6a86dd999752b84ee808aba86d5f71..69affb4ca494c33309537b7d5b0a2dde7de01831 100644 (file)
--- a/include/capabilities.h
+++ b/include/capabilities.h
@@ -44,6 +44,9 @@ int get_cap_wsize(const struct Capabilities *cap);
 int get_cap_xmid(const struct Capabilities *cap);
 int get_cap_ymid(const struct Capabilities *cap);
 
+int get_cap_xmin(const struct Capabilities *cap);
+int get_cap_ymin(const struct Capabilities *cap);
+
 int get_cap_xflip(const struct Capabilities *cap, int x);
 int get_cap_yflip(const struct Capabilities *cap, int y);
 

diff --git a/include/mconfig.h b/include/mconfig.h
index 2c3c86f4fa9e2c6d8b5c06c93d21ab87888c2f3c..e14d53c2256d9a6e4c4594d47d2fc28bd6225d5e 100644 (file)
--- a/include/mconfig.h
+++ b/include/mconfig.h
@@ -97,6 +97,8 @@ struct MConfig {
        int touch_max;          // Maximum touch value.
        int pad_width;          // Width of the touchpad.
        int pad_height;         // Height of the touchpad.
+       int pad_xmin;           // Minimum x coordinate.
+       int pad_ymin;           // Minimum y coordinate.
 
        // Set by config.
        int touch_down;         // When is a finger touching? 0 - 100 (percentage)

diff --git a/src/capabilities.c b/src/capabilities.c
index 310ee0b8109cdbd0b5eeadbccc2c1c377204bf67..d95de608442bcc381729259a2adac20bb0f0a233 100644 (file)
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -151,6 +151,18 @@ int get_cap_ymid(const struct Capabilities *cap)
        return (y->maximum + y->minimum) >> 1;
 }
 
+int get_cap_xmin(const struct Capabilities *cap)
+{
+       const struct input_absinfo *x = &cap->abs[MTDEV_POSITION_X];
+       return x->minimum;
+}
+
+int get_cap_ymin(const struct Capabilities *cap)
+{
+       const struct input_absinfo *y = &cap->abs[MTDEV_POSITION_Y];
+       return y->minimum;
+}
+
 int get_cap_xflip(const struct Capabilities *cap, int x)
 {
        const struct input_absinfo *i = &cap->abs[MTDEV_POSITION_X];

diff --git a/src/mconfig.c b/src/mconfig.c
index 761b9a17d00a6c273501e0fbb96b6079b28188b7..b68c63cb1429e36a2ac03e55a38164316266ffd3 100644 (file)
--- a/src/mconfig.c
+++ b/src/mconfig.c
@@ -86,6 +86,8 @@ void mconfig_init(struct MConfig* cfg,
        cfg->touch_minor = caps->has_abs[MTDEV_TOUCH_MINOR];
        cfg->pad_width = get_cap_xsize(caps);
        cfg->pad_height = get_cap_ysize(caps);
+       cfg->pad_xmin = get_cap_xmin(caps);
+       cfg->pad_ymin = get_cap_ymin(caps);
        
        if (caps->has_abs[MTDEV_TOUCH_MAJOR] && caps->has_abs[MTDEV_WIDTH_MAJOR]) {
                cfg->touch_type = MCFG_SCALE;