From e708bebcc029873004ade4241f347ce8c58896af Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jul 2014 18:00:29 +0200 Subject: fontconfig libX11 xserver mkfontscale mesa git update 11 July 2014 xserver commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3 libX11 commit ff9a5c199251a84fa59d14fd48dadb3f8920b54b mkfontscale commit 47908fd7a0d061fdcd21e3498da4e223ca9136d9 fontconfig commit dca5d0feee5eb6428bec48b1aff4396cf92c76c0 mesa commit f381c27c548aa28b003c8e188f5d627ab4105f76 --- libX11/modules/lc/def/lcDefConv.c | 38 +++++++++++++------ libX11/nls/en_US.UTF-8/Compose.pre | 3 ++ libX11/specs/libX11/AppC.xml | 6 +-- libX11/specs/libX11/AppD.xml | 5 ++- libX11/specs/libX11/CH03.xml | 46 +++++++++++++---------- libX11/specs/libX11/CH04.xml | 11 +++--- libX11/specs/libX11/CH05.xml | 17 +++++---- libX11/specs/libX11/CH06.xml | 34 ++++++++--------- libX11/specs/libX11/CH07.xml | 38 +++++++++++-------- libX11/specs/libX11/CH08.xml | 77 +++++++++++++++++++++++++------------- libX11/specs/libX11/CH09.xml | 3 +- libX11/specs/libX11/CH12.xml | 23 ++++++------ libX11/specs/libX11/CH13.xml | 18 ++++++--- libX11/specs/libX11/CH14.xml | 2 +- libX11/specs/libX11/CH16.xml | 47 +++++++++++++---------- 15 files changed, 223 insertions(+), 145 deletions(-) (limited to 'libX11') 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 : "☺" U263A # WHITE SMILING FACE : "☹" U2639 # WHITE FROWNING FACE + : "🖕" U1F595 # REVERSED HAND WITH MIDDLE FINGER EXTENDED +

