merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

23 files changed, 154 insertions, 326 deletions

diff --git a/man/XAllowDeviceEvents.man b/man/XAllowDeviceEvents.man
index 13eb8b5..a1f4ce6 100644
--- a/man/XAllowDeviceEvents.man
+++ b/man/XAllowDeviceEvents.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XAllDvEv.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XAllDvEv.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,15 +17,9 @@
 .SH NAME
 XAllowDeviceEvents \- release queued events
 .SH SYNTAX
-XAllowDeviceEvents\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIevent_mode\fP\^, \fItime\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      int \fIevent_mode\fP\^; 
-.br
-      Time \fItime\fP\^; 
+.HP
+int XAllowDeviceEvents\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^,
+int \fIevent_mode\fP\^, Time \fItime\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XChangeDeviceDontPropagateList.man b/man/XChangeDeviceDontPropagateList.man
index 25434da..fe89f02 100644
--- a/man/XChangeDeviceDontPropagateList.man
+++ b/man/XChangeDeviceDontPropagateList.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChProp.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChProp.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,27 +17,13 @@
 .SH NAME
 XChangeDeviceDontPropagateList, XGetDeviceDontPropagateList \- query or change the dont-propagate-list for extension devices
 .SH SYNTAX
-XChangeDeviceDontPropagateList\^(\^\fIdisplay\fP, \fIwindow\fP\^,
-\fIcount\fP\^, \fIevent_list\fP\^, \fImode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window *\fIwindow\fP\^; 
-.br
-      int *\fIcount\fP\^; 
-.br
-      XEventClass *\fIevent_list\fP\^; 
-.br
-      int \fImode\fP\^; 
-.br
-XEventClass *XGetDeviceDontPropagateList\^(\^\fIdisplay\fP, \fIwindow\fP\^, 
-\fIcount\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window *\fIwindow\fP\^; 
-.br
-      int *\fIcount\fP\^; 
+.HP
+int XChangeDeviceDontPropagateList\^(\^Display *\fIdisplay\fP\^, Window
+*\fIwindow\fP\^, int *\fIcount\fP\^, XEventClass *\fIevent_list\fP\^, int
+\fImode\fP\^); 
+.HP
+XEventClass *XGetDeviceDontPropagateList\^(\^Display *\fIdisplay\fP\^, Window
+*\fIwindow\fP\^, int *\fIcount\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XChangeKeyboardDevice.man b/man/XChangeKeyboardDevice.man
index 9a03488..643422f 100644
--- a/man/XChangeKeyboardDevice.man
+++ b/man/XChangeKeyboardDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChgKbd.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChgKbd.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,11 +17,9 @@
 .SH NAME
 XChangeKeyboardDevice \- change which device is used as the X keyboard
 .SH SYNTAX
-Status XChangeKeyboardDevice\^(\^\fIdisplay\fP, \fIdevice\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
+.HP
+Status XChangeKeyboardDevice\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^); 
 .br
 .SH ARGUMENTS
 .TP 12
diff --git a/man/XChangePointerDevice.man b/man/XChangePointerDevice.man
index 9a7da8c..759dfa2 100644
--- a/man/XChangePointerDevice.man
+++ b/man/XChangePointerDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChgPtr.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChgPtr.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,15 +17,9 @@
 .SH NAME
 XChangePointerDevice \- change which device is the X pointer
 .SH SYNTAX
-Status XChangePointerDevice\^(\^\fIdisplay\fP, \fIdevice\fP\^ \fIxaxis\fP\^, \fIyaxis\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      int \fIxaxis\fP\^; 
-.br
-      int \fIyaxis\fP\^; 
+.HP
+Status XChangePointerDevice\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, int \fIxaxis\fP\^, int \fIyaxis\fP\^); 
 .br
 .SH ARGUMENTS
 .TP 12
diff --git a/man/XDeviceBell.man b/man/XDeviceBell.man
index e5431c1..8556704 100644
--- a/man/XDeviceBell.man
+++ b/man/XDeviceBell.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XDevBell.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XDevBell.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,18 +17,9 @@
 .SH NAME
 XDeviceBell \- ring a bell on a device supported through the input extension
 .SH SYNTAX
-Status XDeviceBell\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIfeedbackclass\fP\^, \fIfeedbackid\fP\^, \fIpercent\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      XID *\fIfeedbackclass\fP\^; 
-.br
-      XID *\fIfeedbackid\fP\^; 
-.br
-      int *\fIpercent\fP\^; 
-.br
+.HP
+Status XDeviceBell\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^, XID
+*\fIfeedbackclass\fP\^, XID *\fIfeedbackid\fP\^, int *\fIpercent\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XGetDeviceControl.man b/man/XGetDeviceControl.man
index 09a39f2..bff45d3 100644
--- a/man/XGetDeviceControl.man
+++ b/man/XGetDeviceControl.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChDCtl.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChDCtl.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,25 +17,12 @@
 .SH NAME
 XGetDeviceControl, XChangeDeviceControl \- query and change input device controls
 .SH SYNTAX
-XDeviceControl *
-XGetDeviceControl\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIcontrol\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      int *\fIcontrolType\fP\^; 
-.br
-.sp 
-int XChangeDeviceControl\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIcontrolType\fP\^, \fIcontrol\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      int \fIcontrolType\fP\^; 
-.br
-      XDeviceControl *\fIcontrol\fP\^; 
+.HP
+XDeviceControl *XGetDeviceControl\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, int *\fIcontrolType\fP\^); 
+.HP
+int XChangeDeviceControl\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, int \fIcontrolType\fP\^, XDeviceControl *\fIcontrol\fP\^); 
 .SH ARGUMENTS
 .TP 15
 .I display
diff --git a/man/XGetDeviceKeyMapping.man b/man/XGetDeviceKeyMapping.man
index 26c4ff0..3bd0d66 100644
--- a/man/XGetDeviceKeyMapping.man
+++ b/man/XGetDeviceKeyMapping.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChKMap.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChKMap.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -18,23 +18,13 @@
 XGetDeviceKeyMapping, XChangeDeviceKeyMapping \- query or change device key mappings
 .SH SYNTAX
 \fB
-XChangeDeviceKeyMapping(\^\fIdisplay\fP, \fIdevice\fP, \fIfirst_keycode\fP, 
-\fIkeysyms_per_keycode\fP, \fIkeysyms\fP, \fIkeycode_count\fP\^)
-.nf
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      int \fIfirst_keycode\fP\^;
-      int \fIkeysyms_per_keycode\fP\^;
-      KeySym *\fIkeysyms\fP\^;
-      int \fIkeycode_count\fP\^;
-
-KeySym *XGetDeviceKeyMapping(\^\fIdisplay\fP, \fIdevice\fP, \fIfirst_keycode\fP, \fIkeycode_count\fP,
-\fIkeysyms_per_keycode_return\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      KeyCode \fIfirst_keycode\fP\^;
-      int \fIkeycode_count\fP\^;
-      int *\fIkeysyms_per_keycode_return\fP\^;
+int XChangeDeviceKeyMapping(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, int \fIfirst_keycode\fP\^, int \fIkeysyms_per_keycode\fP\^,
+KeySym *\fIkeysyms\fP\^, int \fIkeycode_count\fP\^); 
+.HP
+KeySym *XGetDeviceKeyMapping(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, KeyCode \fIfirst_keycode\fP\^, int \fIkeycode_count\fP\^, int
+*\fIkeysyms_per_keycode_return\fP\^); 
 .fi
 \fP
 .SH ARGUMENTS
diff --git a/man/XGetDeviceModifierMapping.man b/man/XGetDeviceModifierMapping.man
index d6e8e24..50b5b67 100644
--- a/man/XGetDeviceModifierMapping.man
+++ b/man/XGetDeviceModifierMapping.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChMMap.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChMMap.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -18,15 +18,12 @@
 XGetDeviceModifierMapping, XSetDeviceModifierMapping \- query or change device modifier mappings
 .SH SYNTAX
 \fB
-XSetDeviceModifierMapping(\^\fIdisplay\fP, \fIdevice\fP, \fImodmap\fP\^)
-.nf
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      XModifierKeymap  *\fImodmap\fP\^;
-
-XModifierKeymap *XGetDeviceModifierMapping(\^\fIdisplay\fP, \fIdevice\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
+.HP
+int XSetDeviceModifierMapping(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, XModifierKeymap  *\fImodmap\fP\^); 
+.HP
+XModifierKeymap *XGetDeviceModifierMapping(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^);
 .fi
 \fP
 .SH ARGUMENTS
diff --git a/man/XGetDeviceMotionEvents.man b/man/XGetDeviceMotionEvents.man
index f3fded0..369c279 100644
--- a/man/XGetDeviceMotionEvents.man
+++ b/man/XGetDeviceMotionEvents.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGetDvMo.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XGetDvMo.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,22 +17,11 @@
 .SH NAME
 XGetDeviceMotionEvents, XDeviceTimeCoord \- get device motion history 
 .SH SYNTAX
-XDeviceTimeCoord *XGetDeviceMotionEvents\^(\fIdisplay\fP\^, \fIdevice\fP\^,
-\fIstart\fP\^, \fIstop\fP\^,
-.br
-\fInevents_return\fP\^, \fImode_return\fP\^, \fIaxis_count_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^;
-.br
-      Time \fIstart\fP\^, \fIstop\fP\^;	
-.br
-      int *\fInevents_return\fP\^;
-.br
-      int *\fImode_return\fP\^;
-.br
-      int *\fIaxis_count_return\fP\^;
+.HP
+XDeviceTimeCoord *XGetDeviceMotionEvents\^(Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, Time \fIstart\fP\^, Time \fIstop\fP\^, int
+*\fInevents_return\fP\^, int *\fImode_return\fP\^, int
+*\fIaxis_count_return\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XGetExtensionVersion.man b/man/XGetExtensionVersion.man
index 4e3fde9..49eed2e 100644
--- a/man/XGetExtensionVersion.man
+++ b/man/XGetExtensionVersion.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGetExtV.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XGetExtV.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,11 +17,9 @@
 .SH NAME
 XGetExtensionVersion \- query the version of the input extension.
 .SH SYNTAX
-XExtensionVersion *XGetExtensionVersion\^(\^\fIdisplay\fP, \fIname\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIname\fP\^; 
+.HP
+XExtensionVersion *XGetExtensionVersion\^(\^Display *\fIdisplay\fP\^, char
+*\fIname\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XGetFeedbackControl.man b/man/XGetFeedbackControl.man
index 853d48a..cff6c8c 100644
--- a/man/XGetFeedbackControl.man
+++ b/man/XGetFeedbackControl.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChFCtl.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XChFCtl.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,25 +17,12 @@
 .SH NAME
 XGetFeedbackControl, XChangeFeedbackControl \- query and change input device feedbacks
 .SH SYNTAX
-XFeedbackState *
-XGetFeedbackControl\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fInum_feedbacks\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      int *\fInum_feedbacks\fP\^; 
-.br
-.sp 
-int XChangeFeedbackControl\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fImask\fP\^, \fIcontrol\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
-.br
-      Mask \fImask\fP\^; 
-.br
-      XFeedbackControl *\fIcontrol\fP\^; 
+.HP
+XFeedbackState *XGetFeedbackControl\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, int *\fInum_feedbacks\fP\^); 
+.HP
+int XChangeFeedbackControl\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, Mask \fImask\fP\^, XFeedbackControl *\fIcontrol\fP\^); 
 .SH ARGUMENTS
 .TP 15
 .I display
diff --git a/man/XGrabDevice.man b/man/XGrabDevice.man
index 8b6de38..e39bc0e 100644
--- a/man/XGrabDevice.man
+++ b/man/XGrabDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGrabDev.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XGrabDev.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -19,21 +19,14 @@ XGrabDevice, XUngrabDevice \- grab/release the specified extension device
 .SH SYNTAX
 .nf
 \fB
-int XGrabDevice\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIgrab_window\fP\^, \fIowner_events\fP\^, \fIevent_count\fP\^, \fIevent_list\fP\^,
-\fIthis_device_mode\fP\^, \fIother_devices_mode\fP\^, \fItime\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      Window \fIgrab_window\fP\^;
-      Bool \fIowner_events\fP\^;
-      int \fIevent_count\fP\^;
-      XEventClass *\fIevent_list\fP\^;
-      int \fIthis_device_mode\fP\^, \fIother_devices_mode\fP\^;
-      Time \fItime\fP\^;
-
-XUngrabDevice\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fItime\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      Time \fItime\fP\^;
+.HP
+int XGrabDevice\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^, Window
+\fIgrab_window\fP\^, Bool \fIowner_events\fP\^, int \fIevent_count\fP\^,
+XEventClass *\fIevent_list\fP\^, int \fIthis_device_mode\fP\^,
+int \fIother_devices_mode\fP\^, Time \fItime\fP\^); 
+.HP 
+int XUngrabDevice\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^, Time
+\fItime\fP\^); 
 .fi
 \fP
 .SH ARGUMENTS
diff --git a/man/XGrabDeviceButton.man b/man/XGrabDeviceButton.man
index 92912d2..1de8ae7 100644
--- a/man/XGrabDeviceButton.man
+++ b/man/XGrabDeviceButton.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGrDvBut.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XGrDvBut.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -19,26 +19,17 @@ XGrabDeviceButton, XUngrabDeviceButton \- grab/ungrab extension input device but
 .SH SYNTAX
 \fB
 .nf
-XGrabDeviceButton\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIbutton\fP\^, \fImodifiers\fP\^, \fImodifier_device\fP\^, \fIgrab_window\fP\^,
-\fIowner_events\fP\^, \fIevent_count\fP\^, \fIevent_list\fP\^, \fIthis_device_mode\fP\^, \fIother_devices_mode\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      unsigned int \fIbutton\fP\^;
-      unsigned int \fImodifiers\fP\^;
-      XDevice *\fImodifier_device\fP\^;
-      Window \fIgrab_window\fP\^;
-      Bool \fIowner_events\fP\^;
-      unsigned int \fIevent_count\fP\^;	
-      XEventClass *\fIevent_list\fP\^;	
-      int \fIthis_device_mode\fP\^, \fIother_devices_mode\fP\^;
-
-XUngrabDeviceButton\^(\^\fIdisplay\fP\^, \fIdevice\fP\^, \fIbutton\fP\^, \fImodifiers\fP\^, \fImodifier_device\fP\^, \fIgrab_window\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^;
-      unsigned int \fIbutton\fP\^;
-      unsigned int \fImodifiers\fP\^;
-      XDevice *\fImodifier_device\fP\^;
-      Window \fIgrab_window\fP\^;
+.HP
+int XGrabDeviceButton\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^,
+unsigned int \fIbutton\fP\^, unsigned int \fImodifiers\fP\^, XDevice
+*\fImodifier_device\fP\^, Window \fIgrab_window\fP\^, Bool
+\fIowner_events\fP\^, unsigned int \fIevent_count\fP\^, XEventClass
+*\fIevent_list\fP\^, int \fIthis_device_mode\fP\^, int
+\fIother_devices_mode\fP\^); 
+.HP
+int XUngrabDeviceButton\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^,
+unsigned int \fIbutton\fP\^, unsigned int \fImodifiers\fP\^, XDevice
+*\fImodifier_device\fP\^, Window \fIgrab_window\fP\^); 
 .fi
 \fP
 .SH ARGUMENTS
diff --git a/man/XGrabDeviceKey.man b/man/XGrabDeviceKey.man
index 12defb8..138f06b 100644
--- a/man/XGrabDeviceKey.man
+++ b/man/XGrabDeviceKey.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGrDvKey.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XGrDvKey.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,46 +17,18 @@
 .SH NAME
 XGrabDeviceKey, XUngrabDeviceKey \- grab/ungrab extension input device Keys
 .SH SYNTAX
-XGrabDeviceKey\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIKey\fP\^, \fImodifiers\fP\^, 
-\fImodifier_device\fP\^, \fIgrab_window\fP\^, \fIowner_events\fP\^, 
-.br
-\fIevent_count\fP\^, \fIevent_list\fP\^, \fIthis_device_mode\fP\^, 
-\fIother_devices_mode\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^;
-.br
-      unsigned int \fIKey\fP\^;
-.br
-      unsigned int \fImodifiers\fP\^;
-.br
-      XDevice *\fImodifier_device\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
-.br
-      Bool \fIowner_events\fP\^;
-.br
-      unsigned int \fIevent_count\fP\^;	
-.br
-      XEventClass \fIevent_list\fP\^;	
-.br
-      int \fIthis_device_mode\fP\^, \fIother_devices_mode\fP\^;
-.sp
-XUngrabDeviceKey\^(\fIdisplay\fP\^, \fIdevice\fP\^, \fIKey\fP\^, \fImodifiers\fP\^, 
-\fImodifier_device\fP\^, \fIgrab_window\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^;
-.br
-      unsigned int \fIKey\fP\^;
-.br
-      unsigned int \fImodifiers\fP\^;
-.br
-      XDevice *\fImodifier_device\fP\^;
-.br
-      Window \fIgrab_window\fP\^;
+.SP
+.HP
+int XGrabDeviceKey\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^,
+unsigned int \fIKey\fP\^, unsigned int \fImodifiers\fP\^, XDevice
+*\fImodifier_device\fP\^, Window \fIgrab_window\fP\^, Bool
+\fIowner_events\fP\^, unsigned int \fIevent_count\fP\^, XEventClass
+\fIevent_list\fP\^, int \fIthis_device_mode\fP\^, int
+\fIother_devices_mode\fP\^); 
+.HP
+int XUngrabDeviceKey\^(Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^,
+unsigned int \fIKey\fP\^, unsigned int \fImodifiers\fP\^, XDevice
+*\fImodifier_device\fP\^, Window \fIgrab_window\fP\^); 
 .SH ARGUMENTS
 .ds Bu grabbed or released
 .TP 12
diff --git a/man/XListInputDevices.man b/man/XListInputDevices.man
index 8d1f841..794b3fc 100644
--- a/man/XListInputDevices.man
+++ b/man/XListInputDevices.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XListDev.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XListDev.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,15 +17,11 @@
 .SH NAME
 XListInputDevices, XFreeDeviceList \- list available input devices
 .SH SYNTAX
-XDeviceInfo *XListInputDevices\^(\^\fIdisplay\fP, \fIndevices_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      int *\fIndevices_return\fP\^;
-.sp
-XFreeDeviceList\^(\^\fIlist\fP\^)
-.br
-      XDeviceInfo *\fIlist\fP\^;
+.HP
+XDeviceInfo *XListInputDevices\^(\^Display *\fIdisplay\fP\^, int
+*\fIndevices_return\fP\^); 
+.HP
+int XFreeDeviceList\^(\^XDeviceInfo *\fIlist\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XOpenDevice.man b/man/XOpenDevice.man
index 307b12c..2500bc9 100644
--- a/man/XOpenDevice.man
+++ b/man/XOpenDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XOpenDev.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XOpenDev.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,15 +17,10 @@
 .SH NAME
 XOpenDevice, XCloseDevice \- open or close an extension input device
 .SH SYNTAX
-\fB
-.nf
-XDevice *XOpenDevice\^(\^\fIdisplay\fP, \fIdevice_id\fP\^)
-      Display *\fIdisplay\fP\^;
-      XID \fIdevice_id\fP\^; 
-
-XCloseDevice\^(\^\fIdisplay\fP, \fIdevice\fP\^)
-      Display *\fIdisplay\fP\^;
-      XDevice *\fIdevice\fP\^; 
+.HP
+XDevice *XOpenDevice\^(\^Display *\fIdisplay\fP\^, XID \fIdevice_id\fP\^); 
+.HP
+XCloseDevice\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^); 
 .fi
 \fP
 .SH ARGUMENTS
diff --git a/man/XQueryDeviceState.man b/man/XQueryDeviceState.man
index cf90e77..9b6ca99 100644
--- a/man/XQueryDeviceState.man
+++ b/man/XQueryDeviceState.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XQueryDv.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XQueryDv.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,11 +17,8 @@
 .SH NAME
 XQueryDeviceState \- query the state of an extension input device.
 .SH SYNTAX
-XQueryDeviceState\^(\^\fIdisplay\fP, \fIdevice\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^; 
+.HP
+int XQueryDeviceState\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XSendExtensionEvent.man b/man/XSendExtensionEvent.man
index be6e14b..487c97c 100644
--- a/man/XSendExtensionEvent.man
+++ b/man/XSendExtensionEvent.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSExEvnt.man,v 1.3 2001/02/09 03:47:49 tsi Exp $
+.\" $XFree86: xc/doc/man/Xi/XSExEvnt.man,v 1.4 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,21 +17,11 @@
 .SH NAME
 XSendExtensionEvent \- send input extension events to a client
 .SH SYNTAX
-Status XSendExtensionEvent\^(\^\fIdisplay\fP, \fIdevice\fP\^, \fIdestination\fP\^, \fIpropagate\fP\^, \fIevent_count\fP\^, \fIevent_list\fP\^, \fIevent_send\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^;
-.br
-      Window \fIdestination\fP\^;
-.br
-      Bool \fIpropagate\fP\^;
-.br
-      int \fIevent_count\fP\^;
-.br
-      XEventClass *\fIevent_list\fP\^;
-.br
-      XEvent *\fIevent_send\fP\^;
+.HP
+Status XSendExtensionEvent\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, Window \fIdestination\fP\^, Bool \fIpropagate\fP\^, int
+\fIevent_count\fP\^, XEventClass *\fIevent_list\fP\^, XEvent
+*\fIevent_send\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/man/XSetDeviceButtonMapping.man b/man/XSetDeviceButtonMapping.man
index 38521b2..8ed8a3e 100644
--- a/man/XSetDeviceButtonMapping.man
+++ b/man/XSetDeviceButtonMapping.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
@@ -17,26 +17,12 @@
 .SH NAME
 XSetDeviceButtonMapping, XGetDeviceButtonMapping \- query or change device button mappings
 .SH SYNTAX
-int XSetDeviceButtonMapping\^(\^\fIdisplay\fP, \fIdevice\fP, \fImap\fP, \fInmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^;
-.br
-      unsigned char \fImap\fP\^[]\^;
-.br
-      int \fInmap\fP\^;
-.sp
-int XGetDeviceButtonMapping\^(\^\fIdisplay\fP, \fIdevice\fP, \fImap_return\fP, 
-\fInmap\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XDevice *\fIdevice\fP\^;
-.br
-      unsigned char \fImap_return\fP\^[]\^;
-.br
-      int \fInmap\fP\^;
+.HP
+int XSetDeviceButtonMapping\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, unsigned char \fImap\fP\^[]\^, int \fInmap\fP\^); 
+.HP
+int XGetDeviceButtonMapping\^(\^Display *\fIdisplay\fP\^, XDevice
+*\fIdevice\fP\^, unsigned char \fImap_return\fP\^[]\^, int \fInmap\fP\^); 
 .SH ARGUMENTS
 .TP 12
 .I display
diff --git a/src/XExtInt.c b/src/XExtInt.c
index ebd0614..09d1aa2 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.7 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.8 2003/07/07 15:34:22 eich Exp $ */
 
 /***********************************************************************
  *
@@ -196,7 +196,7 @@ _XiCheckExtInit(dpy, version_index)
 	    return (-1);
 	    }
 	((XInputData *) info->data)->vers =
-	    XGetExtensionVersion (dpy, "XInputExtension");
+	    _XiGetExtensionVersion (dpy, "XInputExtension");
 	}
 
     if (versions[version_index].major_version > Dont_Check)
diff --git a/src/XGetKMap.c b/src/XGetKMap.c
index 3ea7819..fd14050 100644
--- a/src/XGetKMap.c
+++ b/src/XGetKMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.5 2003/11/17 22:20:21 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -60,9 +60,8 @@ SOFTWARE.
 #include <X11/extensions/extutil.h>
 #include "XIint.h"
 
-KeySym 
-#if NeedFunctionPrototypes
-*XGetDeviceKeyMapping (
+KeySym *
+XGetDeviceKeyMapping (
     register	Display 	*dpy,
     XDevice			*dev,
 #if NeedWidePrototypes
@@ -72,14 +71,6 @@ KeySym
 #endif
     int				keycount,
     int				*syms_per_code)
-#else
-*XGetDeviceKeyMapping (dpy, dev, first, keycount, syms_per_code)
-    register	Display 	*dpy;
-    XDevice			*dev;
-    KeyCode			first;
-    int				keycount;
-    int				*syms_per_code;		/* RETURN */
-#endif
     {
     long nbytes;
     register KeySym *mapping = NULL;
diff --git a/src/XGetVers.c b/src/XGetVers.c
index 0672e75..fa8cf7f 100644
--- a/src/XGetVers.c
+++ b/src/XGetVers.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -60,23 +60,32 @@ SOFTWARE.
 #include <X11/extensions/extutil.h>
 #include "XIint.h"
 
-XExtensionVersion
-#if NeedFunctionPrototypes
-*XGetExtensionVersion (
+XExtensionVersion *
+XGetExtensionVersion (
+    register Display 	*dpy,
+    _Xconst char	*name)
+    {       
+    XExtensionVersion		*ext;
+
+    LockDisplay (dpy);
+    ext = _XiGetExtensionVersion (dpy, name);
+    if (ext != (XExtensionVersion *) NoSuchExtension) {
+	UnlockDisplay (dpy);
+	SyncHandle();
+    }
+    return (ext);
+    }
+
+XExtensionVersion *
+_XiGetExtensionVersion (
     register Display 	*dpy,
     _Xconst char	*name)
-#else
-*XGetExtensionVersion (dpy, name)
-    register Display 	*dpy;
-    char		*name;
-#endif
     {       
     xGetExtensionVersionReq 	*req;
     xGetExtensionVersionReply 	rep;
     XExtensionVersion		*ext;
     XExtDisplayInfo *info = XInput_find_display (dpy);
 
-    LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, Dont_Check) == -1)
 	return ((XExtensionVersion *) NoSuchExtension);
 
@@ -89,8 +98,6 @@ XExtensionVersion
 
     if (! _XReply (dpy, (xReply *) &rep, 0, xTrue)) 
 	{
-	UnlockDisplay(dpy);
-	SyncHandle();
 	return (XExtensionVersion *) NULL;
 	}
     ext = (XExtensionVersion *) Xmalloc (sizeof (XExtensionVersion));
@@ -103,8 +110,6 @@ XExtensionVersion
 	    ext->minor_version = rep.minor_version;
 	    }
 	}
-    UnlockDisplay(dpy);
-    SyncHandle();
     return (ext);
     }
 
diff --git a/src/XIint.h b/src/XIint.h
index 1e8f124..8dfe80a 100644
--- a/src/XIint.h
+++ b/src/XIint.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xi/XIint.h,v 3.1 2001/08/01 00:44:39 tsi Exp $ */
+/* $XFree86: xc/lib/Xi/XIint.h,v 3.3 2003/11/17 22:20:22 dawes Exp $ */
 
 /*
  *	XIint.h - Header definition and support file for the internal
@@ -9,16 +9,17 @@
 #define _XIINT_H_
 
 extern XExtDisplayInfo * XInput_find_display(
-#if NeedFunctionPrototypes
 	Display*
-#endif
 );
 
 extern int _XiCheckExtInit(
-#if NeedFunctionPrototypes
 	Display*,
 	int
-#endif
+);
+
+extern XExtensionVersion * _XiGetExtensionVersion(
+	Display*,
+	_Xconst char*
 );
 
 #endif