aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
Diffstat (limited to 'libX11')
-rw-r--r--libX11/modules/lc/def/lcDefConv.c38
-rw-r--r--libX11/nls/en_US.UTF-8/Compose.pre3
-rw-r--r--libX11/specs/libX11/AppC.xml6
-rw-r--r--libX11/specs/libX11/AppD.xml5
-rw-r--r--libX11/specs/libX11/CH03.xml46
-rw-r--r--libX11/specs/libX11/CH04.xml11
-rw-r--r--libX11/specs/libX11/CH05.xml17
-rw-r--r--libX11/specs/libX11/CH06.xml34
-rw-r--r--libX11/specs/libX11/CH07.xml38
-rw-r--r--libX11/specs/libX11/CH08.xml77
-rw-r--r--libX11/specs/libX11/CH09.xml3
-rw-r--r--libX11/specs/libX11/CH12.xml23
-rw-r--r--libX11/specs/libX11/CH13.xml18
-rw-r--r--libX11/specs/libX11/CH14.xml2
-rw-r--r--libX11/specs/libX11/CH16.xml47
15 files changed, 223 insertions, 145 deletions
diff --git a/libX11/modules/lc/def/lcDefConv.c b/libX11/modules/lc/def/lcDefConv.c
index e1f02289b..51ad2f8e7 100644
--- a/libX11/modules/lc/def/lcDefConv.c
+++ b/libX11/modules/lc/def/lcDefConv.c
@@ -149,14 +149,16 @@ def_mbstowcs(
XPointer *args,
int num_args)
{
- const char *src = (const char *) *from;
- wchar_t *dst = (wchar_t *) * to;
+ const char *src;
+ wchar_t *dst = (wchar_t *) *to;
State state = (State) conv->state;
int unconv = 0;
if (from == NULL || *from == NULL)
return 0;
+ src = (const char *) *from;
+
while (*from_left && *to_left) {
(*from_left)--;
if (state->MBtoWC (state, src++, dst)) {
@@ -181,7 +183,7 @@ def_wcstombs(
XPointer *args,
int num_args)
{
- const wchar_t *src = (const wchar_t *) * from;
+ const wchar_t *src;
char *dst = (char *) *to;
State state = (State) conv->state;
char ch[MB_LEN_MAX];
@@ -190,6 +192,8 @@ def_wcstombs(
if (from == NULL || *from == NULL)
return 0;
+ src = (const wchar_t *) *from;
+
while (*from_left && *to_left) {
(*from_left)--;
if (state->WCtoMB (state, *src++, ch)) {
@@ -214,7 +218,7 @@ mbstostr(
XPointer *args,
int num_args)
{
- const char *src = (const char *) *from;
+ const char *src;
char *dst = (char *) *to;
CodeSet codeset;
State state = (State) conv->state;
@@ -224,6 +228,8 @@ mbstostr(
if (from == NULL || *from == NULL)
return 0;
+ src = (const char *) *from;
+
while (*from_left && *to_left) {
ch = *src++;
(*from_left)--;
@@ -251,7 +257,7 @@ wcstostr(
XPointer *args,
int num_args)
{
- const wchar_t *src = (const wchar_t *) *from;
+ const wchar_t *src;
char *dst = (char *) *to;
CodeSet codeset;
State state = (State) conv->state;
@@ -261,6 +267,8 @@ wcstostr(
if (from == NULL || *from == NULL)
return 0;
+ src = (const wchar_t *) *from;
+
while (*from_left && *to_left) {
(*from_left)--;
if (state->WCtoMB (state, *src++, ch)) {
@@ -290,7 +298,7 @@ mbstocs(
XPointer *args,
int num_args)
{
- const char *src = (const char *) *from;
+ const char *src;
char *dst = (char *) *to;
int length;
State state = (State) conv->state;
@@ -300,6 +308,7 @@ mbstocs(
if (from == NULL || *from == NULL)
return 0;
+ src = (const char *) *from;
length = min(*from_left, *to_left);
cur_side = *src & GR;
@@ -336,7 +345,7 @@ wcstocs(
XPointer *args,
int num_args)
{
- const wchar_t *src = (const wchar_t *) * from;
+ const wchar_t *src;
char *dst = (char *) *to;
State state = (State) conv->state;
char cur_side = 0, ch[MB_LEN_MAX];
@@ -346,6 +355,8 @@ wcstocs(
if (from == NULL || *from == NULL)
return 0;
+ src = (const wchar_t *) *from;
+
while (*from_left) {
if ((found = state->WCtoMB (state, *src, ch)))
break;
@@ -398,7 +409,7 @@ cstombs(
XPointer *args,
int num_args)
{
- const char *src = (const char *) *from;
+ const char *src;
char *dst = (char *) *to;
CodeSet codeset;
XlcCharSet charset;
@@ -410,6 +421,8 @@ cstombs(
if (from == NULL || *from == NULL)
return 0;
+ src = (const char *) *from;
+
if (num_args > 0) {
charset = (XlcCharSet) args[0];
if (charset == NULL)
@@ -467,8 +480,8 @@ cstowcs(
XPointer *args,
int num_args)
{
- const char *src = (const char *) *from;
- wchar_t *dst = (wchar_t *) * to;
+ const char *src;
+ wchar_t *dst = (wchar_t *) *to;
CodeSet codeset;
XlcCharSet charset;
State state = (State) conv->state;
@@ -479,6 +492,8 @@ cstowcs(
if (from == NULL || *from == NULL)
return 0;
+ src = (const char *) *from;
+
if (num_args > 0) {
charset = (XlcCharSet) args[0];
if (charset == NULL)
@@ -539,13 +554,14 @@ strtombs(
XPointer *args,
int num_args)
{
- const char *src = (const char *) *from;
+ const char *src;
char *dst = (char *) *to;
int length;
if (from == NULL || *from == NULL)
return 0;
+ src = (const char *) *from;
length = min(*from_left, *to_left);
while (length) {
*dst++ = *src++;
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index 068a3d305..23829b4cc 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -275,6 +275,9 @@ XCOMM Other symbols
<Multi_key> <colon> <parenright> : "☺" U263A # WHITE SMILING FACE
<Multi_key> <colon> <parenleft> : "☹" U2639 # WHITE FROWNING FACE
+<Multi_key> <F> <U> : "🖕" U1F595 # REVERSED HAND WITH MIDDLE FINGER EXTENDED
+<Multi_key> <L> <L> <A> <P> : "🖖" U1F596 # RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+
XCOMM Part 2
XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically
diff --git a/libX11/specs/libX11/AppC.xml b/libX11/specs/libX11/AppC.xml
index 0b37048f1..7f4904c91 100644
--- a/libX11/specs/libX11/AppC.xml
+++ b/libX11/specs/libX11/AppC.xml
@@ -3056,7 +3056,7 @@ critical section:
<funcprototype>
<funcdef>char *<function>_XAllocScratch</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedlong<parameter> nbytes</parameter></paramdef>
+ <paramdef>unsigned long <parameter> nbytes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3113,7 +3113,7 @@ critical sections:
<funcprototype>
<funcdef>char *<function>_XAllocTemp</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedlong<parameter> nbytes</parameter></paramdef>
+ <paramdef>unsigned long <parameter> nbytes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3153,7 +3153,7 @@ The following function returns the storage:
<funcdef>void <function>_XFreeTemp</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>char<parameter> *buf</parameter></paramdef>
- <paramdef>unsignedlong<parameter> nbytes</parameter></paramdef>
+ <paramdef>unsigned long <parameter> nbytes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
diff --git a/libX11/specs/libX11/AppD.xml b/libX11/specs/libX11/AppD.xml
index fdea46894..83837970f 100644
--- a/libX11/specs/libX11/AppD.xml
+++ b/libX11/specs/libX11/AppD.xml
@@ -864,8 +864,9 @@ This function has been superseded by
<paramdef>Display<parameter> *display</parameter></paramdef>
<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> bwidth</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/libX11/specs/libX11/CH03.xml b/libX11/specs/libX11/CH03.xml
index 4e599da3b..d003717ab 100644
--- a/libX11/specs/libX11/CH03.xml
+++ b/libX11/specs/libX11/CH03.xml
@@ -1256,13 +1256,15 @@ To create an unmapped window and set its window attributes, use
<funcdef>Window <function>XCreateWindow</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> parent</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
- <paramdef>unsignedint<parameter> border_width</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
+ <paramdef>unsigned int <parameter> border_width</parameter></paramdef>
<paramdef>int<parameter> depth</parameter></paramdef>
- <paramdef>unsignedint<parameter> class</parameter></paramdef>
+ <paramdef>unsigned int <parameter> class</parameter></paramdef>
<paramdef>Visual<parameter> *visual</parameter></paramdef>
- <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> valuemask</parameter></paramdef>
<paramdef>XSetWindowAttributes<parameter> *attributes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -1520,11 +1522,13 @@ subwindow of a given parent window, use
<funcdef>Window <function>XCreateSimpleWindow</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> parent</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
- <paramdef>unsignedint<parameter> border_width</parameter></paramdef>
- <paramdef>unsignedlong<parameter> border</parameter></paramdef>
- <paramdef>unsignedlong<parameter> background</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
+ <paramdef>unsigned int <parameter> border_width</parameter></paramdef>
+ <paramdef>unsigned long <parameter> border</parameter></paramdef>
+ <paramdef>unsigned long <parameter> background</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2535,7 +2539,7 @@ To configure a window's size, location, stacking, or border, use
<funcdef><function>XConfigureWindow</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>unsignedint<parameter> value_mask</parameter></paramdef>
+ <paramdef>unsigned int <parameter> value_mask</parameter></paramdef>
<paramdef>XWindowChanges<parameter> *values</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -2640,7 +2644,8 @@ To move a window without changing its size, use
<funcdef><function>XMoveWindow</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2741,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 -->
@@ -2843,8 +2849,10 @@ To change the size and location of a window, use
<funcdef><function>XMoveResizeWindow</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2962,7 +2970,7 @@ To change the border width of a given window, use
<funcdef><function>XSetWindowBorderWidth</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>unsignedint<parameter> width</parameter></paramdef>
+ <paramdef>unsigned int <parameter> width</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3504,7 +3512,7 @@ To change one or more attributes for a given window, use
<funcdef><function>XChangeWindowAttributes</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> valuemask</parameter></paramdef>
<paramdef>XSetWindowAttributes<parameter> *attributes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -3662,7 +3670,7 @@ To set the background of a window to a given pixel, use
<funcdef><function>XSetWindowBackground</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>unsignedlong<parameter> background_pixel</parameter></paramdef>
+ <paramdef>unsigned long <parameter> background_pixel</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3831,7 +3839,7 @@ To change and repaint a window's border to a given pixel, use
<funcdef><function>XSetWindowBorder</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>unsignedlong<parameter> border_pixel</parameter></paramdef>
+ <paramdef>unsigned long <parameter> border_pixel</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml
index b8e73a469..a147b1848 100644
--- a/libX11/specs/libX11/CH04.xml
+++ b/libX11/specs/libX11/CH04.xml
@@ -49,7 +49,7 @@ a given window, use
<paramdef>Window<parameter> *root_return</parameter></paramdef>
<paramdef>Window<parameter> *parent_return</parameter></paramdef>
<paramdef>Window<parameter> **children_return</parameter></paramdef>
- <paramdef>unsignedint<parameter> *nchildren_return</parameter></paramdef>
+ <paramdef>unsigned int <parameter> *nchildren_return</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -378,9 +378,10 @@ 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>unsignedint<parameter> *border_width_return</parameter></paramdef>
- <paramdef>unsignedint<parameter> *depth_return</parameter></paramdef>
+ <paramdef>unsigned int <parameter>*width_return</parameter></paramdef>
+ <paramdef>unsigned int <parameter>*height_return</parameter></paramdef>
+ <paramdef>unsigned int <parameter> *border_width_return</parameter></paramdef>
+ <paramdef>unsigned int <parameter> *depth_return</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -673,7 +674,7 @@ or to determine the pointer coordinates relative to a specified window, use
<paramdef>Window*root_return,<parameter> *child_return</parameter></paramdef>
<paramdef>int*root_x_return,<parameter> *root_y_return</parameter></paramdef>
<paramdef>int*win_x_return,<parameter> *win_y_return</parameter></paramdef>
- <paramdef>unsignedint<parameter> *mask_return</parameter></paramdef>
+ <paramdef>unsigned int <parameter> *mask_return</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
diff --git a/libX11/specs/libX11/CH05.xml b/libX11/specs/libX11/CH05.xml
index c37eaddb8..a2fa8f739 100644
--- a/libX11/specs/libX11/CH05.xml
+++ b/libX11/specs/libX11/CH05.xml
@@ -30,8 +30,9 @@ 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>unsignedint<parameter> depth</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
+ <paramdef>unsigned int <parameter> depth</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -231,7 +232,7 @@ To create a cursor from the standard cursor font, use
<funcprototype>
<funcdef>Cursor <function>XCreateFontCursor</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedint<parameter> shape</parameter></paramdef>
+ <paramdef>unsigned int <parameter> shape</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -300,7 +301,7 @@ To create a cursor from font glyphs, use
<funcdef>Cursor <function>XCreateGlyphCursor</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Fontsource_font,<parameter> mask_font</parameter></paramdef>
- <paramdef>unsignedintsource_char,<parameter> mask_char</parameter></paramdef>
+ <paramdef>unsigned int source_char,<parameter> mask_char</parameter></paramdef>
<paramdef>XColor<parameter> *foreground_color</parameter></paramdef>
<paramdef>XColor<parameter> *background_color</parameter></paramdef>
</funcprototype>
@@ -442,7 +443,7 @@ use
<paramdef>Pixmap<parameter> mask</parameter></paramdef>
<paramdef>XColor<parameter> *foreground_color</parameter></paramdef>
<paramdef>XColor<parameter> *background_color</parameter></paramdef>
- <paramdef>unsignedintx,<parameter> y</parameter></paramdef>
+ <paramdef>unsigned int x,<parameter> y</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -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/libX11/specs/libX11/CH06.xml b/libX11/specs/libX11/CH06.xml
index a82a5e231..4f10019ac 100644
--- a/libX11/specs/libX11/CH06.xml
+++ b/libX11/specs/libX11/CH06.xml
@@ -1915,10 +1915,10 @@ model, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Colormap<parameter> colormap</parameter></paramdef>
<paramdef>Bool<parameter> contig</parameter></paramdef>
- <paramdef>unsignedlong<parameter> plane_masks_return[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> nplanes</parameter></paramdef>
- <paramdef>unsignedlong<parameter> pixels_return[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> npixels</parameter></paramdef>
+ <paramdef>unsigned long <parameter> plane_masks_return[]</parameter></paramdef>
+ <paramdef>unsigned int <parameter> nplanes</parameter></paramdef>
+ <paramdef>unsigned long <parameter> pixels_return[]</parameter></paramdef>
+ <paramdef>unsigned int <parameter> npixels</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2069,10 +2069,10 @@ model, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Colormap<parameter> colormap</parameter></paramdef>
<paramdef>Bool<parameter> contig</parameter></paramdef>
- <paramdef>unsignedlong<parameter> pixels_return[]</parameter></paramdef>
+ <paramdef>unsigned long <parameter> pixels_return[]</parameter></paramdef>
<paramdef>int<parameter> ncolors</parameter></paramdef>
<paramdef>intnreds,ngreens,<parameter> nblues</parameter></paramdef>
- <paramdef>unsignedlong*rmask_return,*gmask_return,<parameter> *bmask_return</parameter></paramdef>
+ <paramdef>unsigned long *rmask_return,*gmask_return,<parameter> *bmask_return</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2270,9 +2270,9 @@ To free colormap cells, use
<funcdef><function>XFreeColors</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Colormap<parameter> colormap</parameter></paramdef>
- <paramdef>unsignedlong<parameter> pixels[]</parameter></paramdef>
+ <paramdef>unsigned long <parameter> pixels[]</parameter></paramdef>
<paramdef>int<parameter> npixels</parameter></paramdef>
- <paramdef>unsignedlong<parameter> planes</parameter></paramdef>
+ <paramdef>unsigned long <parameter> planes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2866,7 +2866,7 @@ To store a color specified by name in a single colormap cell, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Colormap<parameter> colormap</parameter></paramdef>
<paramdef>char<parameter> *color</parameter></paramdef>
- <paramdef>unsignedlong<parameter> pixel</parameter></paramdef>
+ <paramdef>unsigned long <parameter> pixel</parameter></paramdef>
<paramdef>int<parameter> flags</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -3249,7 +3249,7 @@ To query the color of multiple colormap cells in an arbitrary format, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Colormap<parameter> colormap</parameter></paramdef>
<paramdef>XcmsColor<parameter> colors_in_out[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> ncolors</parameter></paramdef>
+ <paramdef>unsigned int <parameter> ncolors</parameter></paramdef>
<paramdef>XcmsColorFormat<parameter> result_format</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -4186,7 +4186,7 @@ to a single destination format, use
<funcdef>Status <function>XcmsConvertColors</function></funcdef>
<paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
<paramdef>XcmsColor<parameter> colors_in_out[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> ncolors</parameter></paramdef>
+ <paramdef>unsigned int <parameter> ncolors</parameter></paramdef>
<paramdef>XcmsColorFormat<parameter> target_format</parameter></paramdef>
<paramdef>Bool<parameter> compression_flags_return[]</parameter></paramdef>
</funcprototype>
@@ -4330,8 +4330,8 @@ following:
<funcdef>typedef Status<function>(*XcmsCompressionProc</function>)</funcdef>
<paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
<paramdef>XcmsColor<parameter> colors_in_out[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> ncolors</parameter></paramdef>
- <paramdef>unsignedint<parameter> index</parameter></paramdef>
+ <paramdef>unsigned int <parameter> ncolors</parameter></paramdef>
+ <paramdef>unsigned int <parameter> index</parameter></paramdef>
<paramdef>Bool<parameter> compression_flags_return[]</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -4660,7 +4660,7 @@ The white point adjustment procedure interface must adhere to the following:
<paramdef>XcmsColor<parameter> *target_white_point</parameter></paramdef>
<paramdef>XcmsColorFormat<parameter> target_format</parameter></paramdef>
<paramdef>XcmsColor<parameter> colors_in_out[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> ncolors</parameter></paramdef>
+ <paramdef>unsigned int <parameter> ncolors</parameter></paramdef>
<paramdef>Bool<parameter> compression_flags_return[]</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -6273,7 +6273,7 @@ Chroma at which the maximum Values are reached, use
<paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
<paramdef>XcmsFloat<parameter> hue</parameter></paramdef>
<paramdef>XcmsColor<parameter> colors_return[]</parameter></paramdef>
- <paramdef>unsignedint<parameter> nsamples</parameter></paramdef>
+ <paramdef>unsigned int <parameter> nsamples</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -6813,7 +6813,7 @@ following software interface specification:
<paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
<paramdef>XcmsColor<parameter> *white_point</parameter></paramdef>
<paramdef>XcmsColor<parameter> *colors_in_out</parameter></paramdef>
- <paramdef>unsignedint<parameter> ncolors</parameter></paramdef>
+ <paramdef>unsigned int <parameter> ncolors</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -6881,7 +6881,7 @@ following software interface specification:
<funcdef>Status <function><replaceable>ConversionProc</replaceable></function></funcdef>
<paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
<paramdef>XcmsColor<parameter> *colors_in_out</parameter></paramdef>
- <paramdef>unsignedint<parameter> ncolors</parameter></paramdef>
+ <paramdef>unsigned int <parameter> ncolors</parameter></paramdef>
<paramdef>Bool<parameter> compression_flags_return[]</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/libX11/specs/libX11/CH07.xml b/libX11/specs/libX11/CH07.xml
index fc3f44d18..28cc8791c 100644
--- a/libX11/specs/libX11/CH07.xml
+++ b/libX11/specs/libX11/CH07.xml
@@ -971,7 +971,7 @@ depth of drawable, use
<funcdef>GC <function>XCreateGC</function></funcdef>
<paramdef>Display <parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
- <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> valuemask</parameter></paramdef>
<paramdef>XGCValues *<parameter>values</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -1059,7 +1059,7 @@ To copy components from a source GC to a destination GC, use
<funcdef><function>XCopyGC</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GCsrc,<parameter> dest</parameter></paramdef>
- <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> valuemask</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1145,7 +1145,7 @@ To change the components in a given GC, use
<funcdef><function>XChangeGC</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> valuemask</parameter></paramdef>
<paramdef>XGCValues<parameter> *values</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -1241,7 +1241,7 @@ To obtain components of a given GC, use
<funcdef>Status <function>XGetGCValues</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> valuemask</parameter></paramdef>
<paramdef>XGCValues<parameter> *values_return</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -1536,9 +1536,9 @@ for a given GC, use
<funcdef><function>XSetState</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedlongforeground,<parameter> background</parameter></paramdef>
+ <paramdef>unsigned long foreground,<parameter> background</parameter></paramdef>
<paramdef>int<parameter> function</parameter></paramdef>
- <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> plane_mask</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1629,7 +1629,7 @@ To set the foreground of a given GC, use
<funcdef><function>XSetForeground</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedlong<parameter> foreground</parameter></paramdef>
+ <paramdef>unsigned long <parameter> foreground</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1688,7 +1688,7 @@ To set the background of a given GC, use
<funcdef><function>XSetBackground</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedlong<parameter> background</parameter></paramdef>
+ <paramdef>unsigned long <parameter> background</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1807,7 +1807,7 @@ To set the plane mask of a given GC, use
<funcdef><function>XSetPlaneMask</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> plane_mask</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1872,7 +1872,7 @@ To set the line drawing components of a given GC, use
<funcdef><function>XSetLineAttributes</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>unsignedint<parameter> line_width</parameter></paramdef>
+ <paramdef>unsigned int <parameter> line_width</parameter></paramdef>
<paramdef>int<parameter> line_style</parameter></paramdef>
<paramdef>int<parameter> cap_style</parameter></paramdef>
<paramdef>int<parameter> join_style</parameter></paramdef>
@@ -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/libX11/specs/libX11/CH08.xml b/libX11/specs/libX11/CH08.xml
index fb76c84d8..cdf4df87b 100644
--- a/libX11/specs/libX11/CH08.xml
+++ b/libX11/specs/libX11/CH08.xml
@@ -49,8 +49,10 @@ To clear a rectangular area of a given window, use
<funcdef><function>XClearArea</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
<paramdef>Bool<parameter> exposures</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -275,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>
@@ -468,9 +471,10 @@ 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>
+ <paramdef>unsigned long <parameter> plane</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -770,7 +774,8 @@ To draw a single point in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1335,8 +1340,10 @@ To draw the outline of a single rectangle in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -1566,8 +1573,10 @@ To draw a single arc in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
<paramdef>intangle1,<parameter> angle2</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -1923,8 +1932,10 @@ To fill a single rectangular area in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2353,8 +2364,10 @@ To fill a single arc in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
<paramdef>intangle1,<parameter> angle2</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -3285,7 +3298,7 @@ To return a given font property, use
<funcdef>Bool <function>XGetFontProperty</function></funcdef>
<paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
<paramdef>Atom<parameter> atom</parameter></paramdef>
- <paramdef>unsignedlong<parameter> *value_return</parameter></paramdef>
+ <paramdef>unsigned long <parameter> *value_return</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -4481,7 +4494,8 @@ To draw 8-bit characters in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>XTextItem<parameter> *items</parameter></paramdef>
<paramdef>int<parameter> nitems</parameter></paramdef>
</funcprototype>
@@ -4576,7 +4590,8 @@ To draw 2-byte characters in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>XTextItem16<parameter> *items</parameter></paramdef>
<paramdef>int<parameter> nitems</parameter></paramdef>
</funcprototype>
@@ -4831,7 +4846,8 @@ To draw 2-byte characters in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>XChar2b<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> length</parameter></paramdef>
</funcprototype>
@@ -4974,7 +4990,8 @@ To draw 8-bit image text characters in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>char<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> length</parameter></paramdef>
</funcprototype>
@@ -5069,7 +5086,8 @@ To draw 2-byte image text characters in a given drawable, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>XChar2b<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> length</parameter></paramdef>
</funcprototype>
@@ -5374,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 -->
@@ -5558,9 +5577,11 @@ This function specifically supports rudimentary screen dumps.
<funcdef>XImage *<function>XGetImage</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
- <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
+ <paramdef>unsigned long <parameter> plane_mask</parameter></paramdef>
<paramdef>int<parameter> format</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -5744,9 +5765,11 @@ to a location within a preexisting image structure, use
<funcdef>XImage *<function>XGetSubImage</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
- <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
+ <paramdef>unsigned long <parameter> plane_mask</parameter></paramdef>
<paramdef>int<parameter> format</parameter></paramdef>
<paramdef>XImage<parameter> *dest_image</parameter></paramdef>
<paramdef>intdest_x,<parameter> dest_y</parameter></paramdef>
diff --git a/libX11/specs/libX11/CH09.xml b/libX11/specs/libX11/CH09.xml
index d5d93d0a0..6be5285e1 100644
--- a/libX11/specs/libX11/CH09.xml
+++ b/libX11/specs/libX11/CH09.xml
@@ -42,7 +42,8 @@ There is no way to move a window between screens.
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
<paramdef>Window<parameter> parent</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int<parameter> x</parameter></paramdef>
+ <paramdef>int<parameter> y</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
diff --git a/libX11/specs/libX11/CH12.xml b/libX11/specs/libX11/CH12.xml
index 43953e16b..42ceb1315 100644
--- a/libX11/specs/libX11/CH12.xml
+++ b/libX11/specs/libX11/CH12.xml
@@ -166,7 +166,7 @@ To grab the pointer, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> grab_window</parameter></paramdef>
<paramdef>Bool<parameter> owner_events</parameter></paramdef>
- <paramdef>unsignedint<parameter> event_mask</parameter></paramdef>
+ <paramdef>unsigned int <parameter> event_mask</parameter></paramdef>
<paramdef>intpointer_mode,<parameter> keyboard_mode</parameter></paramdef>
<paramdef>Window<parameter> confine_to</parameter></paramdef>
<paramdef>Cursor<parameter> cursor</parameter></paramdef>
@@ -498,7 +498,7 @@ To change an active pointer grab, use
<funcprototype>
<funcdef><function>XChangeActivePointerGrab</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedint<parameter> event_mask</parameter></paramdef>
+ <paramdef>unsigned int <parameter> event_mask</parameter></paramdef>
<paramdef>Cursor<parameter> cursor</parameter></paramdef>
<paramdef>Time<parameter> time</parameter></paramdef>
</funcprototype>
@@ -586,11 +586,11 @@ To grab a pointer button, use
<funcprototype>
<funcdef><function>XGrabButton</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedint<parameter> button</parameter></paramdef>
- <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
+ <paramdef>unsigned int <parameter> button</parameter></paramdef>
+ <paramdef>unsigned int <parameter> modifiers</parameter></paramdef>
<paramdef>Window<parameter> grab_window</parameter></paramdef>
<paramdef>Bool<parameter> owner_events</parameter></paramdef>
- <paramdef>unsignedint<parameter> event_mask</parameter></paramdef>
+ <paramdef>unsigned int <parameter> event_mask</parameter></paramdef>
<paramdef>intpointer_mode,<parameter> keyboard_mode</parameter></paramdef>
<paramdef>Window<parameter> confine_to</parameter></paramdef>
<paramdef>Cursor<parameter> cursor</parameter></paramdef>
@@ -829,8 +829,8 @@ To ungrab a pointer button, use
<funcprototype>
<funcdef><function>XUngrabButton</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedint<parameter> button</parameter></paramdef>
- <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
+ <paramdef>unsigned int <parameter> button</parameter></paramdef>
+ <paramdef>unsigned int <parameter> modifiers</parameter></paramdef>
<paramdef>Window<parameter> grab_window</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -1205,7 +1205,7 @@ To passively grab a single key of the keyboard, use
<funcdef><function>XGrabKey</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>int<parameter> keycode</parameter></paramdef>
- <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
+ <paramdef>unsigned int <parameter> modifiers</parameter></paramdef>
<paramdef>Window<parameter> grab_window</parameter></paramdef>
<paramdef>Bool<parameter> owner_events</parameter></paramdef>
<paramdef>intpointer_mode,<parameter> keyboard_mode</parameter></paramdef>
@@ -1409,7 +1409,7 @@ To ungrab a key, use
<funcdef><function>XUngrabKey</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>int<parameter> keycode</parameter></paramdef>
- <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
+ <paramdef>unsigned int <parameter> modifiers</parameter></paramdef>
<paramdef>Window<parameter> grab_window</parameter></paramdef>
</funcprototype>
</funcsynopsis>
@@ -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>
@@ -2328,7 +2329,7 @@ If an error is generated, a subset of the controls may have been altered.
<funcprototype>
<funcdef><function>XChangeKeyboardControl</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
- <paramdef>unsignedlong<parameter> value_mask</parameter></paramdef>
+ <paramdef>unsigned long <parameter> value_mask</parameter></paramdef>
<paramdef>XKeyboardControl<parameter> *values</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/libX11/specs/libX11/CH13.xml b/libX11/specs/libX11/CH13.xml
index 096d86097..a471caaa9 100644
--- a/libX11/specs/libX11/CH13.xml
+++ b/libX11/specs/libX11/CH13.xml
@@ -3555,7 +3555,8 @@ or
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>XmbTextItem<parameter> *items</parameter></paramdef>
<paramdef>int<parameter> nitems</parameter></paramdef>
</funcprototype>
@@ -3567,7 +3568,8 @@ or
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>XwcTextItem<parameter> *items</parameter></paramdef>
<paramdef>int<parameter> nitems</parameter></paramdef>
</funcprototype>
@@ -3707,7 +3709,8 @@ or
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>XFontSet<parameter> font_set</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>char<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> num_bytes</parameter></paramdef>
</funcprototype>
@@ -3720,7 +3723,8 @@ or
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>XFontSet<parameter> font_set</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>wchar_t<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> num_wchars</parameter></paramdef>
</funcprototype>
@@ -3853,7 +3857,8 @@ or
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>XFontSet<parameter> font_set</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>char<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> num_bytes</parameter></paramdef>
</funcprototype>
@@ -3866,7 +3871,8 @@ or
<paramdef>Drawable<parameter> d</parameter></paramdef>
<paramdef>XFontSet<parameter> font_set</parameter></paramdef>
<paramdef>GC<parameter> gc</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
<paramdef>wchar_t<parameter> *string</parameter></paramdef>
<paramdef>int<parameter> num_wchars</parameter></paramdef>
</funcprototype>
diff --git a/libX11/specs/libX11/CH14.xml b/libX11/specs/libX11/CH14.xml
index d7bbf5e67..678f979c4 100644
--- a/libX11/specs/libX11/CH14.xml
+++ b/libX11/specs/libX11/CH14.xml
@@ -419,7 +419,7 @@ To request that a top-level window be reconfigured, use
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Window<parameter> w</parameter></paramdef>
<paramdef>int<parameter> screen_number</parameter></paramdef>
- <paramdef>unsignedint<parameter> value_mask</parameter></paramdef>
+ <paramdef>unsigned int <parameter> value_mask</parameter></paramdef>
<paramdef>XWindowChanges<parameter> *values</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/libX11/specs/libX11/CH16.xml b/libX11/specs/libX11/CH16.xml
index 790cb0118..7253722bc 100644
--- a/libX11/specs/libX11/CH16.xml
+++ b/libX11/specs/libX11/CH16.xml
@@ -895,7 +895,7 @@ To allocate some memory you will never give back, use
<funcsynopsis id='Xpermalloc'>
<funcprototype>
<funcdef>char *<function>Xpermalloc</function></funcdef>
- <paramdef>unsignedint<parameter> size</parameter></paramdef>
+ <paramdef>unsigned int <parameter> size</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -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 -->
@@ -1066,7 +1067,7 @@ To construct a window's geometry information, use
<paramdef>int<parameter> screen</parameter></paramdef>
<paramdef>char<parameter> *user_geom</parameter></paramdef>
<paramdef>char<parameter> *def_geom</parameter></paramdef>
- <paramdef>unsignedint<parameter> bwidth</parameter></paramdef>
+ <paramdef>unsigned int <parameter> bwidth</parameter></paramdef>
<paramdef>XSizeHints<parameter> *hints</parameter></paramdef>
<paramdef>int*x_return,<parameter> *y_return</parameter></paramdef>
<paramdef>int<parameter> *width_return</parameter></paramdef>
@@ -1975,7 +1976,8 @@ To determine if a specified point resides in a specified region, use
<funcprototype>
<funcdef>Bool <function>XPointInRegion</function></funcdef>
<paramdef>Region<parameter> r</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2033,8 +2035,10 @@ To determine if a specified rectangle is inside a region, use
<funcprototype>
<funcdef>int <function>XRectInRegion</function></funcdef>
<paramdef>Region<parameter> r</parameter></paramdef>
- <paramdef>intx,<parameter> y</parameter></paramdef>
- <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
+ <paramdef>int <parameter>x</parameter></paramdef>
+ <paramdef>int <parameter>y</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -2740,12 +2744,12 @@ structure and initialize it with image format values from a display, use
<funcdef>XImage *<function>XCreateImage</function></funcdef>
<paramdef>Display<parameter> *display</parameter></paramdef>
<paramdef>Visual<parameter> *visual</parameter></paramdef>
- <paramdef>unsignedint<parameter> depth</parameter></paramdef>
+ <paramdef>unsigned int <parameter> depth</parameter></paramdef>
<paramdef>int<parameter> format</parameter></paramdef>
<paramdef>int<parameter> offset</parameter></paramdef>
<paramdef>char<parameter> *data</parameter></paramdef>
- <paramdef>unsignedint<parameter> width</parameter></paramdef>
- <paramdef>unsignedint<parameter> height</parameter></paramdef>
+ <paramdef>unsigned int <parameter> width</parameter></paramdef>
+ <paramdef>unsigned int <parameter> height</parameter></paramdef>
<paramdef>int<parameter> bitmap_pad</parameter></paramdef>
<paramdef>int<parameter> bytes_per_line</parameter></paramdef>
</funcprototype>
@@ -2985,7 +2989,7 @@ To set a pixel value in an image, use
<paramdef>XImage<parameter> *ximage</parameter></paramdef>
<paramdef>int<parameter> x</parameter></paramdef>
<paramdef>int<parameter> y</parameter></paramdef>
- <paramdef>unsignedlong<parameter> pixel</parameter></paramdef>
+ <paramdef>unsigned long <parameter> pixel</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3057,8 +3061,8 @@ To create a subimage, use
<paramdef>XImage<parameter> *ximage</parameter></paramdef>
<paramdef>int<parameter> x</parameter></paramdef>
<paramdef>int<parameter> y</parameter></paramdef>
- <paramdef>unsignedint<parameter> subimage_width</parameter></paramdef>
- <paramdef>unsignedint<parameter> subimage_height</parameter></paramdef>
+ <paramdef>unsigned int <parameter> subimage_width</parameter></paramdef>
+ <paramdef>unsigned int <parameter> subimage_height</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3279,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>
@@ -3431,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>
@@ -3530,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>
@@ -3657,9 +3664,10 @@ 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>unsignedlongfg,<parameter> bg</parameter></paramdef>
- <paramdef>unsignedint<parameter> depth</parameter></paramdef>
+ <paramdef>unsigned int <parameter>width</parameter></paramdef>
+ <paramdef>unsigned int <parameter>height</parameter></paramdef>
+ <paramdef>unsigned long fg,<parameter> bg</parameter></paramdef>
+ <paramdef>unsigned int <parameter> depth</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<!-- .FN -->
@@ -3788,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 -->
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 21:02:39 +0000