On Monday, September 6, 2010, Peter Hutterer <[email protected]> wrote:
> Input drivers are not in the business of exporting screen coordinates.
> Especially since these are likely to be incorrect in the light of RandR 1.2
> and later.
>
> Signed-off-by: Peter Hutterer <[email protected]>
> ---
> include/wacom-properties.h | 2 +-
> src/wcmXCommand.c | 15 +---
> tools/xsetwacom.c | 256
> --------------------------------------------
> 3 files changed, 2 insertions(+), 271 deletions(-)
>
> diff --git a/include/wacom-properties.h b/include/wacom-properties.h
> index f6633a1..15e0e35 100644
> --- a/include/wacom-properties.h
> +++ b/include/wacom-properties.h
> @@ -54,7 +54,7 @@
> /* 8 bit 3 values, screen number, twinview on/off, multimonitor */
> #define WACOM_PROP_DISPLAY_OPTS "Wacom Display Options"
>
> -/* 32 bit, 4 values, top x, top y, bottom x, bottom y */
> +/* DEPRECATED. DO NOT USE */
> #define WACOM_PROP_SCREENAREA "Wacom Screen Area"
Why do we still need those two defines above?
> /* 32 bit, 1 value */
> diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
> index 87669ea..1f3fcb6 100644
> --- a/src/wcmXCommand.c
> +++ b/src/wcmXCommand.c
> @@ -95,7 +95,6 @@ Atom prop_strip_buttons;
> Atom prop_wheel_buttons;
> Atom prop_display;
> Atom prop_tv_resolutions;
> -Atom prop_screen;
> Atom prop_cursorprox;
> Atom prop_capacity;
> Atom prop_threshold;
> @@ -203,12 +202,6 @@ void InitWcmDeviceProperties(InputInfoPtr pInfo)
> values[2] = priv->wcmMMonitor;
> prop_display = InitWcmAtom(pInfo->dev, WACOM_PROP_DISPLAY_OPTS, 8, 3,
> values);
Why do we still need this prop?
> - values[0] = priv->screenTopX[priv->currentScreen];
> - values[1] = priv->screenTopY[p
> X11-input-wacom-kmp-default-0.8.8_2.16.60_0.42.10-8.x86_64.rpm
> riv->currentScreen];
> - values[2] = priv->screenBottomX[priv->currentScreen];
> - values[3] = priv->screenBottomY[priv->currentScreen];
> - prop_screen = InitWcmAtom(pInfo->dev, WACOM_PROP_SCREENAREA, 32, 4,
> values);
> -
> values[0] = common->wcmCursorProxoutDist;
> prop_cursorprox = InitWcmAtom(pInfo->dev,
> WACOM_PROP_PROXIMITY_THRESHOLD, 32, 1, values);
>
> @@ -677,13 +670,7 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property,
> XIPropertyValuePtr prop,
> return wcmSetStripProperty(dev, property, prop, checkonly);
> else if (property == prop_wheel_buttons)
> return wcmSetWheelProperty(dev, property, prop, checkonly);
> - else if (property == prop_screen)
> - {
> - /* Long-term, this property should be removed, there's other
> ways to
> - * get the screen resolution. For now, we leave it in for
> backwards
> - * compat */
> - return BadValue; /* Read-only */
> - } else if (property == prop_display)
> + else if (property == prop_display)
> {
> INT8 *values;
>
> diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
> index fb6556e..6071452 100644
> --- a/tools/xsetwacom.c
> +++ b/tools/xsetwacom.c
> @@ -559,262 +559,6 @@ static param_t parameters[] =
> .prop_offset = 2,
> },
> {
> - .name = "STopX0",
> - .desc = "Screen 0 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 0,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY0",
> - .desc = "Screen 0 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 1,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX0",
> - .desc = "Screen 0 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 2,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomY0",
> - .desc = "Screen 0 bottom coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 3,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopX1",
> - .desc = "Screen 1 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 4,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY1",
> - .desc = "Screen 1 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 5,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX1",
> - .desc = "Screen 1 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 6,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomY1",
> - .desc = "Screen 1 bottom coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 7,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopX2",
> - .desc = "Screen 2 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 8,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY2",
> - .desc = "Screen 2 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 9,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX2",
> - .desc = "Screen 2 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_offset = 10,
> - .prop_format = 32,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomY2",
> - .desc = "Screen 2 bottom coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 11,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopX3",
> - .desc = "Screen 3 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 12,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY3",
> - .desc = "Screen 3 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 13,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX3",
> - .desc = "Screen 3 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 14,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomY3",
> - .desc = "Screen 3 bottom coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 15,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopX4",
> - .desc = "Screen 4 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 16,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY4",
> - .desc = "Screen 4 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 17,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX4",
> - .desc = "Screen 4 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 18,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomY4",
> - .desc = "Screen 4 bottom coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 19,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopX5",
> - .desc = "Screen 5 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 20,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY5",
> - .desc = "Screen 5 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 21,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX5",
> - .desc = "Screen 5 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 22,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomY5",
> - .desc = "Screen 5 bottom coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 23,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopX6",
> - .desc = "Screen 6 left coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 24,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "STopY6",
> - .desc = "Screen 6 top coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 25,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> - .name = "SBottomX6",
> - .desc = "Screen 6 right coordinate in pixels. ",
> - .prop_name = WACOM_PROP_SCREENAREA,
> - .prop_format = 32,
> - .prop_offset = 26,
> - .prop_flags = PROP_FLAG_READONLY
> - },
> - {
> -
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
