diff options
| author | pingc <pingc> | 2007-03-28 18:57:45 +0000 |
|---|---|---|
| committer | pingc <pingc> | 2007-03-28 18:57:45 +0000 |
| commit | 63fb0ef1f39ce9d33e27ab3c3ca282528d2d7d34 (patch) | |
| tree | 2af3dd8cee31bbebd377b456430c281345adf2e5 | |
| parent | 088dab520184d7ef2179ee598109bf0346894be4 (diff) | |
| download | xf86-input-wacom-release-0.7.7-7.tar.gz | |
Updated xsetwacom and fixed bug 1675567release-0_7_7-7release-0.7.7-7
| -rwxr-xr-x | src/util/xsetwacom.c | 12 | ||||
| -rwxr-xr-x | src/xdrv/xf86Wacom.c | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/util/xsetwacom.c b/src/util/xsetwacom.c index d03981d..b3806a2 100755 --- a/src/util/xsetwacom.c +++ b/src/util/xsetwacom.c @@ -893,12 +893,20 @@ static void DisplayValue (WACOMDEVICE *hDev, const char *devname, PARAMINFO *p, case gfXCONF: if (p->nParamID > XWACOM_PARAM_NOXOPTION) { - printf ("This %s option is only an xsetwacom command \n", p->pszParam); if (p->nParamID < XWACOM_PARAM_GETONLYPARAM) printf ("xsetwacom set %s %s \"%s\"\n", devname, p->pszParam, strval); + else + printf ("This %s option is only an xsetwacom get command \n", p->pszParam); } else - printf ("\tOption\t\"%s\"\t\"%s\"\n", p->pszParam, strval); + { + if ((p->nParamID >= XWACOM_PARAM_BUTTON1) && + (p->nParamID >= XWACOM_PARAM_STRIPRDN) && + ((value & AC_TYPE) != AC_BUTTON)) + printf ("This %s option is only an xsetwacom command \n", p->pszParam); + else + printf ("\tOption\t\"%s\"\t\"%s\"\n", p->pszParam, strval); + } break; default: if ((value & AC_TYPE) != AC_KEY) diff --git a/src/xdrv/xf86Wacom.c b/src/xdrv/xf86Wacom.c index 3467b5f..0c9055b 100755 --- a/src/xdrv/xf86Wacom.c +++ b/src/xdrv/xf86Wacom.c @@ -57,9 +57,10 @@ * 2006-11-13 47-pc0.7.7 - Updated Xinerama setup support * 2007-01-31 47-pc0.7.7-3 - multiarea support * 2007-02-09 47-pc0.7.7-5 - Support keystrokes + * 2007-03-28 47-pc0.7.7-7 - multiarea support */ -static const char identification[] = "$Identification: 47-0.7.7-5 $"; +static const char identification[] = "$Identification: 47-0.7.7-7 $"; /****************************************************************************/ |