changeset 49307:a5b237cfccef

8198844: Clean up GensrcX11Wrappers Reviewed-by: erikj, prr
author ihse
date Tue, 06 Mar 2018 00:59:49 +0100
parents 5d35b6050163
children 9cbb97715f53
files make/Main.gmk make/UpdateX11Wrappers.gmk make/data/x11wrappergen/functions.txt make/data/x11wrappergen/sizes-32.txt make/data/x11wrappergen/sizes-64.txt make/data/x11wrappergen/sizes.32 make/data/x11wrappergen/sizes.64 make/data/x11wrappergen/sizes.64-solaris-i386 make/data/x11wrappergen/xlibtypes.txt make/gensrc/Gensrc-java.desktop.gmk make/gensrc/GensrcX11Wrappers.gmk make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java
diffstat 12 files changed, 2193 insertions(+), 3221 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Tue Mar 06 00:56:03 2018 +0100
+++ b/make/Main.gmk	Tue Mar 06 00:59:49 2018 +0100
@@ -399,10 +399,13 @@
 update-build-docs:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
 
+update-x11wrappers:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateX11Wrappers.gmk)
+
 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \
     docs-javase-api-javadoc docs-javase-api-modulegraph \
     docs-reference-api-javadoc docs-reference-api-modulegraph docs-jdk-specs \
-    docs-jdk-index docs-zip update-build-docs
+    docs-jdk-index docs-zip update-build-docs update-x11wrappers
 
 ################################################################################
 # Cross compilation support
@@ -724,9 +727,9 @@
 
   # If not already set, set the JVM target so that the JVM will be built.
   JVM_MAIN_TARGETS ?= hotspot
-   
+
   # Building java.base-jmod requires all of VM (ie hotspot) to be built.
-  java.base-jmod: $(JVM_MAIN_TARGETS) 
+  java.base-jmod: $(JVM_MAIN_TARGETS)
 
   # Declare dependencies from <module>-jmod to all other module targets
   # When creating a BUILDJDK, the java compilation has already been done by the
@@ -830,7 +833,7 @@
 
   # If not already set, then set the JVM specific docs targets
   JVM_DOCS_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc
-  
+
   # The gensrc steps for hotspot and jdk.jdi create html spec files.
   docs-jdk-specs: $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \
       docs-jdk-index
@@ -894,6 +897,8 @@
 
   generate-summary: jmods buildtools-modules
 