: "🖖" 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: char *_XAllocScratch Display *display - unsignedlong nbytes + unsigned long nbytes @@ -3113,7 +3113,7 @@ critical sections: char *_XAllocTemp Display *display - unsignedlong nbytes + unsigned long nbytes @@ -3153,7 +3153,7 @@ The following function returns the storage: void _XFreeTemp Display *display char *buf - unsignedlong nbytes + unsigned long nbytes 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 Display *display int screen char*position, *default_position - unsignedint bwidth - unsignedintfwidth, fheight + unsigned int bwidth + unsigned int fwidth + unsigned int fheight intxadder, yadder int*x_return, *y_return int*width_return, *height_return 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 Window XCreateWindow Display *display Window parent - intx, y - unsignedintwidth, height - unsignedint border_width + int x + int y + unsigned int width + unsigned int height + unsigned int border_width int depth - unsignedint class + unsigned int class Visual *visual - unsignedlong valuemask + unsigned long valuemask XSetWindowAttributes *attributes @@ -1520,11 +1522,13 @@ subwindow of a given parent window, use Window XCreateSimpleWindow Display *display Window parent - intx, y - unsignedintwidth, height - unsignedint border_width - unsignedlong border - unsignedlong background + int x + int y + unsigned int width + unsigned int height + unsigned int border_width + unsigned long border + unsigned long background @@ -2535,7 +2539,7 @@ To configure a window's size, location, stacking, or border, use XConfigureWindow Display *display Window w - unsignedint value_mask + unsigned int value_mask XWindowChanges *values @@ -2640,7 +2644,8 @@ To move a window without changing its size, use XMoveWindow Display *display Window w - intx, y + int x + int y @@ -2741,7 +2746,8 @@ To change a window's size without changing the upper-left coordinate, use XResizeWindow Display *display Window w - unsignedintwidth, height + unsigned int width + unsigned int height @@ -2843,8 +2849,10 @@ To change the size and location of a window, use XMoveResizeWindow Display *display Window w - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height @@ -2962,7 +2970,7 @@ To change the border width of a given window, use XSetWindowBorderWidth Display *display Window w - unsignedint width + unsigned int width @@ -3504,7 +3512,7 @@ To change one or more attributes for a given window, use XChangeWindowAttributes Display *display Window w - unsignedlong valuemask + unsigned long valuemask XSetWindowAttributes *attributes @@ -3662,7 +3670,7 @@ To set the background of a window to a given pixel, use XSetWindowBackground Display *display Window w - unsignedlong background_pixel + unsigned long background_pixel @@ -3831,7 +3839,7 @@ To change and repaint a window's border to a given pixel, use XSetWindowBorder Display *display Window w - unsignedlong border_pixel + unsigned long border_pixel 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 Window *root_return Window *parent_return Window **children_return - unsignedint *nchildren_return + unsigned int *nchildren_return @@ -378,9 +378,10 @@ To obtain the current geometry of a given drawable, use Drawable d Window *root_return int*x_return, *y_return - unsignedint*width_return, *height_return - unsignedint *border_width_return - unsignedint *depth_return + unsigned int *width_return + unsigned int *height_return + unsigned int *border_width_return + unsigned int *depth_return @@ -673,7 +674,7 @@ or to determine the pointer coordinates relative to a specified window, use Window*root_return, *child_return int*root_x_return, *root_y_return int*win_x_return, *win_y_return - unsignedint *mask_return + unsigned int *mask_return 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 Pixmap XCreatePixmap Display *display Drawable d - unsignedintwidth, height - unsignedint depth + unsigned int width + unsigned int height + unsigned int depth @@ -231,7 +232,7 @@ To create a cursor from the standard cursor font, use Cursor XCreateFontCursor Display *display - unsignedint shape + unsigned int shape @@ -300,7 +301,7 @@ To create a cursor from font glyphs, use Cursor XCreateGlyphCursor Display *display Fontsource_font, mask_font - unsignedintsource_char, mask_char + unsigned int source_char, mask_char XColor *foreground_color XColor *background_color @@ -442,7 +443,7 @@ use Pixmap mask XColor *foreground_color XColor *background_color - unsignedintx, y + unsigned int x, y @@ -586,8 +587,10 @@ To determine useful cursor sizes, use Status XQueryBestCursor Display *display Drawable d - unsignedintwidth, height - unsignedint*width_return, *height_return + unsigned int width + unsigned int height + unsigned int *width_return + unsigned int *height_return 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 Display *display Colormap colormap Bool contig - unsignedlong plane_masks_return[] - unsignedint nplanes - unsignedlong pixels_return[] - unsignedint npixels + unsigned long plane_masks_return[] + unsigned int nplanes + unsigned long pixels_return[] + unsigned int npixels @@ -2069,10 +2069,10 @@ model, use Display *display Colormap colormap Bool contig - unsignedlong pixels_return[] + unsigned long pixels_return[] int ncolors intnreds,ngreens, nblues - unsignedlong*rmask_return,*gmask_return, *bmask_return + unsigned long *rmask_return,*gmask_return, *bmask_return @@ -2270,9 +2270,9 @@ To free colormap cells, use XFreeColors Display *display Colormap colormap - unsignedlong pixels[] + unsigned long pixels[] int npixels - unsignedlong planes + unsigned long planes @@ -2866,7 +2866,7 @@ To store a color specified by name in a single colormap cell, use Display *display Colormap colormap char *color - unsignedlong pixel + unsigned long pixel int flags @@ -3249,7 +3249,7 @@ To query the color of multiple colormap cells in an arbitrary format, use Display *display Colormap colormap XcmsColor colors_in_out[] - unsignedint ncolors + unsigned int ncolors XcmsColorFormat result_format @@ -4186,7 +4186,7 @@ to a single destination format, use Status XcmsConvertColors XcmsCCC ccc XcmsColor colors_in_out[] - unsignedint ncolors + unsigned int ncolors XcmsColorFormat target_format Bool compression_flags_return[] @@ -4330,8 +4330,8 @@ following: typedef Status(*XcmsCompressionProc) XcmsCCC ccc XcmsColor colors_in_out[] - unsignedint ncolors - unsignedint index + unsigned int ncolors + unsigned int index Bool compression_flags_return[] @@ -4660,7 +4660,7 @@ The white point adjustment procedure interface must adhere to the following: XcmsColor *target_white_point XcmsColorFormat target_format XcmsColor colors_in_out[] - unsignedint ncolors + unsigned int ncolors Bool compression_flags_return[] @@ -6273,7 +6273,7 @@ Chroma at which the maximum Values are reached, use XcmsCCC ccc XcmsFloat hue XcmsColor colors_return[] - unsignedint nsamples + unsigned int nsamples @@ -6813,7 +6813,7 @@ following software interface specification: XcmsCCC ccc XcmsColor *white_point XcmsColor *colors_in_out - unsignedint ncolors + unsigned int ncolors @@ -6881,7 +6881,7 @@ following software interface specification: Status ConversionProc XcmsCCC ccc XcmsColor *colors_in_out - unsignedint ncolors + unsigned int ncolors Bool compression_flags_return[] 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 GC XCreateGC Display *display Drawable d - unsignedlong valuemask + unsigned long valuemask XGCValues *values @@ -1059,7 +1059,7 @@ To copy components from a source GC to a destination GC, use XCopyGC Display *display GCsrc, dest - unsignedlong valuemask + unsigned long valuemask @@ -1145,7 +1145,7 @@ To change the components in a given GC, use XChangeGC Display *display GC gc - unsignedlong valuemask + unsigned long valuemask XGCValues *values @@ -1241,7 +1241,7 @@ To obtain components of a given GC, use Status XGetGCValues Display *display GC gc - unsignedlong valuemask + unsigned long valuemask XGCValues *values_return @@ -1536,9 +1536,9 @@ for a given GC, use XSetState Display *display GC gc - unsignedlongforeground, background + unsigned long foreground, background int function - unsignedlong plane_mask + unsigned long plane_mask @@ -1629,7 +1629,7 @@ To set the foreground of a given GC, use XSetForeground Display *display GC gc - unsignedlong foreground + unsigned long foreground @@ -1688,7 +1688,7 @@ To set the background of a given GC, use XSetBackground Display *display GC gc - unsignedlong background + unsigned long background @@ -1807,7 +1807,7 @@ To set the plane mask of a given GC, use XSetPlaneMask Display *display GC gc - unsignedlong plane_mask + unsigned long plane_mask @@ -1872,7 +1872,7 @@ To set the line drawing components of a given GC, use XSetLineAttributes Display *display GC gc - unsignedint line_width + unsigned int line_width int line_style int cap_style int join_style @@ -2257,8 +2257,10 @@ To obtain the best size of a tile, stipple, or cursor, use Display *display int class Drawable which_screen - unsignedintwidth, height - unsignedint*width_return, *height_return + unsigned int width + unsigned int height + unsigned int *width_return + unsigned int *height_return @@ -2399,8 +2401,10 @@ To obtain the best fill tile shape, use Status XQueryBestTile Display *display Drawable which_screen - unsignedintwidth, height - unsignedint*width_return, *height_return + unsigned int width + unsigned int height + unsigned int *width_return + unsigned int *height_return @@ -2505,8 +2509,10 @@ To obtain the best stipple shape, use Status XQueryBestStipple Display *display Drawable which_screen - unsignedintwidth, height - unsignedint*width_return, *height_return + unsigned int width + unsigned int height + unsigned int *width_return + unsigned int *height_return 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 XClearArea Display *display Window w - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height Bool exposures @@ -275,7 +277,8 @@ root and depth, use Drawablesrc, dest GC gc intsrc_x, src_y - unsignedintwidth, height + unsigned int width + unsigned int height intdest_x, dest_y @@ -468,9 +471,10 @@ To copy a single bit plane of a given drawable, use Drawablesrc, dest GC gc intsrc_x, src_y - unsignedintwidth, height + unsigned int width + unsigned int height intdest_x, dest_y - unsignedlong plane + unsigned long plane @@ -770,7 +774,8 @@ To draw a single point in a given drawable, use Display *display Drawable d GC gc - intx, y + int x + int y @@ -1335,8 +1340,10 @@ To draw the outline of a single rectangle in a given drawable, use Display *display Drawable d GC gc - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height @@ -1566,8 +1573,10 @@ To draw a single arc in a given drawable, use Display *display Drawable d GC gc - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height intangle1, angle2 @@ -1923,8 +1932,10 @@ To fill a single rectangular area in a given drawable, use Display *display Drawable d GC gc - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height @@ -2353,8 +2364,10 @@ To fill a single arc in a given drawable, use Display *display Drawable d GC gc - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height intangle1, angle2 @@ -3285,7 +3298,7 @@ To return a given font property, use Bool XGetFontProperty XFontStruct *font_struct Atom atom - unsignedlong *value_return + unsigned long *value_return @@ -4481,7 +4494,8 @@ To draw 8-bit characters in a given drawable, use Display *display Drawable d GC gc - intx, y + int x + int y XTextItem *items int nitems @@ -4576,7 +4590,8 @@ To draw 2-byte characters in a given drawable, use Display *display Drawable d GC gc - intx, y + int x + int y XTextItem16 *items int nitems @@ -4831,7 +4846,8 @@ To draw 2-byte characters in a given drawable, use Display *display Drawable d GC gc - intx, y + int x + int y XChar2b *string int length @@ -4974,7 +4990,8 @@ To draw 8-bit image text characters in a given drawable, use Display *display Drawable d GC gc - intx, y + int x + int y char *string int length @@ -5069,7 +5086,8 @@ To draw 2-byte image text characters in a given drawable, use Display *display Drawable d GC gc - intx, y + int x + int y XChar2b *string int length @@ -5374,7 +5392,8 @@ use XImage *image intsrc_x, src_y intdest_x, dest_y - unsignedintwidth, height + unsigned int width + unsigned int height @@ -5558,9 +5577,11 @@ This function specifically supports rudimentary screen dumps. XImage *XGetImage Display *display Drawable d - intx, y - unsignedintwidth, height - unsignedlong plane_mask + int x + int y + unsigned int width + unsigned int height + unsigned long plane_mask int format @@ -5744,9 +5765,11 @@ to a location within a preexisting image structure, use XImage *XGetSubImage Display *display Drawable d - intx, y - unsignedintwidth, height - unsignedlong plane_mask + int x + int y + unsigned int width + unsigned int height + unsigned long plane_mask int format XImage *dest_image intdest_x, dest_y 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. Display *display Window w Window parent - intx, y + int x + int y 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 Display *display Window grab_window Bool owner_events - unsignedint event_mask + unsigned int event_mask intpointer_mode, keyboard_mode Window confine_to Cursor cursor @@ -498,7 +498,7 @@ To change an active pointer grab, use XChangeActivePointerGrab Display *display - unsignedint event_mask + unsigned int event_mask Cursor cursor Time time @@ -586,11 +586,11 @@ To grab a pointer button, use XGrabButton Display *display - unsignedint button - unsignedint modifiers + unsigned int button + unsigned int modifiers Window grab_window Bool owner_events - unsignedint event_mask + unsigned int event_mask intpointer_mode, keyboard_mode Window confine_to Cursor cursor @@ -829,8 +829,8 @@ To ungrab a pointer button, use XUngrabButton Display *display - unsignedint button - unsignedint modifiers + unsigned int button + unsigned int modifiers Window grab_window @@ -1205,7 +1205,7 @@ To passively grab a single key of the keyboard, use XGrabKey Display *display int keycode - unsignedint modifiers + unsigned int modifiers Window grab_window Bool owner_events intpointer_mode, keyboard_mode @@ -1409,7 +1409,7 @@ To ungrab a key, use XUngrabKey Display *display int keycode - unsignedint modifiers + unsigned int modifiers Window grab_window @@ -1767,7 +1767,8 @@ To move the pointer to an arbitrary point in a window, use Display *display Windowsrc_w, dest_w intsrc_x, src_y - unsignedintsrc_width, src_height + unsigned int src_width + unsigned int src_height intdest_x, dest_y @@ -2328,7 +2329,7 @@ If an error is generated, a subset of the controls may have been altered. XChangeKeyboardControl Display *display - unsignedlong value_mask + unsigned long value_mask XKeyboardControl *values 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 Display *display Drawable d GC gc - intx, y + int x + int y XmbTextItem *items int nitems @@ -3567,7 +3568,8 @@ or Display *display Drawable d GC gc - intx, y + int x + int y XwcTextItem *items int nitems @@ -3707,7 +3709,8 @@ or Drawable d XFontSet font_set GC gc - intx, y + int x + int y char *string int num_bytes @@ -3720,7 +3723,8 @@ or Drawable d XFontSet font_set GC gc - intx, y + int x + int y wchar_t *string int num_wchars @@ -3853,7 +3857,8 @@ or Drawable d XFontSet font_set GC gc - intx, y + int x + int y char *string int num_bytes @@ -3866,7 +3871,8 @@ or Drawable d XFontSet font_set GC gc - intx, y + int x + int y wchar_t *string int num_wchars 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 Display *display Window w int screen_number - unsignedint value_mask + unsigned int value_mask XWindowChanges *values 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 char *Xpermalloc - unsignedint size + unsigned int size @@ -930,7 +930,8 @@ To parse standard window geometry strings, use int XParseGeometry char *parsestring int*x_return, *y_return - unsignedint*width_return, *height_return + unsigned int *width_return + unsigned int *height_return @@ -1066,7 +1067,7 @@ To construct a window's geometry information, use int screen char *user_geom char *def_geom - unsignedint bwidth + unsigned int bwidth XSizeHints *hints int*x_return, *y_return int *width_return @@ -1975,7 +1976,8 @@ To determine if a specified point resides in a specified region, use Bool XPointInRegion Region r - intx, y + int x + int y @@ -2033,8 +2035,10 @@ To determine if a specified rectangle is inside a region, use int XRectInRegion Region r - intx, y - unsignedintwidth, height + int x + int y + unsigned int width + unsigned int height @@ -2740,12 +2744,12 @@ structure and initialize it with image format values from a display, use XImage *XCreateImage Display *display Visual *visual - unsignedint depth + unsigned int depth int format int offset char *data - unsignedint width - unsignedint height + unsigned int width + unsigned int height int bitmap_pad int bytes_per_line @@ -2985,7 +2989,7 @@ To set a pixel value in an image, use XImage *ximage int x int y - unsignedlong pixel + unsigned long pixel @@ -3057,8 +3061,8 @@ To create a subimage, use XImage *ximage int x int y - unsignedint subimage_width - unsignedint subimage_height + unsigned int subimage_width + unsigned int subimage_height @@ -3279,7 +3283,8 @@ To read a bitmap from a file and store it in a pixmap, use Display *display Drawable d char *filename - unsignedint*width_return, *height_return + unsigned int *width_return + unsigned int *height_return Pixmap *bitmap_return int*x_hot_return, *y_hot_return @@ -3431,7 +3436,8 @@ To read a bitmap from a file and return it as data, use int XReadBitmapFileData char *filename - unsignedint*width_return, *height_return + unsigned int *width_return + unsigned int *height_return unsignedchar *data_return int*x_hot_return, *y_hot_return @@ -3530,7 +3536,8 @@ To write out a bitmap from a pixmap to a file, use Display *display char *filename Pixmap bitmap - unsignedintwidth, height + unsigned int width + unsigned int height intx_hot, y_hot @@ -3657,9 +3664,10 @@ To create a pixmap and then store bitmap-format data into it, use Display *display Drawable d char *data - unsignedintwidth, height - unsignedlongfg, bg - unsignedint depth + unsigned int width + unsigned int height + unsigned long fg, bg + unsigned int depth @@ -3788,7 +3796,8 @@ in a program directly, as opposed to reading it in every time at run time, use Display *display Drawable d char *data - unsignedintwidth, height + unsigned int width + unsigned int height -- cgit v1.2.3