specs/libX11: Fix height & width in parameter lists to be two separate entries

"unsigned int width, unsigned int height", not a single parameter "height"
of type "unsignedintwidth,".

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

8 files changed, 66 insertions, 33 deletions

diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index fdea4689..a7c81044 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -865,7 +865,8 @@ This function has been superseded by
   <paramdef>int<parameter> screen</parameter></paramdef>
   <paramdef>char*position,<parameter> *default_position</parameter></paramdef>
   <paramdef>unsignedint<parameter> bwidth</parameter></paramdef>
-  <paramdef>unsignedintfwidth,<parameter> fheight</parameter></paramdef>
+  <paramdef>unsigned int <parameter>fwidth</parameter></paramdef>
+  <paramdef>unsigned int <parameter>fheight</parameter></paramdef>
   <paramdef>intxadder,<parameter> yadder</parameter></paramdef>
   <paramdef>int*x_return,<parameter> *y_return</parameter></paramdef>
   <paramdef>int*width_return,<parameter> *height_return</parameter></paramdef>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index 95db599c..af2e0dc0 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -1258,7 +1258,8 @@ To create an unmapped window and set its window attributes, use
   <paramdef>Window<parameter> parent</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>unsignedint<parameter> border_width</parameter></paramdef>
   <paramdef>int<parameter> depth</parameter></paramdef>
   <paramdef>unsignedint<parameter> class</parameter></paramdef>
@@ -1523,7 +1524,8 @@ subwindow of a given parent window, use
   <paramdef>Window<parameter> parent</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>unsignedint<parameter> border_width</parameter></paramdef>
   <paramdef>unsignedlong<parameter> border</parameter></paramdef>
   <paramdef>unsignedlong<parameter> background</parameter></paramdef>
@@ -2744,7 +2746,8 @@ To change a window's size without changing the upper-left coordinate, use
   <funcdef><function>XResizeWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -2848,7 +2851,8 @@ To change the size and location of a window, use
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index b8e73a46..e3af18a7 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -378,7 +378,8 @@ To obtain the current geometry of a given drawable, use
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>Window<parameter> *root_return</parameter></paramdef>
   <paramdef>int*x_return,<parameter> *y_return</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
   <paramdef>unsignedint<parameter> *border_width_return</parameter></paramdef>
   <paramdef>unsignedint<parameter> *depth_return</parameter></paramdef>
 </funcprototype>
diff --git a/specs/libX11/CH05.xml b/specs/libX11/CH05.xml
index c37eaddb..ae12b968 100644
--- a/specs/libX11/CH05.xml
+++ b/specs/libX11/CH05.xml
@@ -30,7 +30,8 @@ To create a pixmap of a given size, use
   <funcdef>Pixmap <function>XCreatePixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>unsignedint<parameter> depth</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -586,8 +587,10 @@ To determine useful cursor sizes, use
   <funcdef>Status <function>XQueryBestCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
diff --git a/specs/libX11/CH07.xml b/specs/libX11/CH07.xml
index fc3f44d1..ec26f6f2 100644
--- a/specs/libX11/CH07.xml
+++ b/specs/libX11/CH07.xml
@@ -2257,8 +2257,10 @@ To obtain the best size of a tile, stipple, or cursor, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> class</parameter></paramdef>
   <paramdef>Drawable<parameter> which_screen</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -2399,8 +2401,10 @@ To obtain the best fill tile shape, use
   <funcdef>Status <function>XQueryBestTile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> which_screen</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -2505,8 +2509,10 @@ To obtain the best stipple shape, use
   <funcdef>Status <function>XQueryBestStipple</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> which_screen</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
diff --git a/specs/libX11/CH08.xml b/specs/libX11/CH08.xml
index 2fd44073..0dea739d 100644
--- a/specs/libX11/CH08.xml
+++ b/specs/libX11/CH08.xml
@@ -51,7 +51,8 @@ To clear a rectangular area of a given window, use
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>Bool<parameter> exposures</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -276,7 +277,8 @@ root and depth, use
   <paramdef>Drawablesrc,<parameter> dest</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>intsrc_x,<parameter> src_y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>intdest_x,<parameter> dest_y</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -469,7 +471,8 @@ To copy a single bit plane of a given drawable, use
   <paramdef>Drawablesrc,<parameter> dest</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>intsrc_x,<parameter> src_y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>intdest_x,<parameter> dest_y</parameter></paramdef>
   <paramdef>unsignedlong<parameter> plane</parameter></paramdef>
 </funcprototype>