+  update-x11wrappers: java.base-copy buildtools-jdk
+
 endif
 
 ################################################################################
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/UpdateX11Wrappers.gmk	Tue Mar 06 00:59:49 2018 +0100
@@ -0,0 +1,101 @@
+#
+# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include NativeCompilation.gmk
+include ToolsJdk.gmk
+
+################################################################################
+# This file is responsible for extracting the x11 native struct offsets to
+# the xawt Java library. The tool needs to be run on the os/arch that
+# will host the final jvm, thus the tool cannot be used when cross compiling.
+#
+# Two versions of the generated offset file, sizes-32.txt and sizes-64.txt are
+# committed into the source code repository. These are the ones used in
+# GensrcX11Wrappers.gmk to generate the Java code during the build.
+################################################################################
+
+ifeq ($(COMPILE_TYPE), cross)
+  $(error It is not possible to update the x11wrappers when cross-compiling)
+endif
+
+X11WRAPPERS_OUTPUT := $(SUPPORT_OUTPUTDIR)/x11wrappers
+
+GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
+
+BITS := $(OPENJDK_TARGET_CPU_BITS)
+
+# Generate the C code for the program that will output the offset file.
+$(X11WRAPPERS_OUTPUT)/src/data_generator.c: $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(BUILD_TOOLS_JDK)
+	$(call LogInfo, Generating X11 wrapper data generator source code)
+	$(call MakeDir, $(@D))
+	$(call ExecuteWithLog, $@, \
+	    $(TOOL_WRAPPERGENERATOR) gen_c_source $@ $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(BITS))
+
+DATA_GENERATOR_INCLUDES := \
+    -I$(TOPDIR)/src/hotspot/share/include \
+    -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
+    -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
+    -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
+    -I$(TOPDIR)/src/java.base/share/native/libjava \
+    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+    -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+    -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+    -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+    #
+
+# Compile the generated C code into an executable.
+$(eval $(call SetupNativeCompilation, BUILD_DATA_GENERATOR, \
+    PROGRAM := data_generator, \
+    OUTPUT_DIR := $(X11WRAPPERS_OUTPUT)/bin, \
+    EXTRA_FILES := $(X11WRAPPERS_OUTPUT)/src/data_generator.c, \
+    CFLAGS := $(X_CFLAGS) $(DATA_GENERATOR_INCLUDES) $(CFLAGS_JDKEXE), \
+    LDFLAGS := $(LDFLAGS_JDKEXE), \
+    LIBS := $(X_LIBS) -lc, \
+    OBJECT_DIR := $(X11WRAPPERS_OUTPUT)/objs, \
+))
+
+# Run the executable to create the data file.
+$(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(BITS).txt: $(BUILD_DATA_GENERATOR_TARGET)
+	$(call LogInfo, Generating X11 wrapper data files)
+	$(call MakeDir, $(@D))
+	$(call ExecuteWithLog, $(X11WRAPPERS_OUTPUT)/generation, \
+	    $(BUILD_DATA_GENERATOR_TARGET) | $(SORT) > $@)
+	$(ECHO) IMPORTANT: If you update the X11 wrapper data files, they most certainly
+	$(ECHO) need to be updated for both 32 and 64 bit platforms. You have now
+	$(ECHO) updated them for $(BITS) bit platforms only.
+
+TARGETS += $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(BITS).txt
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default
--- a/make/data/x11wrappergen/functions.txt	Tue Mar 06 00:56:03 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-!XGetWindowProperty|int
-    w                long
-    property         Atom
-    long_offset      long
-    long_length      long
-    delete           Bool
-    req_type         Atom
-    actual_type      Atom out
-    actual_format    int out
-    number_of_items  long out
-    bytes_after      long out
-    data             pointer out free
-!XQueryTree|int
-    w                long
-    root             long out
-    parent           long out
-    children         pointer out free
-    nchildren        int out
-!XTranslateCoordinates|int
-    scr_w            long
-    dest_w           long 
-    src_x            int
-    src_y            int
-    dest_x           int out
-    dest_y           int out
-    child            long out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/x11wrappergen/sizes-32.txt	Tue Mar 06 00:59:49 2018 +0100
@@ -0,0 +1,1017 @@
+Atom	4
+AwtGraphicsConfigData	128
+AwtGraphicsConfigData.awt_cmap	4
+AwtGraphicsConfigData.AwtColorMatch	56
+AwtGraphicsConfigData.awt_depth	0
+AwtGraphicsConfigData.awtImage	52
+AwtGraphicsConfigData.awt_num_colors	48
+AwtGraphicsConfigData.awt_visInfo	8
+AwtGraphicsConfigData.color_data	84
+AwtGraphicsConfigData.glxInfo	88
+AwtGraphicsConfigData.isTranslucencySupported	92
+AwtGraphicsConfigData.monoImage	60
+AwtGraphicsConfigData.monoPixmap	64
+AwtGraphicsConfigData.monoPixmapGC	76
+AwtGraphicsConfigData.monoPixmapHeight	72
+AwtGraphicsConfigData.monoPixmapWidth	68
+AwtGraphicsConfigData.pixelStride	80
+AwtGraphicsConfigData.renderPictFormat	96
+awtImageData	304
+awtImageData.clrdata	16
+awtImageData.convert	48
+awtImageData.Depth	0
+awtImageData.wsImageFormat	4
+AwtScreenData	24
+AwtScreenData.blackpixel	12
+AwtScreenData.configs	20
+AwtScreenData.defaultConfig	16
+AwtScreenData.numConfigs	0
+AwtScreenData.root	4
+AwtScreenData.whitepixel	8
+Bool	4
+ColorData	48
+ColorData.awt_Colors	0
+ColorData.awt_icmLUT2Colors	12
+ColorData.awt_icmLUT	8
+ColorData.awt_numICMcolors	4
+ColorData.img_clr_tbl	20
+ColorData.img_grays	16
+ColorData.img_oda_blue	32
+ColorData.img_oda_green	28
+ColorData.img_oda_red	24
+ColorData.pGrayInverseLutData	36
+ColorData.representsPrimaries	44
+ColorData.screendata	40
+ColorEntry	4
+ColorEntry.b	2
+ColorEntry.flags	3
+ColorEntry.g	1
+ColorEntry.r	0
+Depth	12
+Depth.depth	0
+Depth.nvisuals	4
+Depth.visuals	8
+int	4
+long	4
+PropMwmHints	20
+PropMwmHints.decorations	8
+PropMwmHints.flags	0
+PropMwmHints.functions	4
+PropMwmHints.inputMode	12
+PropMwmHints.status	16
+ptr	4
+Screen	80
+Screen.backing_store	68
+Screen.black_pixel	56
+Screen.cmap	48
+Screen.default_gc	44
+Screen.depths	32
+Screen.display	4
+Screen.ext_data	0
+ScreenFormat	16
+ScreenFormat.bits_per_pixel	8
+ScreenFormat.depth	4
+ScreenFormat.ext_data	0
+ScreenFormat.scanline_pad	12
+Screen.height	16
+Screen.max_maps	60
+Screen.mheight	24
+Screen.min_maps	64
+Screen.mwidth	20
+Screen.ndepths	28
+Screen.root	8
+Screen.root_depth	36
+Screen.root_input_mask	76
+Screen.root_visual	40
+Screen.save_unders	72
+Screen.white_pixel	52
+Screen.width	12
+short	2
+Visual	32
+Visual.bits_per_rgb	24
+Visual.blue_mask	20
+Visual.class	8
+Visual.ext_data	0
+Visual.green_mask	16
+Visual.map_entries	28
+Visual.red_mask	12
+Visual.visualid	4
+Window	4
+XAnyEvent	20
+XAnyEvent.display	12
+XAnyEvent.send_event	8
+XAnyEvent.serial	4
+XAnyEvent.type	0
+XAnyEvent.window	16
+XArc	12
+XArc.angle1	8
+XArc.angle2	10
+XArc.height	6
+XArc.width	4
+XArc.x	0
+XArc.y	2
+XButtonEvent	60
+XButtonEvent.button	52
+XButtonEvent.display	12
+XButtonEvent.root	20
+XButtonEvent.same_screen	56
+XButtonEvent.send_event	8
+XButtonEvent.serial	4
+XButtonEvent.state	48
+XButtonEvent.subwindow	24
+XButtonEvent.time	28
+XButtonEvent.type	0
+XButtonEvent.window	16
+XButtonEvent.x	32
+XButtonEvent.x_root	40
+XButtonEvent.y	36
+XButtonEvent.y_root	44
+XChar2b	2
+XChar2b.byte1	0
+XChar2b.byte2	1
+XCharStruct	12
+XCharStruct.ascent	6
+XCharStruct.attributes	10
+XCharStruct.descent	8
+XCharStruct.lbearing	0
+XCharStruct.rbearing	2
+XCharStruct.width	4
+XCirculateEvent	28
+XCirculateEvent.display	12
+XCirculateEvent.event	16
+XCirculateEvent.place	24
+XCirculateEvent.send_event	8
+XCirculateEvent.serial	4
+XCirculateEvent.type	0
+XCirculateEvent.window	20
+XCirculateRequestEvent	28
+XCirculateRequestEvent.display	12
+XCirculateRequestEvent.parent	16
+XCirculateRequestEvent.place	24
+XCirculateRequestEvent.send_event	8
+XCirculateRequestEvent.serial	4
+XCirculateRequestEvent.type	0
+XCirculateRequestEvent.window	20
+XClassHint	8
+XClassHint.res_class	4
+XClassHint.res_name	0
+XClientMessageEvent	48
+XClientMessageEvent.data	28
+XClientMessageEvent.display	12
+XClientMessageEvent.format	24
+XClientMessageEvent.message_type	20
+XClientMessageEvent.send_event	8
+XClientMessageEvent.serial	4
+XClientMessageEvent.type	0
+XClientMessageEvent.window	16
+XColor	12
+XColor.blue	8
+XColor.flags	10
+XColor.green	6
+XColormapEvent	32
+XColormapEvent.colormap	20
+XColormapEvent.display	12
+XColormapEvent.new	24
+XColormapEvent.send_event	8
+XColormapEvent.serial	4
+XColormapEvent.state	28
+XColormapEvent.type	0
+XColormapEvent.window	16
+XColor.pad	11
+XColor.pixel	0
+XColor.red	4
+XComposeStatus	8
+XComposeStatus.chars_matched	4
+XComposeStatus.compose_ptr	0
+XConfigureEvent	52
+XConfigureEvent.above	44
+XConfigureEvent.border_width	40
+XConfigureEvent.display	12
+XConfigureEvent.event	16
+XConfigureEvent.height	36
+XConfigureEvent.override_redirect	48
+XConfigureEvent.send_event	8
+XConfigureEvent.serial	4
+XConfigureEvent.type	0
+XConfigureEvent.width	32
+XConfigureEvent.window	20
+XConfigureEvent.x	24
+XConfigureEvent.y	28
+XConfigureRequestEvent	56
+XConfigureRequestEvent.above	44
+XConfigureRequestEvent.border_width	40
+XConfigureRequestEvent.detail	48
+XConfigureRequestEvent.display	12
+XConfigureRequestEvent.height	36
+XConfigureRequestEvent.parent	16
+XConfigureRequestEvent.send_event	8
+XConfigureRequestEvent.serial	4
+XConfigureRequestEvent.type	0
+XConfigureRequestEvent.value_mask	52
+XConfigureRequestEvent.width	32
+XConfigureRequestEvent.window	20
+XConfigureRequestEvent.x	24
+XConfigureRequestEvent.y	28
+XCreateWindowEvent	48
+XCreateWindowEvent.border_width	40
+XCreateWindowEvent.display	12
+XCreateWindowEvent.height	36
+XCreateWindowEvent.override_redirect	44
+XCreateWindowEvent.parent	16
+XCreateWindowEvent.send_event	8
+XCreateWindowEvent.serial	4
+XCreateWindowEvent.type	0
+XCreateWindowEvent.width	32
+XCreateWindowEvent.window	20
+XCreateWindowEvent.x	24
+XCreateWindowEvent.y	28
+XCrossingEvent	68
+XCrossingEvent.detail	52
+XCrossingEvent.display	12
+XCrossingEvent.focus	60
+XCrossingEvent.mode	48
+XCrossingEvent.root	20
+XCrossingEvent.same_screen	56
+XCrossingEvent.send_event	8
+XCrossingEvent.serial	4
+XCrossingEvent.state	64
+XCrossingEvent.subwindow	24
+XCrossingEvent.time	28
+XCrossingEvent.type	0
+XCrossingEvent.window	16
+XCrossingEvent.x	32
+XCrossingEvent.x_root	40
+XCrossingEvent.y	36
+XCrossingEvent.y_root	44
+XdbeSwapInfo	8
+XdbeSwapInfo.swap_action	4
+XdbeSwapInfo.swap_window	0
+XDestroyWindowEvent	24
+XDestroyWindowEvent.display	12
+XDestroyWindowEvent.event	16
+XDestroyWindowEvent.send_event	8
+XDestroyWindowEvent.serial	4
+XDestroyWindowEvent.type	0
+XDestroyWindowEvent.window	20
+XErrorEvent	20
+XErrorEvent.display	4
+XErrorEvent.error_code	16
+XErrorEvent.minor_code	18
+XErrorEvent.request_code	17
+XErrorEvent.resourceid	8
+XErrorEvent.serial	12
+XErrorEvent.type	0
+XEvent	96
+XEvent.pad	0
+XEvent.type	0
+XEvent.xany	0
+XEvent.xbutton	0
+XEvent.xcirculate	0
+XEvent.xcirculaterequest	0
+XEvent.xclient	0
+XEvent.xcolormap	0
+XEvent.xconfigure	0
+XEvent.xconfigurerequest	0
+XEvent.xcreatewindow	0
+XEvent.xcrossing	0
+XEvent.xdestroywindow	0
+XEvent.xerror	0
+XEvent.xexpose	0
+XEvent.xfocus	0
+XEvent.xgraphicsexpose	0
+XEvent.xgravity	0
+XEvent.xkey	0
+XEvent.xkeymap	0
+XEvent.xmap	0
+XEvent.xmapping	0
+XEvent.xmaprequest	0
+XEvent.xmotion	0
+XEvent.xnoexpose	0
+XEvent.xproperty	0
+XEvent.xreparent	0
+XEvent.xresizerequest	0
+XEvent.xselection	0
+XEvent.xselectionclear	0
+XEvent.xselectionrequest	0
+XEvent.xunmap	0
+XEvent.xvisibility	0
+XExposeEvent	40
+XExposeEvent.count	36
+XExposeEvent.display	12
+XExposeEvent.height	32
+XExposeEvent.send_event	8
+XExposeEvent.serial	4
+XExposeEvent.type	0
+XExposeEvent.width	28
+XExposeEvent.window	16
+XExposeEvent.x	20
+XExposeEvent.y	24
+XExtCodes	16
+XExtCodes.extension	0
+XExtCodes.first_error	12
+XExtCodes.first_event	8
+XExtCodes.major_opcode	4
+XExtData	16
+XExtData.free_private	8
+XExtData.next	4
+XExtData.number	0
+XExtData.private_data	12
+XFocusChangeEvent	28
+XFocusChangeEvent.detail	24
+XFocusChangeEvent.display	12
+XFocusChangeEvent.mode	20
+XFocusChangeEvent.send_event	8
+XFocusChangeEvent.serial	4
+XFocusChangeEvent.type	0
+XFocusChangeEvent.window	16
+XFontProp	8
+XFontProp.card32	4
+XFontProp.name	0
+XFontSetExtents	16
+XFontSetExtents.max_ink_extent	0
+XFontSetExtents.max_logical_extent	8
+XFontStruct	80
+XFontStruct.all_chars_exist	28
+XFontStruct.ascent	72
+XFontStruct.descent	76
+XFontStruct.direction	8
+XFontStruct.ext_data	0
+XFontStruct.fid	4
+XFontStruct.max_bounds	56
+XFontStruct.max_byte1	24
+XFontStruct.max_char_or_byte2	16
+XFontStruct.min_bounds	44
+XFontStruct.min_byte1	20
+XFontStruct.min_char_or_byte2	12
+XFontStruct.n_properties	36
+XFontStruct.per_char	68
+XFontStruct.properties	40
+XGCValues	92
+XGCValues.arc_mode	40
+XGCValues.background	12
+XGCValues.cap_style	24
+XGCValues.clip_mask	80
+XGCValues.clip_x_origin	72
+XGCValues.clip_y_origin	76
+XGCValues.dashes	88
+XGCValues.dash_offset	84
+XGCValues.fill_rule	36
+XGCValues.fill_style	32
+XGCValues.font	60
+XGCValues.foreground	8
+XGCValues.function	0
+XGCValues.graphics_exposures	68
+XGCValues.join_style	28
+XGCValues.line_style	20
+XGCValues.line_width	16
+XGCValues.plane_mask	4
+XGCValues.stipple	48
+XGCValues.subwindow_mode	64
+XGCValues.tile	44
+XGCValues.ts_x_origin	52
+XGCValues.ts_y_origin	56
+XGraphicsExposeEvent	48
+XGraphicsExposeEvent.count	36
+XGraphicsExposeEvent.display	12
+XGraphicsExposeEvent.drawable	16
+XGraphicsExposeEvent.height	32
+XGraphicsExposeEvent.major_code	40
+XGraphicsExposeEvent.minor_code	44
+XGraphicsExposeEvent.send_event	8
+XGraphicsExposeEvent.serial	4
+XGraphicsExposeEvent.type	0
+XGraphicsExposeEvent.width	28
+XGraphicsExposeEvent.x	20
+XGraphicsExposeEvent.y	24
+XGravityEvent	32
+XGravityEvent.display	12
+XGravityEvent.event	16
+XGravityEvent.send_event	8
+XGravityEvent.serial	4
+XGravityEvent.type	0
+XGravityEvent.window	20
+XGravityEvent.x	24
+XGravityEvent.y	28
+XHostAddress	12
+XHostAddress.address	8
+XHostAddress.family	0
+XHostAddress.length	4
+XIconSize	24
+XIconSize.height_inc	20
+XIconSize.max_height	12
+XIconSize.max_width	8
+XIconSize.min_height	4
+XIconSize.min_width	0
+XIconSize.width_inc	16
+XImage	88
+XImage.bitmap_bit_order	28
+XImage.bitmap_pad	32
+XImage.bitmap_unit	24
+XImage.bits_per_pixel	44
+XImage.blue_mask	56
+XImage.byte_order	20
+XImage.bytes_per_line	40
+XImage.data	16
+XImage.depth	36
+XImage.f.add_pixel	84
+XImage.f.create_image	64
+XImage.f.destroy_image	68
+XImage.f.get_pixel	72
+XImage.format	12
+XImage.f.put_pixel	76
+XImage.f.sub_image	80
+XImage.green_mask	52
+XImage.height	4
+XImage.obdata	60
+XImage.red_mask	48
+XImage.width	0
+XImage.xoffset	8
+XIMCallback	8
+XIMCallback.callback	4
+XIMCallback.client_data	0
+XIMHotKeyTrigger	12
+XIMHotKeyTrigger.keysym	0
+XIMHotKeyTrigger.modifier	4
+XIMHotKeyTrigger.modifier_mask	8
+XIMHotKeyTriggers	8
+XIMHotKeyTriggers.key	4
+XIMHotKeyTriggers.num_hot_key	0
+XIMPreeditCaretCallbackStruct	12
+XIMPreeditCaretCallbackStruct.direction	4
+XIMPreeditCaretCallbackStruct.position	0
+XIMPreeditCaretCallbackStruct.style	8
+XIMPreeditDrawCallbackStruct	16
+XIMPreeditDrawCallbackStruct.caret	0
+XIMPreeditDrawCallbackStruct.chg_first	4
+XIMPreeditDrawCallbackStruct.chg_length	8
+XIMPreeditDrawCallbackStruct.text	12
+XIMPreeditStateNotifyCallbackStruct	4
+XIMPreeditStateNotifyCallbackStruct.state	0
+XIMStatusDrawCallbackStruct	8
+XIMStatusDrawCallbackStruct.data	4
+XIMStatusDrawCallbackStruct.type	0
+XIMStringConversionCallbackStruct	16
+XIMStringConversionCallbackStruct.direction	4
+XIMStringConversionCallbackStruct.factor	10
+XIMStringConversionCallbackStruct.operation	8
+XIMStringConversionCallbackStruct.position	0
+XIMStringConversionCallbackStruct.text	12
+XIMStringConversionText	16
+XIMStringConversionText.encoding_is_wchar	8
+XIMStringConversionText.feedback	4
+XIMStringConversionText.length	0
+XIMStringConversionText.string	12
+XIMStyles	8
+XIMStyles.count_styles	0
+XIMStyles.supported_styles	4
+XIMText	16
+XIMText.encoding_is_wchar	8
+XIMText.feedback	4
+XIMText.length	0
+XIMText.string	12
+XIMValuesList	8
+XIMValuesList.count_values	0
+XIMValuesList.supported_values	4
+XkbAccessXNotifyEvent	44
+XkbAccessXNotifyEvent.debounce_delay	40
+XkbAccessXNotifyEvent.detail	28
+XkbAccessXNotifyEvent.device	24
+XkbAccessXNotifyEvent.display	12
+XkbAccessXNotifyEvent.keycode	32
+XkbAccessXNotifyEvent.send_event	8
+XkbAccessXNotifyEvent.serial	4
+XkbAccessXNotifyEvent.sk_delay	36
+XkbAccessXNotifyEvent.time	16
+XkbAccessXNotifyEvent.type	0
+XkbAccessXNotifyEvent.xkb_type	20
+XkbActionMessageEvent	56
+XkbActionMessageEvent.device	24
+XkbActionMessageEvent.display	12
+XkbActionMessageEvent.group	40
+XkbActionMessageEvent.keycode	28
+XkbActionMessageEvent.key_event_follows	36
+XkbActionMessageEvent.message	48
+XkbActionMessageEvent.mods	44
+XkbActionMessageEvent.press	32
+XkbActionMessageEvent.send_event	8
+XkbActionMessageEvent.serial	4
+XkbActionMessageEvent.time	16
+XkbActionMessageEvent.type	0
+XkbActionMessageEvent.xkb_type	20
+XkbAnyEvent	28
+XkbAnyEvent.device	24
+XkbAnyEvent.display	12
+XkbAnyEvent.send_event	8
+XkbAnyEvent.serial	4
+XkbAnyEvent.time	16
+XkbAnyEvent.type	0
+XkbAnyEvent.xkb_type	20
+XkbBellNotifyEvent	60
+XkbBellNotifyEvent.bell_class	40
+XkbBellNotifyEvent.bell_id	44
+XkbBellNotifyEvent.device	24
+XkbBellNotifyEvent.display	12
+XkbBellNotifyEvent.duration	36
+XkbBellNotifyEvent.event_only	56
+XkbBellNotifyEvent.name	48
+XkbBellNotifyEvent.percent	28
+XkbBellNotifyEvent.pitch	32
+XkbBellNotifyEvent.send_event	8
+XkbBellNotifyEvent.serial	4
+XkbBellNotifyEvent.time	16
+XkbBellNotifyEvent.type	0
+XkbBellNotifyEvent.window	52
+XkbBellNotifyEvent.xkb_type	20
+XkbCompatMapNotifyEvent	44
+XkbCompatMapNotifyEvent.changed_groups	28
+XkbCompatMapNotifyEvent.device	24
+XkbCompatMapNotifyEvent.display	12
+XkbCompatMapNotifyEvent.first_si	32
+XkbCompatMapNotifyEvent.num_si	36
+XkbCompatMapNotifyEvent.num_total_si	40
+XkbCompatMapNotifyEvent.send_event	8
+XkbCompatMapNotifyEvent.serial	4
+XkbCompatMapNotifyEvent.time	16
+XkbCompatMapNotifyEvent.type	0
+XkbCompatMapNotifyEvent.xkb_type	20
+XkbControlsNotifyEvent	48
+XkbControlsNotifyEvent.changed_ctrls	28
+XkbControlsNotifyEvent.device	24
+XkbControlsNotifyEvent.display	12
+XkbControlsNotifyEvent.enabled_ctrl_changes	36
+XkbControlsNotifyEvent.enabled_ctrls	32
+XkbControlsNotifyEvent.event_type	45
+XkbControlsNotifyEvent.keycode	44
+XkbControlsNotifyEvent.num_groups	40
+XkbControlsNotifyEvent.req_major	46
+XkbControlsNotifyEvent.req_minor	47
+XkbControlsNotifyEvent.send_event	8
+XkbControlsNotifyEvent.serial	4
+XkbControlsNotifyEvent.time	16
+XkbControlsNotifyEvent.type	0
+XkbControlsNotifyEvent.xkb_type	20
+XkbEvent	96
+XkbEvent.accessx	0
+XkbEvent.any	0
+XkbEvent.bell	0
+XkbEvent.compat	0
+XkbEvent.core	0
+XkbEvent.ctrls	0
+XkbEvent.device	0
+XkbEvent.indicators	0
+XkbEvent.map	0
+XkbEvent.message	0
+XkbEvent.names	0
+XkbEvent.new_kbd	0
+XkbEvent.state	0
+XkbEvent.type	0
+XkbExtensionDeviceNotifyEvent	64
+XkbExtensionDeviceNotifyEvent.device	24
+XkbExtensionDeviceNotifyEvent.display	12
+XkbExtensionDeviceNotifyEvent.first_btn	40
+XkbExtensionDeviceNotifyEvent.led_class	56
+XkbExtensionDeviceNotifyEvent.led_id	60
+XkbExtensionDeviceNotifyEvent.leds_defined	48
+XkbExtensionDeviceNotifyEvent.led_state	52
+XkbExtensionDeviceNotifyEvent.num_btns	44
+XkbExtensionDeviceNotifyEvent.reason	28
+XkbExtensionDeviceNotifyEvent.send_event	8
+XkbExtensionDeviceNotifyEvent.serial	4
+XkbExtensionDeviceNotifyEvent.supported	32
+XkbExtensionDeviceNotifyEvent.time	16
+XkbExtensionDeviceNotifyEvent.type	0
+XkbExtensionDeviceNotifyEvent.unsupported	36
+XkbExtensionDeviceNotifyEvent.xkb_type	20
+XkbIndicatorNotifyEvent	36
+XkbIndicatorNotifyEvent.changed	28
+XkbIndicatorNotifyEvent.device	24
+XkbIndicatorNotifyEvent.display	12
+XkbIndicatorNotifyEvent.send_event	8
+XkbIndicatorNotifyEvent.serial	4
+XkbIndicatorNotifyEvent.state	32
+XkbIndicatorNotifyEvent.time	16
+XkbIndicatorNotifyEvent.type	0
+XkbIndicatorNotifyEvent.xkb_type	20
+XkbMapNotifyEvent	80
+XkbMapNotifyEvent.changed	28
+XkbMapNotifyEvent.device	24
+XkbMapNotifyEvent.display	12
+XkbMapNotifyEvent.first_key_act	47
+XkbMapNotifyEvent.first_key_behavior	48
+XkbMapNotifyEvent.first_key_explicit	49
+XkbMapNotifyEvent.first_key_sym	46
+XkbMapNotifyEvent.first_modmap_key	50
+XkbMapNotifyEvent.first_type	36
+XkbMapNotifyEvent.first_vmodmap_key	51
+XkbMapNotifyEvent.flags	32
+XkbMapNotifyEvent.max_key_code	45
+XkbMapNotifyEvent.min_key_code	44
+XkbMapNotifyEvent.num_key_acts	56
+XkbMapNotifyEvent.num_key_behaviors	60
+XkbMapNotifyEvent.num_key_explicit	64
+XkbMapNotifyEvent.num_key_syms	52
+XkbMapNotifyEvent.num_modmap_keys	68
+XkbMapNotifyEvent.num_types	40
+XkbMapNotifyEvent.num_vmodmap_keys	72
+XkbMapNotifyEvent.send_event	8
+XkbMapNotifyEvent.serial	4
+XkbMapNotifyEvent.time	16
+XkbMapNotifyEvent.type	0
+XkbMapNotifyEvent.vmods	76
+XkbMapNotifyEvent.xkb_type	20
+XkbNamesNotifyEvent	76
+XkbNamesNotifyEvent.changed	28
+XkbNamesNotifyEvent.changed_groups	60
+XkbNamesNotifyEvent.changed_indicators	64
+XkbNamesNotifyEvent.changed_vmods	56
+XkbNamesNotifyEvent.device	24
+XkbNamesNotifyEvent.display	12
+XkbNamesNotifyEvent.first_key	68
+XkbNamesNotifyEvent.first_lvl	40
+XkbNamesNotifyEvent.first_type	32
+XkbNamesNotifyEvent.num_aliases	48
+XkbNamesNotifyEvent.num_keys	72
+XkbNamesNotifyEvent.num_lvls	44
+XkbNamesNotifyEvent.num_radio_groups	52
+XkbNamesNotifyEvent.num_types	36
+XkbNamesNotifyEvent.send_event	8
+XkbNamesNotifyEvent.serial	4
+XkbNamesNotifyEvent.time	16
+XkbNamesNotifyEvent.type	0
+XkbNamesNotifyEvent.xkb_type	20
+XkbNewKeyboardNotifyEvent	56
+XkbNewKeyboardNotifyEvent.changed	48
+XkbNewKeyboardNotifyEvent.device	24
+XkbNewKeyboardNotifyEvent.display	12
+XkbNewKeyboardNotifyEvent.max_key_code	36
+XkbNewKeyboardNotifyEvent.min_key_code	32
+XkbNewKeyboardNotifyEvent.old_device	28
+XkbNewKeyboardNotifyEvent.old_max_key_code	44
+XkbNewKeyboardNotifyEvent.old_min_key_code	40
+XkbNewKeyboardNotifyEvent.req_major	52
+XkbNewKeyboardNotifyEvent.req_minor	53
+XkbNewKeyboardNotifyEvent.send_event	8
+XkbNewKeyboardNotifyEvent.serial	4
+XkbNewKeyboardNotifyEvent.time	16
+XkbNewKeyboardNotifyEvent.type	0
+XkbNewKeyboardNotifyEvent.xkb_type	20
+XkbStateNotifyEvent	80
+XkbStateNotifyEvent.base_group	36
+XkbStateNotifyEvent.base_mods	52
+XkbStateNotifyEvent.changed	28
+XkbStateNotifyEvent.compat_grab_mods	69
+XkbStateNotifyEvent.compat_lookup_mods	71
+XkbStateNotifyEvent.compat_state	64
+XkbStateNotifyEvent.device	24
+XkbStateNotifyEvent.display	12
+XkbStateNotifyEvent.event_type	77
+XkbStateNotifyEvent.grab_mods	68
+XkbStateNotifyEvent.group	32
+XkbStateNotifyEvent.keycode	76
+XkbStateNotifyEvent.latched_group	40
+XkbStateNotifyEvent.latched_mods	56
+XkbStateNotifyEvent.locked_group	44
+XkbStateNotifyEvent.locked_mods	60
+XkbStateNotifyEvent.lookup_mods	70
+XkbStateNotifyEvent.mods	48
+XkbStateNotifyEvent.ptr_buttons	72
+XkbStateNotifyEvent.req_major	78
+XkbStateNotifyEvent.req_minor	79
+XkbStateNotifyEvent.send_event	8
+XkbStateNotifyEvent.serial	4
+XkbStateNotifyEvent.time	16
+XkbStateNotifyEvent.type	0
+XkbStateNotifyEvent.xkb_type	20
+XKeyboardControl	32
+XKeyboardControl.auto_repeat_mode	28
+XKeyboardControl.bell_duration	12
+XKeyboardControl.bell_percent	4
+XKeyboardControl.bell_pitch	8
+XKeyboardControl.key	24
+XKeyboardControl.key_click_percent	0
+XKeyboardControl.led	16
+XKeyboardControl.led_mode	20
+XKeyboardState	56
+XKeyboardState.auto_repeats	24
+XKeyboardState.bell_duration	12
+XKeyboardState.bell_percent	4
+XKeyboardState.bell_pitch	8
+XKeyboardState.global_auto_repeat	20
+XKeyboardState.key_click_percent	0
+XKeyboardState.led_mask	16
+XKeyEvent	60
+XKeyEvent.display	12
+XKeyEvent.keycode	52
+XKeyEvent.root	20
+XKeyEvent.same_screen	56
+XKeyEvent.send_event	8
+XKeyEvent.serial	4
+XKeyEvent.state	48
+XKeyEvent.subwindow	24
+XKeyEvent.time	28
+XKeyEvent.type	0
+XKeyEvent.window	16
+XKeyEvent.x	32
+XKeyEvent.x_root	40
+XKeyEvent.y	36
+XKeyEvent.y_root	44
+XKeymapEvent	52
+XKeymapEvent.display	12
+XKeymapEvent.key_vector	20
+XKeymapEvent.send_event	8
+XKeymapEvent.serial	4
+XKeymapEvent.type	0
+XKeymapEvent.window	16
+XMapEvent	28
+XMapEvent.display	12
+XMapEvent.event	16
+XMapEvent.override_redirect	24
+XMapEvent.send_event	8
+XMapEvent.serial	4
+XMapEvent.type	0
+XMapEvent.window	20
+XMappingEvent	32
+XMappingEvent.count	28
+XMappingEvent.display	12
+XMappingEvent.first_keycode	24
+XMappingEvent.request	20
+XMappingEvent.send_event	8
+XMappingEvent.serial	4
+XMappingEvent.type	0
+XMappingEvent.window	16
+XMapRequestEvent	24
+XMapRequestEvent.display	12
+XMapRequestEvent.parent	16
+XMapRequestEvent.send_event	8
+XMapRequestEvent.serial	4
+XMapRequestEvent.type	0
+XMapRequestEvent.window	20
+XmbTextItem	16
+XmbTextItem.chars	0
+XmbTextItem.delta	8
+XmbTextItem.font_set	12
+XmbTextItem.nchars	4
+XModifierKeymap	8
+XModifierKeymap.max_keypermod	0
+XModifierKeymap.modifiermap	4
+XMotionEvent	60
+XMotionEvent.display	12
+XMotionEvent.is_hint	52
+XMotionEvent.root	20
+XMotionEvent.same_screen	56
+XMotionEvent.send_event	8
+XMotionEvent.serial	4
+XMotionEvent.state	48
+XMotionEvent.subwindow	24
+XMotionEvent.time	28
+XMotionEvent.type	0
+XMotionEvent.window	16
+XMotionEvent.x	32
+XMotionEvent.x_root	40
+XMotionEvent.y	36
+XMotionEvent.y_root	44
+XNoExposeEvent	28
+XNoExposeEvent.display	12
+XNoExposeEvent.drawable	16
+XNoExposeEvent.major_code	20
+XNoExposeEvent.minor_code	24
+XNoExposeEvent.send_event	8
+XNoExposeEvent.serial	4
+XNoExposeEvent.type	0
+XOMCharSetList	8
+XOMCharSetList.charset_count	0
+XOMCharSetList.charset_list	4
+XOMFontInfo	12
+XOMFontInfo.font_name_list	8
+XOMFontInfo.font_struct_list	4
+XOMFontInfo.num_font	0
+XOMOrientation	8
+XOMOrientation.num_orientation	0
+XOMOrientation.orientation	4
+XPixmapFormatValues	12
+XPixmapFormatValues.bits_per_pixel	4
+XPixmapFormatValues.depth	0
+XPixmapFormatValues.scanline_pad	8
+XPoint	4
+XPoint.x	0
+XPoint.y	2
+XPropertyEvent	32
+XPropertyEvent.atom	20
+XPropertyEvent.display	12
+XPropertyEvent.send_event	8
+XPropertyEvent.serial	4
+XPropertyEvent.state	28
+XPropertyEvent.time	24
+XPropertyEvent.type	0
+XPropertyEvent.window	16
+XRectangle	8
+XRectangle.height	6
+XRectangle.width	4
+XRectangle.x	0
+XRectangle.y	2
+XRenderDirectFormat	16
+XRenderDirectFormat.alpha	12
+XRenderDirectFormat.alphaMask	14
+XRenderDirectFormat.blue	8
+XRenderDirectFormat.blueMask	10
+XRenderDirectFormat.green	4
+XRenderDirectFormat.greenMask	6
+XRenderDirectFormat.red	0
+XRenderDirectFormat.redMask	2
+XRenderPictFormat	32
+XRenderPictFormat.colormap	28
+XRenderPictFormat.depth	8
+XRenderPictFormat.direct	12
+XRenderPictFormat.id	0
+XRenderPictFormat.type	4
+XReparentEvent	40
+XReparentEvent.display	12
+XReparentEvent.event	16
+XReparentEvent.override_redirect	36
+XReparentEvent.parent	24
+XReparentEvent.send_event	8
+XReparentEvent.serial	4
+XReparentEvent.type	0
+XReparentEvent.window	20
+XReparentEvent.x	28
+XReparentEvent.y	32
+XResizeRequestEvent	28
+XResizeRequestEvent.display	12
+XResizeRequestEvent.height	24
+XResizeRequestEvent.send_event	8
+XResizeRequestEvent.serial	4
+XResizeRequestEvent.type	0
+XResizeRequestEvent.width	20
+XResizeRequestEvent.window	16
+XSegment	8
+XSegment.x1	0
+XSegment.x2	4
+XSegment.y1	2
+XSegment.y2	6
+XSelectionClearEvent	28
+XSelectionClearEvent.display	12
+XSelectionClearEvent.selection	20
+XSelectionClearEvent.send_event	8
+XSelectionClearEvent.serial	4
+XSelectionClearEvent.time	24
+XSelectionClearEvent.type	0
+XSelectionClearEvent.window	16
+XSelectionEvent	36
+XSelectionEvent.display	12
+XSelectionEvent.property	28
+XSelectionEvent.requestor	16
+XSelectionEvent.selection	20
+XSelectionEvent.send_event	8
+XSelectionEvent.serial	4
+XSelectionEvent.target	24
+XSelectionEvent.time	32
+XSelectionEvent.type	0
+XSelectionRequestEvent	40
+XSelectionRequestEvent.display	12
+XSelectionRequestEvent.owner	16
+XSelectionRequestEvent.property	32
+XSelectionRequestEvent.requestor	20
+XSelectionRequestEvent.selection	24
+XSelectionRequestEvent.send_event	8
+XSelectionRequestEvent.serial	4
+XSelectionRequestEvent.target	28
+XSelectionRequestEvent.time	36
+XSelectionRequestEvent.type	0
+XSetWindowAttributes	60
+XSetWindowAttributes.background_pixel	4
+XSetWindowAttributes.background_pixmap	0
+XSetWindowAttributes.backing_pixel	32
+XSetWindowAttributes.backing_planes	28
+XSetWindowAttributes.backing_store	24
+XSetWindowAttributes.bit_gravity	16
+XSetWindowAttributes.border_pixel	12
+XSetWindowAttributes.border_pixmap	8
+XSetWindowAttributes.colormap	52
+XSetWindowAttributes.cursor	56
+XSetWindowAttributes.do_not_propagate_mask	44
+XSetWindowAttributes.event_mask	40
+XSetWindowAttributes.override_redirect	48
+XSetWindowAttributes.save_under	36
+XSetWindowAttributes.win_gravity	20
+XSizeHints	72
+XSizeHints.base_height	64
+XSizeHints.base_width	60
+XSizeHints.flags	0
+XSizeHints.height	16
+XSizeHints.height_inc	40
+XSizeHints.max_aspect.x	52
+XSizeHints.max_aspect.y	56
+XSizeHints.max_height	32
+XSizeHints.max_width	28
+XSizeHints.min_aspect.x	44
+XSizeHints.min_aspect.y	48
+XSizeHints.min_height	24
+XSizeHints.min_width	20
+XSizeHints.width	12
+XSizeHints.width_inc	36
+XSizeHints.win_gravity	68
+XSizeHints.x	4
+XSizeHints.y	8
+XStandardColormap	40
+XStandardColormap.base_pixel	28
+XStandardColormap.blue_max	20
+XStandardColormap.blue_mult	24
+XStandardColormap.colormap	0
+XStandardColormap.green_max	12
+XStandardColormap.green_mult	16
+XStandardColormap.killid	36
+XStandardColormap.red_max	4
+XStandardColormap.red_mult	8
+XStandardColormap.visualid	32
+XTextItem	16
+XTextItem16	16
+XTextItem16.chars	0
+XTextItem16.delta	8
+XTextItem16.font	12
+XTextItem16.nchars	4
+XTextItem.chars	0
+XTextItem.delta	8
+XTextItem.font	12
+XTextItem.nchars	4
+XTextProperty	16
+XTextProperty.encoding	4
+XTextProperty.format	8
+XTextProperty.nitems	12
+XTextProperty.value	0
+XTimeCoord	8
+XTimeCoord.time	0
+XTimeCoord.x	4
+XTimeCoord.y	6
+XUnmapEvent	28
+XUnmapEvent.display	12
+XUnmapEvent.event	16
+XUnmapEvent.from_configure	24
+XUnmapEvent.send_event	8
+XUnmapEvent.serial	4
+XUnmapEvent.type	0
+XUnmapEvent.window	20
+XVisibilityEvent	24
+XVisibilityEvent.display	12
+XVisibilityEvent.send_event	8
+XVisibilityEvent.serial	4
+XVisibilityEvent.state	20
+XVisibilityEvent.type	0
+XVisibilityEvent.window	16
+XVisualInfo	40
+XVisualInfo.bits_per_rgb	36
+XVisualInfo.blue_mask	28
+XVisualInfo.class	16
+XVisualInfo.colormap_size	32
+XVisualInfo.depth	12
+XVisualInfo.green_mask	24
+XVisualInfo.red_mask	20
+XVisualInfo.screen	8
+XVisualInfo.visual	0
+XVisualInfo.visualid	4
+XwcTextItem	16
+XwcTextItem.chars	0
+XwcTextItem.delta	8
+XwcTextItem.font_set	12
+XwcTextItem.nchars	4
+XWindowAttributes	92
+XWindowAttributes.all_event_masks	72
+XWindowAttributes.backing_pixel	52
+XWindowAttributes.backing_planes	48
+XWindowAttributes.backing_store	44
+XWindowAttributes.bit_gravity	36
+XWindowAttributes.border_width	16
+XWindowAttributes.class	32
+XWindowAttributes.colormap	60
+XWindowAttributes.depth	20
+XWindowAttributes.do_not_propagate_mask	80
+XWindowAttributes.height	12
+XWindowAttributes.map_installed	64
+XWindowAttributes.map_state	68
+XWindowAttributes.override_redirect	84
+XWindowAttributes.root	28
+XWindowAttributes.save_under	56
+XWindowAttributes.screen	88
+XWindowAttributes.visual	24
+XWindowAttributes.width	8
+XWindowAttributes.win_gravity	40
+XWindowAttributes.x	0
+XWindowAttributes.y	4
+XWindowAttributes.your_event_mask	76
+XWindowChanges	28
+XWindowChanges.border_width	16
+XWindowChanges.height	12
+XWindowChanges.sibling	20
+XWindowChanges.stack_mode	24
+XWindowChanges.width	8
+XWindowChanges.x	0
+XWindowChanges.y	4
+XWMHints	36
+XWMHints.flags	0
+XWMHints.icon_mask	28
+XWMHints.icon_pixmap	12
+XWMHints.icon_window	16
+XWMHints.icon_x	20
+XWMHints.icon_y	24
+XWMHints.initial_state	8
+XWMHints.input	4
+XWMHints.window_group	32
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/x11wrappergen/sizes-64.txt	Tue Mar 06 00:59:49 2018 +0100
@@ -0,0 +1,1017 @@
+Atom	8
+AwtGraphicsConfigData	208
+AwtGraphicsConfigData.awt_cmap	8
+AwtGraphicsConfigData.AwtColorMatch	96
+AwtGraphicsConfigData.awt_depth	0
+AwtGraphicsConfigData.awtImage	88
+AwtGraphicsConfigData.awt_num_colors	80
+AwtGraphicsConfigData.awt_visInfo	16
+AwtGraphicsConfigData.color_data	144
+AwtGraphicsConfigData.glxInfo	152
+AwtGraphicsConfigData.isTranslucencySupported	160
+AwtGraphicsConfigData.monoImage	104
+AwtGraphicsConfigData.monoPixmap	112
+AwtGraphicsConfigData.monoPixmapGC	128
+AwtGraphicsConfigData.monoPixmapHeight	124
+AwtGraphicsConfigData.monoPixmapWidth	120
+AwtGraphicsConfigData.pixelStride	136
+AwtGraphicsConfigData.renderPictFormat	168
+awtImageData	560
+awtImageData.clrdata	16
+awtImageData.convert	48
+awtImageData.Depth	0
+awtImageData.wsImageFormat	4
+AwtScreenData	48
+AwtScreenData.blackpixel	24
+AwtScreenData.configs	40
+AwtScreenData.defaultConfig	32
+AwtScreenData.numConfigs	0
+AwtScreenData.root	8
+AwtScreenData.whitepixel	16
+Bool	4
+ColorData	88
+ColorData.awt_Colors	0
+ColorData.awt_icmLUT	16
+ColorData.awt_icmLUT2Colors	24
+ColorData.awt_numICMcolors	8
+ColorData.img_clr_tbl	40
+ColorData.img_grays	32
+ColorData.img_oda_blue	64
+ColorData.img_oda_green	56
+ColorData.img_oda_red	48
+ColorData.pGrayInverseLutData	72
+ColorData.representsPrimaries	84
+ColorData.screendata	80
+ColorEntry	4
+ColorEntry.b	2
+ColorEntry.flags	3
+ColorEntry.g	1
+ColorEntry.r	0
+Depth	16
+Depth.depth	0
+Depth.nvisuals	4
+Depth.visuals	8
+int	4
+long	8
+PropMwmHints	40
+PropMwmHints.decorations	16
+PropMwmHints.flags	0
+PropMwmHints.functions	8
+PropMwmHints.inputMode	24
+PropMwmHints.status	32
+ptr	8
+Screen	128
+Screen.backing_store	112
+Screen.black_pixel	96
+Screen.cmap	80
+Screen.default_gc	72
+Screen.depths	48
+Screen.display	8
+Screen.ext_data	0
+ScreenFormat	24
+ScreenFormat.bits_per_pixel	12
+ScreenFormat.depth	8
+ScreenFormat.ext_data	0
+ScreenFormat.scanline_pad	16
+Screen.height	28
+Screen.max_maps	104
+Screen.mheight	36
+Screen.min_maps	108
+Screen.mwidth	32
+Screen.ndepths	40
+Screen.root	16
+Screen.root_depth	56
+Screen.root_input_mask	120
+Screen.root_visual	64
+Screen.save_unders	116
+Screen.white_pixel	88
+Screen.width	24
+short	2
+Visual	56
+Visual.bits_per_rgb	48
+Visual.blue_mask	40
+Visual.class	16
+Visual.ext_data	0
+Visual.green_mask	32
+Visual.map_entries	52
+Visual.red_mask	24
+Visual.visualid	8
+Window	8
+XAnyEvent	40
+XAnyEvent.display	24
+XAnyEvent.send_event	16
+XAnyEvent.serial	8
+XAnyEvent.type	0
+XAnyEvent.window	32
+XArc	12
+XArc.angle1	8
+XArc.angle2	10
+XArc.height	6
+XArc.width	4
+XArc.x	0
+XArc.y	2
+XButtonEvent	96
+XButtonEvent.button	84
+XButtonEvent.display	24
+XButtonEvent.root	40
+XButtonEvent.same_screen	88
+XButtonEvent.send_event	16
+XButtonEvent.serial	8
+XButtonEvent.state	80
+XButtonEvent.subwindow	48
+XButtonEvent.time	56
+XButtonEvent.type	0
+XButtonEvent.window	32
+XButtonEvent.x	64
+XButtonEvent.x_root	72
+XButtonEvent.y	68
+XButtonEvent.y_root	76
+XChar2b	2
+XChar2b.byte1	0
+XChar2b.byte2	1
+XCharStruct	12
+XCharStruct.ascent	6
+XCharStruct.attributes	10
+XCharStruct.descent	8
+XCharStruct.lbearing	0
+XCharStruct.rbearing	2
+XCharStruct.width	4
+XCirculateEvent	56
+XCirculateEvent.display	24
+XCirculateEvent.event	32
+XCirculateEvent.place	48
+XCirculateEvent.send_event	16
+XCirculateEvent.serial	8
+XCirculateEvent.type	0
+XCirculateEvent.window	40
+XCirculateRequestEvent	56
+XCirculateRequestEvent.display	24
+XCirculateRequestEvent.parent	32
+XCirculateRequestEvent.place	48
+XCirculateRequestEvent.send_event	16
+XCirculateRequestEvent.serial	8
+XCirculateRequestEvent.type	0
+XCirculateRequestEvent.window	40
+XClassHint	16
+XClassHint.res_class	8
+XClassHint.res_name	0
+XClientMessageEvent	96
+XClientMessageEvent.data	56
+XClientMessageEvent.display	24
+XClientMessageEvent.format	48
+XClientMessageEvent.message_type	40
+XClientMessageEvent.send_event	16
+XClientMessageEvent.serial	8
+XClientMessageEvent.type	0
+XClientMessageEvent.window	32
+XColor	16
+XColor.blue	12
+XColor.flags	14
+XColor.green	10
+XColormapEvent	56
+XColormapEvent.colormap	40
+XColormapEvent.display	24
+XColormapEvent.new	48
+XColormapEvent.send_event	16
+XColormapEvent.serial	8
+XColormapEvent.state	52
+XColormapEvent.type	0
+XColormapEvent.window	32
+XColor.pad	15
+XColor.pixel	0
+XColor.red	8
+XComposeStatus	16
+XComposeStatus.chars_matched	8
+XComposeStatus.compose_ptr	0
+XConfigureEvent	88
+XConfigureEvent.above	72
+XConfigureEvent.border_width	64
+XConfigureEvent.display	24
+XConfigureEvent.event	32
+XConfigureEvent.height	60
+XConfigureEvent.override_redirect	80
+XConfigureEvent.send_event	16
+XConfigureEvent.serial	8
+XConfigureEvent.type	0
+XConfigureEvent.width	56
+XConfigureEvent.window	40
+XConfigureEvent.x	48
+XConfigureEvent.y	52
+XConfigureRequestEvent	96
+XConfigureRequestEvent.above	72
+XConfigureRequestEvent.border_width	64
+XConfigureRequestEvent.detail	80
+XConfigureRequestEvent.display	24
+XConfigureRequestEvent.height	60
+XConfigureRequestEvent.parent	32
+XConfigureRequestEvent.send_event	16
+XConfigureRequestEvent.serial	8
+XConfigureRequestEvent.type	0
+XConfigureRequestEvent.value_mask	88
+XConfigureRequestEvent.width	56
+XConfigureRequestEvent.window	40
+XConfigureRequestEvent.x	48
+XConfigureRequestEvent.y	52
+XCreateWindowEvent	72
+XCreateWindowEvent.border_width	64
+XCreateWindowEvent.display	24
+XCreateWindowEvent.height	60
+XCreateWindowEvent.override_redirect	68
+XCreateWindowEvent.parent	32
+XCreateWindowEvent.send_event	16
+XCreateWindowEvent.serial	8
+XCreateWindowEvent.type	0
+XCreateWindowEvent.width	56
+XCreateWindowEvent.window	40
+XCreateWindowEvent.x	48
+XCreateWindowEvent.y	52
+XCrossingEvent	104
+XCrossingEvent.detail	84
+XCrossingEvent.display	24
+XCrossingEvent.focus	92
+XCrossingEvent.mode	80
+XCrossingEvent.root	40
+XCrossingEvent.same_screen	88
+XCrossingEvent.send_event	16
+XCrossingEvent.serial	8
+XCrossingEvent.state	96
+XCrossingEvent.subwindow	48
+XCrossingEvent.time	56
+XCrossingEvent.type	0
+XCrossingEvent.window	32
+XCrossingEvent.x	64
+XCrossingEvent.x_root	72
+XCrossingEvent.y	68
+XCrossingEvent.y_root	76
+XdbeSwapInfo	16
+XdbeSwapInfo.swap_action	8
+XdbeSwapInfo.swap_window	0
+XDestroyWindowEvent	48
+XDestroyWindowEvent.display	24
+XDestroyWindowEvent.event	32
+XDestroyWindowEvent.send_event	16
+XDestroyWindowEvent.serial	8
+XDestroyWindowEvent.type	0
+XDestroyWindowEvent.window	40
+XErrorEvent	40
+XErrorEvent.display	8
+XErrorEvent.error_code	32
+XErrorEvent.minor_code	34
+XErrorEvent.request_code	33
+XErrorEvent.resourceid	16
+XErrorEvent.serial	24
+XErrorEvent.type	0
+XEvent	192
+XEvent.pad	0
+XEvent.type	0
+XEvent.xany	0
+XEvent.xbutton	0
+XEvent.xcirculate	0
+XEvent.xcirculaterequest	0
+XEvent.xclient	0
+XEvent.xcolormap	0
+XEvent.xconfigure	0
+XEvent.xconfigurerequest	0
+XEvent.xcreatewindow	0
+XEvent.xcrossing	0
+XEvent.xdestroywindow	0
+XEvent.xerror	0
+XEvent.xexpose	0
+XEvent.xfocus	0
+XEvent.xgraphicsexpose	0
+XEvent.xgravity	0
+XEvent.xkey	0
+XEvent.xkeymap	0
+XEvent.xmap	0
+XEvent.xmapping	0
+XEvent.xmaprequest	0
+XEvent.xmotion	0
+XEvent.xnoexpose	0
+XEvent.xproperty	0
+XEvent.xreparent	0
+XEvent.xresizerequest	0
+XEvent.xselection	0
+XEvent.xselectionclear	0
+XEvent.xselectionrequest	0
+XEvent.xunmap	0
+XEvent.xvisibility	0
+XExposeEvent	64
+XExposeEvent.count	56
+XExposeEvent.display	24
+XExposeEvent.height	52
+XExposeEvent.send_event	16
+XExposeEvent.serial	8
+XExposeEvent.type	0
+XExposeEvent.width	48
+XExposeEvent.window	32
+XExposeEvent.x	40
+XExposeEvent.y	44
+XExtCodes	16
+XExtCodes.extension	0
+XExtCodes.first_error	12
+XExtCodes.first_event	8
+XExtCodes.major_opcode	4
+XExtData	32
+XExtData.free_private	16
+XExtData.next	8
+XExtData.number	0
+XExtData.private_data	24
+XFocusChangeEvent	48
+XFocusChangeEvent.detail	44
+XFocusChangeEvent.display	24
+XFocusChangeEvent.mode	40
+XFocusChangeEvent.send_event	16
+XFocusChangeEvent.serial	8
+XFocusChangeEvent.type	0
+XFocusChangeEvent.window	32
+XFontProp	16
+XFontProp.card32	8
+XFontProp.name	0
+XFontSetExtents	16
+XFontSetExtents.max_ink_extent	0
+XFontSetExtents.max_logical_extent	8
+XFontStruct	96
+XFontStruct.all_chars_exist	36
+XFontStruct.ascent	88
+XFontStruct.descent	92
+XFontStruct.direction	16
+XFontStruct.ext_data	0
+XFontStruct.fid	8
+XFontStruct.max_bounds	68
+XFontStruct.max_byte1	32
+XFontStruct.max_char_or_byte2	24
+XFontStruct.min_bounds	56
+XFontStruct.min_byte1	28
+XFontStruct.min_char_or_byte2	20
+XFontStruct.n_properties	44
+XFontStruct.per_char	80
+XFontStruct.properties	48
+XGCValues	128
+XGCValues.arc_mode	56
+XGCValues.background	24
+XGCValues.cap_style	40
+XGCValues.clip_mask	112
+XGCValues.clip_x_origin	104
+XGCValues.clip_y_origin	108
+XGCValues.dashes	124
+XGCValues.dash_offset	120
+XGCValues.fill_rule	52
+XGCValues.fill_style	48
+XGCValues.font	88
+XGCValues.foreground	16
+XGCValues.function	0
+XGCValues.graphics_exposures	100
+XGCValues.join_style	44
+XGCValues.line_style	36
+XGCValues.line_width	32
+XGCValues.plane_mask	8
+XGCValues.stipple	72
+XGCValues.subwindow_mode	96
+XGCValues.tile	64
+XGCValues.ts_x_origin	80
+XGCValues.ts_y_origin	84
+XGraphicsExposeEvent	72
+XGraphicsExposeEvent.count	56
+XGraphicsExposeEvent.display	24
+XGraphicsExposeEvent.drawable	32
+XGraphicsExposeEvent.height	52
+XGraphicsExposeEvent.major_code	60
+XGraphicsExposeEvent.minor_code	64
+XGraphicsExposeEvent.send_event	16
+XGraphicsExposeEvent.serial	8
+XGraphicsExposeEvent.type	0
+XGraphicsExposeEvent.width	48
+XGraphicsExposeEvent.x	40
+XGraphicsExposeEvent.y	44
+XGravityEvent	56
+XGravityEvent.display	24
+XGravityEvent.event	32
+XGravityEvent.send_event	16
+XGravityEvent.serial	8
+XGravityEvent.type	0
+XGravityEvent.window	40
+XGravityEvent.x	48
+XGravityEvent.y	52
+XHostAddress	16
+XHostAddress.address	8
+XHostAddress.family	0
+XHostAddress.length	4
+XIconSize	24
+XIconSize.height_inc	20
+XIconSize.max_height	12
+XIconSize.max_width	8
+XIconSize.min_height	4
+XIconSize.min_width	0
+XIconSize.width_inc	16
+XImage	136
+XImage.bitmap_bit_order	32
+XImage.bitmap_pad	36
+XImage.bitmap_unit	28
+XImage.bits_per_pixel	48
+XImage.blue_mask	72
+XImage.byte_order	24
+XImage.bytes_per_line	44
+XImage.data	16
+XImage.depth	40
+XImage.f.add_pixel	128
+XImage.f.create_image	88
+XImage.f.destroy_image	96
+XImage.f.get_pixel	104
+XImage.format	12
+XImage.f.put_pixel	112
+XImage.f.sub_image	120
+XImage.green_mask	64
+XImage.height	4
+XImage.obdata	80
+XImage.red_mask	56
+XImage.width	0
+XImage.xoffset	8
+XIMCallback	16
+XIMCallback.callback	8
+XIMCallback.client_data	0
+XIMHotKeyTrigger	16
+XIMHotKeyTrigger.keysym	0
+XIMHotKeyTrigger.modifier	8
+XIMHotKeyTrigger.modifier_mask	12
+XIMHotKeyTriggers	16
+XIMHotKeyTriggers.key	8
+XIMHotKeyTriggers.num_hot_key	0
+XIMPreeditCaretCallbackStruct	12
+XIMPreeditCaretCallbackStruct.direction	4
+XIMPreeditCaretCallbackStruct.position	0
+XIMPreeditCaretCallbackStruct.style	8
+XIMPreeditDrawCallbackStruct	24
+XIMPreeditDrawCallbackStruct.caret	0
+XIMPreeditDrawCallbackStruct.chg_first	4
+XIMPreeditDrawCallbackStruct.chg_length	8
+XIMPreeditDrawCallbackStruct.text	16
+XIMPreeditStateNotifyCallbackStruct	8
+XIMPreeditStateNotifyCallbackStruct.state	0
+XIMStatusDrawCallbackStruct	16
+XIMStatusDrawCallbackStruct.data	8
+XIMStatusDrawCallbackStruct.type	0
+XIMStringConversionCallbackStruct	24
+XIMStringConversionCallbackStruct.direction	4
+XIMStringConversionCallbackStruct.factor	10
+XIMStringConversionCallbackStruct.operation	8
+XIMStringConversionCallbackStruct.position	0
+XIMStringConversionCallbackStruct.text	16
+XIMStringConversionText	32
+XIMStringConversionText.encoding_is_wchar	16
+XIMStringConversionText.feedback	8
+XIMStringConversionText.length	0
+XIMStringConversionText.string	24
+XIMStyles	16
+XIMStyles.count_styles	0
+XIMStyles.supported_styles	8
+XIMText	32
+XIMText.encoding_is_wchar	16
+XIMText.feedback	8
+XIMText.length	0
+XIMText.string	24
+XIMValuesList	16
+XIMValuesList.count_values	0
+XIMValuesList.supported_values	8
+XkbAccessXNotifyEvent	64
+XkbAccessXNotifyEvent.debounce_delay	60
+XkbAccessXNotifyEvent.detail	48
+XkbAccessXNotifyEvent.device	44
+XkbAccessXNotifyEvent.display	24
+XkbAccessXNotifyEvent.keycode	52
+XkbAccessXNotifyEvent.send_event	16
+XkbAccessXNotifyEvent.serial	8
+XkbAccessXNotifyEvent.sk_delay	56
+XkbAccessXNotifyEvent.time	32
+XkbAccessXNotifyEvent.type	0
+XkbAccessXNotifyEvent.xkb_type	40
+XkbActionMessageEvent	80
+XkbActionMessageEvent.device	44
+XkbActionMessageEvent.display	24
+XkbActionMessageEvent.group	60
+XkbActionMessageEvent.keycode	48
+XkbActionMessageEvent.key_event_follows	56
+XkbActionMessageEvent.message	68
+XkbActionMessageEvent.mods	64
+XkbActionMessageEvent.press	52
+XkbActionMessageEvent.send_event	16
+XkbActionMessageEvent.serial	8
+XkbActionMessageEvent.time	32
+XkbActionMessageEvent.type	0
+XkbActionMessageEvent.xkb_type	40
+XkbAnyEvent	48
+XkbAnyEvent.device	44
+XkbAnyEvent.display	24
+XkbAnyEvent.send_event	16
+XkbAnyEvent.serial	8
+XkbAnyEvent.time	32
+XkbAnyEvent.type	0
+XkbAnyEvent.xkb_type	40
+XkbBellNotifyEvent	96
+XkbBellNotifyEvent.bell_class	60
+XkbBellNotifyEvent.bell_id	64
+XkbBellNotifyEvent.device	44
+XkbBellNotifyEvent.display	24
+XkbBellNotifyEvent.duration	56
+XkbBellNotifyEvent.event_only	88
+XkbBellNotifyEvent.name	72
+XkbBellNotifyEvent.percent	48
+XkbBellNotifyEvent.pitch	52
+XkbBellNotifyEvent.send_event	16
+XkbBellNotifyEvent.serial	8
+XkbBellNotifyEvent.time	32
+XkbBellNotifyEvent.type	0
+XkbBellNotifyEvent.window	80
+XkbBellNotifyEvent.xkb_type	40
+XkbCompatMapNotifyEvent	64
+XkbCompatMapNotifyEvent.changed_groups	48
+XkbCompatMapNotifyEvent.device	44
+XkbCompatMapNotifyEvent.display	24
+XkbCompatMapNotifyEvent.first_si	52
+XkbCompatMapNotifyEvent.num_si	56
+XkbCompatMapNotifyEvent.num_total_si	60
+XkbCompatMapNotifyEvent.send_event	16
+XkbCompatMapNotifyEvent.serial	8
+XkbCompatMapNotifyEvent.time	32
+XkbCompatMapNotifyEvent.type	0
+XkbCompatMapNotifyEvent.xkb_type	40
+XkbControlsNotifyEvent	72
+XkbControlsNotifyEvent.changed_ctrls	48
+XkbControlsNotifyEvent.device	44
+XkbControlsNotifyEvent.display	24
+XkbControlsNotifyEvent.enabled_ctrl_changes	56
+XkbControlsNotifyEvent.enabled_ctrls	52
+XkbControlsNotifyEvent.event_type	65
+XkbControlsNotifyEvent.keycode	64
+XkbControlsNotifyEvent.num_groups	60
+XkbControlsNotifyEvent.req_major	66
+XkbControlsNotifyEvent.req_minor	67
+XkbControlsNotifyEvent.send_event	16
+XkbControlsNotifyEvent.serial	8
+XkbControlsNotifyEvent.time	32
+XkbControlsNotifyEvent.type	0
+XkbControlsNotifyEvent.xkb_type	40
+XkbEvent	192
+XkbEvent.accessx	0
+XkbEvent.any	0
+XkbEvent.bell	0
+XkbEvent.compat	0
+XkbEvent.core	0
+XkbEvent.ctrls	0
+XkbEvent.device	0
+XkbEvent.indicators	0
+XkbEvent.map	0
+XkbEvent.message	0
+XkbEvent.names	0
+XkbEvent.new_kbd	0
+XkbEvent.state	0
+XkbEvent.type	0
+XkbExtensionDeviceNotifyEvent	88
+XkbExtensionDeviceNotifyEvent.device	44
+XkbExtensionDeviceNotifyEvent.display	24
+XkbExtensionDeviceNotifyEvent.first_btn	60
+XkbExtensionDeviceNotifyEvent.led_class	76
+XkbExtensionDeviceNotifyEvent.led_id	80
+XkbExtensionDeviceNotifyEvent.leds_defined	68
+XkbExtensionDeviceNotifyEvent.led_state	72
+XkbExtensionDeviceNotifyEvent.num_btns	64
+XkbExtensionDeviceNotifyEvent.reason	48
+XkbExtensionDeviceNotifyEvent.send_event	16
+XkbExtensionDeviceNotifyEvent.serial	8
+XkbExtensionDeviceNotifyEvent.supported	52
+XkbExtensionDeviceNotifyEvent.time	32
+XkbExtensionDeviceNotifyEvent.type	0
+XkbExtensionDeviceNotifyEvent.unsupported	56
+XkbExtensionDeviceNotifyEvent.xkb_type	40
+XkbIndicatorNotifyEvent	56
+XkbIndicatorNotifyEvent.changed	48
+XkbIndicatorNotifyEvent.device	44
+XkbIndicatorNotifyEvent.display	24
+XkbIndicatorNotifyEvent.send_event	16
+XkbIndicatorNotifyEvent.serial	8
+XkbIndicatorNotifyEvent.state	52
+XkbIndicatorNotifyEvent.time	32
+XkbIndicatorNotifyEvent.type	0
+XkbIndicatorNotifyEvent.xkb_type	40
+XkbMapNotifyEvent	104
+XkbMapNotifyEvent.changed	48
+XkbMapNotifyEvent.device	44
+XkbMapNotifyEvent.display	24
+XkbMapNotifyEvent.first_key_act	67
+XkbMapNotifyEvent.first_key_behavior	68
+XkbMapNotifyEvent.first_key_explicit	69
+XkbMapNotifyEvent.first_key_sym	66
+XkbMapNotifyEvent.first_modmap_key	70
+XkbMapNotifyEvent.first_type	56
+XkbMapNotifyEvent.first_vmodmap_key	71
+XkbMapNotifyEvent.flags	52
+XkbMapNotifyEvent.max_key_code	65
+XkbMapNotifyEvent.min_key_code	64
+XkbMapNotifyEvent.num_key_acts	76
+XkbMapNotifyEvent.num_key_behaviors	80
+XkbMapNotifyEvent.num_key_explicit	84
+XkbMapNotifyEvent.num_key_syms	72
+XkbMapNotifyEvent.num_modmap_keys	88
+XkbMapNotifyEvent.num_types	60
+XkbMapNotifyEvent.num_vmodmap_keys	92
+XkbMapNotifyEvent.send_event	16
+XkbMapNotifyEvent.serial	8
+XkbMapNotifyEvent.time	32
+XkbMapNotifyEvent.type	0
+XkbMapNotifyEvent.vmods	96
+XkbMapNotifyEvent.xkb_type	40
+XkbNamesNotifyEvent	96
+XkbNamesNotifyEvent.changed	48
+XkbNamesNotifyEvent.changed_groups	80
+XkbNamesNotifyEvent.changed_indicators	84
+XkbNamesNotifyEvent.changed_vmods	76
+XkbNamesNotifyEvent.device	44
+XkbNamesNotifyEvent.display	24
+XkbNamesNotifyEvent.first_key	88
+XkbNamesNotifyEvent.first_lvl	60
+XkbNamesNotifyEvent.first_type	52
+XkbNamesNotifyEvent.num_aliases	68
+XkbNamesNotifyEvent.num_keys	92
+XkbNamesNotifyEvent.num_lvls	64
+XkbNamesNotifyEvent.num_radio_groups	72
+XkbNamesNotifyEvent.num_types	56
+XkbNamesNotifyEvent.send_event	16
+XkbNamesNotifyEvent.serial	8
+XkbNamesNotifyEvent.time	32
+XkbNamesNotifyEvent.type	0
+XkbNamesNotifyEvent.xkb_type	40
+XkbNewKeyboardNotifyEvent	80
+XkbNewKeyboardNotifyEvent.changed	68
+XkbNewKeyboardNotifyEvent.device	44
+XkbNewKeyboardNotifyEvent.display	24
+XkbNewKeyboardNotifyEvent.max_key_code	56
+XkbNewKeyboardNotifyEvent.min_key_code	52
+XkbNewKeyboardNotifyEvent.old_device	48
+XkbNewKeyboardNotifyEvent.old_max_key_code	64
+XkbNewKeyboardNotifyEvent.old_min_key_code	60
+XkbNewKeyboardNotifyEvent.req_major	72
+XkbNewKeyboardNotifyEvent.req_minor	73
+XkbNewKeyboardNotifyEvent.send_event	16
+XkbNewKeyboardNotifyEvent.serial	8
+XkbNewKeyboardNotifyEvent.time	32
+XkbNewKeyboardNotifyEvent.type	0
+XkbNewKeyboardNotifyEvent.xkb_type	40
+XkbStateNotifyEvent	104
+XkbStateNotifyEvent.base_group	56
+XkbStateNotifyEvent.base_mods	72
+XkbStateNotifyEvent.changed	48
+XkbStateNotifyEvent.compat_grab_mods	89
+XkbStateNotifyEvent.compat_lookup_mods	91
+XkbStateNotifyEvent.compat_state	84
+XkbStateNotifyEvent.device	44
+XkbStateNotifyEvent.display	24
+XkbStateNotifyEvent.event_type	97
+XkbStateNotifyEvent.grab_mods	88
+XkbStateNotifyEvent.group	52
+XkbStateNotifyEvent.keycode	96
+XkbStateNotifyEvent.latched_group	60
+XkbStateNotifyEvent.latched_mods	76
+XkbStateNotifyEvent.locked_group	64
+XkbStateNotifyEvent.locked_mods	80
+XkbStateNotifyEvent.lookup_mods	90
+XkbStateNotifyEvent.mods	68
+XkbStateNotifyEvent.ptr_buttons	92
+XkbStateNotifyEvent.req_major	98
+XkbStateNotifyEvent.req_minor	99
+XkbStateNotifyEvent.send_event	16
+XkbStateNotifyEvent.serial	8
+XkbStateNotifyEvent.time	32
+XkbStateNotifyEvent.type	0
+XkbStateNotifyEvent.xkb_type	40
+XKeyboardControl	32
+XKeyboardControl.auto_repeat_mode	28
+XKeyboardControl.bell_duration	12
+XKeyboardControl.bell_percent	4
+XKeyboardControl.bell_pitch	8
+XKeyboardControl.key	24
+XKeyboardControl.key_click_percent	0
+XKeyboardControl.led	16
+XKeyboardControl.led_mode	20
+XKeyboardState	64
+XKeyboardState.auto_repeats	28
+XKeyboardState.bell_duration	12
+XKeyboardState.bell_percent	4
+XKeyboardState.bell_pitch	8
+XKeyboardState.global_auto_repeat	24
+XKeyboardState.key_click_percent	0
+XKeyboardState.led_mask	16
+XKeyEvent	96
+XKeyEvent.display	24
+XKeyEvent.keycode	84
+XKeyEvent.root	40
+XKeyEvent.same_screen	88
+XKeyEvent.send_event	16
+XKeyEvent.serial	8
+XKeyEvent.state	80
+XKeyEvent.subwindow	48
+XKeyEvent.time	56
+XKeyEvent.type	0
+XKeyEvent.window	32
+XKeyEvent.x	64
+XKeyEvent.x_root	72
+XKeyEvent.y	68
+XKeyEvent.y_root	76
+XKeymapEvent	72
+XKeymapEvent.display	24
+XKeymapEvent.key_vector	40
+XKeymapEvent.send_event	16
+XKeymapEvent.serial	8
+XKeymapEvent.type	0
+XKeymapEvent.window	32
+XMapEvent	56
+XMapEvent.display	24
+XMapEvent.event	32
+XMapEvent.override_redirect	48
+XMapEvent.send_event	16
+XMapEvent.serial	8
+XMapEvent.type	0
+XMapEvent.window	40
+XMappingEvent	56
+XMappingEvent.count	48
+XMappingEvent.display	24
+XMappingEvent.first_keycode	44
+XMappingEvent.request	40
+XMappingEvent.send_event	16
+XMappingEvent.serial	8
+XMappingEvent.type	0
+XMappingEvent.window	32
+XMapRequestEvent	48
+XMapRequestEvent.display	24
+XMapRequestEvent.parent	32
+XMapRequestEvent.send_event	16
+XMapRequestEvent.serial	8
+XMapRequestEvent.type	0
+XMapRequestEvent.window	40
+XmbTextItem	24
+XmbTextItem.chars	0
+XmbTextItem.delta	12
+XmbTextItem.font_set	16
+XmbTextItem.nchars	8
+XModifierKeymap	16
+XModifierKeymap.max_keypermod	0
+XModifierKeymap.modifiermap	8
+XMotionEvent	96
+XMotionEvent.display	24
+XMotionEvent.is_hint	84
+XMotionEvent.root	40
+XMotionEvent.same_screen	88
+XMotionEvent.send_event	16
+XMotionEvent.serial	8
+XMotionEvent.state	80
+XMotionEvent.subwindow	48
+XMotionEvent.time	56
+XMotionEvent.type	0
+XMotionEvent.window	32
+XMotionEvent.x	64
+XMotionEvent.x_root	72
+XMotionEvent.y	68
+XMotionEvent.y_root	76
+XNoExposeEvent	48
+XNoExposeEvent.display	24
+XNoExposeEvent.drawable	32
+XNoExposeEvent.major_code	40
+XNoExposeEvent.minor_code	44
+XNoExposeEvent.send_event	16
+XNoExposeEvent.serial	8
+XNoExposeEvent.type	0
+XOMCharSetList	16
+XOMCharSetList.charset_count	0
+XOMCharSetList.charset_list	8
+XOMFontInfo	24
+XOMFontInfo.font_name_list	16
+XOMFontInfo.font_struct_list	8
+XOMFontInfo.num_font	0
+XOMOrientation	16
+XOMOrientation.num_orientation	0
+XOMOrientation.orientation	8
+XPixmapFormatValues	12
+XPixmapFormatValues.bits_per_pixel	4
+XPixmapFormatValues.depth	0
+XPixmapFormatValues.scanline_pad	8
+XPoint	4
+XPoint.x	0
+XPoint.y	2
+XPropertyEvent	64
+XPropertyEvent.atom	40
+XPropertyEvent.display	24
+XPropertyEvent.send_event	16
+XPropertyEvent.serial	8
+XPropertyEvent.state	56
+XPropertyEvent.time	48
+XPropertyEvent.type	0
+XPropertyEvent.window	32
+XRectangle	8
+XRectangle.height	6
+XRectangle.width	4
+XRectangle.x	0
+XRectangle.y	2
+XRenderDirectFormat	16
+XRenderDirectFormat.alpha	12
+XRenderDirectFormat.alphaMask	14
+XRenderDirectFormat.blue	8
+XRenderDirectFormat.blueMask	10
+XRenderDirectFormat.green	4
+XRenderDirectFormat.greenMask	6
+XRenderDirectFormat.red	0
+XRenderDirectFormat.redMask	2
+XRenderPictFormat	40
+XRenderPictFormat.colormap	32
+XRenderPictFormat.depth	12
+XRenderPictFormat.direct	16
+XRenderPictFormat.id	0
+XRenderPictFormat.type	8
+XReparentEvent	72
+XReparentEvent.display	24
+XReparentEvent.event	32
+XReparentEvent.override_redirect	64
+XReparentEvent.parent	48
+XReparentEvent.send_event	16
+XReparentEvent.serial	8
+XReparentEvent.type	0
+XReparentEvent.window	40
+XReparentEvent.x	56
+XReparentEvent.y	60
+XResizeRequestEvent	48
+XResizeRequestEvent.display	24
+XResizeRequestEvent.height	44
+XResizeRequestEvent.send_event	16
+XResizeRequestEvent.serial	8
+XResizeRequestEvent.type	0
+XResizeRequestEvent.width	40
+XResizeRequestEvent.window	32
+XSegment	8
+XSegment.x1	0
+XSegment.x2	4
+XSegment.y1	2
+XSegment.y2	6
+XSelectionClearEvent	56
+XSelectionClearEvent.display	24
+XSelectionClearEvent.selection	40
+XSelectionClearEvent.send_event	16
+XSelectionClearEvent.serial	8
+XSelectionClearEvent.time	48
+XSelectionClearEvent.type	0
+XSelectionClearEvent.window	32
+XSelectionEvent	72
+XSelectionEvent.display	24
+XSelectionEvent.property	56
+XSelectionEvent.requestor	32
+XSelectionEvent.selection	40
+XSelectionEvent.send_event	16
+XSelectionEvent.serial	8
+XSelectionEvent.target	48
+XSelectionEvent.time	64
+XSelectionEvent.type	0
+XSelectionRequestEvent	80
+XSelectionRequestEvent.display	24
+XSelectionRequestEvent.owner	32
+XSelectionRequestEvent.property	64
+XSelectionRequestEvent.requestor	40
+XSelectionRequestEvent.selection	48
+XSelectionRequestEvent.send_event	16
+XSelectionRequestEvent.serial	8
+XSelectionRequestEvent.target	56
+XSelectionRequestEvent.time	72
+XSelectionRequestEvent.type	0
+XSetWindowAttributes	112
+XSetWindowAttributes.background_pixel	8
+XSetWindowAttributes.background_pixmap	0
+XSetWindowAttributes.backing_pixel	56
+XSetWindowAttributes.backing_planes	48
+XSetWindowAttributes.backing_store	40
+XSetWindowAttributes.bit_gravity	32
+XSetWindowAttributes.border_pixel	24
+XSetWindowAttributes.border_pixmap	16
+XSetWindowAttributes.colormap	96
+XSetWindowAttributes.cursor	104
+XSetWindowAttributes.do_not_propagate_mask	80
+XSetWindowAttributes.event_mask	72
+XSetWindowAttributes.override_redirect	88
+XSetWindowAttributes.save_under	64
+XSetWindowAttributes.win_gravity	36
+XSizeHints	80
+XSizeHints.base_height	68
+XSizeHints.base_width	64
+XSizeHints.flags	0
+XSizeHints.height	20
+XSizeHints.height_inc	44
+XSizeHints.max_aspect.x	56
+XSizeHints.max_aspect.y	60
+XSizeHints.max_height	36
+XSizeHints.max_width	32
+XSizeHints.min_aspect.x	48
+XSizeHints.min_aspect.y	52
+XSizeHints.min_height	28
+XSizeHints.min_width	24
+XSizeHints.width	16
+XSizeHints.width_inc	40
+XSizeHints.win_gravity	72
+XSizeHints.x	8
+XSizeHints.y	12
+XStandardColormap	80
+XStandardColormap.base_pixel	56
+XStandardColormap.blue_max	40
+XStandardColormap.blue_mult	48
+XStandardColormap.colormap	0
+XStandardColormap.green_max	24
+XStandardColormap.green_mult	32
+XStandardColormap.killid	72
+XStandardColormap.red_max	8
+XStandardColormap.red_mult	16
+XStandardColormap.visualid	64
+XTextItem16	24
+XTextItem16.chars	0
+XTextItem16.delta	12
+XTextItem16.font	16
+XTextItem16.nchars	8
+XTextItem	24
+XTextItem.chars	0
+XTextItem.delta	12
+XTextItem.font	16
+XTextItem.nchars	8
+XTextProperty	32
+XTextProperty.encoding	8
+XTextProperty.format	16
+XTextProperty.nitems	24
+XTextProperty.value	0
+XTimeCoord	16
+XTimeCoord.time	0
+XTimeCoord.x	8
+XTimeCoord.y	10
+XUnmapEvent	56
+XUnmapEvent.display	24
+XUnmapEvent.event	32
+XUnmapEvent.from_configure	48
+XUnmapEvent.send_event	16
+XUnmapEvent.serial	8
+XUnmapEvent.type	0
+XUnmapEvent.window	40
+XVisibilityEvent	48
+XVisibilityEvent.display	24
+XVisibilityEvent.send_event	16
+XVisibilityEvent.serial	8
+XVisibilityEvent.state	40
+XVisibilityEvent.type	0
+XVisibilityEvent.window	32
+XVisualInfo	64
+XVisualInfo.bits_per_rgb	60
+XVisualInfo.blue_mask	48
+XVisualInfo.class	24
+XVisualInfo.colormap_size	56
+XVisualInfo.depth	20
+XVisualInfo.green_mask	40
+XVisualInfo.red_mask	32
+XVisualInfo.screen	16
+XVisualInfo.visual	0
+XVisualInfo.visualid	8
+XwcTextItem	24
+XwcTextItem.chars	0
+XwcTextItem.delta	12
+XwcTextItem.font_set	16
+XwcTextItem.nchars	8
+XWindowAttributes	136
+XWindowAttributes.all_event_masks	96
+XWindowAttributes.backing_pixel	64
+XWindowAttributes.backing_planes	56
+XWindowAttributes.backing_store	52
+XWindowAttributes.bit_gravity	44
+XWindowAttributes.border_width	16
+XWindowAttributes.class	40
+XWindowAttributes.colormap	80
+XWindowAttributes.depth	20
+XWindowAttributes.do_not_propagate_mask	112
+XWindowAttributes.height	12
+XWindowAttributes.map_installed	88
+XWindowAttributes.map_state	92
+XWindowAttributes.override_redirect	120
+XWindowAttributes.root	32
+XWindowAttributes.save_under	72
+XWindowAttributes.screen	128
+XWindowAttributes.visual	24
+XWindowAttributes.width	8
+XWindowAttributes.win_gravity	48
+XWindowAttributes.x	0
+XWindowAttributes.y	4
+XWindowAttributes.your_event_mask	104
+XWindowChanges	40
+XWindowChanges.border_width	16
+XWindowChanges.height	12
+XWindowChanges.sibling	24
+XWindowChanges.stack_mode	32
+XWindowChanges.width	8
+XWindowChanges.x	0
+XWindowChanges.y	4
+XWMHints	56
+XWMHints.flags	0
+XWMHints.icon_mask	40
+XWMHints.icon_pixmap	16
+XWMHints.icon_window	24
+XWMHints.icon_x	32
+XWMHints.icon_y	36
+XWMHints.initial_state	12
+XWMHints.input	8
+XWMHints.window_group	48
--- a/make/data/x11wrappergen/sizes.32	Tue Mar 06 00:56:03 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1017 +0,0 @@
-long	4
-int	4
-short	2
-ptr	4
-Bool	4
-Atom	4
-Window	4
-XExtData.number	0
-XExtData.next	4
-XExtData.free_private	8
-XExtData.private_data	12
-XExtData	16
-XIMStringConversionCallbackStruct.position	0
-XIMStringConversionCallbackStruct.direction	4
-XIMStringConversionCallbackStruct.operation	8
-XIMStringConversionCallbackStruct.factor	10
-XIMStringConversionCallbackStruct.text	12
-XIMStringConversionCallbackStruct	16
-XkbNewKeyboardNotifyEvent.type	0
-XkbNewKeyboardNotifyEvent.serial	4
-XkbNewKeyboardNotifyEvent.send_event	8
-XkbNewKeyboardNotifyEvent.display	12
-XkbNewKeyboardNotifyEvent.time	16
-XkbNewKeyboardNotifyEvent.xkb_type	20
-XkbNewKeyboardNotifyEvent.device	24
-XkbNewKeyboardNotifyEvent.old_device	28
-XkbNewKeyboardNotifyEvent.min_key_code	32
-XkbNewKeyboardNotifyEvent.max_key_code	36
-XkbNewKeyboardNotifyEvent.old_min_key_code	40
-XkbNewKeyboardNotifyEvent.old_max_key_code	44
-XkbNewKeyboardNotifyEvent.changed	48
-XkbNewKeyboardNotifyEvent.req_major	52
-XkbNewKeyboardNotifyEvent.req_minor	53
-XkbNewKeyboardNotifyEvent	56
-XTimeCoord.time	0
-XTimeCoord.x	4
-XTimeCoord.y	6
-XTimeCoord	8
-XkbCompatMapNotifyEvent.type	0
-XkbCompatMapNotifyEvent.serial	4
-XkbCompatMapNotifyEvent.send_event	8
-XkbCompatMapNotifyEvent.display	12
-XkbCompatMapNotifyEvent.time	16
-XkbCompatMapNotifyEvent.xkb_type	20
-XkbCompatMapNotifyEvent.device	24
-XkbCompatMapNotifyEvent.changed_groups	28
-XkbCompatMapNotifyEvent.first_si	32
-XkbCompatMapNotifyEvent.num_si	36
-XkbCompatMapNotifyEvent.num_total_si	40
-XkbCompatMapNotifyEvent	44
-XIMStatusDrawCallbackStruct.type	0
-XIMStatusDrawCallbackStruct.data	4
-XIMStatusDrawCallbackStruct	8
-XKeyboardControl.key_click_percent	0
-XKeyboardControl.bell_percent	4
-XKeyboardControl.bell_pitch	8
-XKeyboardControl.bell_duration	12
-XKeyboardControl.led	16
-XKeyboardControl.led_mode	20
-XKeyboardControl.key	24
-XKeyboardControl.auto_repeat_mode	28
-XKeyboardControl	32
-XSelectionClearEvent.type	0
-XSelectionClearEvent.serial	4
-XSelectionClearEvent.send_event	8
-XSelectionClearEvent.display	12
-XSelectionClearEvent.window	16
-XSelectionClearEvent.selection	20
-XSelectionClearEvent.time	24
-XSelectionClearEvent	28
-XWindowChanges.x	0
-XWindowChanges.y	4
-XWindowChanges.width	8
-XWindowChanges.height	12
-XWindowChanges.border_width	16
-XWindowChanges.sibling	20
-XWindowChanges.stack_mode	24
-XWindowChanges	28
-XIMPreeditCaretCallbackStruct.position	0
-XIMPreeditCaretCallbackStruct.direction	4
-XIMPreeditCaretCallbackStruct.style	8
-XIMPreeditCaretCallbackStruct	12
-XOMCharSetList.charset_count	0
-XOMCharSetList.charset_list	4
-XOMCharSetList	8
-XOMFontInfo.num_font	0
-XOMFontInfo.font_struct_list	4
-XOMFontInfo.font_name_list	8
-XOMFontInfo	12
-AwtScreenData.numConfigs	0
-AwtScreenData.root	4
-AwtScreenData.whitepixel	8
-AwtScreenData.blackpixel	12
-AwtScreenData.defaultConfig	16
-AwtScreenData.configs	20
-AwtScreenData	24
-XIMHotKeyTrigger.keysym	0
-XIMHotKeyTrigger.modifier	4
-XIMHotKeyTrigger.modifier_mask	8
-XIMHotKeyTrigger	12
-XCirculateEvent.type	0
-XCirculateEvent.serial	4
-XCirculateEvent.send_event	8
-XCirculateEvent.display	12
-XCirculateEvent.event	16
-XCirculateEvent.window	20
-XCirculateEvent.place	24
-XCirculateEvent	28
-Screen.ext_data	0
-Screen.display	4
-Screen.root	8
-Screen.width	12
-Screen.height	16
-Screen.mwidth	20
-Screen.mheight	24
-Screen.ndepths	28
-Screen.depths	32
-Screen.root_depth	36
-Screen.root_visual	40
-Screen.default_gc	44
-Screen.cmap	48
-Screen.white_pixel	52
-Screen.black_pixel	56
-Screen.max_maps	60
-Screen.min_maps	64
-Screen.backing_store	68
-Screen.save_unders	72
-Screen.root_input_mask	76
-Screen	80
-XMapRequestEvent.type	0
-XMapRequestEvent.serial	4
-XMapRequestEvent.send_event	8
-XMapRequestEvent.display	12
-XMapRequestEvent.parent	16
-XMapRequestEvent.window	20
-XMapRequestEvent	24
-XIMText.length	0
-XIMText.feedback	4
-XIMText.encoding_is_wchar	8
-XIMText.string	12
-XIMText	16
-XGraphicsExposeEvent.type	0
-XGraphicsExposeEvent.serial	4
-XGraphicsExposeEvent.send_event	8
-XGraphicsExposeEvent.display	12
-XGraphicsExposeEvent.drawable	16
-XGraphicsExposeEvent.x	20
-XGraphicsExposeEvent.y	24
-XGraphicsExposeEvent.width	28
-XGraphicsExposeEvent.height	32
-XGraphicsExposeEvent.count	36
-XGraphicsExposeEvent.major_code	40
-XGraphicsExposeEvent.minor_code	44
-XGraphicsExposeEvent	48
-XEvent.type	0
-XEvent.xany	0
-XEvent.xkey	0
-XEvent.xbutton	0
-XEvent.xmotion	0
-XEvent.xcrossing	0
-XEvent.xfocus	0
-XEvent.xexpose	0
-XEvent.xgraphicsexpose	0
-XEvent.xnoexpose	0
-XEvent.xvisibility	0
-XEvent.xcreatewindow	0
-XEvent.xdestroywindow	0
-XEvent.xunmap	0
-XEvent.xmap	0
-XEvent.xmaprequest	0
-XEvent.xreparent	0
-XEvent.xconfigure	0
-XEvent.xgravity	0
-XEvent.xresizerequest	0
-XEvent.xconfigurerequest	0
-XEvent.xcirculate	0
-XEvent.xcirculaterequest	0
-XEvent.xproperty	0
-XEvent.xselectionclear	0
-XEvent.xselectionrequest	0
-XEvent.xselection	0
-XEvent.xcolormap	0
-XEvent.xclient	0
-XEvent.xmapping	0
-XEvent.xerror	0
-XEvent.xkeymap	0
-XEvent.pad	0
-XEvent	96
-XRenderDirectFormat.red	0
-XRenderDirectFormat.redMask	2
-XRenderDirectFormat.green	4
-XRenderDirectFormat.greenMask	6
-XRenderDirectFormat.blue	8
-XRenderDirectFormat.blueMask	10
-XRenderDirectFormat.alpha	12
-XRenderDirectFormat.alphaMask	14
-XRenderDirectFormat	16
-ColorData.awt_Colors	0
-ColorData.awt_numICMcolors	4
-ColorData.awt_icmLUT	8
-ColorData.awt_icmLUT2Colors	12
-ColorData.img_grays	16
-ColorData.img_clr_tbl	20
-ColorData.img_oda_red	24
-ColorData.img_oda_green	28
-ColorData.img_oda_blue	32
-ColorData.pGrayInverseLutData	36
-ColorData.screendata	40
-ColorData.representsPrimaries	44
-ColorData	48
-XFontStruct.ext_data	0
-XFontStruct.fid	4
-XFontStruct.direction	8
-XFontStruct.min_char_or_byte2	12
-XFontStruct.max_char_or_byte2	16
-XFontStruct.min_byte1	20
-XFontStruct.max_byte1	24
-XFontStruct.all_chars_exist	28
-XFontStruct.n_properties	36
-XFontStruct.properties	40
-XFontStruct.min_bounds	44
-XFontStruct.max_bounds	56
-XFontStruct.per_char	68
-XFontStruct.ascent	72
-XFontStruct.descent	76
-XFontStruct	80
-XExtCodes.extension	0
-XExtCodes.major_opcode	4
-XExtCodes.first_event	8
-XExtCodes.first_error	12
-XExtCodes	16
-XFontSetExtents.max_ink_extent	0
-XFontSetExtents.max_logical_extent	8
-XFontSetExtents	16
-XSelectionEvent.type	0
-XSelectionEvent.serial	4
-XSelectionEvent.send_event	8
-XSelectionEvent.display	12
-XSelectionEvent.requestor	16
-XSelectionEvent.selection	20
-XSelectionEvent.target	24
-XSelectionEvent.property	28
-XSelectionEvent.time	32
-XSelectionEvent	36
-XArc.x	0
-XArc.y	2
-XArc.width	4
-XArc.height	6
-XArc.angle1	8
-XArc.angle2	10
-XArc	12
-XErrorEvent.type	0
-XErrorEvent.display	4
-XErrorEvent.resourceid	8
-XErrorEvent.serial	12
-XErrorEvent.error_code	16
-XErrorEvent.request_code	17
-XErrorEvent.minor_code	18
-XErrorEvent	20
-XConfigureRequestEvent.type	0
-XConfigureRequestEvent.serial	4
-XConfigureRequestEvent.send_event	8
-XConfigureRequestEvent.display	12
-XConfigureRequestEvent.parent	16
-XConfigureRequestEvent.window	20
-XConfigureRequestEvent.x	24
-XConfigureRequestEvent.y	28
-XConfigureRequestEvent.width	32
-XConfigureRequestEvent.height	36
-XConfigureRequestEvent.border_width	40
-XConfigureRequestEvent.above	44
-XConfigureRequestEvent.detail	48
-XConfigureRequestEvent.value_mask	52
-XConfigureRequestEvent	56
-ScreenFormat.ext_data	0
-ScreenFormat.depth	4
-ScreenFormat.bits_per_pixel	8
-ScreenFormat.scanline_pad	12
-ScreenFormat	16
-XButtonEvent.type	0
-XButtonEvent.serial	4
-XButtonEvent.send_event	8
-XButtonEvent.display	12
-XButtonEvent.window	16
-XButtonEvent.root	20
-XButtonEvent.subwindow	24
-XButtonEvent.time	28
-XButtonEvent.x	32
-XButtonEvent.y	36
-XButtonEvent.x_root	40
-XButtonEvent.y_root	44
-XButtonEvent.state	48
-XButtonEvent.button	52
-XButtonEvent.same_screen	56
-XButtonEvent	60
-XFontProp.name	0
-XFontProp.card32	4
-XFontProp	8
-XIMValuesList.count_values	0
-XIMValuesList.supported_values	4
-XIMValuesList	8
-XKeymapEvent.type	0
-XKeymapEvent.serial	4
-XKeymapEvent.send_event	8
-XKeymapEvent.display	12
-XKeymapEvent.window	16
-XKeymapEvent.key_vector	20
-XKeymapEvent	52
-XTextItem16.chars	0
-XTextItem16.nchars	4
-XTextItem16.delta	8
-XTextItem16.font	12
-XTextItem16	16
-XIMPreeditDrawCallbackStruct.caret	0
-XIMPreeditDrawCallbackStruct.chg_first	4
-XIMPreeditDrawCallbackStruct.chg_length	8
-XIMPreeditDrawCallbackStruct.text	12
-XIMPreeditDrawCallbackStruct	16
-XVisualInfo.visual	0
-XVisualInfo.visualid	4
-XVisualInfo.screen	8
-XVisualInfo.depth	12
-XVisualInfo.class	16
-XVisualInfo.red_mask	20
-XVisualInfo.green_mask	24
-XVisualInfo.blue_mask	28
-XVisualInfo.colormap_size	32
-XVisualInfo.bits_per_rgb	36
-XVisualInfo	40
-XkbControlsNotifyEvent.type	0
-XkbControlsNotifyEvent.serial	4
-XkbControlsNotifyEvent.send_event	8
-XkbControlsNotifyEvent.display	12
-XkbControlsNotifyEvent.time	16
-XkbControlsNotifyEvent.xkb_type	20
-XkbControlsNotifyEvent.device	24
-XkbControlsNotifyEvent.changed_ctrls	28
-XkbControlsNotifyEvent.enabled_ctrls	32
-XkbControlsNotifyEvent.enabled_ctrl_changes	36
-XkbControlsNotifyEvent.num_groups	40
-XkbControlsNotifyEvent.keycode	44
-XkbControlsNotifyEvent.event_type	45
-XkbControlsNotifyEvent.req_major	46
-XkbControlsNotifyEvent.req_minor	47
-XkbControlsNotifyEvent	48
-PropMwmHints.flags	0
-PropMwmHints.functions	4
-PropMwmHints.decorations	8
-PropMwmHints.inputMode	12
-PropMwmHints.status	16
-PropMwmHints	20
-XClientMessageEvent.type	0
-XClientMessageEvent.serial	4
-XClientMessageEvent.send_event	8
-XClientMessageEvent.display	12
-XClientMessageEvent.window	16
-XClientMessageEvent.message_type	20
-XClientMessageEvent.format	24
-XClientMessageEvent.data	28
-XClientMessageEvent	48
-XAnyEvent.type	0
-XAnyEvent.serial	4
-XAnyEvent.send_event	8
-XAnyEvent.display	12
-XAnyEvent.window	16
-XAnyEvent	20
-XkbIndicatorNotifyEvent.type	0
-XkbIndicatorNotifyEvent.serial	4
-XkbIndicatorNotifyEvent.send_event	8
-XkbIndicatorNotifyEvent.display	12
-XkbIndicatorNotifyEvent.time	16
-XkbIndicatorNotifyEvent.xkb_type	20
-XkbIndicatorNotifyEvent.device	24
-XkbIndicatorNotifyEvent.changed	28
-XkbIndicatorNotifyEvent.state	32
-XkbIndicatorNotifyEvent	36
-XIMPreeditStateNotifyCallbackStruct.state	0
-XIMPreeditStateNotifyCallbackStruct	4
-XkbAnyEvent.type	0
-XkbAnyEvent.serial	4
-XkbAnyEvent.send_event	8
-XkbAnyEvent.display	12
-XkbAnyEvent.time	16
-XkbAnyEvent.xkb_type	20
-XkbAnyEvent.device	24
-XkbAnyEvent	28
-XMotionEvent.type	0
-XMotionEvent.serial	4
-XMotionEvent.send_event	8
-XMotionEvent.display	12
-XMotionEvent.window	16
-XMotionEvent.root	20
-XMotionEvent.subwindow	24
-XMotionEvent.time	28
-XMotionEvent.x	32
-XMotionEvent.y	36
-XMotionEvent.x_root	40
-XMotionEvent.y_root	44
-XMotionEvent.state	48
-XMotionEvent.is_hint	52
-XMotionEvent.same_screen	56
-XMotionEvent	60
-XIMHotKeyTriggers.num_hot_key	0
-XIMHotKeyTriggers.key	4
-XIMHotKeyTriggers	8
-XIMStyles.count_styles	0
-XIMStyles.supported_styles	4
-XIMStyles	8
-XkbExtensionDeviceNotifyEvent.type	0
-XkbExtensionDeviceNotifyEvent.serial	4
-XkbExtensionDeviceNotifyEvent.send_event	8
-XkbExtensionDeviceNotifyEvent.display	12
-XkbExtensionDeviceNotifyEvent.time	16
-XkbExtensionDeviceNotifyEvent.xkb_type	20
-XkbExtensionDeviceNotifyEvent.device	24
-XkbExtensionDeviceNotifyEvent.reason	28
-XkbExtensionDeviceNotifyEvent.supported	32
-XkbExtensionDeviceNotifyEvent.unsupported	36
-XkbExtensionDeviceNotifyEvent.first_btn	40
-XkbExtensionDeviceNotifyEvent.num_btns	44
-XkbExtensionDeviceNotifyEvent.leds_defined	48
-XkbExtensionDeviceNotifyEvent.led_state	52
-XkbExtensionDeviceNotifyEvent.led_class	56
-XkbExtensionDeviceNotifyEvent.led_id	60
-XkbExtensionDeviceNotifyEvent	64
-XwcTextItem.chars	0
-XwcTextItem.nchars	4
-XwcTextItem.delta	8
-XwcTextItem.font_set	12
-XwcTextItem	16
-XClassHint.res_name	0
-XClassHint.res_class	4
-XClassHint	8
-XChar2b.byte1	0
-XChar2b.byte2	1
-XChar2b	2
-XSetWindowAttributes.background_pixmap	0
-XSetWindowAttributes.background_pixel	4
-XSetWindowAttributes.border_pixmap	8
-XSetWindowAttributes.border_pixel	12
-XSetWindowAttributes.bit_gravity	16
-XSetWindowAttributes.win_gravity	20
-XSetWindowAttributes.backing_store	24
-XSetWindowAttributes.backing_planes	28
-XSetWindowAttributes.backing_pixel	32
-XSetWindowAttributes.save_under	36
-XSetWindowAttributes.event_mask	40
-XSetWindowAttributes.do_not_propagate_mask	44
-XSetWindowAttributes.override_redirect	48
-XSetWindowAttributes.colormap	52
-XSetWindowAttributes.cursor	56
-XSetWindowAttributes	60
-XRenderPictFormat.id	0
-XRenderPictFormat.type	4
-XRenderPictFormat.depth	8
-XRenderPictFormat.direct	12
-XRenderPictFormat.colormap	28
-XRenderPictFormat	32
-XReparentEvent.type	0
-XReparentEvent.serial	4
-XReparentEvent.send_event	8
-XReparentEvent.display	12
-XReparentEvent.event	16
-XReparentEvent.window	20
-XReparentEvent.parent	24
-XReparentEvent.x	28
-XReparentEvent.y	32
-XReparentEvent.override_redirect	36
-XReparentEvent	40
-XCirculateRequestEvent.type	0
-XCirculateRequestEvent.serial	4
-XCirculateRequestEvent.send_event	8
-XCirculateRequestEvent.display	12
-XCirculateRequestEvent.parent	16
-XCirculateRequestEvent.window	20
-XCirculateRequestEvent.place	24
-XCirculateRequestEvent	28
-XImage.width	0
-XImage.height	4
-XImage.xoffset	8
-XImage.format	12
-XImage.data	16
-XImage.byte_order	20
-XImage.bitmap_unit	24
-XImage.bitmap_bit_order	28
-XImage.bitmap_pad	32
-XImage.depth	36
-XImage.bytes_per_line	40
-XImage.bits_per_pixel	44
-XImage.red_mask	48
-XImage.green_mask	52
-XImage.blue_mask	56
-XImage.obdata	60
-XImage.f.create_image	64
-XImage.f.destroy_image	68
-XImage.f.get_pixel	72
-XImage.f.put_pixel	76
-XImage.f.sub_image	80
-XImage.f.add_pixel	84
-XImage	88
-XKeyEvent.type	0
-XKeyEvent.serial	4
-XKeyEvent.send_event	8
-XKeyEvent.display	12
-XKeyEvent.window	16
-XKeyEvent.root	20
-XKeyEvent.subwindow	24
-XKeyEvent.time	28
-XKeyEvent.x	32
-XKeyEvent.y	36
-XKeyEvent.x_root	40
-XKeyEvent.y_root	44
-XKeyEvent.state	48
-XKeyEvent.keycode	52
-XKeyEvent.same_screen	56
-XKeyEvent	60
-XkbActionMessageEvent.type	0
-XkbActionMessageEvent.serial	4
-XkbActionMessageEvent.send_event	8
-XkbActionMessageEvent.display	12
-XkbActionMessageEvent.time	16
-XkbActionMessageEvent.xkb_type	20
-XkbActionMessageEvent.device	24
-XkbActionMessageEvent.keycode	28
-XkbActionMessageEvent.press	32
-XkbActionMessageEvent.key_event_follows	36
-XkbActionMessageEvent.group	40
-XkbActionMessageEvent.mods	44
-XkbActionMessageEvent.message	48
-XkbActionMessageEvent	56
-XdbeSwapInfo.swap_window	0
-XdbeSwapInfo.swap_action	4
-XdbeSwapInfo	8
-XTextItem.chars	0
-XTextItem.nchars	4
-XTextItem.delta	8
-XTextItem.font	12
-XTextItem	16
-XModifierKeymap.max_keypermod	0
-XModifierKeymap.modifiermap	4
-XModifierKeymap	8
-XCharStruct.lbearing	0
-XCharStruct.rbearing	2
-XCharStruct.width	4
-XCharStruct.ascent	6
-XCharStruct.descent	8
-XCharStruct.attributes	10
-XCharStruct	12
-XGravityEvent.type	0
-XGravityEvent.serial	4
-XGravityEvent.send_event	8
-XGravityEvent.display	12
-XGravityEvent.event	16
-XGravityEvent.window	20
-XGravityEvent.x	24
-XGravityEvent.y	28
-XGravityEvent	32
-Visual.ext_data	0
-Visual.visualid	4
-Visual.class	8
-Visual.red_mask	12
-Visual.green_mask	16
-Visual.blue_mask	20
-Visual.bits_per_rgb	24
-Visual.map_entries	28
-Visual	32
-XOMOrientation.num_orientation	0
-XOMOrientation.orientation	4
-XOMOrientation	8
-XkbAccessXNotifyEvent.type	0
-XkbAccessXNotifyEvent.serial	4
-XkbAccessXNotifyEvent.send_event	8
-XkbAccessXNotifyEvent.display	12
-XkbAccessXNotifyEvent.time	16
-XkbAccessXNotifyEvent.xkb_type	20
-XkbAccessXNotifyEvent.device	24
-XkbAccessXNotifyEvent.detail	28
-XkbAccessXNotifyEvent.keycode	32
-XkbAccessXNotifyEvent.sk_delay	36
-XkbAccessXNotifyEvent.debounce_delay	40
-XkbAccessXNotifyEvent	44
-XWindowAttributes.x	0
-XWindowAttributes.y	4
-XWindowAttributes.width	8
-XWindowAttributes.height	12
-XWindowAttributes.border_width	16
-XWindowAttributes.depth	20
-XWindowAttributes.visual	24
-XWindowAttributes.root	28
-XWindowAttributes.class	32
-XWindowAttributes.bit_gravity	36
-XWindowAttributes.win_gravity	40
-XWindowAttributes.backing_store	44
-XWindowAttributes.backing_planes	48
-XWindowAttributes.backing_pixel	52
-XWindowAttributes.save_under	56
-XWindowAttributes.colormap	60
-XWindowAttributes.map_installed	64
-XWindowAttributes.map_state	68
-XWindowAttributes.all_event_masks	72
-XWindowAttributes.your_event_mask	76
-XWindowAttributes.do_not_propagate_mask	80
-XWindowAttributes.override_redirect	84
-XWindowAttributes.screen	88
-XWindowAttributes	92
-XmbTextItem.chars	0
-XmbTextItem.nchars	4
-XmbTextItem.delta	8
-XmbTextItem.font_set	12
-XmbTextItem	16
-XMappingEvent.type	0
-XMappingEvent.serial	4
-XMappingEvent.send_event	8
-XMappingEvent.display	12
-XMappingEvent.window	16
-XMappingEvent.request	20
-XMappingEvent.first_keycode	24
-XMappingEvent.count	28
-XMappingEvent	32
-XSizeHints.flags	0
-XSizeHints.x	4
-XSizeHints.y	8
-XSizeHints.width	12
-XSizeHints.height	16
-XSizeHints.min_width	20
-XSizeHints.min_height	24
-XSizeHints.max_width	28
-XSizeHints.max_height	32
-XSizeHints.width_inc	36
-XSizeHints.height_inc	40
-XSizeHints.min_aspect.x	44
-XSizeHints.min_aspect.y	48
-XSizeHints.max_aspect.x	52
-XSizeHints.max_aspect.y	56
-XSizeHints.base_width	60
-XSizeHints.base_height	64
-XSizeHints.win_gravity	68
-XSizeHints	72
-XUnmapEvent.type	0
-XUnmapEvent.serial	4
-XUnmapEvent.send_event	8
-XUnmapEvent.display	12
-XUnmapEvent.event	16
-XUnmapEvent.window	20
-XUnmapEvent.from_configure	24
-XUnmapEvent	28
-awtImageData.Depth	0
-awtImageData.wsImageFormat	4
-awtImageData.clrdata	16
-awtImageData.convert	48
-awtImageData	304
-XkbStateNotifyEvent.type	0
-XkbStateNotifyEvent.serial	4
-XkbStateNotifyEvent.send_event	8
-XkbStateNotifyEvent.display	12
-XkbStateNotifyEvent.time	16
-XkbStateNotifyEvent.xkb_type	20
-XkbStateNotifyEvent.device	24
-XkbStateNotifyEvent.changed	28
-XkbStateNotifyEvent.group	32
-XkbStateNotifyEvent.base_group	36
-XkbStateNotifyEvent.latched_group	40
-XkbStateNotifyEvent.locked_group	44
-XkbStateNotifyEvent.mods	48
-XkbStateNotifyEvent.base_mods	52
-XkbStateNotifyEvent.latched_mods	56
-XkbStateNotifyEvent.locked_mods	60
-XkbStateNotifyEvent.compat_state	64
-XkbStateNotifyEvent.grab_mods	68
-XkbStateNotifyEvent.compat_grab_mods	69
-XkbStateNotifyEvent.lookup_mods	70
-XkbStateNotifyEvent.compat_lookup_mods	71
-XkbStateNotifyEvent.ptr_buttons	72
-XkbStateNotifyEvent.keycode	76
-XkbStateNotifyEvent.event_type	77
-XkbStateNotifyEvent.req_major	78
-XkbStateNotifyEvent.req_minor	79
-XkbStateNotifyEvent	80
-XExposeEvent.type	0
-XExposeEvent.serial	4
-XExposeEvent.send_event	8
-XExposeEvent.display	12
-XExposeEvent.window	16
-XExposeEvent.x	20
-XExposeEvent.y	24
-XExposeEvent.width	28
-XExposeEvent.height	32
-XExposeEvent.count	36
-XExposeEvent	40
-XkbMapNotifyEvent.type	0
-XkbMapNotifyEvent.serial	4
-XkbMapNotifyEvent.send_event	8
-XkbMapNotifyEvent.display	12
-XkbMapNotifyEvent.time	16
-XkbMapNotifyEvent.xkb_type	20
-XkbMapNotifyEvent.device	24
-XkbMapNotifyEvent.changed	28
-XkbMapNotifyEvent.flags	32
-XkbMapNotifyEvent.first_type	36
-XkbMapNotifyEvent.num_types	40
-XkbMapNotifyEvent.min_key_code	44
-XkbMapNotifyEvent.max_key_code	45
-XkbMapNotifyEvent.first_key_sym	46
-XkbMapNotifyEvent.first_key_act	47
-XkbMapNotifyEvent.first_key_behavior	48
-XkbMapNotifyEvent.first_key_explicit	49
-XkbMapNotifyEvent.first_modmap_key	50
-XkbMapNotifyEvent.first_vmodmap_key	51
-XkbMapNotifyEvent.num_key_syms	52
-XkbMapNotifyEvent.num_key_acts	56
-XkbMapNotifyEvent.num_key_behaviors	60
-XkbMapNotifyEvent.num_key_explicit	64
-XkbMapNotifyEvent.num_modmap_keys	68
-XkbMapNotifyEvent.num_vmodmap_keys	72
-XkbMapNotifyEvent.vmods	76
-XkbMapNotifyEvent	80
-XGCValues.function	0
-XGCValues.plane_mask	4
-XGCValues.foreground	8
-XGCValues.background	12
-XGCValues.line_width	16
-XGCValues.line_style	20
-XGCValues.cap_style	24
-XGCValues.join_style	28
-XGCValues.fill_style	32
-XGCValues.fill_rule	36
-XGCValues.arc_mode	40
-XGCValues.tile	44
-XGCValues.stipple	48
-XGCValues.ts_x_origin	52
-XGCValues.ts_y_origin	56
-XGCValues.font	60
-XGCValues.subwindow_mode	64
-XGCValues.graphics_exposures	68
-XGCValues.clip_x_origin	72
-XGCValues.clip_y_origin	76
-XGCValues.clip_mask	80
-XGCValues.dash_offset	84
-XGCValues.dashes	88
-XGCValues	92
-XFocusChangeEvent.type	0
-XFocusChangeEvent.serial	4
-XFocusChangeEvent.send_event	8
-XFocusChangeEvent.display	12
-XFocusChangeEvent.window	16
-XFocusChangeEvent.mode	20
-XFocusChangeEvent.detail	24
-XFocusChangeEvent	28
-XPixmapFormatValues.depth	0
-XPixmapFormatValues.bits_per_pixel	4
-XPixmapFormatValues.scanline_pad	8
-XPixmapFormatValues	12
-XMapEvent.type	0
-XMapEvent.serial	4
-XMapEvent.send_event	8
-XMapEvent.display	12
-XMapEvent.event	16
-XMapEvent.window	20
-XMapEvent.override_redirect	24
-XMapEvent	28
-XkbBellNotifyEvent.type	0
-XkbBellNotifyEvent.serial	4
-XkbBellNotifyEvent.send_event	8
-XkbBellNotifyEvent.display	12
-XkbBellNotifyEvent.time	16
-XkbBellNotifyEvent.xkb_type	20
-XkbBellNotifyEvent.device	24
-XkbBellNotifyEvent.percent	28
-XkbBellNotifyEvent.pitch	32
-XkbBellNotifyEvent.duration	36
-XkbBellNotifyEvent.bell_class	40
-XkbBellNotifyEvent.bell_id	44
-XkbBellNotifyEvent.name	48
-XkbBellNotifyEvent.window	52
-XkbBellNotifyEvent.event_only	56
-XkbBellNotifyEvent	60
-XIMStringConversionText.length	0
-XIMStringConversionText.feedback	4
-XIMStringConversionText.encoding_is_wchar	8
-XIMStringConversionText.string	12
-XIMStringConversionText	16
-XKeyboardState.key_click_percent	0
-XKeyboardState.bell_percent	4
-XKeyboardState.bell_pitch	8
-XKeyboardState.bell_duration	12
-XKeyboardState.led_mask	16
-XKeyboardState.global_auto_repeat	20
-XKeyboardState.auto_repeats	24
-XKeyboardState	56
-XkbEvent.type	0
-XkbEvent.any	0
-XkbEvent.new_kbd	0
-XkbEvent.map	0
-XkbEvent.state	0
-XkbEvent.ctrls	0
-XkbEvent.indicators	0
-XkbEvent.names	0
-XkbEvent.compat	0
-XkbEvent.bell	0
-XkbEvent.message	0
-XkbEvent.accessx	0
-XkbEvent.device	0
-XkbEvent.core	0
-XkbEvent	96
-XPoint.x	0
-XPoint.y	2
-XPoint	4
-XSegment.x1	0
-XSegment.y1	2
-XSegment.x2	4
-XSegment.y2	6
-XSegment	8
-XIconSize.min_width	0
-XIconSize.min_height	4
-XIconSize.max_width	8
-XIconSize.max_height	12
-XIconSize.width_inc	16
-XIconSize.height_inc	20
-XIconSize	24
-XIMCallback.client_data	0
-XIMCallback.callback	4
-XIMCallback	8
-XConfigureEvent.type	0
-XConfigureEvent.serial	4
-XConfigureEvent.send_event	8
-XConfigureEvent.display	12
-XConfigureEvent.event	16
-XConfigureEvent.window	20
-XConfigureEvent.x	24
-XConfigureEvent.y	28
-XConfigureEvent.width	32
-XConfigureEvent.height	36
-XConfigureEvent.border_width	40
-XConfigureEvent.above	44
-XConfigureEvent.override_redirect	48
-XConfigureEvent	52
-XRectangle.x	0
-XRectangle.y	2
-XRectangle.width	4
-XRectangle.height	6
-XRectangle	8
-XkbNamesNotifyEvent.type	0
-XkbNamesNotifyEvent.serial	4
-XkbNamesNotifyEvent.send_event	8
-XkbNamesNotifyEvent.display	12
-XkbNamesNotifyEvent.time	16
-XkbNamesNotifyEvent.xkb_type	20
-XkbNamesNotifyEvent.device	24
-XkbNamesNotifyEvent.changed	28
-XkbNamesNotifyEvent.first_type	32
-XkbNamesNotifyEvent.num_types	36
-XkbNamesNotifyEvent.first_lvl	40
-XkbNamesNotifyEvent.num_lvls	44
-XkbNamesNotifyEvent.num_aliases	48
-XkbNamesNotifyEvent.num_radio_groups	52
-XkbNamesNotifyEvent.changed_vmods	56
-XkbNamesNotifyEvent.changed_groups	60
-XkbNamesNotifyEvent.changed_indicators	64
-XkbNamesNotifyEvent.first_key	68
-XkbNamesNotifyEvent.num_keys	72
-XkbNamesNotifyEvent	76
-XCreateWindowEvent.type	0
-XCreateWindowEvent.serial	4
-XCreateWindowEvent.send_event	8
-XCreateWindowEvent.display	12
-XCreateWindowEvent.parent	16
-XCreateWindowEvent.window	20
-XCreateWindowEvent.x	24
-XCreateWindowEvent.y	28
-XCreateWindowEvent.width	32
-XCreateWindowEvent.height	36
-XCreateWindowEvent.border_width	40
-XCreateWindowEvent.override_redirect	44
-XCreateWindowEvent	48
-XVisibilityEvent.type	0
-XVisibilityEvent.serial	4
-XVisibilityEvent.send_event	8
-XVisibilityEvent.display	12
-XVisibilityEvent.window	16
-XVisibilityEvent.state	20
-XVisibilityEvent	24
-XWMHints.flags	0
-XWMHints.initial_state	8
-XWMHints.icon_pixmap	12
-XWMHints.icon_window	16
-XWMHints.icon_x	20
-XWMHints.icon_y	24
-XWMHints.icon_mask	28
-XWMHints.input	4
-XWMHints.window_group	32
-XWMHints	36
-XCrossingEvent.type	0
-XCrossingEvent.serial	4
-XCrossingEvent.send_event	8
-XCrossingEvent.display	12
-XCrossingEvent.window	16
-XCrossingEvent.root	20
-XCrossingEvent.subwindow	24
-XCrossingEvent.time	28
-XCrossingEvent.x	32
-XCrossingEvent.y	36
-XCrossingEvent.x_root	40
-XCrossingEvent.y_root	44
-XCrossingEvent.mode	48
-XCrossingEvent.detail	52
-XCrossingEvent.same_screen	56
-XCrossingEvent.focus	60
-XCrossingEvent.state	64
-XCrossingEvent	68
-XSelectionRequestEvent.type	0
-XSelectionRequestEvent.serial	4
-XSelectionRequestEvent.send_event	8
-XSelectionRequestEvent.display	12
-XSelectionRequestEvent.owner	16
-XSelectionRequestEvent.requestor	20
-XSelectionRequestEvent.selection	24
-XSelectionRequestEvent.target	28
-XSelectionRequestEvent.property	32
-XSelectionRequestEvent.time	36
-XSelectionRequestEvent	40
-XNoExposeEvent.type	0
-XNoExposeEvent.serial	4
-XNoExposeEvent.send_event	8
-XNoExposeEvent.display	12
-XNoExposeEvent.drawable	16
-XNoExposeEvent.major_code	20
-XNoExposeEvent.minor_code	24
-XNoExposeEvent	28
-XHostAddress.family	0
-XHostAddress.length	4
-XHostAddress.address	8
-XHostAddress	12
-XColormapEvent.type	0
-XColormapEvent.serial	4
-XColormapEvent.send_event	8
-XColormapEvent.display	12
-XColormapEvent.window	16
-XColormapEvent.colormap	20
-XColormapEvent.new	24
-XColormapEvent.state	28
-XColormapEvent	32
-ColorEntry.r	0
-ColorEntry.g	1
-ColorEntry.b	2
-ColorEntry.flags	3
-ColorEntry	4
-XResizeRequestEvent.type	0
-XResizeRequestEvent.serial	4
-XResizeRequestEvent.send_event	8
-XResizeRequestEvent.display	12
-XResizeRequestEvent.window	16
-XResizeRequestEvent.width	20
-XResizeRequestEvent.height	24
-XResizeRequestEvent	28
-Depth.depth	0
-Depth.nvisuals	4
-Depth.visuals	8
-Depth	12
-XPropertyEvent.type	0
-XPropertyEvent.serial	4
-XPropertyEvent.send_event	8
-XPropertyEvent.display	12
-XPropertyEvent.window	16
-XPropertyEvent.atom	20
-XPropertyEvent.time	24
-XPropertyEvent.state	28
-XPropertyEvent	32
-XDestroyWindowEvent.type	0
-XDestroyWindowEvent.serial	4
-XDestroyWindowEvent.send_event	8
-XDestroyWindowEvent.display	12
-XDestroyWindowEvent.event	16
-XDestroyWindowEvent.window	20
-XDestroyWindowEvent	24
-XStandardColormap.colormap	0
-XStandardColormap.red_max	4
-XStandardColormap.red_mult	8
-XStandardColormap.green_max	12
-XStandardColormap.green_mult	16
-XStandardColormap.blue_max	20
-XStandardColormap.blue_mult	24
-XStandardColormap.base_pixel	28
-XStandardColormap.visualid	32
-XStandardColormap.killid	36
-XStandardColormap	40
-XComposeStatus.compose_ptr	0
-XComposeStatus.chars_matched	4
-XComposeStatus	8
-AwtGraphicsConfigData.awt_depth	0
-AwtGraphicsConfigData.awt_cmap	4
-AwtGraphicsConfigData.awt_visInfo	8
-AwtGraphicsConfigData.awt_num_colors	48
-AwtGraphicsConfigData.awtImage	52
-AwtGraphicsConfigData.AwtColorMatch	56
-AwtGraphicsConfigData.monoImage	60
-AwtGraphicsConfigData.monoPixmap	64
-AwtGraphicsConfigData.monoPixmapWidth	68
-AwtGraphicsConfigData.monoPixmapHeight	72
-AwtGraphicsConfigData.monoPixmapGC	76
-AwtGraphicsConfigData.pixelStride	80
-AwtGraphicsConfigData.color_data	84
-AwtGraphicsConfigData.glxInfo	88
-AwtGraphicsConfigData.isTranslucencySupported	92
-AwtGraphicsConfigData.renderPictFormat	96
-AwtGraphicsConfigData	128
-XColor.pixel	0
-XColor.red	4
-XColor.green	6
-XColor.blue	8
-XColor.flags	10
-XColor.pad	11
-XColor	12
-XTextProperty.value	0
-XTextProperty.encoding	4
-XTextProperty.format	8
-XTextProperty.nitems	12
-XTextProperty	16
--- a/make/data/x11wrappergen/sizes.64	Tue Mar 06 00:56:03 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1017 +0,0 @@
-long	8
-int	4
-short	2
-ptr	8
-Bool	4
-Atom	8
-Window	8
-XExtData.number	0
-XExtData.next	8
-XExtData.free_private	16
-XExtData.private_data	24
-XExtData	32
-XIMStringConversionCallbackStruct.position	0
-XIMStringConversionCallbackStruct.direction	4
-XIMStringConversionCallbackStruct.operation	8
-XIMStringConversionCallbackStruct.factor	10
-XIMStringConversionCallbackStruct.text	16
-XIMStringConversionCallbackStruct	24
-XkbNewKeyboardNotifyEvent.type	0
-XkbNewKeyboardNotifyEvent.serial	8
-XkbNewKeyboardNotifyEvent.send_event	16
-XkbNewKeyboardNotifyEvent.display	24
-XkbNewKeyboardNotifyEvent.time	32
-XkbNewKeyboardNotifyEvent.xkb_type	40
-XkbNewKeyboardNotifyEvent.device	44
-XkbNewKeyboardNotifyEvent.old_device	48
-XkbNewKeyboardNotifyEvent.min_key_code	52
-XkbNewKeyboardNotifyEvent.max_key_code	56
-XkbNewKeyboardNotifyEvent.old_min_key_code	60
-XkbNewKeyboardNotifyEvent.old_max_key_code	64
-XkbNewKeyboardNotifyEvent.changed	68
-XkbNewKeyboardNotifyEvent.req_major	72
-XkbNewKeyboardNotifyEvent.req_minor	73
-XkbNewKeyboardNotifyEvent	80
-XTimeCoord.time	0
-XTimeCoord.x	8
-XTimeCoord.y	10
-XTimeCoord	16
-XkbCompatMapNotifyEvent.type	0
-XkbCompatMapNotifyEvent.serial	8
-XkbCompatMapNotifyEvent.send_event	16
-XkbCompatMapNotifyEvent.display	24
-XkbCompatMapNotifyEvent.time	32
-XkbCompatMapNotifyEvent.xkb_type	40
-XkbCompatMapNotifyEvent.device	44
-XkbCompatMapNotifyEvent.changed_groups	48
-XkbCompatMapNotifyEvent.first_si	52
-XkbCompatMapNotifyEvent.num_si	56
-XkbCompatMapNotifyEvent.num_total_si	60
-XkbCompatMapNotifyEvent	64
-XIMStatusDrawCallbackStruct.type	0
-XIMStatusDrawCallbackStruct.data	8
-XIMStatusDrawCallbackStruct	16
-XKeyboardControl.key_click_percent	0
-XKeyboardControl.bell_percent	4
-XKeyboardControl.bell_pitch	8
-XKeyboardControl.bell_duration	12
-XKeyboardControl.led	16
-XKeyboardControl.led_mode	20
-XKeyboardControl.key	24
-XKeyboardControl.auto_repeat_mode	28
-XKeyboardControl	32
-XSelectionClearEvent.type	0
-XSelectionClearEvent.serial	8
-XSelectionClearEvent.send_event	16
-XSelectionClearEvent.display	24
-XSelectionClearEvent.window	32
-XSelectionClearEvent.selection	40
-XSelectionClearEvent.time	48
-XSelectionClearEvent	56
-XWindowChanges.x	0
-XWindowChanges.y	4
-XWindowChanges.width	8
-XWindowChanges.height	12
-XWindowChanges.border_width	16
-XWindowChanges.sibling	24
-XWindowChanges.stack_mode	32
-XWindowChanges	40
-XIMPreeditCaretCallbackStruct.position	0
-XIMPreeditCaretCallbackStruct.direction	4
-XIMPreeditCaretCallbackStruct.style	8
-XIMPreeditCaretCallbackStruct	12
-XOMCharSetList.charset_count	0
-XOMCharSetList.charset_list	8
-XOMCharSetList	16
-XOMFontInfo.num_font	0
-XOMFontInfo.font_struct_list	8
-XOMFontInfo.font_name_list	16
-XOMFontInfo	24
-AwtScreenData.numConfigs	0
-AwtScreenData.root	8
-AwtScreenData.whitepixel	16
-AwtScreenData.blackpixel	24
-AwtScreenData.defaultConfig	32
-AwtScreenData.configs	40
-AwtScreenData	48
-XIMHotKeyTrigger.keysym	0
-XIMHotKeyTrigger.modifier	8
-XIMHotKeyTrigger.modifier_mask	12
-XIMHotKeyTrigger	16
-XCirculateEvent.type	0
-XCirculateEvent.serial	8
-XCirculateEvent.send_event	16
-XCirculateEvent.display	24
-XCirculateEvent.event	32
-XCirculateEvent.window	40
-XCirculateEvent.place	48
-XCirculateEvent	56
-Screen.ext_data	0
-Screen.display	8
-Screen.root	16
-Screen.width	24
-Screen.height	28
-Screen.mwidth	32
-Screen.mheight	36
-Screen.ndepths	40
-Screen.depths	48
-Screen.root_depth	56
-Screen.root_visual	64
-Screen.default_gc	72
-Screen.cmap	80
-Screen.white_pixel	88
-Screen.black_pixel	96
-Screen.max_maps	104
-Screen.min_maps	108
-Screen.backing_store	112
-Screen.save_unders	116
-Screen.root_input_mask	120
-Screen	128
-XMapRequestEvent.type	0
-XMapRequestEvent.serial	8
-XMapRequestEvent.send_event	16
-XMapRequestEvent.display	24
-XMapRequestEvent.parent	32
-XMapRequestEvent.window	40
-XMapRequestEvent	48
-XIMText.length	0
-XIMText.feedback	8
-XIMText.encoding_is_wchar	16
-XIMText.string	24
-XIMText	32
-XGraphicsExposeEvent.type	0
-XGraphicsExposeEvent.serial	8
-XGraphicsExposeEvent.send_event	16
-XGraphicsExposeEvent.display	24
-XGraphicsExposeEvent.drawable	32
-XGraphicsExposeEvent.x	40
-XGraphicsExposeEvent.y	44
-XGraphicsExposeEvent.width	48
-XGraphicsExposeEvent.height	52
-XGraphicsExposeEvent.count	56
-XGraphicsExposeEvent.major_code	60
-XGraphicsExposeEvent.minor_code	64
-XGraphicsExposeEvent	72
-XEvent.type	0
-XEvent.xany	0
-XEvent.xkey	0
-XEvent.xbutton	0
-XEvent.xmotion	0
-XEvent.xcrossing	0
-XEvent.xfocus	0
-XEvent.xexpose	0
-XEvent.xgraphicsexpose	0
-XEvent.xnoexpose	0
-XEvent.xvisibility	0
-XEvent.xcreatewindow	0
-XEvent.xdestroywindow	0
-XEvent.xunmap	0
-XEvent.xmap	0
-XEvent.xmaprequest	0
-XEvent.xreparent	0
-XEvent.xconfigure	0
-XEvent.xgravity	0
-XEvent.xresizerequest	0
-XEvent.xconfigurerequest	0
-XEvent.xcirculate	0
-XEvent.xcirculaterequest	0
-XEvent.xproperty	0
-XEvent.xselectionclear	0
-XEvent.xselectionrequest	0
-XEvent.xselection	0
-XEvent.xcolormap	0
-XEvent.xclient	0
-XEvent.xmapping	0
-XEvent.xerror	0
-XEvent.xkeymap	0
-XEvent.pad	0
-XEvent	192
-XRenderDirectFormat.red	0
-XRenderDirectFormat.redMask	2
-XRenderDirectFormat.green	4
-XRenderDirectFormat.greenMask	6
-XRenderDirectFormat.blue	8
-XRenderDirectFormat.blueMask	10
-XRenderDirectFormat.alpha	12
-XRenderDirectFormat.alphaMask	14
-XRenderDirectFormat	16
-ColorData.awt_Colors	0
-ColorData.awt_numICMcolors	8
-ColorData.awt_icmLUT	16
-ColorData.awt_icmLUT2Colors	24
-ColorData.img_grays	32
-ColorData.img_clr_tbl	40
-ColorData.img_oda_red	48
-ColorData.img_oda_green	56
-ColorData.img_oda_blue	64
-ColorData.pGrayInverseLutData	72
-ColorData.screendata	80
-ColorData.representsPrimaries	84
-ColorData	88
-XFontStruct.ext_data	0
-XFontStruct.fid	8
-XFontStruct.direction	16
-XFontStruct.min_char_or_byte2	20
-XFontStruct.max_char_or_byte2	24
-XFontStruct.min_byte1	28
-XFontStruct.max_byte1	32
-XFontStruct.all_chars_exist	36
-XFontStruct.n_properties	44
-XFontStruct.properties	48
-XFontStruct.min_bounds	56
-XFontStruct.max_bounds	68
-XFontStruct.per_char	80
-XFontStruct.ascent	88
-XFontStruct.descent	92
-XFontStruct	96
-XExtCodes.extension	0
-XExtCodes.major_opcode	4
-XExtCodes.first_event	8
-XExtCodes.first_error	12
-XExtCodes	16
-XFontSetExtents.max_ink_extent	0
-XFontSetExtents.max_logical_extent	8
-XFontSetExtents	16
-XSelectionEvent.type	0
-XSelectionEvent.serial	8
-XSelectionEvent.send_event	16
-XSelectionEvent.display	24
-XSelectionEvent.requestor	32
-XSelectionEvent.selection	40
-XSelectionEvent.target	48
-XSelectionEvent.property	56
-XSelectionEvent.time	64
-XSelectionEvent	72
-XArc.x	0
-XArc.y	2
-XArc.width	4
-XArc.height	6
-XArc.angle1	8
-XArc.angle2	10
-XArc	12
-XErrorEvent.type	0
-XErrorEvent.display	8
-XErrorEvent.resourceid	16
-XErrorEvent.serial	24
-XErrorEvent.error_code	32
-XErrorEvent.request_code	33
-XErrorEvent.minor_code	34
-XErrorEvent	40
-XConfigureRequestEvent.type	0
-XConfigureRequestEvent.serial	8
-XConfigureRequestEvent.send_event	16
-XConfigureRequestEvent.display	24
-XConfigureRequestEvent.parent	32
-XConfigureRequestEvent.window	40
-XConfigureRequestEvent.x	48
-XConfigureRequestEvent.y	52
-XConfigureRequestEvent.width	56
-XConfigureRequestEvent.height	60
-XConfigureRequestEvent.border_width	64
-XConfigureRequestEvent.above	72
-XConfigureRequestEvent.detail	80
-XConfigureRequestEvent.value_mask	88
-XConfigureRequestEvent	96
-ScreenFormat.ext_data	0
-ScreenFormat.depth	8
-ScreenFormat.bits_per_pixel	12
-ScreenFormat.scanline_pad	16
-ScreenFormat	24
-XButtonEvent.type	0
-XButtonEvent.serial	8
-XButtonEvent.send_event	16
-XButtonEvent.display	24
-XButtonEvent.window	32
-XButtonEvent.root	40
-XButtonEvent.subwindow	48
-XButtonEvent.time	56
-XButtonEvent.x	64
-XButtonEvent.y	68
-XButtonEvent.x_root	72
-XButtonEvent.y_root	76
-XButtonEvent.state	80
-XButtonEvent.button	84
-XButtonEvent.same_screen	88
-XButtonEvent	96
-XFontProp.name	0
-XFontProp.card32	8
-XFontProp	16
-XIMValuesList.count_values	0
-XIMValuesList.supported_values	8
-XIMValuesList	16
-XKeymapEvent.type	0
-XKeymapEvent.serial	8
-XKeymapEvent.send_event	16
-XKeymapEvent.display	24
-XKeymapEvent.window	32
-XKeymapEvent.key_vector	40
-XKeymapEvent	72
-XTextItem16.chars	0
-XTextItem16.nchars	8
-XTextItem16.delta	12
-XTextItem16.font	16
-XTextItem16	24
-XIMPreeditDrawCallbackStruct.caret	0
-XIMPreeditDrawCallbackStruct.chg_first	4
-XIMPreeditDrawCallbackStruct.chg_length	8
-XIMPreeditDrawCallbackStruct.text	16
-XIMPreeditDrawCallbackStruct	24
-XVisualInfo.visual	0
-XVisualInfo.visualid	8
-XVisualInfo.screen	16
-XVisualInfo.depth	20
-XVisualInfo.class	24
-XVisualInfo.red_mask	32
-XVisualInfo.green_mask	40
-XVisualInfo.blue_mask	48
-XVisualInfo.colormap_size	56
-XVisualInfo.bits_per_rgb	60
-XVisualInfo	64
-XkbControlsNotifyEvent.type	0
-XkbControlsNotifyEvent.serial	8
-XkbControlsNotifyEvent.send_event	16
-XkbControlsNotifyEvent.display	24
-XkbControlsNotifyEvent.time	32
-XkbControlsNotifyEvent.xkb_type	40
-XkbControlsNotifyEvent.device	44
-XkbControlsNotifyEvent.changed_ctrls	48
-XkbControlsNotifyEvent.enabled_ctrls	52
-XkbControlsNotifyEvent.enabled_ctrl_changes	56
-XkbControlsNotifyEvent.num_groups	60
-XkbControlsNotifyEvent.keycode	64
-XkbControlsNotifyEvent.event_type	65
-XkbControlsNotifyEvent.req_major	66
-XkbControlsNotifyEvent.req_minor	67
-XkbControlsNotifyEvent	72
-PropMwmHints.flags	0
-PropMwmHints.functions	8
-PropMwmHints.decorations	16
-PropMwmHints.inputMode	24
-PropMwmHints.status	32
-PropMwmHints	40
-XClientMessageEvent.type	0
-XClientMessageEvent.serial	8
-XClientMessageEvent.send_event	16
-XClientMessageEvent.display	24
-XClientMessageEvent.window	32
-XClientMessageEvent.message_type	40
-XClientMessageEvent.format	48
-XClientMessageEvent.data	56
-XClientMessageEvent	96
-XAnyEvent.type	0
-XAnyEvent.serial	8
-XAnyEvent.send_event	16
-XAnyEvent.display	24
-XAnyEvent.window	32
-XAnyEvent	40
-XkbIndicatorNotifyEvent.type	0
-XkbIndicatorNotifyEvent.serial	8
-XkbIndicatorNotifyEvent.send_event	16
-XkbIndicatorNotifyEvent.display	24
-XkbIndicatorNotifyEvent.time	32
-XkbIndicatorNotifyEvent.xkb_type	40
-XkbIndicatorNotifyEvent.device	44
-XkbIndicatorNotifyEvent.changed	48
-XkbIndicatorNotifyEvent.state	52
-XkbIndicatorNotifyEvent	56
-XIMPreeditStateNotifyCallbackStruct.state	0
-XIMPreeditStateNotifyCallbackStruct	8
-XkbAnyEvent.type	0
-XkbAnyEvent.serial	8
-XkbAnyEvent.send_event	16
-XkbAnyEvent.display	24
-XkbAnyEvent.time	32
-XkbAnyEvent.xkb_type	40
-XkbAnyEvent.device	44
-XkbAnyEvent	48
-XMotionEvent.type	0
-XMotionEvent.serial	8
-XMotionEvent.send_event	16
-XMotionEvent.display	24
-XMotionEvent.window	32
-XMotionEvent.root	40
-XMotionEvent.subwindow	48
-XMotionEvent.time	56
-XMotionEvent.x	64
-XMotionEvent.y	68
-XMotionEvent.x_root	72
-XMotionEvent.y_root	76
-XMotionEvent.state	80
-XMotionEvent.is_hint	84
-XMotionEvent.same_screen	88
-XMotionEvent	96
-XIMHotKeyTriggers.num_hot_key	0
-XIMHotKeyTriggers.key	8
-XIMHotKeyTriggers	16
-XIMStyles.count_styles	0
-XIMStyles.supported_styles	8
-XIMStyles	16
-XkbExtensionDeviceNotifyEvent.type	0
-XkbExtensionDeviceNotifyEvent.serial	8
-XkbExtensionDeviceNotifyEvent.send_event	16
-XkbExtensionDeviceNotifyEvent.display	24
-XkbExtensionDeviceNotifyEvent.time	32
-XkbExtensionDeviceNotifyEvent.xkb_type	40
-XkbExtensionDeviceNotifyEvent.device	44
-XkbExtensionDeviceNotifyEvent.reason	48
-XkbExtensionDeviceNotifyEvent.supported	52
-XkbExtensionDeviceNotifyEvent.unsupported	56
-XkbExtensionDeviceNotifyEvent.first_btn	60
-XkbExtensionDeviceNotifyEvent.num_btns	64
-XkbExtensionDeviceNotifyEvent.leds_defined	68
-XkbExtensionDeviceNotifyEvent.led_state	72
-XkbExtensionDeviceNotifyEvent.led_class	76
-XkbExtensionDeviceNotifyEvent.led_id	80
-XkbExtensionDeviceNotifyEvent	88
-XwcTextItem.chars	0
-XwcTextItem.nchars	8
-XwcTextItem.delta	12
-XwcTextItem.font_set	16
-XwcTextItem	24
-XClassHint.res_name	0
-XClassHint.res_class	8
-XClassHint	16
-XChar2b.byte1	0
-XChar2b.byte2	1
-XChar2b	2
-XSetWindowAttributes.background_pixmap	0
-XSetWindowAttributes.background_pixel	8
-XSetWindowAttributes.border_pixmap	16
-XSetWindowAttributes.border_pixel	24
-XSetWindowAttributes.bit_gravity	32
-XSetWindowAttributes.win_gravity	36
-XSetWindowAttributes.backing_store	40
-XSetWindowAttributes.backing_planes	48
-XSetWindowAttributes.backing_pixel	56
-XSetWindowAttributes.save_under	64
-XSetWindowAttributes.event_mask	72
-XSetWindowAttributes.do_not_propagate_mask	80
-XSetWindowAttributes.override_redirect	88
-XSetWindowAttributes.colormap	96
-XSetWindowAttributes.cursor	104
-XSetWindowAttributes	112
-XRenderPictFormat.id	0
-XRenderPictFormat.type	8
-XRenderPictFormat.depth	12
-XRenderPictFormat.direct	16
-XRenderPictFormat.colormap	32
-XRenderPictFormat	40
-XReparentEvent.type	0
-XReparentEvent.serial	8
-XReparentEvent.send_event	16
-XReparentEvent.display	24
-XReparentEvent.event	32
-XReparentEvent.window	40
-XReparentEvent.parent	48
-XReparentEvent.x	56
-XReparentEvent.y	60
-XReparentEvent.override_redirect	64
-XReparentEvent	72
-XCirculateRequestEvent.type	0
-XCirculateRequestEvent.serial	8
-XCirculateRequestEvent.send_event	16
-XCirculateRequestEvent.display	24
-XCirculateRequestEvent.parent	32
-XCirculateRequestEvent.window	40
-XCirculateRequestEvent.place	48
-XCirculateRequestEvent	56
-XImage.width	0
-XImage.height	4
-XImage.xoffset	8
-XImage.format	12
-XImage.data	16
-XImage.byte_order	24
-XImage.bitmap_unit	28
-XImage.bitmap_bit_order	32
-XImage.bitmap_pad	36
-XImage.depth	40
-XImage.bytes_per_line	44
-XImage.bits_per_pixel	48
-XImage.red_mask	56
-XImage.green_mask	64
-XImage.blue_mask	72
-XImage.obdata	80
-XImage.f.create_image	88
-XImage.f.destroy_image	96
-XImage.f.get_pixel	104
-XImage.f.put_pixel	112
-XImage.f.sub_image	120
-XImage.f.add_pixel	128
-XImage	136
-XKeyEvent.type	0
-XKeyEvent.serial	8
-XKeyEvent.send_event	16
-XKeyEvent.display	24
-XKeyEvent.window	32
-XKeyEvent.root	40
-XKeyEvent.subwindow	48
-XKeyEvent.time	56
-XKeyEvent.x	64
-XKeyEvent.y	68
-XKeyEvent.x_root	72
-XKeyEvent.y_root	76
-XKeyEvent.state	80
-XKeyEvent.keycode	84
-XKeyEvent.same_screen	88
-XKeyEvent	96
-XkbActionMessageEvent.type	0
-XkbActionMessageEvent.serial	8
-XkbActionMessageEvent.send_event	16
-XkbActionMessageEvent.display	24
-XkbActionMessageEvent.time	32
-XkbActionMessageEvent.xkb_type	40
-XkbActionMessageEvent.device	44
-XkbActionMessageEvent.keycode	48
-XkbActionMessageEvent.press	52
-XkbActionMessageEvent.key_event_follows	56
-XkbActionMessageEvent.group	60
-XkbActionMessageEvent.mods	64
-XkbActionMessageEvent.message	68
-XkbActionMessageEvent	80
-XdbeSwapInfo.swap_window	0
-XdbeSwapInfo.swap_action	8
-XdbeSwapInfo	16
-XTextItem.chars	0
-XTextItem.nchars	8
-XTextItem.delta	12
-XTextItem.font	16
-XTextItem	24
-XModifierKeymap.max_keypermod	0
-XModifierKeymap.modifiermap	8
-XModifierKeymap	16
-XCharStruct.lbearing	0
-XCharStruct.rbearing	2
-XCharStruct.width	4
-XCharStruct.ascent	6
-XCharStruct.descent	8
-XCharStruct.attributes	10
-XCharStruct	12
-XGravityEvent.type	0
-XGravityEvent.serial	8
-XGravityEvent.send_event	16
-XGravityEvent.display	24
-XGravityEvent.event	32
-XGravityEvent.window	40
-XGravityEvent.x	48
-XGravityEvent.y	52
-XGravityEvent	56
-Visual.ext_data	0
-Visual.visualid	8
-Visual.class	16
-Visual.red_mask	24
-Visual.green_mask	32
-Visual.blue_mask	40
-Visual.bits_per_rgb	48
-Visual.map_entries	52
-Visual	56
-XOMOrientation.num_orientation	0
-XOMOrientation.orientation	8
-XOMOrientation	16
-XkbAccessXNotifyEvent.type	0
-XkbAccessXNotifyEvent.serial	8
-XkbAccessXNotifyEvent.send_event	16
-XkbAccessXNotifyEvent.display	24
-XkbAccessXNotifyEvent.time	32
-XkbAccessXNotifyEvent.xkb_type	40
-XkbAccessXNotifyEvent.device	44
-XkbAccessXNotifyEvent.detail	48
-XkbAccessXNotifyEvent.keycode	52
-XkbAccessXNotifyEvent.sk_delay	56
-XkbAccessXNotifyEvent.debounce_delay	60
-XkbAccessXNotifyEvent	64
-XWindowAttributes.x	0
-XWindowAttributes.y	4
-XWindowAttributes.width	8
-XWindowAttributes.height	12
-XWindowAttributes.border_width	16
-XWindowAttributes.depth	20
-XWindowAttributes.visual	24
-XWindowAttributes.root	32
-XWindowAttributes.class	40
-XWindowAttributes.bit_gravity	44
-XWindowAttributes.win_gravity	48
-XWindowAttributes.backing_store	52
-XWindowAttributes.backing_planes	56
-XWindowAttributes.backing_pixel	64
-XWindowAttributes.save_under	72
-XWindowAttributes.colormap	80
-XWindowAttributes.map_installed	88
-XWindowAttributes.map_state	92
-XWindowAttributes.all_event_masks	96
-XWindowAttributes.your_event_mask	104
-XWindowAttributes.do_not_propagate_mask	112
-XWindowAttributes.override_redirect	120
-XWindowAttributes.screen	128
-XWindowAttributes	136
-XmbTextItem.chars	0
-XmbTextItem.nchars	8
-XmbTextItem.delta	12
-XmbTextItem.font_set	16
-XmbTextItem	24
-XMappingEvent.type	0
-XMappingEvent.serial	8
-XMappingEvent.send_event	16
-XMappingEvent.display	24
-XMappingEvent.window	32
-XMappingEvent.request	40
-XMappingEvent.first_keycode	44
-XMappingEvent.count	48
-XMappingEvent	56
-XSizeHints.flags	0
-XSizeHints.x	8
-XSizeHints.y	12
-XSizeHints.width	16
-XSizeHints.height	20
-XSizeHints.min_width	24
-XSizeHints.min_height	28
-XSizeHints.max_width	32
-XSizeHints.max_height	36
-XSizeHints.width_inc	40
-XSizeHints.height_inc	44
-XSizeHints.min_aspect.x	48
-XSizeHints.min_aspect.y	52
-XSizeHints.max_aspect.x	56
-XSizeHints.max_aspect.y	60
-XSizeHints.base_width	64
-XSizeHints.base_height	68
-XSizeHints.win_gravity	72
-XSizeHints	80
-XUnmapEvent.type	0
-XUnmapEvent.serial	8
-XUnmapEvent.send_event	16
-XUnmapEvent.display	24
-XUnmapEvent.event	32
-XUnmapEvent.window	40
-XUnmapEvent.from_configure	48
-XUnmapEvent	56
-awtImageData.Depth	0
-awtImageData.wsImageFormat	4
-awtImageData.clrdata	16
-awtImageData.convert	48
-awtImageData	560
-XkbStateNotifyEvent.type	0
-XkbStateNotifyEvent.serial	8
-XkbStateNotifyEvent.send_event	16
-XkbStateNotifyEvent.display	24
-XkbStateNotifyEvent.time	32
-XkbStateNotifyEvent.xkb_type	40
-XkbStateNotifyEvent.device	44
-XkbStateNotifyEvent.changed	48
-XkbStateNotifyEvent.group	52
-XkbStateNotifyEvent.base_group	56
-XkbStateNotifyEvent.latched_group	60
-XkbStateNotifyEvent.locked_group	64
-XkbStateNotifyEvent.mods	68
-XkbStateNotifyEvent.base_mods	72
-XkbStateNotifyEvent.latched_mods	76
-XkbStateNotifyEvent.locked_mods	80
-XkbStateNotifyEvent.compat_state	84
-XkbStateNotifyEvent.grab_mods	88
-XkbStateNotifyEvent.compat_grab_mods	89
-XkbStateNotifyEvent.lookup_mods	90
-XkbStateNotifyEvent.compat_lookup_mods	91
-XkbStateNotifyEvent.ptr_buttons	92
-XkbStateNotifyEvent.keycode	96
-XkbStateNotifyEvent.event_type	97
-XkbStateNotifyEvent.req_major	98
-XkbStateNotifyEvent.req_minor	99
-XkbStateNotifyEvent	104
-XExposeEvent.type	0
-XExposeEvent.serial	8
-XExposeEvent.send_event	16
-XExposeEvent.display	24
-XExposeEvent.window	32
-XExposeEvent.x	40
-XExposeEvent.y	44
-XExposeEvent.width	48
-XExposeEvent.height	52
-XExposeEvent.count	56
-XExposeEvent	64
-XkbMapNotifyEvent.type	0
-XkbMapNotifyEvent.serial	8
-XkbMapNotifyEvent.send_event	16
-XkbMapNotifyEvent.display	24
-XkbMapNotifyEvent.time	32
-XkbMapNotifyEvent.xkb_type	40
-XkbMapNotifyEvent.device	44
-XkbMapNotifyEvent.changed	48
-XkbMapNotifyEvent.flags	52
-XkbMapNotifyEvent.first_type	56
-XkbMapNotifyEvent.num_types	60
-XkbMapNotifyEvent.min_key_code	64
-XkbMapNotifyEvent.max_key_code	65
-XkbMapNotifyEvent.first_key_sym	66
-XkbMapNotifyEvent.first_key_act	67
-XkbMapNotifyEvent.first_key_behavior	68
-XkbMapNotifyEvent.first_key_explicit	69
-XkbMapNotifyEvent.first_modmap_key	70
-XkbMapNotifyEvent.first_vmodmap_key	71
-XkbMapNotifyEvent.num_key_syms	72
-XkbMapNotifyEvent.num_key_acts	76
-XkbMapNotifyEvent.num_key_behaviors	80
-XkbMapNotifyEvent.num_key_explicit	84
-XkbMapNotifyEvent.num_modmap_keys	88
-XkbMapNotifyEvent.num_vmodmap_keys	92
-XkbMapNotifyEvent.vmods	96
-XkbMapNotifyEvent	104
-XGCValues.function	0
-XGCValues.plane_mask	8
-XGCValues.foreground	16
-XGCValues.background	24
-XGCValues.line_width	32
-XGCValues.line_style	36
-XGCValues.cap_style	40
-XGCValues.join_style	44
-XGCValues.fill_style	48
-XGCValues.fill_rule	52
-XGCValues.arc_mode	56
-XGCValues.tile	64
-XGCValues.stipple	72
-XGCValues.ts_x_origin	80
-XGCValues.ts_y_origin	84
-XGCValues.font	88
-XGCValues.subwindow_mode	96
-XGCValues.graphics_exposures	100
-XGCValues.clip_x_origin	104
-XGCValues.clip_y_origin	108
-XGCValues.clip_mask	112
-XGCValues.dash_offset	120
-XGCValues.dashes	124
-XGCValues	128
-XFocusChangeEvent.type	0
-XFocusChangeEvent.serial	8
-XFocusChangeEvent.send_event	16
-XFocusChangeEvent.display	24
-XFocusChangeEvent.window	32
-XFocusChangeEvent.mode	40
-XFocusChangeEvent.detail	44
-XFocusChangeEvent	48
-XPixmapFormatValues.depth	0
-XPixmapFormatValues.bits_per_pixel	4
-XPixmapFormatValues.scanline_pad	8
-XPixmapFormatValues	12
-XMapEvent.type	0
-XMapEvent.serial	8
-XMapEvent.send_event	16
-XMapEvent.display	24
-XMapEvent.event	32
-XMapEvent.window	40
-XMapEvent.override_redirect	48
-XMapEvent	56
-XkbBellNotifyEvent.type	0
-XkbBellNotifyEvent.serial	8
-XkbBellNotifyEvent.send_event	16
-XkbBellNotifyEvent.display	24
-XkbBellNotifyEvent.time	32
-XkbBellNotifyEvent.xkb_type	40
-XkbBellNotifyEvent.device	44
-XkbBellNotifyEvent.percent	48
-XkbBellNotifyEvent.pitch	52
-XkbBellNotifyEvent.duration	56
-XkbBellNotifyEvent.bell_class	60
-XkbBellNotifyEvent.bell_id	64
-XkbBellNotifyEvent.name	72
-XkbBellNotifyEvent.window	80
-XkbBellNotifyEvent.event_only	88
-XkbBellNotifyEvent	96
-XIMStringConversionText.length	0
-XIMStringConversionText.feedback	8
-XIMStringConversionText.encoding_is_wchar	16
-XIMStringConversionText.string	24
-XIMStringConversionText	32
-XKeyboardState.key_click_percent	0
-XKeyboardState.bell_percent	4
-XKeyboardState.bell_pitch	8
-XKeyboardState.bell_duration	12
-XKeyboardState.led_mask	16
-XKeyboardState.global_auto_repeat	24
-XKeyboardState.auto_repeats	28
-XKeyboardState	64
-XkbEvent.type	0
-XkbEvent.any	0
-XkbEvent.new_kbd	0
-XkbEvent.map	0
-XkbEvent.state	0
-XkbEvent.ctrls	0
-XkbEvent.indicators	0
-XkbEvent.names	0
-XkbEvent.compat	0
-XkbEvent.bell	0
-XkbEvent.message	0
-XkbEvent.accessx	0
-XkbEvent.device	0
-XkbEvent.core	0
-XkbEvent	192
-XPoint.x	0
-XPoint.y	2
-XPoint	4
-XSegment.x1	0
-XSegment.y1	2
-XSegment.x2	4
-XSegment.y2	6
-XSegment	8
-XIconSize.min_width	0
-XIconSize.min_height	4
-XIconSize.max_width	8
-XIconSize.max_height	12
-XIconSize.width_inc	16
-XIconSize.height_inc	20
-XIconSize	24
-XIMCallback.client_data	0
-XIMCallback.callback	8
-XIMCallback	16
-XConfigureEvent.type	0
-XConfigureEvent.serial	8
-XConfigureEvent.send_event	16
-XConfigureEvent.display	24
-XConfigureEvent.event	32
-XConfigureEvent.window	40
-XConfigureEvent.x	48
-XConfigureEvent.y	52
-XConfigureEvent.width	56
-XConfigureEvent.height	60
-XConfigureEvent.border_width	64
-XConfigureEvent.above	72
-XConfigureEvent.override_redirect	80
-XConfigureEvent	88
-XRectangle.x	0
-XRectangle.y	2
-XRectangle.width	4
-XRectangle.height	6
-XRectangle	8
-XkbNamesNotifyEvent.type	0
-XkbNamesNotifyEvent.serial	8
-XkbNamesNotifyEvent.send_event	16
-XkbNamesNotifyEvent.display	24
-XkbNamesNotifyEvent.time	32
-XkbNamesNotifyEvent.xkb_type	40
-XkbNamesNotifyEvent.device	44
-XkbNamesNotifyEvent.changed	48
-XkbNamesNotifyEvent.first_type	52
-XkbNamesNotifyEvent.num_types	56
-XkbNamesNotifyEvent.first_lvl	60
-XkbNamesNotifyEvent.num_lvls	64
-XkbNamesNotifyEvent.num_aliases	68
-XkbNamesNotifyEvent.num_radio_groups	72
-XkbNamesNotifyEvent.changed_vmods	76
-XkbNamesNotifyEvent.changed_groups	80
-XkbNamesNotifyEvent.changed_indicators	84
-XkbNamesNotifyEvent.first_key	88
-XkbNamesNotifyEvent.num_keys	92
-XkbNamesNotifyEvent	96
-XCreateWindowEvent.type	0
-XCreateWindowEvent.serial	8
-XCreateWindowEvent.send_event	16
-XCreateWindowEvent.display	24
-XCreateWindowEvent.parent	32
-XCreateWindowEvent.window	40
-XCreateWindowEvent.x	48
-XCreateWindowEvent.y	52
-XCreateWindowEvent.width	56
-XCreateWindowEvent.height	60
-XCreateWindowEvent.border_width	64
-XCreateWindowEvent.override_redirect	68
-XCreateWindowEvent	72
-XVisibilityEvent.type	0
-XVisibilityEvent.serial	8
-XVisibilityEvent.send_event	16
-XVisibilityEvent.display	24
-XVisibilityEvent.window	32
-XVisibilityEvent.state	40
-XVisibilityEvent	48
-XWMHints.flags	0
-XWMHints.initial_state	12
-XWMHints.icon_pixmap	16
-XWMHints.icon_window	24
-XWMHints.icon_x	32
-XWMHints.icon_y	36
-XWMHints.icon_mask	40
-XWMHints.input	8
-XWMHints.window_group	48
-XWMHints	56
-XCrossingEvent.type	0
-XCrossingEvent.serial	8
-XCrossingEvent.send_event	16
-XCrossingEvent.display	24
-XCrossingEvent.window	32
-XCrossingEvent.root	40
-XCrossingEvent.subwindow	48
-XCrossingEvent.time	56
-XCrossingEvent.x	64
-XCrossingEvent.y	68
-XCrossingEvent.x_root	72
-XCrossingEvent.y_root	76
-XCrossingEvent.mode	80
-XCrossingEvent.detail	84
-XCrossingEvent.same_screen	88
-XCrossingEvent.focus	92
-XCrossingEvent.state	96
-XCrossingEvent	104
-XSelectionRequestEvent.type	0
-XSelectionRequestEvent.serial	8
-XSelectionRequestEvent.send_event	16
-XSelectionRequestEvent.display	24
-XSelectionRequestEvent.owner	32
-XSelectionRequestEvent.requestor	40
-XSelectionRequestEvent.selection	48
-XSelectionRequestEvent.target	56
-XSelectionRequestEvent.property	64
-XSelectionRequestEvent.time	72
-XSelectionRequestEvent	80
-XNoExposeEvent.type	0
-XNoExposeEvent.serial	8
-XNoExposeEvent.send_event	16
-XNoExposeEvent.display	24
-XNoExposeEvent.drawable	32
-XNoExposeEvent.major_code	40
-XNoExposeEvent.minor_code	44
-XNoExposeEvent	48
-XHostAddress.family	0
-XHostAddress.length	4
-XHostAddress.address	8
-XHostAddress	16
-XColormapEvent.type	0
-XColormapEvent.serial	8
-XColormapEvent.send_event	16
-XColormapEvent.display	24
-XColormapEvent.window	32
-XColormapEvent.colormap	40
-XColormapEvent.new	48
-XColormapEvent.state	52
-XColormapEvent	56
-ColorEntry.r	0
-ColorEntry.g	1
-ColorEntry.b	2
-ColorEntry.flags	3
-ColorEntry	4
-XResizeRequestEvent.type	0
-XResizeRequestEvent.serial	8
-XResizeRequestEvent.send_event	16
-XResizeRequestEvent.display	24
-XResizeRequestEvent.window	32
-XResizeRequestEvent.width	40
-XResizeRequestEvent.height	44
-XResizeRequestEvent	48
-Depth.depth	0
-Depth.nvisuals	4
-Depth.visuals	8
-Depth	16
-XPropertyEvent.type	0
-XPropertyEvent.serial	8
-XPropertyEvent.send_event	16
-XPropertyEvent.display	24
-XPropertyEvent.window	32
-XPropertyEvent.atom	40
-XPropertyEvent.time	48
-XPropertyEvent.state	56
-XPropertyEvent	64
-XDestroyWindowEvent.type	0
-XDestroyWindowEvent.serial	8
-XDestroyWindowEvent.send_event	16
-XDestroyWindowEvent.display	24
-XDestroyWindowEvent.event	32
-XDestroyWindowEvent.window	40
-XDestroyWindowEvent	48
-XStandardColormap.colormap	0
-XStandardColormap.red_max	8
-XStandardColormap.red_mult	16
-XStandardColormap.green_max	24
-XStandardColormap.green_mult	32
-XStandardColormap.blue_max	40
-XStandardColormap.blue_mult	48
-XStandardColormap.base_pixel	56
-XStandardColormap.visualid	64
-XStandardColormap.killid	72
-XStandardColormap	80
-XComposeStatus.compose_ptr	0
-XComposeStatus.chars_matched	8
-XComposeStatus	16
-AwtGraphicsConfigData.awt_depth	0
-AwtGraphicsConfigData.awt_cmap	8
-AwtGraphicsConfigData.awt_visInfo	16
-AwtGraphicsConfigData.awt_num_colors	80
-AwtGraphicsConfigData.awtImage	88
-AwtGraphicsConfigData.AwtColorMatch	96
-AwtGraphicsConfigData.monoImage	104
-AwtGraphicsConfigData.monoPixmap	112
-AwtGraphicsConfigData.monoPixmapWidth	120
-AwtGraphicsConfigData.monoPixmapHeight	124
-AwtGraphicsConfigData.monoPixmapGC	128
-AwtGraphicsConfigData.pixelStride	136
-AwtGraphicsConfigData.color_data	144
-AwtGraphicsConfigData.glxInfo	152
-AwtGraphicsConfigData.isTranslucencySupported	160
-AwtGraphicsConfigData.renderPictFormat	168
-AwtGraphicsConfigData	208
-XColor.pixel	0
-XColor.red	8
-XColor.green	10
-XColor.blue	12
-XColor.flags	14
-XColor.pad	15
-XColor	16
-XTextProperty.value	0
-XTextProperty.encoding	8
-XTextProperty.format	16
-XTextProperty.nitems	24
-XTextProperty	32
--- a/make/data/x11wrappergen/sizes.64-solaris-i386	Tue Mar 06 00:56:03 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1017 +0,0 @@
-long	8
-int	4
-short	2
-ptr	8
-Bool	4
-Atom	8
-Window	8
-XExtData.number	0
-XExtData.next	8
-XExtData.free_private	16
-XExtData.private_data	24
-XExtData	32
-XIMStringConversionCallbackStruct.position	0
-XIMStringConversionCallbackStruct.direction	4
-XIMStringConversionCallbackStruct.operation	8
-XIMStringConversionCallbackStruct.factor	10
-XIMStringConversionCallbackStruct.text	16
-XIMStringConversionCallbackStruct	24
-XkbNewKeyboardNotifyEvent.type	0
-XkbNewKeyboardNotifyEvent.serial	8
-XkbNewKeyboardNotifyEvent.send_event	16
-XkbNewKeyboardNotifyEvent.display	24
-XkbNewKeyboardNotifyEvent.time	32
-XkbNewKeyboardNotifyEvent.xkb_type	40
-XkbNewKeyboardNotifyEvent.device	44
-XkbNewKeyboardNotifyEvent.old_device	48
-XkbNewKeyboardNotifyEvent.min_key_code	52
-XkbNewKeyboardNotifyEvent.max_key_code	56
-XkbNewKeyboardNotifyEvent.old_min_key_code	60
-XkbNewKeyboardNotifyEvent.old_max_key_code	64
-XkbNewKeyboardNotifyEvent.changed	68
-XkbNewKeyboardNotifyEvent.req_major	72
-XkbNewKeyboardNotifyEvent.req_minor	73
-XkbNewKeyboardNotifyEvent	80
-XTimeCoord.time	0
-XTimeCoord.x	8
-XTimeCoord.y	10
-XTimeCoord	16
-XkbCompatMapNotifyEvent.type	0
-XkbCompatMapNotifyEvent.serial	8
-XkbCompatMapNotifyEvent.send_event	16
-XkbCompatMapNotifyEvent.display	24
-XkbCompatMapNotifyEvent.time	32
-XkbCompatMapNotifyEvent.xkb_type	40
-XkbCompatMapNotifyEvent.device	44
-XkbCompatMapNotifyEvent.changed_groups	48
-XkbCompatMapNotifyEvent.first_si	52
-XkbCompatMapNotifyEvent.num_si	56
-XkbCompatMapNotifyEvent.num_total_si	60
-XkbCompatMapNotifyEvent	64
-XIMStatusDrawCallbackStruct.type	0
-XIMStatusDrawCallbackStruct.data	8
-XIMStatusDrawCallbackStruct	16
-XKeyboardControl.key_click_percent	0
-XKeyboardControl.bell_percent	4
-XKeyboardControl.bell_pitch	8
-XKeyboardControl.bell_duration	12
-XKeyboardControl.led	16
-XKeyboardControl.led_mode	20
-XKeyboardControl.key	24
-XKeyboardControl.auto_repeat_mode	28
-XKeyboardControl	32
-XSelectionClearEvent.type	0
-XSelectionClearEvent.serial	8
-XSelectionClearEvent.send_event	16
-XSelectionClearEvent.display	24
-XSelectionClearEvent.window	32
-XSelectionClearEvent.selection	40
-XSelectionClearEvent.time	48
-XSelectionClearEvent	56
-XWindowChanges.x	0
-XWindowChanges.y	4
-XWindowChanges.width	8
-XWindowChanges.height	12
-XWindowChanges.border_width	16
-XWindowChanges.sibling	24
-XWindowChanges.stack_mode	32
-XWindowChanges	40
-XIMPreeditCaretCallbackStruct.position	0
-XIMPreeditCaretCallbackStruct.direction	4
-XIMPreeditCaretCallbackStruct.style	8
-XIMPreeditCaretCallbackStruct	12
-XOMCharSetList.charset_count	0
-XOMCharSetList.charset_list	8
-XOMCharSetList	16
-XOMFontInfo.num_font	0
-XOMFontInfo.font_struct_list	8
-XOMFontInfo.font_name_list	16
-XOMFontInfo	24
-AwtScreenData.numConfigs	0
-AwtScreenData.root	8
-AwtScreenData.whitepixel	16
-AwtScreenData.blackpixel	24
-AwtScreenData.defaultConfig	32
-AwtScreenData.configs	40
-AwtScreenData	48
-XIMHotKeyTrigger.keysym	0
-XIMHotKeyTrigger.modifier	8
-XIMHotKeyTrigger.modifier_mask	12
-XIMHotKeyTrigger	16
-XCirculateEvent.type	0
-XCirculateEvent.serial	8
-XCirculateEvent.send_event	16
-XCirculateEvent.display	24
-XCirculateEvent.event	32
-XCirculateEvent.window	40
-XCirculateEvent.place	48
-XCirculateEvent	56
-Screen.ext_data	0
-Screen.display	8
-Screen.root	16
-Screen.width	24
-Screen.height	28
-Screen.mwidth	32
-Screen.mheight	36
-Screen.ndepths	40
-Screen.depths	48
-Screen.root_depth	56
-Screen.root_visual	64
-Screen.default_gc	72
-Screen.cmap	80
-Screen.white_pixel	88
-Screen.black_pixel	96
-Screen.max_maps	104
-Screen.min_maps	108
-Screen.backing_store	112
-Screen.save_unders	116
-Screen.root_input_mask	120
-Screen	128
-XMapRequestEvent.type	0
-XMapRequestEvent.serial	8
-XMapRequestEvent.send_event	16
-XMapRequestEvent.display	24
-XMapRequestEvent.parent	32
-XMapRequestEvent.window	40
-XMapRequestEvent	48
-XIMText.length	0
-XIMText.feedback	8
-XIMText.encoding_is_wchar	16
-XIMText.string	24
-XIMText	32
-XGraphicsExposeEvent.type	0
-XGraphicsExposeEvent.serial	8
-XGraphicsExposeEvent.send_event	16
-XGraphicsExposeEvent.display	24
-XGraphicsExposeEvent.drawable	32
-XGraphicsExposeEvent.x	40
-XGraphicsExposeEvent.y	44
-XGraphicsExposeEvent.width	48
-XGraphicsExposeEvent.height	52
-XGraphicsExposeEvent.count	56
-XGraphicsExposeEvent.major_code	60
-XGraphicsExposeEvent.minor_code	64
-XGraphicsExposeEvent	72
-XEvent.type	0
-XEvent.xany	0
-XEvent.xkey	0
-XEvent.xbutton	0
-XEvent.xmotion	0
-XEvent.xcrossing	0
-XEvent.xfocus	0
-XEvent.xexpose	0
-XEvent.xgraphicsexpose	0
-XEvent.xnoexpose	0
-XEvent.xvisibility	0
-XEvent.xcreatewindow	0
-XEvent.xdestroywindow	0
-XEvent.xunmap	0
-XEvent.xmap	0
-XEvent.xmaprequest	0
-XEvent.xreparent	0
-XEvent.xconfigure	0
-XEvent.xgravity	0
-XEvent.xresizerequest	0
-XEvent.xconfigurerequest	0
-XEvent.xcirculate	0
-XEvent.xcirculaterequest	0
-XEvent.xproperty	0
-XEvent.xselectionclear	0
-XEvent.xselectionrequest	0
-XEvent.xselection	0
-XEvent.xcolormap	0
-XEvent.xclient	0
-XEvent.xmapping	0
-XEvent.xerror	0
-XEvent.xkeymap	0
-XEvent.pad	0
-XEvent	192
-XRenderDirectFormat.red	0
-XRenderDirectFormat.redMask	2
-XRenderDirectFormat.green	4
-XRenderDirectFormat.greenMask	6
-XRenderDirectFormat.blue	8
-XRenderDirectFormat.blueMask	10
-XRenderDirectFormat.alpha	12
-XRenderDirectFormat.alphaMask	14
-XRenderDirectFormat	16
-ColorData.awt_Colors	0
-ColorData.awt_numICMcolors	8
-ColorData.awt_icmLUT	16
-ColorData.awt_icmLUT2Colors	24
-ColorData.img_grays	32
-ColorData.img_clr_tbl	40
-ColorData.img_oda_red	48
-ColorData.img_oda_green	56
-ColorData.img_oda_blue	64
-ColorData.pGrayInverseLutData	72
-ColorData.screendata	80
-ColorData.representsPrimaries	84
-ColorData	88
-XFontStruct.ext_data	0
-XFontStruct.fid	8
-XFontStruct.direction	16
-XFontStruct.min_char_or_byte2	20
-XFontStruct.max_char_or_byte2	24
-XFontStruct.min_byte1	28
-XFontStruct.max_byte1	32
-XFontStruct.all_chars_exist	36
-XFontStruct.n_properties	44
-XFontStruct.properties	48
-XFontStruct.min_bounds	56
-XFontStruct.max_bounds	68
-XFontStruct.per_char	80
-XFontStruct.ascent	88
-XFontStruct.descent	92
-XFontStruct	96
-XExtCodes.extension	0
-XExtCodes.major_opcode	4
-XExtCodes.first_event	8
-XExtCodes.first_error	12
-XExtCodes	16
-XFontSetExtents.max_ink_extent	0
-XFontSetExtents.max_logical_extent	8
-XFontSetExtents	16
-XSelectionEvent.type	0
-XSelectionEvent.serial	8
-XSelectionEvent.send_event	16
-XSelectionEvent.display	24
-XSelectionEvent.requestor	32
-XSelectionEvent.selection	40
-XSelectionEvent.target	48
-XSelectionEvent.property	56
-XSelectionEvent.time	64
-XSelectionEvent	72
-XArc.x	0
-XArc.y	2
-XArc.width	4
-XArc.height	6
-XArc.angle1	8
-XArc.angle2	10
-XArc	12
-XErrorEvent.type	0
-XErrorEvent.display	8
-XErrorEvent.resourceid	16
-XErrorEvent.serial	24
-XErrorEvent.error_code	32
-XErrorEvent.request_code	33
-XErrorEvent.minor_code	34
-XErrorEvent	40
-XConfigureRequestEvent.type	0
-XConfigureRequestEvent.serial	8
-XConfigureRequestEvent.send_event	16
-XConfigureRequestEvent.display	24
-XConfigureRequestEvent.parent	32
-XConfigureRequestEvent.window	40
-XConfigureRequestEvent.x	48
-XConfigureRequestEvent.y	52
-XConfigureRequestEvent.width	56
-XConfigureRequestEvent.height	60
-XConfigureRequestEvent.border_width	64
-XConfigureRequestEvent.above	72
-XConfigureRequestEvent.detail	80
-XConfigureRequestEvent.value_mask	88
-XConfigureRequestEvent	96
-ScreenFormat.ext_data	0
-ScreenFormat.depth	8
-ScreenFormat.bits_per_pixel	12
-ScreenFormat.scanline_pad	16
-ScreenFormat	24
-XButtonEvent.type	0
-XButtonEvent.serial	8
-XButtonEvent.send_event	16
-XButtonEvent.display	24
-XButtonEvent.window	32
-XButtonEvent.root	40
-XButtonEvent.subwindow	48
-XButtonEvent.time	56
-XButtonEvent.x	64
-XButtonEvent.y	68
-XButtonEvent.x_root	72
-XButtonEvent.y_root	76
-XButtonEvent.state	80
-XButtonEvent.button	84
-XButtonEvent.same_screen	88
-XButtonEvent	96
-XFontProp.name	0
-XFontProp.card32	8
-XFontProp	16
-XIMValuesList.count_values	0
-XIMValuesList.supported_values	8
-XIMValuesList	16
-XKeymapEvent.type	0
-XKeymapEvent.serial	8
-XKeymapEvent.send_event	16
-XKeymapEvent.display	24
-XKeymapEvent.window	32
-XKeymapEvent.key_vector	40
-XKeymapEvent	72
-XTextItem16.chars	0
-XTextItem16.nchars	8
-XTextItem16.delta	12
-XTextItem16.font	16
-XTextItem16	24
-XIMPreeditDrawCallbackStruct.caret	0
-XIMPreeditDrawCallbackStruct.chg_first	4
-XIMPreeditDrawCallbackStruct.chg_length	8
-XIMPreeditDrawCallbackStruct.text	16
-XIMPreeditDrawCallbackStruct	24
-XVisualInfo.visual	0
-XVisualInfo.visualid	8
-XVisualInfo.screen	16
-XVisualInfo.depth	20
-XVisualInfo.class	24
-XVisualInfo.red_mask	32
-XVisualInfo.green_mask	40
-XVisualInfo.blue_mask	48
-XVisualInfo.colormap_size	56
-XVisualInfo.bits_per_rgb	60
-XVisualInfo	64
-XkbControlsNotifyEvent.type	0
-XkbControlsNotifyEvent.serial	8
-XkbControlsNotifyEvent.send_event	16
-XkbControlsNotifyEvent.display	24
-XkbControlsNotifyEvent.time	32
-XkbControlsNotifyEvent.xkb_type	40
-XkbControlsNotifyEvent.device	44
-XkbControlsNotifyEvent.changed_ctrls	48
-XkbControlsNotifyEvent.enabled_ctrls	52
-XkbControlsNotifyEvent.enabled_ctrl_changes	56
-XkbControlsNotifyEvent.num_groups	60
-XkbControlsNotifyEvent.keycode	64
-XkbControlsNotifyEvent.event_type	65
-XkbControlsNotifyEvent.req_major	66
-XkbControlsNotifyEvent.req_minor	67
-XkbControlsNotifyEvent	72
-PropMwmHints.flags	0
-PropMwmHints.functions	8
-PropMwmHints.decorations	16
-PropMwmHints.inputMode	24
-PropMwmHints.status	32
-PropMwmHints	40
-XClientMessageEvent.type	0
-XClientMessageEvent.serial	8
-XClientMessageEvent.send_event	16
-XClientMessageEvent.display	24
-XClientMessageEvent.window	32
-XClientMessageEvent.message_type	40
-XClientMessageEvent.format	48
-XClientMessageEvent.data	56
-XClientMessageEvent	96
-XAnyEvent.type	0
-XAnyEvent.serial	8
-XAnyEvent.send_event	16
-XAnyEvent.display	24
-XAnyEvent.window	32
-XAnyEvent	40
-XkbIndicatorNotifyEvent.type	0
-XkbIndicatorNotifyEvent.serial	8
-XkbIndicatorNotifyEvent.send_event	16
-XkbIndicatorNotifyEvent.display	24
-XkbIndicatorNotifyEvent.time	32
-XkbIndicatorNotifyEvent.xkb_type	40
-XkbIndicatorNotifyEvent.device	44
-XkbIndicatorNotifyEvent.changed	48
-XkbIndicatorNotifyEvent.state	52
-XkbIndicatorNotifyEvent	56
-XIMPreeditStateNotifyCallbackStruct.state	0
-XIMPreeditStateNotifyCallbackStruct	8
-XkbAnyEvent.type	0
-XkbAnyEvent.serial	8
-XkbAnyEvent.send_event	16
-XkbAnyEvent.display	24
-XkbAnyEvent.time	32
-XkbAnyEvent.xkb_type	40
-XkbAnyEvent.device	44
-XkbAnyEvent	48
-XMotionEvent.type	0
-XMotionEvent.serial	8
-XMotionEvent.send_event	16
-XMotionEvent.display	24
-XMotionEvent.window	32
-XMotionEvent.root	40
-XMotionEvent.subwindow	48
-XMotionEvent.time	56
-XMotionEvent.x	64
-XMotionEvent.y	68
-XMotionEvent.x_root	72
-XMotionEvent.y_root	76
-XMotionEvent.state	80
-XMotionEvent.is_hint	84
-XMotionEvent.same_screen	88
-XMotionEvent	96
-XIMHotKeyTriggers.num_hot_key	0
-XIMHotKeyTriggers.key	8
-XIMHotKeyTriggers	16
-XIMStyles.count_styles	0
-XIMStyles.supported_styles	8
-XIMStyles	16
-XkbExtensionDeviceNotifyEvent.type	0
-XkbExtensionDeviceNotifyEvent.serial	8
-XkbExtensionDeviceNotifyEvent.send_event	16
-XkbExtensionDeviceNotifyEvent.display	24
-XkbExtensionDeviceNotifyEvent.time	32
-XkbExtensionDeviceNotifyEvent.xkb_type	40
-XkbExtensionDeviceNotifyEvent.device	44
-XkbExtensionDeviceNotifyEvent.reason	48
-XkbExtensionDeviceNotifyEvent.supported	52
-XkbExtensionDeviceNotifyEvent.unsupported	56
-XkbExtensionDeviceNotifyEvent.first_btn	60
-XkbExtensionDeviceNotifyEvent.num_btns	64
-XkbExtensionDeviceNotifyEvent.leds_defined	68
-XkbExtensionDeviceNotifyEvent.led_state	72
-XkbExtensionDeviceNotifyEvent.led_class	76
-XkbExtensionDeviceNotifyEvent.led_id	80
-XkbExtensionDeviceNotifyEvent	88
-XwcTextItem.chars	0
-XwcTextItem.nchars	8
-XwcTextItem.delta	12
-XwcTextItem.font_set	16
-XwcTextItem	24
-XClassHint.res_name	0
-XClassHint.res_class	8
-XClassHint	16
-XChar2b.byte1	0
-XChar2b.byte2	1
-XChar2b	2
-XSetWindowAttributes.background_pixmap	0
-XSetWindowAttributes.background_pixel	8
-XSetWindowAttributes.border_pixmap	16
-XSetWindowAttributes.border_pixel	24
-XSetWindowAttributes.bit_gravity	32
-XSetWindowAttributes.win_gravity	36
-XSetWindowAttributes.backing_store	40
-XSetWindowAttributes.backing_planes	48
-XSetWindowAttributes.backing_pixel	56
-XSetWindowAttributes.save_under	64
-XSetWindowAttributes.event_mask	72
-XSetWindowAttributes.do_not_propagate_mask	80
-XSetWindowAttributes.override_redirect	88
-XSetWindowAttributes.colormap	96
-XSetWindowAttributes.cursor	104
-XSetWindowAttributes	112
-XRenderPictFormat.id	0
-XRenderPictFormat.type	8
-XRenderPictFormat.depth	12
-XRenderPictFormat.direct	16
-XRenderPictFormat.colormap	32
-XRenderPictFormat	40
-XReparentEvent.type	0
-XReparentEvent.serial	8
-XReparentEvent.send_event	16
-XReparentEvent.display	24
-XReparentEvent.event	32
-XReparentEvent.window	40
-XReparentEvent.parent	48
-XReparentEvent.x	56
-XReparentEvent.y	60
-XReparentEvent.override_redirect	64
-XReparentEvent	72
-XCirculateRequestEvent.type	0
-XCirculateRequestEvent.serial	8
-XCirculateRequestEvent.send_event	16
-XCirculateRequestEvent.display	24
-XCirculateRequestEvent.parent	32
-XCirculateRequestEvent.window	40
-XCirculateRequestEvent.place	48
-XCirculateRequestEvent	56
-XImage.width	0
-XImage.height	4
-XImage.xoffset	8
-XImage.format	12
-XImage.data	16
-XImage.byte_order	24
-XImage.bitmap_unit	28
-XImage.bitmap_bit_order	32
-XImage.bitmap_pad	36
-XImage.depth	40
-XImage.bytes_per_line	44
-XImage.bits_per_pixel	48
-XImage.red_mask	56
-XImage.green_mask	64
-XImage.blue_mask	72
-XImage.obdata	80
-XImage.f.create_image	88
-XImage.f.destroy_image	96
-XImage.f.get_pixel	104
-XImage.f.put_pixel	112
-XImage.f.sub_image	120
-XImage.f.add_pixel	128
-XImage	136
-XKeyEvent.type	0
-XKeyEvent.serial	8
-XKeyEvent.send_event	16
-XKeyEvent.display	24
-XKeyEvent.window	32
-XKeyEvent.root	40
-XKeyEvent.subwindow	48
-XKeyEvent.time	56
-XKeyEvent.x	64
-XKeyEvent.y	68
-XKeyEvent.x_root	72
-XKeyEvent.y_root	76
-XKeyEvent.state	80
-XKeyEvent.keycode	84
-XKeyEvent.same_screen	88
-XKeyEvent	96
-XkbActionMessageEvent.type	0
-XkbActionMessageEvent.serial	8
-XkbActionMessageEvent.send_event	16
-XkbActionMessageEvent.display	24
-XkbActionMessageEvent.time	32
-XkbActionMessageEvent.xkb_type	40
-XkbActionMessageEvent.device	44
-XkbActionMessageEvent.keycode	48
-XkbActionMessageEvent.press	52
-XkbActionMessageEvent.key_event_follows	56
-XkbActionMessageEvent.group	60
-XkbActionMessageEvent.mods	64
-XkbActionMessageEvent.message	68
-XkbActionMessageEvent	80
-XdbeSwapInfo.swap_window	0
-XdbeSwapInfo.swap_action	8
-XdbeSwapInfo	16
-XTextItem.chars	0
-XTextItem.nchars	8
-XTextItem.delta	12
-XTextItem.font	16
-XTextItem	24
-XModifierKeymap.max_keypermod	0
-XModifierKeymap.modifiermap	8
-XModifierKeymap	16
-XCharStruct.lbearing	0
-XCharStruct.rbearing	2
-XCharStruct.width	4
-XCharStruct.ascent	6
-XCharStruct.descent	8
-XCharStruct.attributes	10
-XCharStruct	12
-XGravityEvent.type	0
-XGravityEvent.serial	8
-XGravityEvent.send_event	16
-XGravityEvent.display	24
-XGravityEvent.event	32
-XGravityEvent.window	40
-XGravityEvent.x	48
-XGravityEvent.y	52
-XGravityEvent	56
-Visual.ext_data	0
-Visual.visualid	8
-Visual.class	16
-Visual.red_mask	24
-Visual.green_mask	32
-Visual.blue_mask	40
-Visual.bits_per_rgb	48
-Visual.map_entries	52
-Visual	56
-XOMOrientation.num_orientation	0
-XOMOrientation.orientation	8
-XOMOrientation	16
-XkbAccessXNotifyEvent.type	0
-XkbAccessXNotifyEvent.serial	8
-XkbAccessXNotifyEvent.send_event	16
-XkbAccessXNotifyEvent.display	24
-XkbAccessXNotifyEvent.time	32
-XkbAccessXNotifyEvent.xkb_type	40
-XkbAccessXNotifyEvent.device	44
-XkbAccessXNotifyEvent.detail	48
-XkbAccessXNotifyEvent.keycode	52
-XkbAccessXNotifyEvent.sk_delay	56
-XkbAccessXNotifyEvent.debounce_delay	60
-XkbAccessXNotifyEvent	64
-XWindowAttributes.x	0
-XWindowAttributes.y	4
-XWindowAttributes.width	8
-XWindowAttributes.height	12
-XWindowAttributes.border_width	16
-XWindowAttributes.depth	20
-XWindowAttributes.visual	24
-XWindowAttributes.root	32
-XWindowAttributes.class	40
-XWindowAttributes.bit_gravity	44
-XWindowAttributes.win_gravity	48
-XWindowAttributes.backing_store	52
-XWindowAttributes.backing_planes	56
-XWindowAttributes.backing_pixel	64
-XWindowAttributes.save_under	72
-XWindowAttributes.colormap	80
-XWindowAttributes.map_installed	88
-XWindowAttributes.map_state	92
-XWindowAttributes.all_event_masks	96
-XWindowAttributes.your_event_mask	104
-XWindowAttributes.do_not_propagate_mask	112
-XWindowAttributes.override_redirect	120
-XWindowAttributes.screen	128
-XWindowAttributes	136
-XmbTextItem.chars	0
-XmbTextItem.nchars	8
-XmbTextItem.delta	12
-XmbTextItem.font_set	16
-XmbTextItem	24
-XMappingEvent.type	0
-XMappingEvent.serial	8
-XMappingEvent.send_event	16
-XMappingEvent.display	24
-XMappingEvent.window	32
-XMappingEvent.request	40
-XMappingEvent.first_keycode	44
-XMappingEvent.count	48
-XMappingEvent	56
-XSizeHints.flags	0
-XSizeHints.x	8
-XSizeHints.y	12
-XSizeHints.width	16
-XSizeHints.height	20
-XSizeHints.min_width	24
-XSizeHints.min_height	28
-XSizeHints.max_width	32
-XSizeHints.max_height	36
-XSizeHints.width_inc	40
-XSizeHints.height_inc	44
-XSizeHints.min_aspect.x	48
-XSizeHints.min_aspect.y	52
-XSizeHints.max_aspect.x	56
-XSizeHints.max_aspect.y	60
-XSizeHints.base_width	64
-XSizeHints.base_height	68
-XSizeHints.win_gravity	72
-XSizeHints	80
-XUnmapEvent.type	0
-XUnmapEvent.serial	8
-XUnmapEvent.send_event	16
-XUnmapEvent.display	24
-XUnmapEvent.event	32
-XUnmapEvent.window	40
-XUnmapEvent.from_configure	48
-XUnmapEvent	56
-awtImageData.Depth	0
-awtImageData.wsImageFormat	4
-awtImageData.clrdata	16
-awtImageData.convert	48
-awtImageData	560
-XkbStateNotifyEvent.type	0
-XkbStateNotifyEvent.serial	8
-XkbStateNotifyEvent.send_event	16
-XkbStateNotifyEvent.display	24
-XkbStateNotifyEvent.time	32
-XkbStateNotifyEvent.xkb_type	40
-XkbStateNotifyEvent.device	44
-XkbStateNotifyEvent.changed	48
-XkbStateNotifyEvent.group	52
-XkbStateNotifyEvent.base_group	56
-XkbStateNotifyEvent.latched_group	60
-XkbStateNotifyEvent.locked_group	64
-XkbStateNotifyEvent.mods	68
-XkbStateNotifyEvent.base_mods	72
-XkbStateNotifyEvent.latched_mods	76
-XkbStateNotifyEvent.locked_mods	80
-XkbStateNotifyEvent.compat_state	84
-XkbStateNotifyEvent.grab_mods	88
-XkbStateNotifyEvent.compat_grab_mods	89
-XkbStateNotifyEvent.lookup_mods	90
-XkbStateNotifyEvent.compat_lookup_mods	91
-XkbStateNotifyEvent.ptr_buttons	92
-XkbStateNotifyEvent.keycode	96
-XkbStateNotifyEvent.event_type	97
-XkbStateNotifyEvent.req_major	98
-XkbStateNotifyEvent.req_minor	99
-XkbStateNotifyEvent	104
-XExposeEvent.type	0
-XExposeEvent.serial	8
-XExposeEvent.send_event	16
-XExposeEvent.display	24
-XExposeEvent.window	32
-XExposeEvent.x	40
-XExposeEvent.y	44
-XExposeEvent.width	48
-XExposeEvent.height	52
-XExposeEvent.count	56
-XExposeEvent	64
-XkbMapNotifyEvent.type	0
-XkbMapNotifyEvent.serial	8
-XkbMapNotifyEvent.send_event	16
-XkbMapNotifyEvent.display	24
-XkbMapNotifyEvent.time	32
-XkbMapNotifyEvent.xkb_type	40
-XkbMapNotifyEvent.device	44
-XkbMapNotifyEvent.changed	48
-XkbMapNotifyEvent.flags	52
-XkbMapNotifyEvent.first_type	56
-XkbMapNotifyEvent.num_types	60
-XkbMapNotifyEvent.min_key_code	64
-XkbMapNotifyEvent.max_key_code	65
-XkbMapNotifyEvent.first_key_sym	66
-XkbMapNotifyEvent.first_key_act	67
-XkbMapNotifyEvent.first_key_behavior	68
-XkbMapNotifyEvent.first_key_explicit	69
-XkbMapNotifyEvent.first_modmap_key	70
-XkbMapNotifyEvent.first_vmodmap_key	71
-XkbMapNotifyEvent.num_key_syms	72
-XkbMapNotifyEvent.num_key_acts	76
-XkbMapNotifyEvent.num_key_behaviors	80
-XkbMapNotifyEvent.num_key_explicit	84
-XkbMapNotifyEvent.num_modmap_keys	88
-XkbMapNotifyEvent.num_vmodmap_keys	92
-XkbMapNotifyEvent.vmods	96
-XkbMapNotifyEvent	104
-XGCValues.function	0
-XGCValues.plane_mask	8
-XGCValues.foreground	16
-XGCValues.background	24
-XGCValues.line_width	32
-XGCValues.line_style	36
-XGCValues.cap_style	40
-XGCValues.join_style	44
-XGCValues.fill_style	48
-XGCValues.fill_rule	52
-XGCValues.arc_mode	56
-XGCValues.tile	64
-XGCValues.stipple	72
-XGCValues.ts_x_origin	80
-XGCValues.ts_y_origin	84
-XGCValues.font	88
-XGCValues.subwindow_mode	96
-XGCValues.graphics_exposures	100
-XGCValues.clip_x_origin	104
-XGCValues.clip_y_origin	108
-XGCValues.clip_mask	112
-XGCValues.dash_offset	120
-XGCValues.dashes	124
-XGCValues	128
-XFocusChangeEvent.type	0
-XFocusChangeEvent.serial	8
-XFocusChangeEvent.send_event	16
-XFocusChangeEvent.display	24
-XFocusChangeEvent.window	32
-XFocusChangeEvent.mode	40
-XFocusChangeEvent.detail	44
-XFocusChangeEvent	48
-XPixmapFormatValues.depth	0
-XPixmapFormatValues.bits_per_pixel	4
-XPixmapFormatValues.scanline_pad	8
-XPixmapFormatValues	12
-XMapEvent.type	0
-XMapEvent.serial	8
-XMapEvent.send_event	16
-XMapEvent.display	24
-XMapEvent.event	32
-XMapEvent.window	40
-XMapEvent.override_redirect	48
-XMapEvent	56
-XkbBellNotifyEvent.type	0
-XkbBellNotifyEvent.serial	8
-XkbBellNotifyEvent.send_event	16
-XkbBellNotifyEvent.display	24
-XkbBellNotifyEvent.time	32
-XkbBellNotifyEvent.xkb_type	40
-XkbBellNotifyEvent.device	44
-XkbBellNotifyEvent.percent	48
-XkbBellNotifyEvent.pitch	52
-XkbBellNotifyEvent.duration	56
-XkbBellNotifyEvent.bell_class	60
-XkbBellNotifyEvent.bell_id	64
-XkbBellNotifyEvent.name	72
-XkbBellNotifyEvent.window	80
-XkbBellNotifyEvent.event_only	88
-XkbBellNotifyEvent	96
-XIMStringConversionText.length	0
-XIMStringConversionText.feedback	8
-XIMStringConversionText.encoding_is_wchar	16
-XIMStringConversionText.string	24
-XIMStringConversionText	32
-XKeyboardState.key_click_percent	0
-XKeyboardState.bell_percent	4
-XKeyboardState.bell_pitch	8
-XKeyboardState.bell_duration	12
-XKeyboardState.led_mask	16
-XKeyboardState.global_auto_repeat	24
-XKeyboardState.auto_repeats	28
-XKeyboardState	64
-XkbEvent.type	0
-XkbEvent.any	0
-XkbEvent.new_kbd	0
-XkbEvent.map	0
-XkbEvent.state	0
-XkbEvent.ctrls	0
-XkbEvent.indicators	0
-XkbEvent.names	0
-XkbEvent.compat	0
-XkbEvent.bell	0
-XkbEvent.message	0
-XkbEvent.accessx	0
-XkbEvent.device	0
-XkbEvent.core	0
-XkbEvent	192
-XPoint.x	0
-XPoint.y	2
-XPoint	4
-XSegment.x1	0
-XSegment.y1	2
-XSegment.x2	4
-XSegment.y2	6
-XSegment	8
-XIconSize.min_width	0
-XIconSize.min_height	4
-XIconSize.max_width	8
-XIconSize.max_height	12
-XIconSize.width_inc	16
-XIconSize.height_inc	20
-XIconSize	24
-XIMCallback.client_data	0
-XIMCallback.callback	8
-XIMCallback	16
-XConfigureEvent.type	0
-XConfigureEvent.serial	8
-XConfigureEvent.send_event	16
-XConfigureEvent.display	24
-XConfigureEvent.event	32
-XConfigureEvent.window	40
-XConfigureEvent.x	48
-XConfigureEvent.y	52
-XConfigureEvent.width	56
-XConfigureEvent.height	60
-XConfigureEvent.border_width	64
-XConfigureEvent.above	72
-XConfigureEvent.override_redirect	80
-XConfigureEvent	88
-XRectangle.x	0
-XRectangle.y	2
-XRectangle.width	4
-XRectangle.height	6
-XRectangle	8
-XkbNamesNotifyEvent.type	0
-XkbNamesNotifyEvent.serial	8
-XkbNamesNotifyEvent.send_event	16
-XkbNamesNotifyEvent.display	24
-XkbNamesNotifyEvent.time	32
-XkbNamesNotifyEvent.xkb_type	40
-XkbNamesNotifyEvent.device	44
-XkbNamesNotifyEvent.changed	48
-XkbNamesNotifyEvent.first_type	52
-XkbNamesNotifyEvent.num_types	56
-XkbNamesNotifyEvent.first_lvl	60
-XkbNamesNotifyEvent.num_lvls	64
-XkbNamesNotifyEvent.num_aliases	68
-XkbNamesNotifyEvent.num_radio_groups	72
-XkbNamesNotifyEvent.changed_vmods	76
-XkbNamesNotifyEvent.changed_groups	80
-XkbNamesNotifyEvent.changed_indicators	84
-XkbNamesNotifyEvent.first_key	88
-XkbNamesNotifyEvent.num_keys	92
-XkbNamesNotifyEvent	96
-XCreateWindowEvent.type	0
-XCreateWindowEvent.serial	8
-XCreateWindowEvent.send_event	16
-XCreateWindowEvent.display	24
-XCreateWindowEvent.parent	32
-XCreateWindowEvent.window	40
-XCreateWindowEvent.x	48
-XCreateWindowEvent.y	52
-XCreateWindowEvent.width	56
-XCreateWindowEvent.height	60
-XCreateWindowEvent.border_width	64
-XCreateWindowEvent.override_redirect	68
-XCreateWindowEvent	72
-XVisibilityEvent.type	0
-XVisibilityEvent.serial	8
-XVisibilityEvent.send_event	16
-XVisibilityEvent.display	24
-XVisibilityEvent.window	32
-XVisibilityEvent.state	40
-XVisibilityEvent	48
-XWMHints.flags	0
-XWMHints.initial_state	12
-XWMHints.icon_pixmap	16
-XWMHints.icon_window	24
-XWMHints.icon_x	32
-XWMHints.icon_y	36
-XWMHints.icon_mask	40
-XWMHints.input	8
-XWMHints.window_group	48
-XWMHints	56
-XCrossingEvent.type	0
-XCrossingEvent.serial	8
-XCrossingEvent.send_event	16
-XCrossingEvent.display	24
-XCrossingEvent.window	32
-XCrossingEvent.root	40
-XCrossingEvent.subwindow	48
-XCrossingEvent.time	56
-XCrossingEvent.x	64
-XCrossingEvent.y	68
-XCrossingEvent.x_root	72
-XCrossingEvent.y_root	76
-XCrossingEvent.mode	80
-XCrossingEvent.detail	84
-XCrossingEvent.same_screen	88
-XCrossingEvent.focus	92
-XCrossingEvent.state	96
-XCrossingEvent	104
-XSelectionRequestEvent.type	0
-XSelectionRequestEvent.serial	8
-XSelectionRequestEvent.send_event	16
-XSelectionRequestEvent.display	24
-XSelectionRequestEvent.owner	32
-XSelectionRequestEvent.requestor	40
-XSelectionRequestEvent.selection	48
-XSelectionRequestEvent.target	56
-XSelectionRequestEvent.property	64
-XSelectionRequestEvent.time	72
-XSelectionRequestEvent	80
-XNoExposeEvent.type	0
-XNoExposeEvent.serial	8
-XNoExposeEvent.send_event	16
-XNoExposeEvent.display	24
-XNoExposeEvent.drawable	32
-XNoExposeEvent.major_code	40
-XNoExposeEvent.minor_code	44
-XNoExposeEvent	48
-XHostAddress.family	0
-XHostAddress.length	4
-XHostAddress.address	8
-XHostAddress	16
-XColormapEvent.type	0
-XColormapEvent.serial	8
-XColormapEvent.send_event	16
-XColormapEvent.display	24
-XColormapEvent.window	32
-XColormapEvent.colormap	40
-XColormapEvent.new	48
-XColormapEvent.state	52
-XColormapEvent	56
-ColorEntry.r	0
-ColorEntry.g	1
-ColorEntry.b	2
-ColorEntry.flags	3
-ColorEntry	4
-XResizeRequestEvent.type	0
-XResizeRequestEvent.serial	8
-XResizeRequestEvent.send_event	16
-XResizeRequestEvent.display	24
-XResizeRequestEvent.window	32
-XResizeRequestEvent.width	40
-XResizeRequestEvent.height	44
-XResizeRequestEvent	48
-Depth.depth	0
-Depth.nvisuals	4
-Depth.visuals	8
-Depth	16
-XPropertyEvent.type	0
-XPropertyEvent.serial	8
-XPropertyEvent.send_event	16
-XPropertyEvent.display	24
-XPropertyEvent.window	32
-XPropertyEvent.atom	40
-XPropertyEvent.time	48
-XPropertyEvent.state	56
-XPropertyEvent	64
-XDestroyWindowEvent.type	0
-XDestroyWindowEvent.serial	8
-XDestroyWindowEvent.send_event	16
-XDestroyWindowEvent.display	24
-XDestroyWindowEvent.event	32
-XDestroyWindowEvent.window	40
-XDestroyWindowEvent	48
-XStandardColormap.colormap	0
-XStandardColormap.red_max	8
-XStandardColormap.red_mult	16
-XStandardColormap.green_max	24
-XStandardColormap.green_mult	32
-XStandardColormap.blue_max	40
-XStandardColormap.blue_mult	48
-XStandardColormap.base_pixel	56
-XStandardColormap.visualid	64
-XStandardColormap.killid	72
-XStandardColormap	80
-XComposeStatus.compose_ptr	0
-XComposeStatus.chars_matched	8
-XComposeStatus	16
-AwtGraphicsConfigData.awt_depth	0
-AwtGraphicsConfigData.awt_cmap	8
-AwtGraphicsConfigData.awt_visInfo	16
-AwtGraphicsConfigData.awt_num_colors	80
-AwtGraphicsConfigData.awtImage	88
-AwtGraphicsConfigData.AwtColorMatch	96
-AwtGraphicsConfigData.monoImage	104
-AwtGraphicsConfigData.monoPixmap	112
-AwtGraphicsConfigData.monoPixmapWidth	120
-AwtGraphicsConfigData.monoPixmapHeight	124
-AwtGraphicsConfigData.monoPixmapGC	128
-AwtGraphicsConfigData.pixelStride	136
-AwtGraphicsConfigData.color_data	144
-AwtGraphicsConfigData.glxInfo	152
-AwtGraphicsConfigData.isTranslucencySupported	160
-AwtGraphicsConfigData.renderPictFormat	168
-AwtGraphicsConfigData	208
-XColor.pixel	0
-XColor.red	8
-XColor.green	10
-XColor.blue	12
-XColor.flags	14
-XColor.pad	15
-XColor	16
-XTextProperty.value	0
-XTextProperty.encoding	8
-XTextProperty.format	16
-XTextProperty.nitems	24
-XTextProperty	32
--- a/make/data/x11wrappergen/xlibtypes.txt	Tue Mar 06 00:56:03 2018 +0100
+++ b/make/data/x11wrappergen/xlibtypes.txt	Tue Mar 06 00:59:49 2018 +0100
@@ -1,9 +1,9 @@
-//
 //
 // This file is used for automated generation of java classes to wrap native structures.
-// The detail on format of this file see WrapperGenerator.java
+// For details on format of this file, see WrapperGenerator.java
 //
-// WARNING: if you modified this file, you need to regenerate sizes.64-solaris-i386
+// WARNING: If you modify this file, you need to regenerate sizes-32.txt and sizes-64.txt.
+// Run "make update-x11wrappers" to do this.
 //
 
 XExtData
--- a/make/gensrc/Gensrc-java.desktop.gmk	Tue Mar 06 00:56:03 2018 +0100
+++ b/make/gensrc/Gensrc-java.desktop.gmk	Tue Mar 06 00:59:49 2018 +0100
@@ -30,10 +30,10 @@
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
+endif
 
-  ifneq ($(OPENJDK_TARGET_OS), macosx)
-    include GensrcX11Wrappers.gmk
-  endif
+ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris aix), )
+  include GensrcX11Wrappers.gmk
 endif
 
 include GensrcSwing.gmk
