This option is badly broken since the driver has lost the ability to check
for screen coordinates.
There is a need for this option, but it will have to come back as a
purely client-configured option (i.e. the client feeds the tablet
coordinates it should map to).
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
man/wacom.man | 7 -------
src/wcmValidateDevice.c | 10 ----------
src/xf86Wacom.c | 38 --------------------------------------
src/xf86WacomDefs.h | 1 -
4 files changed, 0 insertions(+), 56 deletions(-)
diff --git a/man/wacom.man b/man/wacom.man
index 153b88e..1594836 100644
--- a/man/wacom.man
+++ b/man/wacom.man
@@ -151,13 +151,6 @@ slightly depressed curve (firmer) might be "5,0,100,95";
slightly raised curve (softer) might be "0,5,95,100".
The pressure curve is only applicable to devices of type stylus or eraser,
other devices do not honor this setting.
-
-.TP 4
-.B Option \fI"KeepShape"\fP \fI"on"|"off"\fP
-When this option is enabled, the active zone begins according to TopX
-and TopY. The bottom corner is adjusted to keep the ratio width/height
-of the active zone the same as the screen while maximizing the area
-described by TopX, TopY, BottomX, BottomY.
.TP 4
.B Option \fI"DebugLevel"\fP \fI"number"\fP
sets the level of debugging info for tool-specific messages. There are 12
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 90c480d..b8b5b6a 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -582,16 +582,6 @@ int wcmParseOptions(InputInfoPtr pInfo, int hotplugged)
pInfo->name, common->wcmCursorProxoutDist);
}
- if (xf86SetBoolOption(pInfo->options, "KeepShape", 0))
- {
- /* FIXME: re-implenent KeepShape as client-configured
- * setting */
- xf86Msg(X_ERROR, "Option KeepShape is currently not
supported.\n");
-#if 0
- priv->flags |= KEEP_SHAPE_FLAG;
-#endif
- }
-
priv->topX = xf86SetIntOption(pInfo->options, "TopX", 0);
priv->topY = xf86SetIntOption(pInfo->options, "TopY", 0);
priv->bottomX = xf86SetIntOption(pInfo->options, "BottomX", 0);
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index a5fc7a2..2961841 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -90,7 +90,6 @@ static int wcmInitArea(InputInfoPtr pInfo)
WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
WacomToolAreaPtr area = priv->toolarea, inlist;
WacomCommonPtr common = priv->common;
- double screenRatio, tabletRatio;
int bottomx = priv->maxX, bottomy = priv->maxY;
DBG(10, priv, "\n");
@@ -113,43 +112,6 @@ static int wcmInitArea(InputInfoPtr pInfo)
area->bottomX = priv->bottomX;
area->bottomY = priv->bottomY;
- /* Maintain aspect ratio to the whole desktop
- * May need to consider a specific screen in multimonitor settings
- */
- if ((priv->flags & KEEP_SHAPE_FLAG) &&
- (priv->maxHeight == 0)) /* safeguard in case screen
ratio is unknown */
- {
- xf86Msg(X_WARNING,
- "%s: disabling option \"KeepShape\" as screen shape is
not accessible\n",
- pInfo->name);
- priv->flags &= ~KEEP_SHAPE_FLAG;
- }
-
- if (priv->flags & KEEP_SHAPE_FLAG)
- {
-
- screenRatio = ((double)priv->maxWidth /
(double)priv->maxHeight);
- tabletRatio = ((double)(bottomx - priv->topX) /
- (double)(bottomy - priv->topY));
-
- DBG(2, priv, "screenRatio = %.3g, "
- "tabletRatio = %.3g\n", screenRatio, tabletRatio);
-
- if (screenRatio > tabletRatio)
- {
- area->bottomX = priv->bottomX = bottomx;
- area->bottomY = priv->bottomY = (bottomy - priv->topY) *
- tabletRatio / screenRatio + priv->topY;
- }
- else
- {
- area->bottomX = priv->bottomX = (bottomx - priv->topX) *
- screenRatio / tabletRatio + priv->topX;
- area->bottomY = priv->bottomY = bottomy;
- }
- }
- /* end keep shape */
-
inlist = priv->tool->arealist;
/* The first one in the list is always valid */
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index 91adf72..3903bdc 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -174,7 +174,6 @@ struct _WacomModel
#define TabletHasFeature(common, feature) (((common)->tablet_type & (feature))
!= 0)
#define ABSOLUTE_FLAG 0x00000100
-#define KEEP_SHAPE_FLAG 0x00000200
#define BAUD_19200_FLAG 0x00000400
#define BUTTONS_ONLY_FLAG 0x00000800
--
1.7.4
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