@@ -1339,7 +1342,8 @@ To draw the outline of a single rectangle in a given drawable, use
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -1571,7 +1575,8 @@ To draw a single arc in a given drawable, use
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>intangle1,<parameter> angle2</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1929,7 +1934,8 @@ To fill a single rectangular area in a given drawable, use
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -2360,7 +2366,8 @@ To fill a single arc in a given drawable, use
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>intangle1,<parameter> angle2</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5385,7 +5392,8 @@ use
   <paramdef>XImage<parameter> *image</parameter></paramdef>
   <paramdef>intsrc_x,<parameter> src_y</parameter></paramdef>
   <paramdef>intdest_x,<parameter> dest_y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -5571,7 +5579,8 @@ This function specifically supports rudimentary screen dumps.
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
   <paramdef>int<parameter> format</parameter></paramdef>
 </funcprototype>
@@ -5758,7 +5767,8 @@ to a location within a preexisting image structure, use
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
   <paramdef>int<parameter> format</parameter></paramdef>
   <paramdef>XImage<parameter> *dest_image</parameter></paramdef>
diff --git a/specs/libX11/CH12.xml b/specs/libX11/CH12.xml
index 43953e16..b0e9e6f2 100644
--- a/specs/libX11/CH12.xml
+++ b/specs/libX11/CH12.xml
@@ -1767,7 +1767,8 @@ To move the pointer to an arbitrary point in a window, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Windowsrc_w,<parameter> dest_w</parameter></paramdef>
   <paramdef>intsrc_x,<parameter> src_y</parameter></paramdef>
-  <paramdef>unsignedintsrc_width,<parameter> src_height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>src_width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>src_height</parameter></paramdef>
   <paramdef>intdest_x,<parameter> dest_y</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
diff --git a/specs/libX11/CH16.xml b/specs/libX11/CH16.xml
index f8e7a12a..cb47d2a7 100644
--- a/specs/libX11/CH16.xml
+++ b/specs/libX11/CH16.xml
@@ -930,7 +930,8 @@ To parse standard window geometry strings, use
   <funcdef>int <function>XParseGeometry</function></funcdef>
   <paramdef>char<parameter> *parsestring</parameter></paramdef>
   <paramdef>int*x_return,<parameter> *y_return</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -2036,7 +2037,8 @@ To determine if a specified rectangle is inside a region, use
   <paramdef>Region<parameter> r</parameter></paramdef>
   <paramdef>int <parameter>x</parameter></paramdef>
   <paramdef>int <parameter>y</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -3281,7 +3283,8 @@ To read a bitmap from a file and store it in a pixmap, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
   <paramdef>Pixmap<parameter> *bitmap_return</parameter></paramdef>
   <paramdef>int*x_hot_return,<parameter> *y_hot_return</parameter></paramdef>
 </funcprototype>
@@ -3433,7 +3436,8 @@ To read a bitmap from a file and return it as data, use
 <funcprototype>
   <funcdef>int <function>XReadBitmapFileData</function></funcdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
-  <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+  <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
   <paramdef>unsignedchar<parameter> *data_return</parameter></paramdef>
   <paramdef>int*x_hot_return,<parameter> *y_hot_return</parameter></paramdef>
 </funcprototype>
@@ -3532,7 +3536,8 @@ To write out a bitmap from a pixmap to a file, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
   <paramdef>Pixmap<parameter> bitmap</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>intx_hot,<parameter> y_hot</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3659,7 +3664,8 @@ To create a pixmap and then store bitmap-format data into it, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>char<parameter> *data</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
   <paramdef>unsignedlongfg,<parameter> bg</parameter></paramdef>
   <paramdef>unsignedint<parameter> depth</parameter></paramdef>
 </funcprototype>
@@ -3790,7 +3796,8 @@ in a program directly, as opposed to reading it in every time at run time, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>char<parameter> *data</parameter></paramdef>
-  <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+  <paramdef>unsigned int <parameter>width</parameter></paramdef>
+  <paramdef>unsigned int <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->