--- a/make/gensrc/GensrcX11Wrappers.gmk	Tue Mar 06 00:56:03 2018 +0100
+++ b/make/gensrc/GensrcX11Wrappers.gmk	Tue Mar 06 00:59:49 2018 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,106 +23,32 @@
 # questions.
 #
 
-# This file is responsible for extracting the x11 native struct offsets to
-# the xawt Java library. The tool needs to be run on the os/arch that
-# will host the final jvm, thus the tool cannot be used when cross compiling.
+# Generate java sources using the X11 offsets that are precalculated in files
+# make/data/x11wrappergen/sizes-<address size>.txt.
 
-# To enable cross compiling, the two versions of the generated offset file,
-# sizes.32 and sizes.64 are committed into the source code repository.
-# These are the ones used.
+GENSRC_X11WRAPPERS_OUTPUT_TOP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
 
-# However when not cross compiling, the offset generator tool is built and
-# run, to verify that it still generates the same sizes.32 and sizes.64.
+GENSRC_X11WRAPPERS_MARKER := $(GENSRC_X11WRAPPERS_OUTPUT_TOP)/_x11wrappers.marker
 
-GENSRC_X11WRAPPERS :=
-# Put temporary c-code and executable to calculate offsets here.
-# Also put verification offset file here as well.
-GENSRC_X11WRAPPERS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_x11wrappers
 # Put the generated Java classes used to interface X11 from awt here.
-GENSRC_X11WRAPPERS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/sun/awt/X11
+GENSRC_X11WRAPPERS_OUTPUTDIR := $(GENSRC_X11WRAPPERS_OUTPUT_TOP)/sun/awt/X11
 
 # The pre-calculated offset file are stored here:
-GENSRC_SIZER_DIR := $(TOPDIR)/make/data/x11wrappergen
+GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
+GENSRC_X11WRAPPERS_DATA := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(OPENJDK_TARGET_CPU_BITS).txt
 
-# Normal case is to generate only according to target bits
-GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS)
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
-  ifneq ($(OPENJDK_TARGET_OS), linux)
-    # On all 64-bit systems except Linux, generate both 32 and 64 bit versions
-    GENSRC_X11_VERSION := 32 64
-  endif
-else
-  ifeq ($(OPENJDK_TARGET_OS), solaris)
-    # As a special case, solaris 32-bit also generates the 64-bit version
-    GENSRC_X11_VERSION := 32 64
-  endif
-endif
+$(info ExecuteWithLog is $(call ExecuteWithLog $(GENSRC_X11WRAPPERS_OUTPUT_TOP)/foobar, CMDLINE))
 
-GENSRC_X11_SIZES_USED := $(addprefix $(GENSRC_X11WRAPPERS_TMP)/sizes., $(GENSRC_X11_VERSION))
-
-# Copy only the sizes.* files that are actually needed. WrapperGenerator picks up any it finds from the
-# file prefix it is given so those not needed need to be hidden.
-$(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.%
-	$(call MakeDir, $(@D))
-	$(RM) '$@'
-	$(SORT) $< > $@
-
-# Run the tool on the offset files copied from the source repository to generate several Java classes
-# used in awt.
-$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated.x11: $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS_JDK)
-	$(call MakeDir, $(GENSRC_X11WRAPPERS_DST))
-	$(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes
+# Run the tool on the offset files to generate several Java classes used in awt.
+$(GENSRC_X11WRAPPERS_MARKER): $(BUILD_TOOLS_JDK) $(GENSRC_X11WRAPPERS_DATA) \
+    $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt
+	$(call MakeDir, $(GENSRC_X11WRAPPERS_OUTPUTDIR))
+	$(call LogInfo, Generating X11 wrapper source files)
+	$(call ExecuteWithLog, $@, \
+	    $(TOOL_WRAPPERGENERATOR) gen_java $(GENSRC_X11WRAPPERS_OUTPUTDIR) \
+	        $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(GENSRC_X11WRAPPERS_DATA) \
+	        $(OPENJDK_TARGET_CPU_BITS))
 	$(TOUCH) $@
 
-GENSRC_X11WRAPPERS += $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated.x11
 
-ifneq ($(COMPILE_TYPE), cross)
-  # This is not a cross compile, regenerate the offset file, so that we
-  # can compare it with the version in the source code repository.
-
-  # Generate the C code for the program that will output the offset file.
-  $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c: $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS_JDK)
-	$(call LogInfo, Generating X11 wrapper ($*-bit version))
-	$(call MakeDir, $(@D))
-	$(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
-
-  # use -m32/-m64 only if the compiler supports it
-  ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
-    MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
-  endif
-
-  SIZER_CFLAGS := \
-      -I$(TOPDIR)/src/hotspot/share/include \
-      -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
-      -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-      -I$(TOPDIR)/src/java.base/share/native/libjava \
-      -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      #
-
-  # Compile the C code into an executable.
-  $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
-	$(call MakeDir, $(@D))
-	(cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \
-	    $(X_CFLAGS) \
-	    $(X_LIBS) \
-	    $(SIZER_CFLAGS) -lc)
-
-  .PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
-
-  # Run the executable create the offset file and check that it is identical
-  # to the offset file in the source code repository.
-  $(GENSRC_X11WRAPPERS_TMP)/sizes.%.verification: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe
-	$(call LogInfo, Verifying X11 wrapper sizes)
-	$(call MakeDir, $(@D))
-	$(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
-	$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
-	mv $@.tmp $@
-
-  GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
-endif
-
-GENSRC_JAVA_DESKTOP += $(GENSRC_X11WRAPPERS)
+GENSRC_JAVA_DESKTOP += $(GENSRC_X11WRAPPERS_MARKER)
--- a/make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java	Tue Mar 06 00:56:03 2018 +0100
+++ b/make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java	Tue Mar 06 00:59:49 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1109,7 +1109,6 @@
     }
 
     public void writeJavaWrapperClass(String outputDir) {
-//          (new File(outputDir, package_path)).mkdirs();
         try {
             for (Enumeration e = symbolTable.elements() ; e.hasMoreElements() ;) {
                 BaseType tp = (BaseType) e.nextElement();
@@ -1126,7 +1125,6 @@
         }
     }
 
-
     public void writeNativeSizer(String file)
     {
         int type;
@@ -1136,7 +1134,6 @@
         StructType stp;
         Enumeration eo;
 
-
         try {
 
             FileOutputStream fs =  new FileOutputStream(file);
@@ -1158,7 +1155,6 @@
             pw.println("    unsigned long status;\n");
             pw.println("} PropMwmHints;\n");
 
-
             pw.println("\n\nint main(){");
             j=0;
             for ( eo = symbolTable.elements() ; eo.hasMoreElements() ;) {
@@ -1182,7 +1178,6 @@
             pw.println("printf(\"Atom\t%d\\n\",(int)sizeof(Atom));");
             pw.println("printf(\"Window\t%d\\n\",(int)sizeof(Window));");
 
-
             for (eo = symbolTable.elements() ; eo.hasMoreElements() ;) {
 
 
@@ -1234,7 +1229,8 @@
         symbolTable.put("Atom", new AtomicType(AtomicType.TYPE_ATOM, "", "Atom"));
         symbolTable.put("ulong", new AtomicType(AtomicType.TYPE_ULONG, "", "ulong"));
     }
-    public WrapperGenerator(String outputDir, String xlibFilename) {
+
+    public WrapperGenerator(String xlibFilename) {
         initTypes();
         try {
             BufferedReader in  = new BufferedReader(new FileReader(xlibFilename));
@@ -1303,33 +1299,19 @@
         catch (Exception e) {
             e.printStackTrace();
         }
+    }
 
-    }
-    private void makeSizer(String outputDir) {
-        if (wide) {
-            sizerFileName = "sizer.64.c";
-        } else {
-            sizerFileName = "sizer.32.c";
-        }
-        File fp = new File(outputDir, sizerFileName);
+    private void makeSizer(String sizerFileName) {
+        File fp = new File(sizerFileName);
         writeNativeSizer(fp.getAbsolutePath());
     }
-    private boolean readSizeInfo(String sizeInfo) {
+
+    private boolean readFileSizeInfo(String filename, boolean wide) {
         try {
-            File f = new File(sizeInfo+".32");
             boolean res = true;
-            FileInputStream fis = null;
-            if (f.exists()) {
-                fis = new FileInputStream(f);
-                res = readSizeInfo(fis, false);
-                fis.close();
-            }
-            f = new File(sizeInfo+".64");
-            if (f.exists()) {
-                fis = new FileInputStream(f);
-                res &= readSizeInfo(fis, true);
-                fis.close();
-            }
+            FileInputStream fis = new FileInputStream(filename);
+            res = readSizeInfo(fis, wide);
+            fis.close();
             return res;
         } catch (Exception e) {
             e.printStackTrace();
@@ -1337,8 +1319,8 @@
         }
     }
 
-    private void startGeneration(String outputDir, String sizeInfo) {
-        if (readSizeInfo(sizeInfo))
+    private void startGeneration(String outputDir, String filename, boolean wide) {
+        if (readFileSizeInfo(filename, wide))
         {
             writeJavaWrapperClass(outputDir);
         }
@@ -1348,21 +1330,22 @@
     }
 
     public static void main(String[] args) {
+        if (args.length < 4) {
+            System.out.println("Usage:\nWrapperGenerator gen_java <output_dir> <xlibtypes.txt> <sizes-*.txt> <platform>");
+            System.out.println("      or");
+            System.out.println("WrapperGenerator gen_c_source <output_file> <xlibtypes.txt> <platform>");
+            System.out.println("Where <platform>: 32, 64");
 
-        if (args.length < 4) {
-            System.out.println("Usage:\nWrapperGenerator <output_dir> <xlibtypes.txt> <action> [<platform> | <sizes info file>]");
-            System.out.println("Where <action>: gen, sizer");
-            System.out.println("      <platform>: 32, 64");
             System.exit(1);
         }
 
-        WrapperGenerator xparser = new WrapperGenerator(args[0], args[1]);
-        if (args[2].equals("sizer")) {
+        WrapperGenerator xparser = new WrapperGenerator(args[2]);
+        if (args[0].equals("gen_c_source")) {
             xparser.wide = args[3].equals("64");
-            xparser.makeSizer(args[0]);
-        } else if (args[2].equals("gen")) {
-            xparser.startGeneration(args[0], args[3]);
+            xparser.makeSizer(args[1]);
+        } else if (args[0].equals("gen_java")) {
+            boolean wide = args[4].equals("64");
+            xparser.startGeneration(args[1], args[3], wide);
         }
     }
-
 }