diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:48 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:48 +0000 |
| commit | cc092d24a27fd0e70f952139cba6972f64542379 (patch) | |
| tree | 236cedb00d415482109267084d900d15a15ca42d | |
| parent | 6d1263e9ba70aa03d7bf48f20029226351d2914e (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/tek4957.man | 6 | ||||
| -rw-r--r-- | src/xf86Tek4957.c | 25 |
2 files changed, 16 insertions, 15 deletions
diff --git a/man/tek4957.man b/man/tek4957.man index 670dd83..5b2ee5a 100644 --- a/man/tek4957.man +++ b/man/tek4957.man @@ -15,14 +15,14 @@ tek4957 \- Tektronix 4957 input driver .fi .SH DESCRIPTION .B tek4957 -is an XFree86 input driver for the Tektronix 4957 tablet. +is an __xservername__ input driver for the Tektronix 4957 tablet. .PP The .B tek4957 driver functions as a pointer input device, and may be used as the X server's core pointer. .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details and for options that can be used with all input drivers. This section only covers configuration details specific to this driver. .RS 8 @@ -80,6 +80,6 @@ Y coordinate of the bottom corner of the active zone. ( Default = full scale ) .SH "BUGS / LIMITATIONS" Currently, only "Absolute" mode is supported ( Sorry ) .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). .SH AUTHORS Olivier DANET <odanet@caramail.com> diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c index 41ef830..47127c6 100644 --- a/src/xf86Tek4957.c +++ b/src/xf86Tek4957.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.3 2004/04/25 23:16:59 alanc Exp $ */ /* * Copyright 2002 by Olivier DANET <odanet@caramail.com> * @@ -21,7 +22,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.1 2002/11/11 01:18:08 alanh Exp $ */ #ifndef XFree86LOADER #include <unistd.h> @@ -589,16 +590,16 @@ TekInit(InputDriverPtr drv, local->old_y = -1; #if defined (sun) && !defined(i386) - char *dev_name; -#endif - -#if defined(sun) && !defined(i386) - if ((dev_name = getenv("TEK4957_DEV"))) { - priv->Device = xalloc(strlen(dev_name) + 1); - strcpy(priv->Device, dev_name); - xf86Msg(X_INFO,"Tek4957:Port selected : %s\n", priv->Device); - } else { - priv->Device = ""; + { + char *dev_name; + + if ((dev_name = getenv("TEK4957_DEV"))) { + priv->Device = xalloc(strlen(dev_name) + 1); + strcpy(priv->Device, dev_name); + xf86Msg(X_INFO,"Tek4957:Port selected : %s\n", priv->Device); + } else { + priv->Device = ""; + } } #else priv->Device = ""; /* device file name */ @@ -758,7 +759,7 @@ static XF86ModuleVersionInfo TekVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |