patches
changeset 14:f144f75f1ad3
Add IcedTea 1.7 patches.
| author | gnu_andrew@member.fsf.org |
|---|---|
| date | Tue Jun 10 03:20:00 2008 +0100 (2008-06-10) |
| parents | bee64edcb94e |
| children | b2fcfd00c1b8 |
| files | icedtea/1.7.diff icedtea/dist_fix.diff icedtea/others/Makefile-double-rt.committed.patch icedtea/others/Makefile-double-rt.patch icedtea/out-of-dir-build-04.diff icedtea/out-of-dir-build-05.diff icedtea/patch_fixes.diff icedtea/post-1.7.diff icedtea/trivial_patch_fix.diff icedtea/zero_patch.diff |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/icedtea/1.7.diff Tue Jun 10 03:20:00 2008 +0100 1.3 @@ -0,0 +1,275 @@ 1.4 +diff -r 6a6228a27e7f Makefile.am 1.5 +--- a/Makefile.am Sun Jun 01 17:57:21 2008 +0200 1.6 ++++ b/Makefile.am Mon Jun 02 04:04:19 2008 +0100 1.7 +@@ -455,7 +455,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj 1.8 + touch stamps/ports-ecj.stamp 1.9 + 1.10 + # Patch OpenJDK for plug replacements and ecj. 1.11 +-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch 1.12 ++ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch 1.13 + 1.14 + stamps/patch-ecj.stamp: stamps/clone-ecj.stamp 1.15 + echo Checking $(ICEDTEA_ECJ_PATCH) ; \ 1.16 +@@ -1056,9 +1056,9 @@ tools: stamps/tools.stamp 1.17 + 1.18 + tools-class-files: stamps/tools-class-files.stamp 1.19 + 1.20 +-ports: stamps/ports.stamp 1.21 ++hotspot-ports: stamps/ports.stamp 1.22 + 1.23 +-ports-ecj: stamps/ports-ecj.stamp 1.24 ++hotspot-ports-ecj: stamps/ports-ecj.stamp 1.25 + 1.26 + clean: distclean-local 1.27 + 1.28 +diff -r 6a6228a27e7f Makefile.in 1.29 +--- a/Makefile.in Sun Jun 01 17:57:21 2008 +0200 1.30 ++++ b/Makefile.in Mon Jun 02 04:04:19 2008 +0100 1.31 +@@ -426,7 +426,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p 1.32 + $(am__append_7) 1.33 + 1.34 + # Patch OpenJDK for plug replacements and ecj. 1.35 +-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch 1.36 ++ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch 1.37 + @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp 1.38 + @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE@BOOTSTRAP_DIRECTORY_STAMP = 1.39 + @WITH_OPENJDK_TRUE@BOOTSTRAP_DIRECTORY_STAMP = 1.40 +@@ -1496,9 +1496,9 @@ tools: stamps/tools.stamp 1.41 + 1.42 + tools-class-files: stamps/tools-class-files.stamp 1.43 + 1.44 +-ports: stamps/ports.stamp 1.45 ++hotspot-ports: stamps/ports.stamp 1.46 + 1.47 +-ports-ecj: stamps/ports-ecj.stamp 1.48 ++hotspot-ports-ecj: stamps/ports-ecj.stamp 1.49 + 1.50 + clean: distclean-local 1.51 + 1.52 +diff -r 6a6228a27e7f NEWS 1.53 +--- a/NEWS Sun Jun 01 17:57:21 2008 +0200 1.54 ++++ b/NEWS Mon Jun 02 04:04:19 2008 +0100 1.55 +@@ -1,36 +1,98 @@ New in release 1.2 (2008-05-28) 1.56 +-New in release 1.2 (2008-05-28) 1.57 ++New in release 1.7 (2008-06-02) 1.58 + 1.59 +-- Updated to b09 build. 1.60 +-- Added the the lcms library with PYCC and LINEAR_RGB ICC 1.61 +- profiles. 1.62 +-- Integrated Gervill to provide midi support. 1.63 +-- JTreg integrated. 1.64 +-- javaws/NetX fixes: 1.65 +- -improved security, namely catching Socket permissions during 1.66 +- runtime 1.67 +- -implemented the remaining JNLP services api (PrintService, 1.68 +- JNLPRandomAccessFile) 1.69 +- -applet focusing bug fixed 1.70 +-- sparc/sparc64 port 1.71 +-- Desktop file integration. 1.72 +-- Various zero fixes. 1.73 +-- Sound fixes. 1.74 +-- Font fixes. 1.75 +-- Several other bug fixes. 1.76 ++ IcedTea is based on the hard work of a lot of people that contributed to 1.77 ++ IcedTea6 and OpenJDK. The following noteworthy changes were added in 1.78 ++ this release: 1.79 + 1.80 +-New in release 1.1 (2008-04-04) 1.81 ++ - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias 1.82 ++ Klose integrated it into IcedTea. 1.83 ++ - Keith Seiths and Andrew Haley made fixes to the awt color package so 1.84 ++ that it now provides the lcms library with PYCC and LINEAR_RGB ICC 1.85 ++ profiles, fixing several applications that did complex color 1.86 ++ transformations. 1.87 ++ - Karl Helgason wrote a midi software synthesizer called Gervill that 1.88 ++ is now integrated in IcedTea so that javax.sound.midi support works 1.89 ++ now. Mark Wielaard integrated it and made some fixes so that it works 1.90 ++ better with javax.sound.sampled. 1.91 ++ - Jonathan Gibbons released a free version of jtreg, which was imported 1.92 ++ into IcedTea by Mark Wielaard so that a make check now runs all the 1.93 ++ functional unit tests integrated into OpenJDK. 1.94 ++ - Joshua Sumali made lots of fixes to the javaws/netx support. Including 1.95 ++ improved security, namely catching Socket permissions during runtime, 1.96 ++ implementing the remaining JNLP services api (PrintService and 1.97 ++ JNLPRandomAccessFile), and applet focusing bug fixes, so now netx 1.98 ++ plays nice with gcjwebplugin. 1.99 ++ - Kelly O'Hair resolved the license issues with the (j)hat tool which is 1.100 ++ now integrated. 1.101 ++ - Lillian Angel and Tom Fitzsimmons added several .desktop files for 1.102 ++ the various tools included for better GNU/Linux desktop integration. 1.103 ++ - Thomas Fitzsimmons rewrote the cacert support to resolve issues with 1.104 ++ applications like Glashfish and Eclipse which access the keystore 1.105 ++ directly. 1.106 ++ - Lillian Angel made lots of bug fixes to the packaging and integration 1.107 ++ support, include improving the font support. 1.108 ++ - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks 1.109 ++ to Andrew John Hughes. 1.110 ++ - Andrew also did all the work to make sure IcedTea[7] is now based on 1.111 ++ OpenJDK7 b26 as released by Xiomara Jayasena. 1.112 ++ - Thomas Fitzsimmons rewrote the certificate keystore support. 1.113 ++ - Christian Thalinger made various cacao integration fixes. 1.114 + 1.115 +-- Zero builds on any architecture. 1.116 +-- New features added to NetX: 1.117 +- - Certificate fingerprints now show as part 1.118 +- of certificate details. 1.119 +- - gcjwebplugin can now run applets through NetX, 1.120 +- taking advantage of NetX's sandboxing and application security. 1.121 +- - User trusted certificates can be managed by passing the -viewer 1.122 +- option to NetX. 1.123 +-- Updated to b08. 1.124 ++New in release 1.6 (2008-02-13) 1.125 ++ 1.126 ++- Zero-assembler implemented. 1.127 ++- Netx support added. Still a work-in-progress. 1.128 ++- Updated to build with gcc 4.3. 1.129 ++- Many bug fixes. 1.130 ++ 1.131 ++New in release 1.5 (2008-01-03) 1.132 ++ 1.133 ++- ppc/ppc64 support. 1.134 ++- ecj bootstrapping re-implemented. 1.135 ++- Updated to OpenJDK b24 build (now uses mercurial). 1.136 ++- System libraries (libpng, libjpeg, zlib, giflib) are used 1.137 ++instead of OpenJDK's implementations. 1.138 + - Several bug fixes. 1.139 + 1.140 +-New in release 1.0 (2008-02-15) 1.141 ++New in release 1.4 (2007-10-12) 1.142 + 1.143 +-- Initial release 1.144 ++* Updated to OpenJDK b21 build (README and INSTALL updated accordingly). 1.145 ++* Now using SSL/Crypto support included in b21, OpenSSL certs 1.146 ++still read directly. 1.147 ++* TZdata fix: uses System's timezone data. 1.148 ++* Memory issue fix: maximum PermGen space set to 128M and MaxHeap 1.149 ++to 512M. 1.150 ++* Xinerama fix: uses system installed library instead. 1.151 ++* DebugInfo fix: generates full debuginfo, regardless of 1.152 ++optimization. 1.153 ++* Fixed JConsole crash. 1.154 ++* Several other bug fixes. 1.155 ++ 1.156 ++New in release 1.3 (2007-08-29) 1.157 ++ 1.158 ++* Updated to OpenJDK b18 build. 1.159 ++* Web browser plugin support using gcjwebplugin. 1.160 ++* Now using Font supported included in b18. 1.161 ++* Graphics fixes. 1.162 ++* SSL/Crypto fixes. 1.163 ++* Refactored build process. 1.164 ++ 1.165 ++New in release 1.2 (2007-08-01) 1.166 ++ 1.167 ++* Updated to OpenJDK b16 build. 1.168 ++* Freetype font support fully replacing the encumbered libt2k. 1.169 ++* Path widening imported from GNU Classpath. 1.170 ++* Window decorations on x86_64 fixed. 1.171 ++* Bug fixes in various graphics classes. 1.172 ++* Anti-aliasing support explicitly disabled (instead of crashing). 1.173 ++* OpenSSL certs read directly 1.174 ++* Various crypto bug fixes. 1.175 ++ 1.176 ++New in release 1.1 (2007-07-12) 1.177 ++ 1.178 ++* Color management and raster fixes for compatibility with LittleCMS. 1.179 ++* Debuginfo is always generated. 1.180 ++* Initial work to satisfy libt2k requirement with Freetype. 1.181 ++* The GNU Crypto security providers have been imported from GNU 1.182 ++ Classpath. 1.183 ++* IcedTls security provider. 1.184 +diff -r 6a6228a27e7f configure 1.185 +--- a/configure Sun Jun 01 17:57:21 2008 +0200 1.186 ++++ b/configure Mon Jun 02 04:04:19 2008 +0100 1.187 +@@ -1,6 +1,6 @@ 1.188 + #! /bin/sh 1.189 + # Guess values for system-dependent variables and create Makefiles. 1.190 +-# Generated by GNU Autoconf 2.61 for icedtea 1.6. 1.191 ++# Generated by GNU Autoconf 2.61 for icedtea 1.7. 1.192 + # 1.193 + # Report bugs to <fitzsim@redhat.com>. 1.194 + # 1.195 +@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} 1.196 + # Identity of this package. 1.197 + PACKAGE_NAME='icedtea' 1.198 + PACKAGE_TARNAME='icedtea' 1.199 +-PACKAGE_VERSION='1.6' 1.200 +-PACKAGE_STRING='icedtea 1.6' 1.201 ++PACKAGE_VERSION='1.7' 1.202 ++PACKAGE_STRING='icedtea 1.7' 1.203 + PACKAGE_BUGREPORT='fitzsim@redhat.com' 1.204 + 1.205 + ac_default_prefix=bootstrap 1.206 +@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then 1.207 + # Omit some internal or obsolete options to make the list less imposing. 1.208 + # This message is too long to be a string in the A/UX 3.1 sh. 1.209 + cat <<_ACEOF 1.210 +-\`configure' configures icedtea 1.6 to adapt to many kinds of systems. 1.211 ++\`configure' configures icedtea 1.7 to adapt to many kinds of systems. 1.212 + 1.213 + Usage: $0 [OPTION]... [VAR=VALUE]... 1.214 + 1.215 +@@ -1414,7 +1414,7 @@ fi 1.216 + 1.217 + if test -n "$ac_init_help"; then 1.218 + case $ac_init_help in 1.219 +- short | recursive ) echo "Configuration of icedtea 1.6:";; 1.220 ++ short | recursive ) echo "Configuration of icedtea 1.7:";; 1.221 + esac 1.222 + cat <<\_ACEOF 1.223 + 1.224 +@@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat 1.225 + test -n "$ac_init_help" && exit $ac_status 1.226 + if $ac_init_version; then 1.227 + cat <<\_ACEOF 1.228 +-icedtea configure 1.6 1.229 ++icedtea configure 1.7 1.230 + generated by GNU Autoconf 2.61 1.231 + 1.232 + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 1.233 +@@ -1586,7 +1586,7 @@ This file contains any messages produced 1.234 + This file contains any messages produced by compilers while 1.235 + running configure, to aid debugging if configure makes a mistake. 1.236 + 1.237 +-It was created by icedtea $as_me 1.6, which was 1.238 ++It was created by icedtea $as_me 1.7, which was 1.239 + generated by GNU Autoconf 2.61. Invocation command line was 1.240 + 1.241 + $ $0 $@ 1.242 +@@ -2276,7 +2276,7 @@ fi 1.243 + 1.244 + # Define the identity of the package. 1.245 + PACKAGE='icedtea' 1.246 +- VERSION='1.6' 1.247 ++ VERSION='1.7' 1.248 + 1.249 + 1.250 + cat >>confdefs.h <<_ACEOF 1.251 +@@ -12709,7 +12709,7 @@ exec 6>&1 1.252 + # report actual input values of CONFIG_FILES etc. instead of their 1.253 + # values after options handling. 1.254 + ac_log=" 1.255 +-This file was extended by icedtea $as_me 1.6, which was 1.256 ++This file was extended by icedtea $as_me 1.7, which was 1.257 + generated by GNU Autoconf 2.61. Invocation command line was 1.258 + 1.259 + CONFIG_FILES = $CONFIG_FILES 1.260 +@@ -12756,7 +12756,7 @@ _ACEOF 1.261 + _ACEOF 1.262 + cat >>$CONFIG_STATUS <<_ACEOF 1.263 + ac_cs_version="\\ 1.264 +-icedtea config.status 1.6 1.265 ++icedtea config.status 1.7 1.266 + configured by $0, generated by GNU Autoconf 2.61, 1.267 + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 1.268 + 1.269 +diff -r 6a6228a27e7f configure.ac 1.270 +--- a/configure.ac Sun Jun 01 17:57:21 2008 +0200 1.271 ++++ b/configure.ac Mon Jun 02 04:04:19 2008 +0100 1.272 +@@ -1,5 +1,5 @@ AC_PREREQ([2.61]) 1.273 + AC_PREREQ([2.61]) 1.274 +-AC_INIT([icedtea], [1.6], [fitzsim@redhat.com]) 1.275 ++AC_INIT([icedtea], [1.7], [fitzsim@redhat.com]) 1.276 + AM_INIT_AUTOMAKE([tar-pax]) 1.277 + AC_CONFIG_FILES([Makefile]) 1.278 + AC_CANONICAL_HOST
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/icedtea/dist_fix.diff Tue Jun 10 03:20:00 2008 +0100 2.3 @@ -0,0 +1,472 @@ 2.4 +diff -r ccaf170c726a .hgignore 2.5 +--- a/.hgignore Fri May 30 01:16:24 2008 +0100 2.6 ++++ b/.hgignore Fri May 30 15:48:47 2008 +0100 2.7 +@@ -430,4 +430,3 @@ rt/java/io/ 2.8 + rt/java/io/ 2.9 + rt/sun/awt 2.10 + generated/sun/awt/X11/generator/sizer.32.orig 2.11 +-generated/java/lang/UNIXProcess.java 2.12 +diff -r ccaf170c726a Makefile.am 2.13 +--- a/Makefile.am Fri May 30 01:16:24 2008 +0100 2.14 ++++ b/Makefile.am Fri May 30 15:48:47 2008 +0100 2.15 +@@ -37,7 +37,7 @@ install: 2.16 + hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports 2.17 + 2.18 + EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ 2.19 +- gcjwebplugin.cc tools-copy contrib ports \ 2.20 ++ gcjwebplugin.cc tools-copy contrib ${abs_top_srcdir}/ports \ 2.21 + patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ 2.22 + patches/icedtea-cacao.patch $(OPENJDK_PATCHES) \ 2.23 + javaws.png javaws.desktop patches/icedtea-netx-plugin.patch \ 2.24 +@@ -784,12 +784,6 @@ clean-copy: 2.25 + rm -rf rt/$$copy_dir ; \ 2.26 + done 2.27 + 2.28 +-stamps/generated.stamp: 2.29 +- mkdir -p $(abs_top_srcdir)/generated/java/lang 2.30 +- cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \ 2.31 +- $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ; 2.32 +- touch stamps/generated.stamp 2.33 +- 2.34 + SHARE = openjdk/jdk/src/share/classes 2.35 + SOLARIS = openjdk/jdk/src/solaris/classes 2.36 + LANGTOOLS = openjdk/langtools/src/share/classes 2.37 +@@ -834,8 +828,7 @@ hotspot-tools-source-files.txt: stamps/c 2.38 + find hotspot-tools -name '*.java' | sort > $@ 2.39 + mkdir -p lib/hotspot-tools 2.40 + 2.41 +-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \ 2.42 +- stamps/generated.stamp 2.43 ++stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt 2.44 + if ! test -d $(ICEDTEA_BOOT_DIR) ; \ 2.45 + then \ 2.46 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ 2.47 +@@ -881,7 +874,7 @@ rt-source-files.txt: stamps/clone.stamp 2.48 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 2.49 + find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@ 2.50 + 2.51 +-stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 2.52 ++stamps/rt-class-files.stamp: rt-source-files.txt 2.53 + mkdir -p lib/rt 2.54 + if ! test -d $(ICEDTEA_BOOT_DIR) ; \ 2.55 + then \ 2.56 +@@ -932,7 +925,7 @@ stamps/extra-class-files.stamp: extra-so 2.57 + then \ 2.58 + $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \ 2.59 + -source 1.5 \ 2.60 +- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ 2.61 ++ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ 2.62 + -bootclasspath '' @extra-source-files.txt ; \ 2.63 + else \ 2.64 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \ 2.65 +@@ -1039,8 +1032,6 @@ copy-source-files: stamps/copy-source-fi 2.66 + 2.67 + download: stamps/download.stamp 2.68 + 2.69 +-generated: stamps/generated.stamp 2.70 +- 2.71 + icedtea-against-ecj: stamps/icedtea-against-ecj.stamp 2.72 + 2.73 + icedtea-ecj: stamps/icedtea-ecj.stamp 2.74 +diff -r ccaf170c726a Makefile.in 2.75 +--- a/Makefile.in Fri May 30 01:16:24 2008 +0100 2.76 ++++ b/Makefile.in Fri May 30 15:48:47 2008 +0100 2.77 +@@ -94,7 +94,6 @@ AUTOMAKE = @AUTOMAKE@ 2.78 + AUTOMAKE = @AUTOMAKE@ 2.79 + AWK = @AWK@ 2.80 + BUILD_ARCH_DIR = @BUILD_ARCH_DIR@ 2.81 +-BUILD_OS = @BUILD_OS@ 2.82 + CACAO = @CACAO@ 2.83 + CC = @CC@ 2.84 + CCDEPMODE = @CCDEPMODE@ 2.85 +@@ -255,7 +254,7 @@ OPENJDK_VERSION = b26 2.86 + @NETX_PLUGIN_FALSE@NETX_PATCH = 2.87 + @NETX_PLUGIN_TRUE@NETX_PATCH = patches/icedtea-netx-plugin.patch 2.88 + EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ 2.89 +- gcjwebplugin.cc tools-copy contrib ports \ 2.90 ++ gcjwebplugin.cc tools-copy contrib ${abs_top_srcdir}/ports \ 2.91 + patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ 2.92 + patches/icedtea-cacao.patch $(OPENJDK_PATCHES) \ 2.93 + javaws.png javaws.desktop patches/icedtea-netx-plugin.patch \ 2.94 +@@ -1235,12 +1234,6 @@ clean-copy: 2.95 + rm -rf rt/$$copy_dir ; \ 2.96 + done 2.97 + 2.98 +-stamps/generated.stamp: 2.99 +- mkdir -p $(abs_top_srcdir)/generated/java/lang 2.100 +- cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \ 2.101 +- $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ; 2.102 +- touch stamps/generated.stamp 2.103 +- 2.104 + # tools.jar class files. 2.105 + stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp 2.106 + for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \ 2.107 +@@ -1275,8 +1268,7 @@ hotspot-tools-source-files.txt: stamps/c 2.108 + find hotspot-tools -name '*.java' | sort > $@ 2.109 + mkdir -p lib/hotspot-tools 2.110 + 2.111 +-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \ 2.112 +- stamps/generated.stamp 2.113 ++stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt 2.114 + if ! test -d $(ICEDTEA_BOOT_DIR) ; \ 2.115 + then \ 2.116 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ 2.117 +@@ -1322,7 +1314,7 @@ rt-source-files.txt: stamps/clone.stamp 2.118 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 2.119 + find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@ 2.120 + 2.121 +-stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 2.122 ++stamps/rt-class-files.stamp: rt-source-files.txt 2.123 + mkdir -p lib/rt 2.124 + if ! test -d $(ICEDTEA_BOOT_DIR) ; \ 2.125 + then \ 2.126 +@@ -1373,7 +1365,7 @@ stamps/extra-class-files.stamp: extra-so 2.127 + then \ 2.128 + $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \ 2.129 + -source 1.5 \ 2.130 +- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ 2.131 ++ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ 2.132 + -bootclasspath '' @extra-source-files.txt ; \ 2.133 + else \ 2.134 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \ 2.135 +@@ -1480,8 +1472,6 @@ copy-source-files: stamps/copy-source-fi 2.136 + 2.137 + download: stamps/download.stamp 2.138 + 2.139 +-generated: stamps/generated.stamp 2.140 +- 2.141 + icedtea-against-ecj: stamps/icedtea-against-ecj.stamp 2.142 + 2.143 + icedtea-ecj: stamps/icedtea-ecj.stamp 2.144 +diff -r ccaf170c726a acinclude.m4 2.145 +--- a/acinclude.m4 Fri May 30 01:16:24 2008 +0100 2.146 ++++ b/acinclude.m4 Fri May 30 15:48:47 2008 +0100 2.147 +@@ -665,18 +665,3 @@ AC_DEFUN([AC_CHECK_WITH_CACAO], 2.148 + AC_SUBST(CACAO) 2.149 + ]) 2.150 + 2.151 +-AC_DEFUN([SET_OS], 2.152 +-[ 2.153 +- case "${host_os}" in 2.154 +- linux-gnu) 2.155 +- BUILD_OS=linux 2.156 +- ;; 2.157 +- solaris*) 2.158 +- BUILD_OS=solaris 2.159 +- ;; 2.160 +- *) 2.161 +- BUILD_OS=$(uname -o) 2.162 +- ;; 2.163 +- esac 2.164 +- AC_SUBST(BUILD_OS) 2.165 +-]) 2.166 +diff -r ccaf170c726a configure 2.167 +--- a/configure Fri May 30 01:16:24 2008 +0100 2.168 ++++ b/configure Fri May 30 15:48:47 2008 +0100 2.169 +@@ -734,7 +734,6 @@ PARALLEL_JOBS 2.170 + PARALLEL_JOBS 2.171 + BUILD_ARCH_DIR 2.172 + INSTALL_ARCH_DIR 2.173 +-BUILD_OS 2.174 + JAVA 2.175 + JAVAC 2.176 + JAVAH 2.177 +@@ -5985,20 +5984,6 @@ fi 2.178 + 2.179 + 2.180 + 2.181 +- 2.182 +- case "${host_os}" in 2.183 +- linux-gnu) 2.184 +- BUILD_OS=linux 2.185 +- ;; 2.186 +- solaris*) 2.187 +- BUILD_OS=solaris 2.188 +- ;; 2.189 +- *) 2.190 +- BUILD_OS=$(uname -o) 2.191 +- ;; 2.192 +- esac 2.193 +- 2.194 +- 2.195 + if test "${with_openjdk}" == true 2.196 + then 2.197 + JAVA=$SYSTEM_OPENJDK_DIR/bin/java 2.198 +@@ -13104,7 +13089,6 @@ PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim 2.199 + PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim 2.200 + BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim 2.201 + INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim 2.202 +-BUILD_OS!$BUILD_OS$ac_delim 2.203 + JAVA!$JAVA$ac_delim 2.204 + JAVAC!$JAVAC$ac_delim 2.205 + JAVAH!$JAVAH$ac_delim 2.206 +@@ -13175,7 +13159,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim 2.207 + LTLIBOBJS!$LTLIBOBJS$ac_delim 2.208 + _ACEOF 2.209 + 2.210 +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then 2.211 ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then 2.212 + break 2.213 + elif $ac_last_try; then 2.214 + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 2.215 +diff -r ccaf170c726a configure.ac 2.216 +--- a/configure.ac Fri May 30 01:16:24 2008 +0100 2.217 ++++ b/configure.ac Fri May 30 15:48:47 2008 +0100 2.218 +@@ -159,7 +159,6 @@ AC_SUBST(PARALLEL_JOBS) 2.219 + AC_SUBST(PARALLEL_JOBS) 2.220 + 2.221 + SET_ARCH_DIRS 2.222 +-SET_OS 2.223 + if test "${with_openjdk}" == true 2.224 + then 2.225 + JAVA=$SYSTEM_OPENJDK_DIR/bin/java 2.226 +diff -r ccaf170c726a generated/java/lang/UNIXProcess.java 2.227 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.228 ++++ b/generated/java/lang/UNIXProcess.java Fri May 30 15:48:47 2008 +0100 2.229 +@@ -0,0 +1,246 @@ 2.230 ++/* 2.231 ++ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved. 2.232 ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.233 ++ * 2.234 ++ * This code is free software; you can redistribute it and/or modify it 2.235 ++ * under the terms of the GNU General Public License version 2 only, as 2.236 ++ * published by the Free Software Foundation. Sun designates this 2.237 ++ * particular file as subject to the "Classpath" exception as provided 2.238 ++ * by Sun in the LICENSE file that accompanied this code. 2.239 ++ * 2.240 ++ * This code is distributed in the hope that it will be useful, but WITHOUT 2.241 ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.242 ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.243 ++ * version 2 for more details (a copy is included in the LICENSE file that 2.244 ++ * accompanied this code). 2.245 ++ * 2.246 ++ * You should have received a copy of the GNU General Public License version 2.247 ++ * 2 along with this work; if not, write to the Free Software Foundation, 2.248 ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.249 ++ * 2.250 ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 2.251 ++ * CA 95054 USA or visit www.sun.com if you need additional information or 2.252 ++ * have any questions. 2.253 ++ */ 2.254 ++ 2.255 ++package java.lang; 2.256 ++ 2.257 ++import java.io.*; 2.258 ++ 2.259 ++/* java.lang.Process subclass in the UNIX environment. 2.260 ++ * 2.261 ++ * @author Mario Wolczko and Ross Knippel. 2.262 ++ * @author Konstantin Kladko (ported to Linux) 2.263 ++ */ 2.264 ++ 2.265 ++final class UNIXProcess extends Process { 2.266 ++ private static final sun.misc.JavaIOFileDescriptorAccess fdAccess 2.267 ++ = sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); 2.268 ++ 2.269 ++ private int pid; 2.270 ++ private int exitcode; 2.271 ++ private boolean hasExited; 2.272 ++ 2.273 ++ private OutputStream stdin_stream; 2.274 ++ private InputStream stdout_stream; 2.275 ++ private InputStream stderr_stream; 2.276 ++ 2.277 ++ /* this is for the reaping thread */ 2.278 ++ private native int waitForProcessExit(int pid); 2.279 ++ 2.280 ++ /** 2.281 ++ * Create a process using fork(2) and exec(2). 2.282 ++ * 2.283 ++ * @param std_fds array of file descriptors. Indexes 0, 1, and 2.284 ++ * 2 correspond to standard input, standard output and 2.285 ++ * standard error, respectively. On input, a value of -1 2.286 ++ * means to create a pipe to connect child and parent 2.287 ++ * processes. On output, a value which is not -1 is the 2.288 ++ * parent pipe fd corresponding to the pipe which has 2.289 ++ * been created. An element of this array is -1 on input 2.290 ++ * if and only if it is <em>not</em> -1 on output. 2.291 ++ * @return the pid of the subprocess 2.292 ++ */ 2.293 ++ private native int forkAndExec(byte[] prog, 2.294 ++ byte[] argBlock, int argc, 2.295 ++ byte[] envBlock, int envc, 2.296 ++ byte[] dir, 2.297 ++ int[] std_fds, 2.298 ++ boolean redirectErrorStream) 2.299 ++ throws IOException; 2.300 ++ 2.301 ++ /* In the process constructor we wait on this gate until the process */ 2.302 ++ /* has been created. Then we return from the constructor. */ 2.303 ++ /* fork() is called by the same thread which later waits for the process */ 2.304 ++ /* to terminate */ 2.305 ++ 2.306 ++ private static class Gate { 2.307 ++ 2.308 ++ private boolean exited = false; 2.309 ++ private IOException savedException; 2.310 ++ 2.311 ++ synchronized void exit() { /* Opens the gate */ 2.312 ++ exited = true; 2.313 ++ this.notify(); 2.314 ++ } 2.315 ++ 2.316 ++ synchronized void waitForExit() { /* wait until the gate is open */ 2.317 ++ boolean interrupted = false; 2.318 ++ while (!exited) { 2.319 ++ try { 2.320 ++ this.wait(); 2.321 ++ } catch (InterruptedException e) { 2.322 ++ interrupted = true; 2.323 ++ } 2.324 ++ } 2.325 ++ if (interrupted) { 2.326 ++ Thread.currentThread().interrupt(); 2.327 ++ } 2.328 ++ } 2.329 ++ 2.330 ++ void setException (IOException e) { 2.331 ++ savedException = e; 2.332 ++ } 2.333 ++ 2.334 ++ IOException getException() { 2.335 ++ return savedException; 2.336 ++ } 2.337 ++ } 2.338 ++ 2.339 ++ UNIXProcess(final byte[] prog, 2.340 ++ final byte[] argBlock, final int argc, 2.341 ++ final byte[] envBlock, final int envc, 2.342 ++ final byte[] dir, 2.343 ++ final int[] std_fds, 2.344 ++ final boolean redirectErrorStream) 2.345 ++ throws IOException { 2.346 ++ 2.347 ++ final Gate gate = new Gate(); 2.348 ++ /* 2.349 ++ * For each subprocess forked a corresponding reaper thread 2.350 ++ * is started. That thread is the only thread which waits 2.351 ++ * for the subprocess to terminate and it doesn't hold any 2.352 ++ * locks while doing so. This design allows waitFor() and 2.353 ++ * exitStatus() to be safely executed in parallel (and they 2.354 ++ * need no native code). 2.355 ++ */ 2.356 ++ 2.357 ++ java.security.AccessController.doPrivileged( 2.358 ++ new java.security.PrivilegedAction<Void>() { 2.359 ++ public Void run() { 2.360 ++ Thread t = new Thread("process reaper") { 2.361 ++ public void run() { 2.362 ++ try { 2.363 ++ pid = forkAndExec(prog, 2.364 ++ argBlock, argc, 2.365 ++ envBlock, envc, 2.366 ++ dir, 2.367 ++ std_fds, 2.368 ++ redirectErrorStream); 2.369 ++ } catch (IOException e) { 2.370 ++ gate.setException(e); /*remember to rethrow later*/ 2.371 ++ gate.exit(); 2.372 ++ return; 2.373 ++ } 2.374 ++ java.security.AccessController.doPrivileged( 2.375 ++ new java.security.PrivilegedAction<Void>() { 2.376 ++ public Void run() { 2.377 ++ if (std_fds[0] == -1) 2.378 ++ stdin_stream = new ProcessBuilder.NullOutputStream(); 2.379 ++ else { 2.380 ++ FileDescriptor stdin_fd = new FileDescriptor(); 2.381 ++ fdAccess.set(stdin_fd, std_fds[0]); 2.382 ++ stdin_stream = new BufferedOutputStream( 2.383 ++ new FileOutputStream(stdin_fd)); 2.384 ++ } 2.385 ++ 2.386 ++ if (std_fds[1] == -1) 2.387 ++ stdout_stream = new ProcessBuilder.NullInputStream(); 2.388 ++ else { 2.389 ++ FileDescriptor stdout_fd = new FileDescriptor(); 2.390 ++ fdAccess.set(stdout_fd, std_fds[1]); 2.391 ++ stdout_stream = new BufferedInputStream( 2.392 ++ new FileInputStream(stdout_fd)); 2.393 ++ } 2.394 ++ 2.395 ++ if (std_fds[2] == -1) 2.396 ++ stderr_stream = new ProcessBuilder.NullInputStream(); 2.397 ++ else { 2.398 ++ FileDescriptor stderr_fd = new FileDescriptor(); 2.399 ++ fdAccess.set(stderr_fd, std_fds[2]); 2.400 ++ stderr_stream = new FileInputStream(stderr_fd); 2.401 ++ } 2.402 ++ 2.403 ++ return null; }}); 2.404 ++ gate.exit(); /* exit from constructor */ 2.405 ++ int res = waitForProcessExit(pid); 2.406 ++ synchronized (UNIXProcess.this) { 2.407 ++ hasExited = true; 2.408 ++ exitcode = res; 2.409 ++ UNIXProcess.this.notifyAll(); 2.410 ++ } 2.411 ++ } 2.412 ++ }; 2.413 ++ t.setDaemon(true); 2.414 ++ t.start(); 2.415 ++ return null; }}); 2.416 ++ gate.waitForExit(); 2.417 ++ IOException e = gate.getException(); 2.418 ++ if (e != null) 2.419 ++ throw new IOException(e.toString()); 2.420 ++ } 2.421 ++ 2.422 ++ public OutputStream getOutputStream() { 2.423 ++ return stdin_stream; 2.424 ++ } 2.425 ++ 2.426 ++ public InputStream getInputStream() { 2.427 ++ return stdout_stream; 2.428 ++ } 2.429 ++ 2.430 ++ public InputStream getErrorStream() { 2.431 ++ return stderr_stream; 2.432 ++ } 2.433 ++ 2.434 ++ public synchronized int waitFor() throws InterruptedException { 2.435 ++ while (!hasExited) { 2.436 ++ wait(); 2.437 ++ } 2.438 ++ return exitcode; 2.439 ++ } 2.440 ++ 2.441 ++ public synchronized int exitValue() { 2.442 ++ if (!hasExited) { 2.443 ++ throw new IllegalThreadStateException("process hasn't exited"); 2.444 ++ } 2.445 ++ return exitcode; 2.446 ++ } 2.447 ++ 2.448 ++ private static native void destroyProcess(int pid); 2.449 ++ public void destroy() { 2.450 ++ // There is a risk that pid will be recycled, causing us to 2.451 ++ // kill the wrong process! So we only terminate processes 2.452 ++ // that appear to still be running. Even with this check, 2.453 ++ // there is an unavoidable race condition here, but the window 2.454 ++ // is very small, and OSes try hard to not recycle pids too 2.455 ++ // soon, so this is quite safe. 2.456 ++ synchronized (this) { 2.457 ++ if (!hasExited) 2.458 ++ destroyProcess(pid); 2.459 ++ } 2.460 ++ try { 2.461 ++ stdin_stream.close(); 2.462 ++ stdout_stream.close(); 2.463 ++ stderr_stream.close(); 2.464 ++ } catch (IOException e) { 2.465 ++ // ignore 2.466 ++ } 2.467 ++ } 2.468 ++ 2.469 ++ /* This routine initializes JNI field offsets for the class */ 2.470 ++ private static native void initIDs(); 2.471 ++ 2.472 ++ static { 2.473 ++ initIDs(); 2.474 ++ } 2.475 ++}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/icedtea/others/Makefile-double-rt.committed.patch Tue Jun 10 03:20:00 2008 +0100 3.3 @@ -0,0 +1,82 @@ 3.4 +diff -r 837336085669 Makefile.am 3.5 +--- a/Makefile.am Tue May 27 20:24:02 2008 +0100 3.6 ++++ b/Makefile.am Tue May 27 20:25:20 2008 +0100 3.7 +@@ -836,12 +836,12 @@ stamps/hotspot-tools-class-files.stamp: 3.8 + if ! test -f stamps/icedtea-ecj.stamp ; \ 3.9 + then \ 3.10 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \ 3.11 +- -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.12 ++ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.13 + @$< ; \ 3.14 + else \ 3.15 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ 3.16 + -bootclasspath '' -source 1.6 \ 3.17 +- -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.18 ++ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.19 + @$< ; \ 3.20 + fi 3.21 + mkdir -p stamps 3.22 +@@ -875,19 +875,19 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st 3.23 + 3.24 + # rt-closed.jar class files. 3.25 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 3.26 +- find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@ 3.27 ++ find $(abs_top_srcdir)/rt -name '*.java' | sort > $@ 3.28 + 3.29 + stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 3.30 + mkdir -p lib/rt 3.31 + if ! test -f stamps/icedtea-ecj.stamp ; \ 3.32 + then \ 3.33 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \ 3.34 +- -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.35 ++ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \ 3.36 + @$< ; \ 3.37 + else \ 3.38 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \ 3.39 + -bootclasspath '' -source 1.6 \ 3.40 +- -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.41 ++ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \ 3.42 + @$< ; \ 3.43 + fi 3.44 + cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \ 3.45 +diff -r 837336085669 Makefile.in 3.46 +--- a/Makefile.in Tue May 27 20:24:02 2008 +0100 3.47 ++++ b/Makefile.in Tue May 27 20:25:20 2008 +0100 3.48 +@@ -1275,12 +1275,12 @@ stamps/hotspot-tools-class-files.stamp: 3.49 + if ! test -f stamps/icedtea-ecj.stamp ; \ 3.50 + then \ 3.51 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \ 3.52 +- -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.53 ++ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.54 + @$< ; \ 3.55 + else \ 3.56 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ 3.57 + -bootclasspath '' -source 1.6 \ 3.58 +- -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.59 ++ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.60 + @$< ; \ 3.61 + fi 3.62 + mkdir -p stamps 3.63 +@@ -1314,19 +1314,19 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st 3.64 + 3.65 + # rt-closed.jar class files. 3.66 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 3.67 +- find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@ 3.68 ++ find $(abs_top_srcdir)/rt -name '*.java' | sort > $@ 3.69 + 3.70 + stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 3.71 + mkdir -p lib/rt 3.72 + if ! test -f stamps/icedtea-ecj.stamp ; \ 3.73 + then \ 3.74 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \ 3.75 +- -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.76 ++ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \ 3.77 + @$< ; \ 3.78 + else \ 3.79 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \ 3.80 + -bootclasspath '' -source 1.6 \ 3.81 +- -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 3.82 ++ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \ 3.83 + @$< ; \ 3.84 + fi 3.85 + cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/icedtea/others/Makefile-double-rt.patch Tue Jun 10 03:20:00 2008 +0100 4.3 @@ -0,0 +1,41 @@ 4.4 +diff -r fbaa2fe34314 Makefile.am 4.5 +--- a/Makefile.am Tue May 27 00:08:31 2008 +0100 4.6 ++++ b/Makefile.am Tue May 27 13:43:00 2008 +0200 4.7 +@@ -837,12 +837,12 @@ 4.8 + if ! test -f stamps/icedtea-ecj.stamp ; \ 4.9 + then \ 4.10 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \ 4.11 +- -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 4.12 ++ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 4.13 + @$< ; \ 4.14 + else \ 4.15 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ 4.16 + -bootclasspath '' -source 1.6 \ 4.17 +- -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 4.18 ++ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 4.19 + @$< ; \ 4.20 + fi 4.21 + mkdir -p stamps 4.22 +@@ -876,19 +876,19 @@ 4.23 + 4.24 + # rt-closed.jar class files. 4.25 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 4.26 +- find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@ 4.27 ++ find $(abs_top_srcdir)/rt -name '*.java' | sort > $@ 4.28 + 4.29 + stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 4.30 + mkdir -p lib/rt 4.31 + if ! test -f stamps/icedtea-ecj.stamp ; \ 4.32 + then \ 4.33 + $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \ 4.34 +- -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 4.35 ++ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \ 4.36 + @$< ; \ 4.37 + else \ 4.38 + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \ 4.39 + -bootclasspath '' -source 1.6 \ 4.40 +- -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \ 4.41 ++ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \ 4.42 + @$< ; \ 4.43 + fi 4.44 + cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/icedtea/out-of-dir-build-04.diff Tue Jun 10 03:20:00 2008 +0100 5.3 @@ -0,0 +1,3610 @@ 5.4 +diff -r ca3a8b43a54b Makefile.am 5.5 +--- a/Makefile.am Tue May 27 21:14:08 2008 +0100 5.6 ++++ b/Makefile.am Tue May 27 21:15:32 2008 +0100 5.7 +@@ -875,7 +875,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st 5.8 + 5.9 + # rt-closed.jar class files. 5.10 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 5.11 +- find $(abs_top_srcdir)/rt -name '*.java' | sort > $@ 5.12 ++ find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@ 5.13 + 5.14 + stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 5.15 + mkdir -p lib/rt 5.16 +diff -r ca3a8b43a54b Makefile.in 5.17 +--- a/Makefile.in Tue May 27 21:14:08 2008 +0100 5.18 ++++ b/Makefile.in Tue May 27 21:15:32 2008 +0100 5.19 +@@ -1314,7 +1314,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st 5.20 + 5.21 + # rt-closed.jar class files. 5.22 + rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp 5.23 +- find $(abs_top_srcdir)/rt -name '*.java' | sort > $@ 5.24 ++ find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@ 5.25 + 5.26 + stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp 5.27 + mkdir -p lib/rt 5.28 +diff -r ca3a8b43a54b generated/sun/awt/X11/AwtGraphicsConfigData.java 5.29 +--- a/generated/sun/awt/X11/AwtGraphicsConfigData.java Tue May 27 21:14:08 2008 +0100 5.30 ++++ b/generated/sun/awt/X11/AwtGraphicsConfigData.java Tue May 27 21:15:32 2008 +0100 5.31 +@@ -8,7 +8,7 @@ public class AwtGraphicsConfigData exten 5.32 + public class AwtGraphicsConfigData extends XWrapperBase { 5.33 + private Unsafe unsafe = XlibWrapper.unsafe; 5.34 + private final boolean should_free_memory; 5.35 +- public static int getSize() { return 92; } 5.36 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(92):(160)); } 5.37 + public int getDataSize() { return getSize(); } 5.38 + 5.39 + long pData; 5.40 +@@ -39,36 +39,36 @@ public class AwtGraphicsConfigData exten 5.41 + } 5.42 + public int get_awt_depth() { log.finest("");return (Native.getInt(pData+0)); } 5.43 + public void set_awt_depth(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.44 +- public long get_awt_cmap() { log.finest("");return (Native.getLong(pData+4)); } 5.45 +- public void set_awt_cmap(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.46 +- public XVisualInfo get_awt_visInfo() { log.finest("");return new XVisualInfo(pData + 8); } 5.47 +- public int get_awt_num_colors() { log.finest("");return (Native.getInt(pData+48)); } 5.48 +- public void set_awt_num_colors(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.49 +- public awtImageData get_awtImage(int index) { log.finest(""); return (Native.getLong(pData+52) != 0)?(new awtImageData(Native.getLong(pData+52)+index*304)):(null); } 5.50 +- public long get_awtImage() { log.finest("");return Native.getLong(pData+52); } 5.51 +- public void set_awtImage(long v) { log.finest(""); Native.putLong(pData + 52, v); } 5.52 +- public long get_AwtColorMatch(int index) { log.finest(""); return Native.getLong(pData+56)+index*Native.getLongSize(); } 5.53 +- public long get_AwtColorMatch() { log.finest("");return Native.getLong(pData+56); } 5.54 +- public void set_AwtColorMatch(long v) { log.finest(""); Native.putLong(pData + 56, v); } 5.55 +- public long get_monoImage(int index) { log.finest(""); return Native.getLong(pData+60)+index*Native.getLongSize(); } 5.56 +- public long get_monoImage() { log.finest("");return Native.getLong(pData+60); } 5.57 +- public void set_monoImage(long v) { log.finest(""); Native.putLong(pData + 60, v); } 5.58 +- public long get_monoPixmap() { log.finest("");return (Native.getLong(pData+64)); } 5.59 +- public void set_monoPixmap(long v) { log.finest(""); Native.putLong(pData+64, v); } 5.60 +- public int get_monoPixmapWidth() { log.finest("");return (Native.getInt(pData+68)); } 5.61 +- public void set_monoPixmapWidth(int v) { log.finest(""); Native.putInt(pData+68, v); } 5.62 +- public int get_monoPixmapHeight() { log.finest("");return (Native.getInt(pData+72)); } 5.63 +- public void set_monoPixmapHeight(int v) { log.finest(""); Native.putInt(pData+72, v); } 5.64 +- public long get_monoPixmapGC() { log.finest("");return (Native.getLong(pData+76)); } 5.65 +- public void set_monoPixmapGC(long v) { log.finest(""); Native.putLong(pData+76, v); } 5.66 +- public int get_pixelStride() { log.finest("");return (Native.getInt(pData+80)); } 5.67 +- public void set_pixelStride(int v) { log.finest(""); Native.putInt(pData+80, v); } 5.68 +- public ColorData get_color_data(int index) { log.finest(""); return (Native.getLong(pData+84) != 0)?(new ColorData(Native.getLong(pData+84)+index*44)):(null); } 5.69 +- public long get_color_data() { log.finest("");return Native.getLong(pData+84); } 5.70 +- public void set_color_data(long v) { log.finest(""); Native.putLong(pData + 84, v); } 5.71 +- public long get_glxInfo(int index) { log.finest(""); return Native.getLong(pData+88)+index*Native.getLongSize(); } 5.72 +- public long get_glxInfo() { log.finest("");return Native.getLong(pData+88); } 5.73 +- public void set_glxInfo(long v) { log.finest(""); Native.putLong(pData + 88, v); } 5.74 ++ public long get_awt_cmap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.75 ++ public void set_awt_cmap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.76 ++ public XVisualInfo get_awt_visInfo() { log.finest("");return new XVisualInfo(pData + ((XlibWrapper.dataModel == 32)?(8):(16))); } 5.77 ++ public int get_awt_num_colors() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.78 ++ public void set_awt_num_colors(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.79 ++ public awtImageData get_awtImage(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88))) != 0)?(new awtImageData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88)))+index*((XlibWrapper.dataModel == 32)?(304):(560)))):(null); } 5.80 ++ public long get_awtImage() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88))); } 5.81 ++ public void set_awtImage(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(52):(88)), v); } 5.82 ++ public long get_AwtColorMatch(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(96)))+index*Native.getLongSize(); } 5.83 ++ public long get_AwtColorMatch() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(96))); } 5.84 ++ public void set_AwtColorMatch(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(56):(96)), v); } 5.85 ++ public long get_monoImage(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(104)))+index*Native.getLongSize(); } 5.86 ++ public long get_monoImage() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(104))); } 5.87 ++ public void set_monoImage(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(60):(104)), v); } 5.88 ++ public long get_monoPixmap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(64):(112)))); } 5.89 ++ public void set_monoPixmap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(64):(112)), v); } 5.90 ++ public int get_monoPixmapWidth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(68):(120)))); } 5.91 ++ public void set_monoPixmapWidth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(68):(120)), v); } 5.92 ++ public int get_monoPixmapHeight() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(72):(124)))); } 5.93 ++ public void set_monoPixmapHeight(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(72):(124)), v); } 5.94 ++ public long get_monoPixmapGC() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(76):(128)))); } 5.95 ++ public void set_monoPixmapGC(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(76):(128)), v); } 5.96 ++ public int get_pixelStride() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(80):(136)))); } 5.97 ++ public void set_pixelStride(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(80):(136)), v); } 5.98 ++ public ColorData get_color_data(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(144))) != 0)?(new ColorData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(144)))+index*((XlibWrapper.dataModel == 32)?(44):(88)))):(null); } 5.99 ++ public long get_color_data() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(144))); } 5.100 ++ public void set_color_data(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(84):(144)), v); } 5.101 ++ public long get_glxInfo(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(152)))+index*Native.getLongSize(); } 5.102 ++ public long get_glxInfo() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(152))); } 5.103 ++ public void set_glxInfo(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(88):(152)), v); } 5.104 + 5.105 + 5.106 + String getName() { 5.107 +diff -r ca3a8b43a54b generated/sun/awt/X11/AwtScreenData.java 5.108 +--- a/generated/sun/awt/X11/AwtScreenData.java Tue May 27 21:14:08 2008 +0100 5.109 ++++ b/generated/sun/awt/X11/AwtScreenData.java Tue May 27 21:15:32 2008 +0100 5.110 +@@ -8,7 +8,7 @@ public class AwtScreenData extends XWrap 5.111 + public class AwtScreenData extends XWrapperBase { 5.112 + private Unsafe unsafe = XlibWrapper.unsafe; 5.113 + private final boolean should_free_memory; 5.114 +- public static int getSize() { return 24; } 5.115 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(24):(48)); } 5.116 + public int getDataSize() { return getSize(); } 5.117 + 5.118 + long pData; 5.119 +@@ -39,18 +39,18 @@ public class AwtScreenData extends XWrap 5.120 + } 5.121 + public int get_numConfigs() { log.finest("");return (Native.getInt(pData+0)); } 5.122 + public void set_numConfigs(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.123 +- public long get_root() { log.finest("");return (Native.getLong(pData+4)); } 5.124 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.125 +- public long get_whitepixel() { log.finest("");return (Native.getLong(pData+8)); } 5.126 +- public void set_whitepixel(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.127 +- public long get_blackpixel() { log.finest("");return (Native.getLong(pData+12)); } 5.128 +- public void set_blackpixel(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.129 +- public AwtGraphicsConfigData get_defaultConfig(int index) { log.finest(""); return (Native.getLong(pData+16) != 0)?(new AwtGraphicsConfigData(Native.getLong(pData+16)+index*92)):(null); } 5.130 +- public long get_defaultConfig() { log.finest("");return Native.getLong(pData+16); } 5.131 +- public void set_defaultConfig(long v) { log.finest(""); Native.putLong(pData + 16, v); } 5.132 +- public long get_configs(int index) { log.finest(""); return Native.getLong(pData+20)+index*Native.getLongSize(); } 5.133 +- public long get_configs() { log.finest("");return Native.getLong(pData+20); } 5.134 +- public void set_configs(long v) { log.finest(""); Native.putLong(pData + 20, v); } 5.135 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.136 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.137 ++ public long get_whitepixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.138 ++ public void set_whitepixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.139 ++ public long get_blackpixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.140 ++ public void set_blackpixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.141 ++ public AwtGraphicsConfigData get_defaultConfig(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32))) != 0)?(new AwtGraphicsConfigData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))+index*((XlibWrapper.dataModel == 32)?(92):(160)))):(null); } 5.142 ++ public long get_defaultConfig() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32))); } 5.143 ++ public void set_defaultConfig(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.144 ++ public long get_configs(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))+index*Native.getLongSize(); } 5.145 ++ public long get_configs() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40))); } 5.146 ++ public void set_configs(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.147 + 5.148 + 5.149 + String getName() { 5.150 +diff -r ca3a8b43a54b generated/sun/awt/X11/ColorData.java 5.151 +--- a/generated/sun/awt/X11/ColorData.java Tue May 27 21:14:08 2008 +0100 5.152 ++++ b/generated/sun/awt/X11/ColorData.java Tue May 27 21:15:32 2008 +0100 5.153 +@@ -8,7 +8,7 @@ public class ColorData extends XWrapperB 5.154 + public class ColorData extends XWrapperBase { 5.155 + private Unsafe unsafe = XlibWrapper.unsafe; 5.156 + private final boolean should_free_memory; 5.157 +- public static int getSize() { return 44; } 5.158 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(44):(88)); } 5.159 + public int getDataSize() { return getSize(); } 5.160 + 5.161 + long pData; 5.162 +@@ -40,34 +40,34 @@ public class ColorData extends XWrapperB 5.163 + public ColorEntry get_awt_Colors(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new ColorEntry(Native.getLong(pData+0)+index*4)):(null); } 5.164 + public long get_awt_Colors() { log.finest("");return Native.getLong(pData+0); } 5.165 + public void set_awt_Colors(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.166 +- public int get_awt_numICMcolors() { log.finest("");return (Native.getInt(pData+4)); } 5.167 +- public void set_awt_numICMcolors(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.168 +- public int get_awt_icmLUT(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+8)+index*4); } 5.169 +- public long get_awt_icmLUT() { log.finest("");return Native.getLong(pData+8); } 5.170 +- public void set_awt_icmLUT(long v) { log.finest(""); Native.putLong(pData + 8, v); } 5.171 +- public byte get_awt_icmLUT2Colors(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+12)+index*1); } 5.172 +- public long get_awt_icmLUT2Colors() { log.finest("");return Native.getLong(pData+12); } 5.173 +- public void set_awt_icmLUT2Colors(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.174 +- public byte get_img_grays(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+16)+index*1); } 5.175 +- public long get_img_grays() { log.finest("");return Native.getLong(pData+16); } 5.176 +- public void set_img_grays(long v) { log.finest(""); Native.putLong(pData + 16, v); } 5.177 +- public byte get_img_clr_tbl(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+20)+index*1); } 5.178 +- public long get_img_clr_tbl() { log.finest("");return Native.getLong(pData+20); } 5.179 +- public void set_img_clr_tbl(long v) { log.finest(""); Native.putLong(pData + 20, v); } 5.180 +- public byte get_img_oda_red(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+24)+index*1); } 5.181 +- public long get_img_oda_red() { log.finest("");return Native.getLong(pData+24); } 5.182 +- public void set_img_oda_red(long v) { log.finest(""); Native.putLong(pData + 24, v); } 5.183 +- public byte get_img_oda_green(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+28)+index*1); } 5.184 +- public long get_img_oda_green() { log.finest("");return Native.getLong(pData+28); } 5.185 +- public void set_img_oda_green(long v) { log.finest(""); Native.putLong(pData + 28, v); } 5.186 +- public byte get_img_oda_blue(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+32)+index*1); } 5.187 +- public long get_img_oda_blue() { log.finest("");return Native.getLong(pData+32); } 5.188 +- public void set_img_oda_blue(long v) { log.finest(""); Native.putLong(pData + 32, v); } 5.189 +- public int get_pGrayInverseLutData(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+36)+index*4); } 5.190 +- public long get_pGrayInverseLutData() { log.finest("");return Native.getLong(pData+36); } 5.191 +- public void set_pGrayInverseLutData(long v) { log.finest(""); Native.putLong(pData + 36, v); } 5.192 +- public int get_screendata() { log.finest("");return (Native.getInt(pData+40)); } 5.193 +- public void set_screendata(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.194 ++ public int get_awt_numICMcolors() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.195 ++ public void set_awt_numICMcolors(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.196 ++ public int get_awt_icmLUT(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))+index*4); } 5.197 ++ public long get_awt_icmLUT() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16))); } 5.198 ++ public void set_awt_icmLUT(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.199 ++ public byte get_awt_icmLUT2Colors(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))+index*1); } 5.200 ++ public long get_awt_icmLUT2Colors() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24))); } 5.201 ++ public void set_awt_icmLUT2Colors(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.202 ++ public byte get_img_grays(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))+index*1); } 5.203 ++ public long get_img_grays() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32))); } 5.204 ++ public void set_img_grays(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.205 ++ public byte get_img_clr_tbl(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))+index*1); } 5.206 ++ public long get_img_clr_tbl() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40))); } 5.207 ++ public void set_img_clr_tbl(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.208 ++ public byte get_img_oda_red(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))+index*1); } 5.209 ++ public long get_img_oda_red() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48))); } 5.210 ++ public void set_img_oda_red(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.211 ++ public byte get_img_oda_green(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))+index*1); } 5.212 ++ public long get_img_oda_green() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(56))); } 5.213 ++ public void set_img_oda_green(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.214 ++ public byte get_img_oda_blue(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(64)))+index*1); } 5.215 ++ public long get_img_oda_blue() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(64))); } 5.216 ++ public void set_img_oda_blue(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.217 ++ public int get_pGrayInverseLutData(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(36):(72)))+index*4); } 5.218 ++ public long get_pGrayInverseLutData() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(36):(72))); } 5.219 ++ public void set_pGrayInverseLutData(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(36):(72)), v); } 5.220 ++ public int get_screendata() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(80)))); } 5.221 ++ public void set_screendata(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(80)), v); } 5.222 + 5.223 + 5.224 + String getName() { 5.225 +diff -r ca3a8b43a54b generated/sun/awt/X11/Depth.java 5.226 +--- a/generated/sun/awt/X11/Depth.java Tue May 27 21:14:08 2008 +0100 5.227 ++++ b/generated/sun/awt/X11/Depth.java Tue May 27 21:15:32 2008 +0100 5.228 +@@ -8,7 +8,7 @@ public class Depth extends XWrapperBase 5.229 + public class Depth extends XWrapperBase { 5.230 + private Unsafe unsafe = XlibWrapper.unsafe; 5.231 + private final boolean should_free_memory; 5.232 +- public static int getSize() { return 12; } 5.233 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(12):(16)); } 5.234 + public int getDataSize() { return getSize(); } 5.235 + 5.236 + long pData; 5.237 +@@ -41,7 +41,7 @@ public class Depth extends XWrapperBase 5.238 + public void set_depth(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.239 + public int get_nvisuals() { log.finest("");return (Native.getInt(pData+4)); } 5.240 + public void set_nvisuals(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.241 +- public Visual get_visuals(int index) { log.finest(""); return (Native.getLong(pData+8) != 0)?(new Visual(Native.getLong(pData+8)+index*32)):(null); } 5.242 ++ public Visual get_visuals(int index) { log.finest(""); return (Native.getLong(pData+8) != 0)?(new Visual(Native.getLong(pData+8)+index*((XlibWrapper.dataModel == 32)?(32):(56)))):(null); } 5.243 + public long get_visuals() { log.finest("");return Native.getLong(pData+8); } 5.244 + public void set_visuals(long v) { log.finest(""); Native.putLong(pData + 8, v); } 5.245 + 5.246 +diff -r ca3a8b43a54b generated/sun/awt/X11/PropMwmHints.java 5.247 +--- a/generated/sun/awt/X11/PropMwmHints.java Tue May 27 21:14:08 2008 +0100 5.248 ++++ b/generated/sun/awt/X11/PropMwmHints.java Tue May 27 21:15:32 2008 +0100 5.249 +@@ -8,7 +8,7 @@ public class PropMwmHints extends XWrapp 5.250 + public class PropMwmHints extends XWrapperBase { 5.251 + private Unsafe unsafe = XlibWrapper.unsafe; 5.252 + private final boolean should_free_memory; 5.253 +- public static int getSize() { return 20; } 5.254 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(20):(40)); } 5.255 + public int getDataSize() { return getSize(); } 5.256 + 5.257 + long pData; 5.258 +@@ -39,14 +39,14 @@ public class PropMwmHints extends XWrapp 5.259 + } 5.260 + public long get_flags() { log.finest("");return (Native.getLong(pData+0)); } 5.261 + public void set_flags(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.262 +- public long get_functions() { log.finest("");return (Native.getLong(pData+4)); } 5.263 +- public void set_functions(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.264 +- public long get_decorations() { log.finest("");return (Native.getLong(pData+8)); } 5.265 +- public void set_decorations(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.266 +- public long get_inputMode() { log.finest("");return (Native.getLong(pData+12)); } 5.267 +- public void set_inputMode(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.268 +- public long get_status() { log.finest("");return (Native.getLong(pData+16)); } 5.269 +- public void set_status(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.270 ++ public long get_functions() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.271 ++ public void set_functions(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.272 ++ public long get_decorations() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.273 ++ public void set_decorations(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.274 ++ public long get_inputMode() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.275 ++ public void set_inputMode(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.276 ++ public long get_status() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.277 ++ public void set_status(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.278 + 5.279 + 5.280 + String getName() { 5.281 +diff -r ca3a8b43a54b generated/sun/awt/X11/Screen.java 5.282 +--- a/generated/sun/awt/X11/Screen.java Tue May 27 21:14:08 2008 +0100 5.283 ++++ b/generated/sun/awt/X11/Screen.java Tue May 27 21:15:32 2008 +0100 5.284 +@@ -8,7 +8,7 @@ public class Screen extends XWrapperBase 5.285 + public class Screen extends XWrapperBase { 5.286 + private Unsafe unsafe = XlibWrapper.unsafe; 5.287 + private final boolean should_free_memory; 5.288 +- public static int getSize() { return 80; } 5.289 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(80):(128)); } 5.290 + public int getDataSize() { return getSize(); } 5.291 + 5.292 + long pData; 5.293 +@@ -37,50 +37,50 @@ public class Screen extends XWrapperBase 5.294 + unsafe.freeMemory(pData); 5.295 + } 5.296 + } 5.297 +- public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*16)):(null); } 5.298 ++ public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.299 + public long get_ext_data() { log.finest("");return Native.getLong(pData+0); } 5.300 + public void set_ext_data(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.301 +- public long get_display(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.302 +- public long get_display() { log.finest("");return Native.getLong(pData+4); } 5.303 +- public void set_display(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.304 +- public long get_root() { log.finest("");return (Native.getLong(pData+8)); } 5.305 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.306 +- public int get_width() { log.finest("");return (Native.getInt(pData+12)); } 5.307 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.308 +- public int get_height() { log.finest("");return (Native.getInt(pData+16)); } 5.309 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.310 +- public int get_mwidth() { log.finest("");return (Native.getInt(pData+20)); } 5.311 +- public void set_mwidth(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.312 +- public int get_mheight() { log.finest("");return (Native.getInt(pData+24)); } 5.313 +- public void set_mheight(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.314 +- public int get_ndepths() { log.finest("");return (Native.getInt(pData+28)); } 5.315 +- public void set_ndepths(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.316 +- public Depth get_depths(int index) { log.finest(""); return (Native.getLong(pData+32) != 0)?(new Depth(Native.getLong(pData+32)+index*12)):(null); } 5.317 +- public long get_depths() { log.finest("");return Native.getLong(pData+32); } 5.318 +- public void set_depths(long v) { log.finest(""); Native.putLong(pData + 32, v); } 5.319 +- public int get_root_depth() { log.finest("");return (Native.getInt(pData+36)); } 5.320 +- public void set_root_depth(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.321 +- public Visual get_root_visual(int index) { log.finest(""); return (Native.getLong(pData+40) != 0)?(new Visual(Native.getLong(pData+40)+index*32)):(null); } 5.322 +- public long get_root_visual() { log.finest("");return Native.getLong(pData+40); } 5.323 +- public void set_root_visual(long v) { log.finest(""); Native.putLong(pData + 40, v); } 5.324 +- public long get_default_gc() { log.finest("");return (Native.getLong(pData+44)); } 5.325 +- public void set_default_gc(long v) { log.finest(""); Native.putLong(pData+44, v); } 5.326 +- public long get_cmap() { log.finest("");return (Native.getLong(pData+48)); } 5.327 +- public void set_cmap(long v) { log.finest(""); Native.putLong(pData+48, v); } 5.328 +- public long get_white_pixel() { log.finest("");return (Native.getLong(pData+52)); } 5.329 +- public void set_white_pixel(long v) { log.finest(""); Native.putLong(pData+52, v); } 5.330 +- public long get_black_pixel() { log.finest("");return (Native.getLong(pData+56)); } 5.331 +- public void set_black_pixel(long v) { log.finest(""); Native.putLong(pData+56, v); } 5.332 +- public int get_max_maps() { log.finest("");return (Native.getInt(pData+60)); } 5.333 +- public void set_max_maps(int v) { log.finest(""); Native.putInt(pData+60, v); } 5.334 +- public int get_min_maps() { log.finest("");return (Native.getInt(pData+64)); } 5.335 +- public void set_min_maps(int v) { log.finest(""); Native.putInt(pData+64, v); } 5.336 +- public int get_backing_store() { log.finest("");return (Native.getInt(pData+68)); } 5.337 +- public void set_backing_store(int v) { log.finest(""); Native.putInt(pData+68, v); } 5.338 +- public boolean get_save_unders() { log.finest("");return (Native.getBool(pData+72)); } 5.339 +- public void set_save_unders(boolean v) { log.finest(""); Native.putBool(pData+72, v); } 5.340 +- public long get_root_input_mask() { log.finest("");return (Native.getLong(pData+76)); } 5.341 +- public void set_root_input_mask(long v) { log.finest(""); Native.putLong(pData+76, v); } 5.342 ++ public long get_display(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.343 ++ public long get_display() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.344 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.345 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.346 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.347 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.348 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.349 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(16):(28)))); } 5.350 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(16):(28)), v); } 5.351 ++ public int get_mwidth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(32)))); } 5.352 ++ public void set_mwidth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(32)), v); } 5.353 ++ public int get_mheight() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(36)))); } 5.354 ++ public void set_mheight(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(36)), v); } 5.355 ++ public int get_ndepths() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(40)))); } 5.356 ++ public void set_ndepths(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(40)), v); } 5.357 ++ public Depth get_depths(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(48))) != 0)?(new Depth(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(48)))+index*((XlibWrapper.dataModel == 32)?(12):(16)))):(null); } 5.358 ++ public long get_depths() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(48))); } 5.359 ++ public void set_depths(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(32):(48)), v); } 5.360 ++ public int get_root_depth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(56)))); } 5.361 ++ public void set_root_depth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(56)), v); } 5.362 ++ public Visual get_root_visual(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(64))) != 0)?(new Visual(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(64)))+index*((XlibWrapper.dataModel == 32)?(32):(56)))):(null); } 5.363 ++ public long get_root_visual() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(64))); } 5.364 ++ public void set_root_visual(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(40):(64)), v); } 5.365 ++ public long get_default_gc() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(44):(72)))); } 5.366 ++ public void set_default_gc(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(44):(72)), v); } 5.367 ++ public long get_cmap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.368 ++ public void set_cmap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.369 ++ public long get_white_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88)))); } 5.370 ++ public void set_white_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(52):(88)), v); } 5.371 ++ public long get_black_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(96)))); } 5.372 ++ public void set_black_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(56):(96)), v); } 5.373 ++ public int get_max_maps() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(60):(104)))); } 5.374 ++ public void set_max_maps(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(60):(104)), v); } 5.375 ++ public int get_min_maps() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(64):(108)))); } 5.376 ++ public void set_min_maps(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(64):(108)), v); } 5.377 ++ public int get_backing_store() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(68):(112)))); } 5.378 ++ public void set_backing_store(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(68):(112)), v); } 5.379 ++ public boolean get_save_unders() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(72):(116)))); } 5.380 ++ public void set_save_unders(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(72):(116)), v); } 5.381 ++ public long get_root_input_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(76):(120)))); } 5.382 ++ public void set_root_input_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(76):(120)), v); } 5.383 + 5.384 + 5.385 + String getName() { 5.386 +diff -r ca3a8b43a54b generated/sun/awt/X11/ScreenFormat.java 5.387 +--- a/generated/sun/awt/X11/ScreenFormat.java Tue May 27 21:14:08 2008 +0100 5.388 ++++ b/generated/sun/awt/X11/ScreenFormat.java Tue May 27 21:15:32 2008 +0100 5.389 +@@ -8,7 +8,7 @@ public class ScreenFormat extends XWrapp 5.390 + public class ScreenFormat extends XWrapperBase { 5.391 + private Unsafe unsafe = XlibWrapper.unsafe; 5.392 + private final boolean should_free_memory; 5.393 +- public static int getSize() { return 16; } 5.394 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.395 + public int getDataSize() { return getSize(); } 5.396 + 5.397 + long pData; 5.398 +@@ -37,15 +37,15 @@ public class ScreenFormat extends XWrapp 5.399 + unsafe.freeMemory(pData); 5.400 + } 5.401 + } 5.402 +- public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*16)):(null); } 5.403 ++ public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.404 + public long get_ext_data() { log.finest("");return Native.getLong(pData+0); } 5.405 + public void set_ext_data(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.406 +- public int get_depth() { log.finest("");return (Native.getInt(pData+4)); } 5.407 +- public void set_depth(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.408 +- public int get_bits_per_pixel() { log.finest("");return (Native.getInt(pData+8)); } 5.409 +- public void set_bits_per_pixel(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.410 +- public int get_scanline_pad() { log.finest("");return (Native.getInt(pData+12)); } 5.411 +- public void set_scanline_pad(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.412 ++ public int get_depth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.413 ++ public void set_depth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.414 ++ public int get_bits_per_pixel() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.415 ++ public void set_bits_per_pixel(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.416 ++ public int get_scanline_pad() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(12):(16)))); } 5.417 ++ public void set_scanline_pad(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.418 + 5.419 + 5.420 + String getName() { 5.421 +diff -r ca3a8b43a54b generated/sun/awt/X11/Visual.java 5.422 +--- a/generated/sun/awt/X11/Visual.java Tue May 27 21:14:08 2008 +0100 5.423 ++++ b/generated/sun/awt/X11/Visual.java Tue May 27 21:15:32 2008 +0100 5.424 +@@ -8,7 +8,7 @@ public class Visual extends XWrapperBase 5.425 + public class Visual extends XWrapperBase { 5.426 + private Unsafe unsafe = XlibWrapper.unsafe; 5.427 + private final boolean should_free_memory; 5.428 +- public static int getSize() { return 32; } 5.429 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(32):(56)); } 5.430 + public int getDataSize() { return getSize(); } 5.431 + 5.432 + long pData; 5.433 +@@ -37,23 +37,23 @@ public class Visual extends XWrapperBase 5.434 + unsafe.freeMemory(pData); 5.435 + } 5.436 + } 5.437 +- public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*16)):(null); } 5.438 ++ public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.439 + public long get_ext_data() { log.finest("");return Native.getLong(pData+0); } 5.440 + public void set_ext_data(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.441 +- public long get_visualid() { log.finest("");return (Native.getLong(pData+4)); } 5.442 +- public void set_visualid(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.443 +- public int get_class() { log.finest("");return (Native.getInt(pData+8)); } 5.444 +- public void set_class(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.445 +- public long get_red_mask() { log.finest("");return (Native.getLong(pData+12)); } 5.446 +- public void set_red_mask(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.447 +- public long get_green_mask() { log.finest("");return (Native.getLong(pData+16)); } 5.448 +- public void set_green_mask(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.449 +- public long get_blue_mask() { log.finest("");return (Native.getLong(pData+20)); } 5.450 +- public void set_blue_mask(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.451 +- public int get_bits_per_rgb() { log.finest("");return (Native.getInt(pData+24)); } 5.452 +- public void set_bits_per_rgb(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.453 +- public int get_map_entries() { log.finest("");return (Native.getInt(pData+28)); } 5.454 +- public void set_map_entries(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.455 ++ public long get_visualid() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.456 ++ public void set_visualid(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.457 ++ public int get_class() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.458 ++ public void set_class(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.459 ++ public long get_red_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.460 ++ public void set_red_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.461 ++ public long get_green_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.462 ++ public void set_green_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.463 ++ public long get_blue_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.464 ++ public void set_blue_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.465 ++ public int get_bits_per_rgb() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.466 ++ public void set_bits_per_rgb(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.467 ++ public int get_map_entries() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)))); } 5.468 ++ public void set_map_entries(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)), v); } 5.469 + 5.470 + 5.471 + String getName() { 5.472 +diff -r ca3a8b43a54b generated/sun/awt/X11/XAnyEvent.java 5.473 +--- a/generated/sun/awt/X11/XAnyEvent.java Tue May 27 21:14:08 2008 +0100 5.474 ++++ b/generated/sun/awt/X11/XAnyEvent.java Tue May 27 21:15:32 2008 +0100 5.475 +@@ -8,7 +8,7 @@ public class XAnyEvent extends XWrapperB 5.476 + public class XAnyEvent extends XWrapperBase { 5.477 + private Unsafe unsafe = XlibWrapper.unsafe; 5.478 + private final boolean should_free_memory; 5.479 +- public static int getSize() { return 20; } 5.480 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(20):(40)); } 5.481 + public int getDataSize() { return getSize(); } 5.482 + 5.483 + long pData; 5.484 +@@ -39,14 +39,14 @@ public class XAnyEvent extends XWrapperB 5.485 + } 5.486 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.487 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.488 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.489 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.490 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.491 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.492 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.493 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.494 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.495 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.496 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.497 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.498 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.499 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.500 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.501 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.502 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.503 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.504 + 5.505 + 5.506 + String getName() { 5.507 +diff -r ca3a8b43a54b generated/sun/awt/X11/XButtonEvent.java 5.508 +--- a/generated/sun/awt/X11/XButtonEvent.java Tue May 27 21:14:08 2008 +0100 5.509 ++++ b/generated/sun/awt/X11/XButtonEvent.java Tue May 27 21:15:32 2008 +0100 5.510 +@@ -8,7 +8,7 @@ public class XButtonEvent extends XWrapp 5.511 + public class XButtonEvent extends XWrapperBase { 5.512 + private Unsafe unsafe = XlibWrapper.unsafe; 5.513 + private final boolean should_free_memory; 5.514 +- public static int getSize() { return 60; } 5.515 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(60):(96)); } 5.516 + public int getDataSize() { return getSize(); } 5.517 + 5.518 + long pData; 5.519 +@@ -39,34 +39,34 @@ public class XButtonEvent extends XWrapp 5.520 + } 5.521 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.522 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.523 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.524 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.525 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.526 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.527 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.528 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.529 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.530 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.531 +- public long get_root() { log.finest("");return (Native.getLong(pData+20)); } 5.532 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.533 +- public long get_subwindow() { log.finest("");return (Native.getLong(pData+24)); } 5.534 +- public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.535 +- public long get_time() { log.finest("");return (Native.getULong(pData+28)); } 5.536 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+28, v); } 5.537 +- public int get_x() { log.finest("");return (Native.getInt(pData+32)); } 5.538 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.539 +- public int get_y() { log.finest("");return (Native.getInt(pData+36)); } 5.540 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.541 +- public int get_x_root() { log.finest("");return (Native.getInt(pData+40)); } 5.542 +- public void set_x_root(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.543 +- public int get_y_root() { log.finest("");return (Native.getInt(pData+44)); } 5.544 +- public void set_y_root(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.545 +- public int get_state() { log.finest("");return (Native.getInt(pData+48)); } 5.546 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.547 +- public int get_button() { log.finest("");return (Native.getInt(pData+52)); } 5.548 +- public void set_button(int v) { log.finest(""); Native.putInt(pData+52, v); } 5.549 +- public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+56)); } 5.550 +- public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+56, v); } 5.551 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.552 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.553 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.554 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.555 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.556 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.557 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.558 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.559 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.560 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.561 ++ public long get_subwindow() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.562 ++ public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.563 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.564 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.565 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.566 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.567 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)))); } 5.568 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)), v); } 5.569 ++ public int get_x_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)))); } 5.570 ++ public void set_x_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)), v); } 5.571 ++ public int get_y_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)))); } 5.572 ++ public void set_y_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)), v); } 5.573 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.574 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.575 ++ public int get_button() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(52):(84)))); } 5.576 ++ public void set_button(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(52):(84)), v); } 5.577 ++ public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)))); } 5.578 ++ public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)), v); } 5.579 + 5.580 + 5.581 + String getName() { 5.582 +diff -r ca3a8b43a54b generated/sun/awt/X11/XCirculateEvent.java 5.583 +--- a/generated/sun/awt/X11/XCirculateEvent.java Tue May 27 21:14:08 2008 +0100 5.584 ++++ b/generated/sun/awt/X11/XCirculateEvent.java Tue May 27 21:15:32 2008 +0100 5.585 +@@ -8,7 +8,7 @@ public class XCirculateEvent extends XWr 5.586 + public class XCirculateEvent extends XWrapperBase { 5.587 + private Unsafe unsafe = XlibWrapper.unsafe; 5.588 + private final boolean should_free_memory; 5.589 +- public static int getSize() { return 28; } 5.590 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(56)); } 5.591 + public int getDataSize() { return getSize(); } 5.592 + 5.593 + long pData; 5.594 +@@ -39,18 +39,18 @@ public class XCirculateEvent extends XWr 5.595 + } 5.596 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.597 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.598 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.599 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.600 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.601 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.602 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.603 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.604 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.605 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.606 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.607 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.608 +- public int get_place() { log.finest("");return (Native.getInt(pData+24)); } 5.609 +- public void set_place(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.610 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.611 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.612 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.613 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.614 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.615 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.616 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.617 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.618 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.619 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.620 ++ public int get_place() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.621 ++ public void set_place(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.622 + 5.623 + 5.624 + String getName() { 5.625 +diff -r ca3a8b43a54b generated/sun/awt/X11/XCirculateRequestEvent.java 5.626 +--- a/generated/sun/awt/X11/XCirculateRequestEvent.java Tue May 27 21:14:08 2008 +0100 5.627 ++++ b/generated/sun/awt/X11/XCirculateRequestEvent.java Tue May 27 21:15:32 2008 +0100 5.628 +@@ -8,7 +8,7 @@ public class XCirculateRequestEvent exte 5.629 + public class XCirculateRequestEvent extends XWrapperBase { 5.630 + private Unsafe unsafe = XlibWrapper.unsafe; 5.631 + private final boolean should_free_memory; 5.632 +- public static int getSize() { return 28; } 5.633 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(56)); } 5.634 + public int getDataSize() { return getSize(); } 5.635 + 5.636 + long pData; 5.637 +@@ -39,18 +39,18 @@ public class XCirculateRequestEvent exte 5.638 + } 5.639 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.640 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.641 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.642 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.643 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.644 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.645 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.646 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.647 +- public long get_parent() { log.finest("");return (Native.getLong(pData+16)); } 5.648 +- public void set_parent(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.649 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.650 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.651 +- public int get_place() { log.finest("");return (Native.getInt(pData+24)); } 5.652 +- public void set_place(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.653 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.654 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.655 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.656 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.657 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.658 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.659 ++ public long get_parent() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.660 ++ public void set_parent(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.661 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.662 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.663 ++ public int get_place() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.664 ++ public void set_place(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.665 + 5.666 + 5.667 + String getName() { 5.668 +diff -r ca3a8b43a54b generated/sun/awt/X11/XClassHint.java 5.669 +--- a/generated/sun/awt/X11/XClassHint.java Tue May 27 21:14:08 2008 +0100 5.670 ++++ b/generated/sun/awt/X11/XClassHint.java Tue May 27 21:15:32 2008 +0100 5.671 +@@ -8,7 +8,7 @@ public class XClassHint extends XWrapper 5.672 + public class XClassHint extends XWrapperBase { 5.673 + private Unsafe unsafe = XlibWrapper.unsafe; 5.674 + private final boolean should_free_memory; 5.675 +- public static int getSize() { return 8; } 5.676 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.677 + public int getDataSize() { return getSize(); } 5.678 + 5.679 + long pData; 5.680 +@@ -40,9 +40,9 @@ public class XClassHint extends XWrapper 5.681 + public long get_res_name(int index) { log.finest(""); return Native.getLong(pData+0)+index*Native.getLongSize(); } 5.682 + public long get_res_name() { log.finest("");return Native.getLong(pData+0); } 5.683 + public void set_res_name(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.684 +- public long get_res_class(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.685 +- public long get_res_class() { log.finest("");return Native.getLong(pData+4); } 5.686 +- public void set_res_class(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.687 ++ public long get_res_class(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.688 ++ public long get_res_class() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.689 ++ public void set_res_class(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.690 + 5.691 + 5.692 + String getName() { 5.693 +diff -r ca3a8b43a54b generated/sun/awt/X11/XClientMessageEvent.java 5.694 +--- a/generated/sun/awt/X11/XClientMessageEvent.java Tue May 27 21:14:08 2008 +0100 5.695 ++++ b/generated/sun/awt/X11/XClientMessageEvent.java Tue May 27 21:15:32 2008 +0100 5.696 +@@ -8,7 +8,7 @@ public class XClientMessageEvent extends 5.697 + public class XClientMessageEvent extends XWrapperBase { 5.698 + private Unsafe unsafe = XlibWrapper.unsafe; 5.699 + private final boolean should_free_memory; 5.700 +- public static int getSize() { return 48; } 5.701 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(48):(96)); } 5.702 + public int getDataSize() { return getSize(); } 5.703 + 5.704 + long pData; 5.705 +@@ -39,21 +39,21 @@ public class XClientMessageEvent extends 5.706 + } 5.707 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.708 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.709 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.710 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.711 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.712 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.713 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.714 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.715 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.716 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.717 +- public long get_message_type() { log.finest("");return (Native.getLong(pData+20)); } 5.718 +- public void set_message_type(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.719 +- public int get_format() { log.finest("");return (Native.getInt(pData+24)); } 5.720 +- public void set_format(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.721 +- public long get_data(int index) { log.finest("");return Native.getLong(pData + 28+index*Native.getLongSize()); } 5.722 +- public void set_data(int index, long v) { log.finest(""); Native.putLong(pData+28 + index*Native.getLongSize(), v); } 5.723 +- public long get_data() { log.finest("");return pData+28; } 5.724 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.725 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.726 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.727 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.728 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.729 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.730 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.731 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.732 ++ public long get_message_type() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.733 ++ public void set_message_type(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.734 ++ public int get_format() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.735 ++ public void set_format(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.736 ++ public long get_data(int index) { log.finest("");return Native.getLong(pData + ((XlibWrapper.dataModel == 32)?(28):(56))+index*Native.getLongSize()); } 5.737 ++ public void set_data(int index, long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)) + index*Native.getLongSize(), v); } 5.738 ++ public long get_data() { log.finest("");return pData+((XlibWrapper.dataModel == 32)?(28):(56)); } 5.739 + 5.740 + 5.741 + String getName() { 5.742 +diff -r ca3a8b43a54b generated/sun/awt/X11/XColor.java 5.743 +--- a/generated/sun/awt/X11/XColor.java Tue May 27 21:14:08 2008 +0100 5.744 ++++ b/generated/sun/awt/X11/XColor.java Tue May 27 21:15:32 2008 +0100 5.745 +@@ -8,7 +8,7 @@ public class XColor extends XWrapperBase 5.746 + public class XColor extends XWrapperBase { 5.747 + private Unsafe unsafe = XlibWrapper.unsafe; 5.748 + private final boolean should_free_memory; 5.749 +- public static int getSize() { return 12; } 5.750 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(12):(16)); } 5.751 + public int getDataSize() { return getSize(); } 5.752 + 5.753 + long pData; 5.754 +@@ -39,16 +39,16 @@ public class XColor extends XWrapperBase 5.755 + } 5.756 + public long get_pixel() { log.finest("");return (Native.getLong(pData+0)); } 5.757 + public void set_pixel(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.758 +- public short get_red() { log.finest("");return (Native.getShort(pData+4)); } 5.759 +- public void set_red(short v) { log.finest(""); Native.putShort(pData+4, v); } 5.760 +- public short get_green() { log.finest("");return (Native.getShort(pData+6)); } 5.761 +- public void set_green(short v) { log.finest(""); Native.putShort(pData+6, v); } 5.762 +- public short get_blue() { log.finest("");return (Native.getShort(pData+8)); } 5.763 +- public void set_blue(short v) { log.finest(""); Native.putShort(pData+8, v); } 5.764 +- public byte get_flags() { log.finest("");return (Native.getByte(pData+10)); } 5.765 +- public void set_flags(byte v) { log.finest(""); Native.putByte(pData+10, v); } 5.766 +- public byte get_pad() { log.finest("");return (Native.getByte(pData+11)); } 5.767 +- public void set_pad(byte v) { log.finest(""); Native.putByte(pData+11, v); } 5.768 ++ public short get_red() { log.finest("");return (Native.getShort(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.769 ++ public void set_red(short v) { log.finest(""); Native.putShort(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.770 ++ public short get_green() { log.finest("");return (Native.getShort(pData+((XlibWrapper.dataModel == 32)?(6):(10)))); } 5.771 ++ public void set_green(short v) { log.finest(""); Native.putShort(pData+((XlibWrapper.dataModel == 32)?(6):(10)), v); } 5.772 ++ public short get_blue() { log.finest("");return (Native.getShort(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.773 ++ public void set_blue(short v) { log.finest(""); Native.putShort(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.774 ++ public byte get_flags() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(10):(14)))); } 5.775 ++ public void set_flags(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(10):(14)), v); } 5.776 ++ public byte get_pad() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(11):(15)))); } 5.777 ++ public void set_pad(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(11):(15)), v); } 5.778 + 5.779 + 5.780 + String getName() { 5.781 +diff -r ca3a8b43a54b generated/sun/awt/X11/XColormapEvent.java 5.782 +--- a/generated/sun/awt/X11/XColormapEvent.java Tue May 27 21:14:08 2008 +0100 5.783 ++++ b/generated/sun/awt/X11/XColormapEvent.java Tue May 27 21:15:32 2008 +0100 5.784 +@@ -8,7 +8,7 @@ public class XColormapEvent extends XWra 5.785 + public class XColormapEvent extends XWrapperBase { 5.786 + private Unsafe unsafe = XlibWrapper.unsafe; 5.787 + private final boolean should_free_memory; 5.788 +- public static int getSize() { return 32; } 5.789 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(32):(56)); } 5.790 + public int getDataSize() { return getSize(); } 5.791 + 5.792 + long pData; 5.793 +@@ -39,20 +39,20 @@ public class XColormapEvent extends XWra 5.794 + } 5.795 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.796 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.797 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.798 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.799 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.800 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.801 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.802 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.803 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.804 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.805 +- public long get_colormap() { log.finest("");return (Native.getLong(pData+20)); } 5.806 +- public void set_colormap(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.807 +- public boolean get_new() { log.finest("");return (Native.getBool(pData+24)); } 5.808 +- public void set_new(boolean v) { log.finest(""); Native.putBool(pData+24, v); } 5.809 +- public int get_state() { log.finest("");return (Native.getInt(pData+28)); } 5.810 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.811 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.812 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.813 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.814 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.815 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.816 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.817 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.818 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.819 ++ public long get_colormap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.820 ++ public void set_colormap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.821 ++ public boolean get_new() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.822 ++ public void set_new(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.823 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)))); } 5.824 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)), v); } 5.825 + 5.826 + 5.827 + String getName() { 5.828 +diff -r ca3a8b43a54b generated/sun/awt/X11/XComposeStatus.java 5.829 +--- a/generated/sun/awt/X11/XComposeStatus.java Tue May 27 21:14:08 2008 +0100 5.830 ++++ b/generated/sun/awt/X11/XComposeStatus.java Tue May 27 21:15:32 2008 +0100 5.831 +@@ -8,7 +8,7 @@ public class XComposeStatus extends XWra 5.832 + public class XComposeStatus extends XWrapperBase { 5.833 + private Unsafe unsafe = XlibWrapper.unsafe; 5.834 + private final boolean should_free_memory; 5.835 +- public static int getSize() { return 8; } 5.836 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.837 + public int getDataSize() { return getSize(); } 5.838 + 5.839 + long pData; 5.840 +@@ -40,8 +40,8 @@ public class XComposeStatus extends XWra 5.841 + public long get_compose_ptr(int index) { log.finest(""); return Native.getLong(pData+0)+index*Native.getLongSize(); } 5.842 + public long get_compose_ptr() { log.finest("");return Native.getLong(pData+0); } 5.843 + public void set_compose_ptr(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.844 +- public int get_chars_matched() { log.finest("");return (Native.getInt(pData+4)); } 5.845 +- public void set_chars_matched(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.846 ++ public int get_chars_matched() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.847 ++ public void set_chars_matched(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.848 + 5.849 + 5.850 + String getName() { 5.851 +diff -r ca3a8b43a54b generated/sun/awt/X11/XConfigureEvent.java 5.852 +--- a/generated/sun/awt/X11/XConfigureEvent.java Tue May 27 21:14:08 2008 +0100 5.853 ++++ b/generated/sun/awt/X11/XConfigureEvent.java Tue May 27 21:15:32 2008 +0100 5.854 +@@ -8,7 +8,7 @@ public class XConfigureEvent extends XWr 5.855 + public class XConfigureEvent extends XWrapperBase { 5.856 + private Unsafe unsafe = XlibWrapper.unsafe; 5.857 + private final boolean should_free_memory; 5.858 +- public static int getSize() { return 52; } 5.859 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(52):(88)); } 5.860 + public int getDataSize() { return getSize(); } 5.861 + 5.862 + long pData; 5.863 +@@ -39,30 +39,30 @@ public class XConfigureEvent extends XWr 5.864 + } 5.865 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.866 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.867 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.868 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.869 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.870 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.871 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.872 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.873 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.874 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.875 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.876 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.877 +- public int get_x() { log.finest("");return (Native.getInt(pData+24)); } 5.878 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.879 +- public int get_y() { log.finest("");return (Native.getInt(pData+28)); } 5.880 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.881 +- public int get_width() { log.finest("");return (Native.getInt(pData+32)); } 5.882 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.883 +- public int get_height() { log.finest("");return (Native.getInt(pData+36)); } 5.884 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.885 +- public int get_border_width() { log.finest("");return (Native.getInt(pData+40)); } 5.886 +- public void set_border_width(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.887 +- public long get_above() { log.finest("");return (Native.getLong(pData+44)); } 5.888 +- public void set_above(long v) { log.finest(""); Native.putLong(pData+44, v); } 5.889 +- public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+48)); } 5.890 +- public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+48, v); } 5.891 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.892 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.893 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.894 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.895 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.896 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.897 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.898 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.899 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.900 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.901 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.902 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.903 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)))); } 5.904 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)), v); } 5.905 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)))); } 5.906 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)), v); } 5.907 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)))); } 5.908 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)), v); } 5.909 ++ public int get_border_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(64)))); } 5.910 ++ public void set_border_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(64)), v); } 5.911 ++ public long get_above() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(44):(72)))); } 5.912 ++ public void set_above(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(44):(72)), v); } 5.913 ++ public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.914 ++ public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.915 + 5.916 + 5.917 + String getName() { 5.918 +diff -r ca3a8b43a54b generated/sun/awt/X11/XConfigureRequestEvent.java 5.919 +--- a/generated/sun/awt/X11/XConfigureRequestEvent.java Tue May 27 21:14:08 2008 +0100 5.920 ++++ b/generated/sun/awt/X11/XConfigureRequestEvent.java Tue May 27 21:15:32 2008 +0100 5.921 +@@ -8,7 +8,7 @@ public class XConfigureRequestEvent exte 5.922 + public class XConfigureRequestEvent extends XWrapperBase { 5.923 + private Unsafe unsafe = XlibWrapper.unsafe; 5.924 + private final boolean should_free_memory; 5.925 +- public static int getSize() { return 56; } 5.926 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(56):(96)); } 5.927 + public int getDataSize() { return getSize(); } 5.928 + 5.929 + long pData; 5.930 +@@ -39,32 +39,32 @@ public class XConfigureRequestEvent exte 5.931 + } 5.932 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.933 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.934 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.935 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.936 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.937 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.938 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.939 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.940 +- public long get_parent() { log.finest("");return (Native.getLong(pData+16)); } 5.941 +- public void set_parent(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.942 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.943 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.944 +- public int get_x() { log.finest("");return (Native.getInt(pData+24)); } 5.945 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.946 +- public int get_y() { log.finest("");return (Native.getInt(pData+28)); } 5.947 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.948 +- public int get_width() { log.finest("");return (Native.getInt(pData+32)); } 5.949 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.950 +- public int get_height() { log.finest("");return (Native.getInt(pData+36)); } 5.951 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.952 +- public int get_border_width() { log.finest("");return (Native.getInt(pData+40)); } 5.953 +- public void set_border_width(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.954 +- public long get_above() { log.finest("");return (Native.getLong(pData+44)); } 5.955 +- public void set_above(long v) { log.finest(""); Native.putLong(pData+44, v); } 5.956 +- public int get_detail() { log.finest("");return (Native.getInt(pData+48)); } 5.957 +- public void set_detail(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.958 +- public long get_value_mask() { log.finest("");return (Native.getLong(pData+52)); } 5.959 +- public void set_value_mask(long v) { log.finest(""); Native.putLong(pData+52, v); } 5.960 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.961 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.962 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.963 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.964 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.965 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.966 ++ public long get_parent() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.967 ++ public void set_parent(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.968 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.969 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.970 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.971 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.972 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)))); } 5.973 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)), v); } 5.974 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)))); } 5.975 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)), v); } 5.976 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)))); } 5.977 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)), v); } 5.978 ++ public int get_border_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(64)))); } 5.979 ++ public void set_border_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(64)), v); } 5.980 ++ public long get_above() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(44):(72)))); } 5.981 ++ public void set_above(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(44):(72)), v); } 5.982 ++ public int get_detail() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.983 ++ public void set_detail(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.984 ++ public long get_value_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88)))); } 5.985 ++ public void set_value_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(52):(88)), v); } 5.986 + 5.987 + 5.988 + String getName() { 5.989 +diff -r ca3a8b43a54b generated/sun/awt/X11/XCreateWindowEvent.java 5.990 +--- a/generated/sun/awt/X11/XCreateWindowEvent.java Tue May 27 21:14:08 2008 +0100 5.991 ++++ b/generated/sun/awt/X11/XCreateWindowEvent.java Tue May 27 21:15:32 2008 +0100 5.992 +@@ -8,7 +8,7 @@ public class XCreateWindowEvent extends 5.993 + public class XCreateWindowEvent extends XWrapperBase { 5.994 + private Unsafe unsafe = XlibWrapper.unsafe; 5.995 + private final boolean should_free_memory; 5.996 +- public static int getSize() { return 48; } 5.997 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(48):(72)); } 5.998 + public int getDataSize() { return getSize(); } 5.999 + 5.1000 + long pData; 5.1001 +@@ -39,28 +39,28 @@ public class XCreateWindowEvent extends 5.1002 + } 5.1003 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1004 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1005 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1006 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1007 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1008 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1009 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1010 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1011 +- public long get_parent() { log.finest("");return (Native.getLong(pData+16)); } 5.1012 +- public void set_parent(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1013 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.1014 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.1015 +- public int get_x() { log.finest("");return (Native.getInt(pData+24)); } 5.1016 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1017 +- public int get_y() { log.finest("");return (Native.getInt(pData+28)); } 5.1018 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.1019 +- public int get_width() { log.finest("");return (Native.getInt(pData+32)); } 5.1020 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.1021 +- public int get_height() { log.finest("");return (Native.getInt(pData+36)); } 5.1022 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.1023 +- public int get_border_width() { log.finest("");return (Native.getInt(pData+40)); } 5.1024 +- public void set_border_width(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.1025 +- public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+44)); } 5.1026 +- public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+44, v); } 5.1027 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1028 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1029 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1030 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1031 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1032 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1033 ++ public long get_parent() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1034 ++ public void set_parent(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1035 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1036 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1037 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.1038 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.1039 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)))); } 5.1040 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)), v); } 5.1041 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)))); } 5.1042 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)), v); } 5.1043 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)))); } 5.1044 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)), v); } 5.1045 ++ public int get_border_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(64)))); } 5.1046 ++ public void set_border_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(64)), v); } 5.1047 ++ public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(44):(68)))); } 5.1048 ++ public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(44):(68)), v); } 5.1049 + 5.1050 + 5.1051 + String getName() { 5.1052 +diff -r ca3a8b43a54b generated/sun/awt/X11/XCrossingEvent.java 5.1053 +--- a/generated/sun/awt/X11/XCrossingEvent.java Tue May 27 21:14:08 2008 +0100 5.1054 ++++ b/generated/sun/awt/X11/XCrossingEvent.java Tue May 27 21:15:32 2008 +0100 5.1055 +@@ -8,7 +8,7 @@ public class XCrossingEvent extends XWra 5.1056 + public class XCrossingEvent extends XWrapperBase { 5.1057 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1058 + private final boolean should_free_memory; 5.1059 +- public static int getSize() { return 68; } 5.1060 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(68):(104)); } 5.1061 + public int getDataSize() { return getSize(); } 5.1062 + 5.1063 + long pData; 5.1064 +@@ -39,38 +39,38 @@ public class XCrossingEvent extends XWra 5.1065 + } 5.1066 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1067 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1068 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1069 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1070 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1071 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1072 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1073 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1074 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.1075 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1076 +- public long get_root() { log.finest("");return (Native.getLong(pData+20)); } 5.1077 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.1078 +- public long get_subwindow() { log.finest("");return (Native.getLong(pData+24)); } 5.1079 +- public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.1080 +- public long get_time() { log.finest("");return (Native.getULong(pData+28)); } 5.1081 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+28, v); } 5.1082 +- public int get_x() { log.finest("");return (Native.getInt(pData+32)); } 5.1083 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.1084 +- public int get_y() { log.finest("");return (Native.getInt(pData+36)); } 5.1085 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.1086 +- public int get_x_root() { log.finest("");return (Native.getInt(pData+40)); } 5.1087 +- public void set_x_root(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.1088 +- public int get_y_root() { log.finest("");return (Native.getInt(pData+44)); } 5.1089 +- public void set_y_root(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.1090 +- public int get_mode() { log.finest("");return (Native.getInt(pData+48)); } 5.1091 +- public void set_mode(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.1092 +- public int get_detail() { log.finest("");return (Native.getInt(pData+52)); } 5.1093 +- public void set_detail(int v) { log.finest(""); Native.putInt(pData+52, v); } 5.1094 +- public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+56)); } 5.1095 +- public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+56, v); } 5.1096 +- public boolean get_focus() { log.finest("");return (Native.getBool(pData+60)); } 5.1097 +- public void set_focus(boolean v) { log.finest(""); Native.putBool(pData+60, v); } 5.1098 +- public int get_state() { log.finest("");return (Native.getInt(pData+64)); } 5.1099 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+64, v); } 5.1100 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1101 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1102 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1103 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1104 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1105 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1106 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1107 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1108 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1109 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1110 ++ public long get_subwindow() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.1111 ++ public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.1112 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.1113 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.1114 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.1115 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.1116 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)))); } 5.1117 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)), v); } 5.1118 ++ public int get_x_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)))); } 5.1119 ++ public void set_x_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)), v); } 5.1120 ++ public int get_y_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)))); } 5.1121 ++ public void set_y_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)), v); } 5.1122 ++ public int get_mode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.1123 ++ public void set_mode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.1124 ++ public int get_detail() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(52):(84)))); } 5.1125 ++ public void set_detail(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(52):(84)), v); } 5.1126 ++ public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)))); } 5.1127 ++ public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)), v); } 5.1128 ++ public boolean get_focus() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(60):(92)))); } 5.1129 ++ public void set_focus(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(60):(92)), v); } 5.1130 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(64):(96)))); } 5.1131 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(64):(96)), v); } 5.1132 + 5.1133 + 5.1134 + String getName() { 5.1135 +diff -r ca3a8b43a54b generated/sun/awt/X11/XDestroyWindowEvent.java 5.1136 +--- a/generated/sun/awt/X11/XDestroyWindowEvent.java Tue May 27 21:14:08 2008 +0100 5.1137 ++++ b/generated/sun/awt/X11/XDestroyWindowEvent.java Tue May 27 21:15:32 2008 +0100 5.1138 +@@ -8,7 +8,7 @@ public class XDestroyWindowEvent extends 5.1139 + public class XDestroyWindowEvent extends XWrapperBase { 5.1140 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1141 + private final boolean should_free_memory; 5.1142 +- public static int getSize() { return 24; } 5.1143 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(24):(48)); } 5.1144 + public int getDataSize() { return getSize(); } 5.1145 + 5.1146 + long pData; 5.1147 +@@ -39,16 +39,16 @@ public class XDestroyWindowEvent extends 5.1148 + } 5.1149 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1150 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1151 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1152 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1153 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1154 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1155 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1156 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1157 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.1158 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1159 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.1160 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.1161 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1162 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1163 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1164 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1165 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1166 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1167 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1168 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1169 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1170 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1171 + 5.1172 + 5.1173 + String getName() { 5.1174 +diff -r ca3a8b43a54b generated/sun/awt/X11/XErrorEvent.java 5.1175 +--- a/generated/sun/awt/X11/XErrorEvent.java Tue May 27 21:14:08 2008 +0100 5.1176 ++++ b/generated/sun/awt/X11/XErrorEvent.java Tue May 27 21:15:32 2008 +0100 5.1177 +@@ -8,7 +8,7 @@ public class XErrorEvent extends XWrappe 5.1178 + public class XErrorEvent extends XWrapperBase { 5.1179 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1180 + private final boolean should_free_memory; 5.1181 +- public static int getSize() { return 20; } 5.1182 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(20):(40)); } 5.1183 + public int getDataSize() { return getSize(); } 5.1184 + 5.1185 + long pData; 5.1186 +@@ -39,18 +39,18 @@ public class XErrorEvent extends XWrappe 5.1187 + } 5.1188 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1189 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1190 +- public long get_display() { log.finest("");return (Native.getLong(pData+4)); } 5.1191 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1192 +- public long get_resourceid() { log.finest("");return (Native.getLong(pData+8)); } 5.1193 +- public void set_resourceid(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.1194 +- public long get_serial() { log.finest("");return (Native.getLong(pData+12)); } 5.1195 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1196 +- public byte get_error_code() { log.finest("");return (Native.getByte(pData+16)); } 5.1197 +- public void set_error_code(byte v) { log.finest(""); Native.putByte(pData+16, v); } 5.1198 +- public byte get_request_code() { log.finest("");return (Native.getByte(pData+17)); } 5.1199 +- public void set_request_code(byte v) { log.finest(""); Native.putByte(pData+17, v); } 5.1200 +- public byte get_minor_code() { log.finest("");return (Native.getByte(pData+18)); } 5.1201 +- public void set_minor_code(byte v) { log.finest(""); Native.putByte(pData+18, v); } 5.1202 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1203 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1204 ++ public long get_resourceid() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1205 ++ public void set_resourceid(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1206 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1207 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1208 ++ public byte get_error_code() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1209 ++ public void set_error_code(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1210 ++ public byte get_request_code() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(17):(33)))); } 5.1211 ++ public void set_request_code(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(17):(33)), v); } 5.1212 ++ public byte get_minor_code() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(18):(34)))); } 5.1213 ++ public void set_minor_code(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(18):(34)), v); } 5.1214 + 5.1215 + 5.1216 + String getName() { 5.1217 +diff -r ca3a8b43a54b generated/sun/awt/X11/XEvent.java 5.1218 +--- a/generated/sun/awt/X11/XEvent.java Tue May 27 21:14:08 2008 +0100 5.1219 ++++ b/generated/sun/awt/X11/XEvent.java Tue May 27 21:15:32 2008 +0100 5.1220 +@@ -8,7 +8,7 @@ public class XEvent extends XWrapperBase 5.1221 + public class XEvent extends XWrapperBase { 5.1222 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1223 + private final boolean should_free_memory; 5.1224 +- public static int getSize() { return 96; } 5.1225 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(96):(192)); } 5.1226 + public int getDataSize() { return getSize(); } 5.1227 + 5.1228 + long pData; 5.1229 +diff -r ca3a8b43a54b generated/sun/awt/X11/XExposeEvent.java 5.1230 +--- a/generated/sun/awt/X11/XExposeEvent.java Tue May 27 21:14:08 2008 +0100 5.1231 ++++ b/generated/sun/awt/X11/XExposeEvent.java Tue May 27 21:15:32 2008 +0100 5.1232 +@@ -8,7 +8,7 @@ public class XExposeEvent extends XWrapp 5.1233 + public class XExposeEvent extends XWrapperBase { 5.1234 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1235 + private final boolean should_free_memory; 5.1236 +- public static int getSize() { return 40; } 5.1237 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(40):(64)); } 5.1238 + public int getDataSize() { return getSize(); } 5.1239 + 5.1240 + long pData; 5.1241 +@@ -39,24 +39,24 @@ public class XExposeEvent extends XWrapp 5.1242 + } 5.1243 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1244 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1245 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1246 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1247 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1248 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1249 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1250 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1251 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.1252 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1253 +- public int get_x() { log.finest("");return (Native.getInt(pData+20)); } 5.1254 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.1255 +- public int get_y() { log.finest("");return (Native.getInt(pData+24)); } 5.1256 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1257 +- public int get_width() { log.finest("");return (Native.getInt(pData+28)); } 5.1258 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.1259 +- public int get_height() { log.finest("");return (Native.getInt(pData+32)); } 5.1260 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.1261 +- public int get_count() { log.finest("");return (Native.getInt(pData+36)); } 5.1262 +- public void set_count(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.1263 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1264 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1265 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1266 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1267 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1268 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1269 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1270 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1271 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1272 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1273 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)))); } 5.1274 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)), v); } 5.1275 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(48)))); } 5.1276 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(48)), v); } 5.1277 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(52)))); } 5.1278 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(52)), v); } 5.1279 ++ public int get_count() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(56)))); } 5.1280 ++ public void set_count(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(56)), v); } 5.1281 + 5.1282 + 5.1283 + String getName() { 5.1284 +diff -r ca3a8b43a54b generated/sun/awt/X11/XExtData.java 5.1285 +--- a/generated/sun/awt/X11/XExtData.java Tue May 27 21:14:08 2008 +0100 5.1286 ++++ b/generated/sun/awt/X11/XExtData.java Tue May 27 21:15:32 2008 +0100 5.1287 +@@ -8,7 +8,7 @@ public class XExtData extends XWrapperBa 5.1288 + public class XExtData extends XWrapperBase { 5.1289 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1290 + private final boolean should_free_memory; 5.1291 +- public static int getSize() { return 16; } 5.1292 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(32)); } 5.1293 + public int getDataSize() { return getSize(); } 5.1294 + 5.1295 + long pData; 5.1296 +@@ -39,15 +39,15 @@ public class XExtData extends XWrapperBa 5.1297 + } 5.1298 + public int get_number() { log.finest("");return (Native.getInt(pData+0)); } 5.1299 + public void set_number(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1300 +- public XExtData get_next(int index) { log.finest(""); return (Native.getLong(pData+4) != 0)?(new XExtData(Native.getLong(pData+4)+index*16)):(null); } 5.1301 +- public long get_next() { log.finest("");return Native.getLong(pData+4); } 5.1302 +- public void set_next(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1303 +- public long get_free_private(int index) { log.finest(""); return Native.getLong(pData+8)+index*Native.getLongSize(); } 5.1304 +- public long get_free_private() { log.finest("");return Native.getLong(pData+8); } 5.1305 +- public void set_free_private(long v) { log.finest(""); Native.putLong(pData + 8, v); } 5.1306 +- public long get_private_data(int index) { log.finest(""); return Native.getLong(pData+12)+index*Native.getLongSize(); } 5.1307 +- public long get_private_data() { log.finest("");return Native.getLong(pData+12); } 5.1308 +- public void set_private_data(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.1309 ++ public XExtData get_next(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))) != 0)?(new XExtData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.1310 ++ public long get_next() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1311 ++ public void set_next(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1312 ++ public long get_free_private(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))+index*Native.getLongSize(); } 5.1313 ++ public long get_free_private() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16))); } 5.1314 ++ public void set_free_private(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1315 ++ public long get_private_data(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))+index*Native.getLongSize(); } 5.1316 ++ public long get_private_data() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24))); } 5.1317 ++ public void set_private_data(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1318 + 5.1319 + 5.1320 + String getName() { 5.1321 +diff -r ca3a8b43a54b generated/sun/awt/X11/XFocusChangeEvent.java 5.1322 +--- a/generated/sun/awt/X11/XFocusChangeEvent.java Tue May 27 21:14:08 2008 +0100 5.1323 ++++ b/generated/sun/awt/X11/XFocusChangeEvent.java Tue May 27 21:15:32 2008 +0100 5.1324 +@@ -8,7 +8,7 @@ public class XFocusChangeEvent extends X 5.1325 + public class XFocusChangeEvent extends XWrapperBase { 5.1326 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1327 + private final boolean should_free_memory; 5.1328 +- public static int getSize() { return 28; } 5.1329 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(48)); } 5.1330 + public int getDataSize() { return getSize(); } 5.1331 + 5.1332 + long pData; 5.1333 +@@ -39,18 +39,18 @@ public class XFocusChangeEvent extends X 5.1334 + } 5.1335 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1336 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1337 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1338 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1339 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1340 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1341 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1342 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1343 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.1344 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1345 +- public int get_mode() { log.finest("");return (Native.getInt(pData+20)); } 5.1346 +- public void set_mode(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.1347 +- public int get_detail() { log.finest("");return (Native.getInt(pData+24)); } 5.1348 +- public void set_detail(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1349 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1350 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1351 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1352 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1353 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1354 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1355 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1356 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1357 ++ public int get_mode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1358 ++ public void set_mode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1359 ++ public int get_detail() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)))); } 5.1360 ++ public void set_detail(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)), v); } 5.1361 + 5.1362 + 5.1363 + String getName() { 5.1364 +diff -r ca3a8b43a54b generated/sun/awt/X11/XFontProp.java 5.1365 +--- a/generated/sun/awt/X11/XFontProp.java Tue May 27 21:14:08 2008 +0100 5.1366 ++++ b/generated/sun/awt/X11/XFontProp.java Tue May 27 21:15:32 2008 +0100 5.1367 +@@ -8,7 +8,7 @@ public class XFontProp extends XWrapperB 5.1368 + public class XFontProp extends XWrapperBase { 5.1369 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1370 + private final boolean should_free_memory; 5.1371 +- public static int getSize() { return 8; } 5.1372 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.1373 + public int getDataSize() { return getSize(); } 5.1374 + 5.1375 + long pData; 5.1376 +@@ -39,8 +39,8 @@ public class XFontProp extends XWrapperB 5.1377 + } 5.1378 + public long get_name() { log.finest("");return (Native.getLong(pData+0)); } 5.1379 + public void set_name(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.1380 +- public long get_card32() { log.finest("");return (Native.getLong(pData+4)); } 5.1381 +- public void set_card32(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1382 ++ public long get_card32() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1383 ++ public void set_card32(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1384 + 5.1385 + 5.1386 + String getName() { 5.1387 +diff -r ca3a8b43a54b generated/sun/awt/X11/XFontStruct.java 5.1388 +--- a/generated/sun/awt/X11/XFontStruct.java Tue May 27 21:14:08 2008 +0100 5.1389 ++++ b/generated/sun/awt/X11/XFontStruct.java Tue May 27 21:15:32 2008 +0100 5.1390 +@@ -8,7 +8,7 @@ public class XFontStruct extends XWrappe 5.1391 + public class XFontStruct extends XWrapperBase { 5.1392 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1393 + private final boolean should_free_memory; 5.1394 +- public static int getSize() { return 80; } 5.1395 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(80):(96)); } 5.1396 + public int getDataSize() { return getSize(); } 5.1397 + 5.1398 + long pData; 5.1399 +@@ -37,37 +37,37 @@ public class XFontStruct extends XWrappe 5.1400 + unsafe.freeMemory(pData); 5.1401 + } 5.1402 + } 5.1403 +- public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*16)):(null); } 5.1404 ++ public XExtData get_ext_data(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XExtData(Native.getLong(pData+0)+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.1405 + public long get_ext_data() { log.finest("");return Native.getLong(pData+0); } 5.1406 + public void set_ext_data(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.1407 +- public long get_fid() { log.finest("");return (Native.getLong(pData+4)); } 5.1408 +- public void set_fid(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1409 +- public int get_direction() { log.finest("");return (Native.getInt(pData+8)); } 5.1410 +- public void set_direction(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.1411 +- public int get_min_char_or_byte2() { log.finest("");return (Native.getInt(pData+12)); } 5.1412 +- public void set_min_char_or_byte2(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.1413 +- public int get_max_char_or_byte2() { log.finest("");return (Native.getInt(pData+16)); } 5.1414 +- public void set_max_char_or_byte2(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.1415 +- public int get_min_byte1() { log.finest("");return (Native.getInt(pData+20)); } 5.1416 +- public void set_min_byte1(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.1417 +- public int get_max_byte1() { log.finest("");return (Native.getInt(pData+24)); } 5.1418 +- public void set_max_byte1(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1419 +- public boolean get_all_chars_exist() { log.finest("");return (Native.getBool(pData+28)); } 5.1420 +- public void set_all_chars_exist(boolean v) { log.finest(""); Native.putBool(pData+28, v); } 5.1421 +- public int get_n_properties() { log.finest("");return (Native.getInt(pData+36)); } 5.1422 +- public void set_n_properties(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.1423 +- public XFontProp get_properties(int index) { log.finest(""); return (Native.getLong(pData+40) != 0)?(new XFontProp(Native.getLong(pData+40)+index*8)):(null); } 5.1424 +- public long get_properties() { log.finest("");return Native.getLong(pData+40); } 5.1425 +- public void set_properties(long v) { log.finest(""); Native.putLong(pData + 40, v); } 5.1426 +- public XCharStruct get_min_bounds() { log.finest("");return new XCharStruct(pData + 44); } 5.1427 +- public XCharStruct get_max_bounds() { log.finest("");return new XCharStruct(pData + 56); } 5.1428 +- public XCharStruct get_per_char(int index) { log.finest(""); return (Native.getLong(pData+68) != 0)?(new XCharStruct(Native.getLong(pData+68)+index*12)):(null); } 5.1429 +- public long get_per_char() { log.finest("");return Native.getLong(pData+68); } 5.1430 +- public void set_per_char(long v) { log.finest(""); Native.putLong(pData + 68, v); } 5.1431 +- public int get_ascent() { log.finest("");return (Native.getInt(pData+72)); } 5.1432 +- public void set_ascent(int v) { log.finest(""); Native.putInt(pData+72, v); } 5.1433 +- public int get_descent() { log.finest("");return (Native.getInt(pData+76)); } 5.1434 +- public void set_descent(int v) { log.finest(""); Native.putInt(pData+76, v); } 5.1435 ++ public long get_fid() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1436 ++ public void set_fid(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1437 ++ public int get_direction() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1438 ++ public void set_direction(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1439 ++ public int get_min_char_or_byte2() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(12):(20)))); } 5.1440 ++ public void set_min_char_or_byte2(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(12):(20)), v); } 5.1441 ++ public int get_max_char_or_byte2() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(16):(24)))); } 5.1442 ++ public void set_max_char_or_byte2(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(16):(24)), v); } 5.1443 ++ public int get_min_byte1() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(28)))); } 5.1444 ++ public void set_min_byte1(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(28)), v); } 5.1445 ++ public int get_max_byte1() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(32)))); } 5.1446 ++ public void set_max_byte1(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(32)), v); } 5.1447 ++ public boolean get_all_chars_exist() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(28):(36)))); } 5.1448 ++ public void set_all_chars_exist(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(28):(36)), v); } 5.1449 ++ public int get_n_properties() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(44)))); } 5.1450 ++ public void set_n_properties(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(44)), v); } 5.1451 ++ public XFontProp get_properties(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(48))) != 0)?(new XFontProp(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(48)))+index*((XlibWrapper.dataModel == 32)?(8):(16)))):(null); } 5.1452 ++ public long get_properties() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(48))); } 5.1453 ++ public void set_properties(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(40):(48)), v); } 5.1454 ++ public XCharStruct get_min_bounds() { log.finest("");return new XCharStruct(pData + ((XlibWrapper.dataModel == 32)?(44):(56))); } 5.1455 ++ public XCharStruct get_max_bounds() { log.finest("");return new XCharStruct(pData + ((XlibWrapper.dataModel == 32)?(56):(68))); } 5.1456 ++ public XCharStruct get_per_char(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(68):(80))) != 0)?(new XCharStruct(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(68):(80)))+index*12)):(null); } 5.1457 ++ public long get_per_char() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(68):(80))); } 5.1458 ++ public void set_per_char(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(68):(80)), v); } 5.1459 ++ public int get_ascent() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(72):(88)))); } 5.1460 ++ public void set_ascent(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(72):(88)), v); } 5.1461 ++ public int get_descent() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(76):(92)))); } 5.1462 ++ public void set_descent(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(76):(92)), v); } 5.1463 + 5.1464 + 5.1465 + String getName() { 5.1466 +diff -r ca3a8b43a54b generated/sun/awt/X11/XGCValues.java 5.1467 +--- a/generated/sun/awt/X11/XGCValues.java Tue May 27 21:14:08 2008 +0100 5.1468 ++++ b/generated/sun/awt/X11/XGCValues.java Tue May 27 21:15:32 2008 +0100 5.1469 +@@ -8,7 +8,7 @@ public class XGCValues extends XWrapperB 5.1470 + public class XGCValues extends XWrapperBase { 5.1471 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1472 + private final boolean should_free_memory; 5.1473 +- public static int getSize() { return 92; } 5.1474 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(92):(128)); } 5.1475 + public int getDataSize() { return getSize(); } 5.1476 + 5.1477 + long pData; 5.1478 +@@ -39,50 +39,50 @@ public class XGCValues extends XWrapperB 5.1479 + } 5.1480 + public int get_function() { log.finest("");return (Native.getInt(pData+0)); } 5.1481 + public void set_function(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1482 +- public long get_plane_mask() { log.finest("");return (Native.getLong(pData+4)); } 5.1483 +- public void set_plane_mask(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1484 +- public long get_foreground() { log.finest("");return (Native.getLong(pData+8)); } 5.1485 +- public void set_foreground(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.1486 +- public long get_background() { log.finest("");return (Native.getLong(pData+12)); } 5.1487 +- public void set_background(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1488 +- public int get_line_width() { log.finest("");return (Native.getInt(pData+16)); } 5.1489 +- public void set_line_width(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.1490 +- public int get_line_style() { log.finest("");return (Native.getInt(pData+20)); } 5.1491 +- public void set_line_style(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.1492 +- public int get_cap_style() { log.finest("");return (Native.getInt(pData+24)); } 5.1493 +- public void set_cap_style(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1494 +- public int get_join_style() { log.finest("");return (Native.getInt(pData+28)); } 5.1495 +- public void set_join_style(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.1496 +- public int get_fill_style() { log.finest("");return (Native.getInt(pData+32)); } 5.1497 +- public void set_fill_style(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.1498 +- public int get_fill_rule() { log.finest("");return (Native.getInt(pData+36)); } 5.1499 +- public void set_fill_rule(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.1500 +- public int get_arc_mode() { log.finest("");return (Native.getInt(pData+40)); } 5.1501 +- public void set_arc_mode(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.1502 +- public long get_tile() { log.finest("");return (Native.getLong(pData+44)); } 5.1503 +- public void set_tile(long v) { log.finest(""); Native.putLong(pData+44, v); } 5.1504 +- public long get_stipple() { log.finest("");return (Native.getLong(pData+48)); } 5.1505 +- public void set_stipple(long v) { log.finest(""); Native.putLong(pData+48, v); } 5.1506 +- public int get_ts_x_origin() { log.finest("");return (Native.getInt(pData+52)); } 5.1507 +- public void set_ts_x_origin(int v) { log.finest(""); Native.putInt(pData+52, v); } 5.1508 +- public int get_ts_y_origin() { log.finest("");return (Native.getInt(pData+56)); } 5.1509 +- public void set_ts_y_origin(int v) { log.finest(""); Native.putInt(pData+56, v); } 5.1510 +- public long get_font() { log.finest("");return (Native.getLong(pData+60)); } 5.1511 +- public void set_font(long v) { log.finest(""); Native.putLong(pData+60, v); } 5.1512 +- public int get_subwindow_mode() { log.finest("");return (Native.getInt(pData+64)); } 5.1513 +- public void set_subwindow_mode(int v) { log.finest(""); Native.putInt(pData+64, v); } 5.1514 +- public boolean get_graphics_exposures() { log.finest("");return (Native.getBool(pData+68)); } 5.1515 +- public void set_graphics_exposures(boolean v) { log.finest(""); Native.putBool(pData+68, v); } 5.1516 +- public int get_clip_x_origin() { log.finest("");return (Native.getInt(pData+72)); } 5.1517 +- public void set_clip_x_origin(int v) { log.finest(""); Native.putInt(pData+72, v); } 5.1518 +- public int get_clip_y_origin() { log.finest("");return (Native.getInt(pData+76)); } 5.1519 +- public void set_clip_y_origin(int v) { log.finest(""); Native.putInt(pData+76, v); } 5.1520 +- public long get_clip_mask() { log.finest("");return (Native.getLong(pData+80)); } 5.1521 +- public void set_clip_mask(long v) { log.finest(""); Native.putLong(pData+80, v); } 5.1522 +- public int get_dash_offset() { log.finest("");return (Native.getInt(pData+84)); } 5.1523 +- public void set_dash_offset(int v) { log.finest(""); Native.putInt(pData+84, v); } 5.1524 +- public byte get_dashes() { log.finest("");return (Native.getByte(pData+88)); } 5.1525 +- public void set_dashes(byte v) { log.finest(""); Native.putByte(pData+88, v); } 5.1526 ++ public long get_plane_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1527 ++ public void set_plane_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1528 ++ public long get_foreground() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1529 ++ public void set_foreground(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1530 ++ public long get_background() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1531 ++ public void set_background(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1532 ++ public int get_line_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1533 ++ public void set_line_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1534 ++ public int get_line_style() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(36)))); } 5.1535 ++ public void set_line_style(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(36)), v); } 5.1536 ++ public int get_cap_style() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(40)))); } 5.1537 ++ public void set_cap_style(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(40)), v); } 5.1538 ++ public int get_join_style() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(44)))); } 5.1539 ++ public void set_join_style(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(44)), v); } 5.1540 ++ public int get_fill_style() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(48)))); } 5.1541 ++ public void set_fill_style(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(48)), v); } 5.1542 ++ public int get_fill_rule() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(52)))); } 5.1543 ++ public void set_fill_rule(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(52)), v); } 5.1544 ++ public int get_arc_mode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(56)))); } 5.1545 ++ public void set_arc_mode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(56)), v); } 5.1546 ++ public long get_tile() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(44):(64)))); } 5.1547 ++ public void set_tile(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(44):(64)), v); } 5.1548 ++ public long get_stipple() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(48):(72)))); } 5.1549 ++ public void set_stipple(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(48):(72)), v); } 5.1550 ++ public int get_ts_x_origin() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(52):(80)))); } 5.1551 ++ public void set_ts_x_origin(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(52):(80)), v); } 5.1552 ++ public int get_ts_y_origin() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(56):(84)))); } 5.1553 ++ public void set_ts_y_origin(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(56):(84)), v); } 5.1554 ++ public long get_font() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(88)))); } 5.1555 ++ public void set_font(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(60):(88)), v); } 5.1556 ++ public int get_subwindow_mode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(64):(96)))); } 5.1557 ++ public void set_subwindow_mode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(64):(96)), v); } 5.1558 ++ public boolean get_graphics_exposures() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(68):(100)))); } 5.1559 ++ public void set_graphics_exposures(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(68):(100)), v); } 5.1560 ++ public int get_clip_x_origin() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(72):(104)))); } 5.1561 ++ public void set_clip_x_origin(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(72):(104)), v); } 5.1562 ++ public int get_clip_y_origin() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(76):(108)))); } 5.1563 ++ public void set_clip_y_origin(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(76):(108)), v); } 5.1564 ++ public long get_clip_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(80):(112)))); } 5.1565 ++ public void set_clip_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(80):(112)), v); } 5.1566 ++ public int get_dash_offset() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(84):(120)))); } 5.1567 ++ public void set_dash_offset(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(84):(120)), v); } 5.1568 ++ public byte get_dashes() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(88):(124)))); } 5.1569 ++ public void set_dashes(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(88):(124)), v); } 5.1570 + 5.1571 + 5.1572 + String getName() { 5.1573 +diff -r ca3a8b43a54b generated/sun/awt/X11/XGraphicsExposeEvent.java 5.1574 +--- a/generated/sun/awt/X11/XGraphicsExposeEvent.java Tue May 27 21:14:08 2008 +0100 5.1575 ++++ b/generated/sun/awt/X11/XGraphicsExposeEvent.java Tue May 27 21:15:32 2008 +0100 5.1576 +@@ -8,7 +8,7 @@ public class XGraphicsExposeEvent extend 5.1577 + public class XGraphicsExposeEvent extends XWrapperBase { 5.1578 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1579 + private final boolean should_free_memory; 5.1580 +- public static int getSize() { return 48; } 5.1581 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(48):(72)); } 5.1582 + public int getDataSize() { return getSize(); } 5.1583 + 5.1584 + long pData; 5.1585 +@@ -39,28 +39,28 @@ public class XGraphicsExposeEvent extend 5.1586 + } 5.1587 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1588 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1589 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1590 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1591 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1592 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1593 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1594 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1595 +- public long get_drawable() { log.finest("");return (Native.getLong(pData+16)); } 5.1596 +- public void set_drawable(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1597 +- public int get_x() { log.finest("");return (Native.getInt(pData+20)); } 5.1598 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.1599 +- public int get_y() { log.finest("");return (Native.getInt(pData+24)); } 5.1600 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1601 +- public int get_width() { log.finest("");return (Native.getInt(pData+28)); } 5.1602 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.1603 +- public int get_height() { log.finest("");return (Native.getInt(pData+32)); } 5.1604 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.1605 +- public int get_count() { log.finest("");return (Native.getInt(pData+36)); } 5.1606 +- public void set_count(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.1607 +- public int get_major_code() { log.finest("");return (Native.getInt(pData+40)); } 5.1608 +- public void set_major_code(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.1609 +- public int get_minor_code() { log.finest("");return (Native.getInt(pData+44)); } 5.1610 +- public void set_minor_code(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.1611 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1612 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1613 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1614 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1615 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1616 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1617 ++ public long get_drawable() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1618 ++ public void set_drawable(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1619 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1620 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1621 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)))); } 5.1622 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)), v); } 5.1623 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(48)))); } 5.1624 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(48)), v); } 5.1625 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(52)))); } 5.1626 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(52)), v); } 5.1627 ++ public int get_count() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(56)))); } 5.1628 ++ public void set_count(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(56)), v); } 5.1629 ++ public int get_major_code() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(60)))); } 5.1630 ++ public void set_major_code(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(60)), v); } 5.1631 ++ public int get_minor_code() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(64)))); } 5.1632 ++ public void set_minor_code(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(64)), v); } 5.1633 + 5.1634 + 5.1635 + String getName() { 5.1636 +diff -r ca3a8b43a54b generated/sun/awt/X11/XGravityEvent.java 5.1637 +--- a/generated/sun/awt/X11/XGravityEvent.java Tue May 27 21:14:08 2008 +0100 5.1638 ++++ b/generated/sun/awt/X11/XGravityEvent.java Tue May 27 21:15:32 2008 +0100 5.1639 +@@ -8,7 +8,7 @@ public class XGravityEvent extends XWrap 5.1640 + public class XGravityEvent extends XWrapperBase { 5.1641 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1642 + private final boolean should_free_memory; 5.1643 +- public static int getSize() { return 32; } 5.1644 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(32):(56)); } 5.1645 + public int getDataSize() { return getSize(); } 5.1646 + 5.1647 + long pData; 5.1648 +@@ -39,20 +39,20 @@ public class XGravityEvent extends XWrap 5.1649 + } 5.1650 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1651 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1652 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.1653 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1654 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.1655 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1656 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.1657 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.1658 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.1659 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.1660 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.1661 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.1662 +- public int get_x() { log.finest("");return (Native.getInt(pData+24)); } 5.1663 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1664 +- public int get_y() { log.finest("");return (Native.getInt(pData+28)); } 5.1665 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.1666 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1667 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1668 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1669 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1670 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.1671 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1672 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.1673 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.1674 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.1675 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.1676 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.1677 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.1678 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)))); } 5.1679 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(52)), v); } 5.1680 + 5.1681 + 5.1682 + String getName() { 5.1683 +diff -r ca3a8b43a54b generated/sun/awt/X11/XHostAddress.java 5.1684 +--- a/generated/sun/awt/X11/XHostAddress.java Tue May 27 21:14:08 2008 +0100 5.1685 ++++ b/generated/sun/awt/X11/XHostAddress.java Tue May 27 21:15:32 2008 +0100 5.1686 +@@ -8,7 +8,7 @@ public class XHostAddress extends XWrapp 5.1687 + public class XHostAddress extends XWrapperBase { 5.1688 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1689 + private final boolean should_free_memory; 5.1690 +- public static int getSize() { return 12; } 5.1691 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(12):(16)); } 5.1692 + public int getDataSize() { return getSize(); } 5.1693 + 5.1694 + long pData; 5.1695 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMCallback.java 5.1696 +--- a/generated/sun/awt/X11/XIMCallback.java Tue May 27 21:14:08 2008 +0100 5.1697 ++++ b/generated/sun/awt/X11/XIMCallback.java Tue May 27 21:15:32 2008 +0100 5.1698 +@@ -8,7 +8,7 @@ public class XIMCallback extends XWrappe 5.1699 + public class XIMCallback extends XWrapperBase { 5.1700 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1701 + private final boolean should_free_memory; 5.1702 +- public static int getSize() { return 8; } 5.1703 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.1704 + public int getDataSize() { return getSize(); } 5.1705 + 5.1706 + long pData; 5.1707 +@@ -40,9 +40,9 @@ public class XIMCallback extends XWrappe 5.1708 + public long get_client_data(int index) { log.finest(""); return Native.getLong(pData+0)+index*Native.getLongSize(); } 5.1709 + public long get_client_data() { log.finest("");return Native.getLong(pData+0); } 5.1710 + public void set_client_data(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.1711 +- public long get_callback(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.1712 +- public long get_callback() { log.finest("");return Native.getLong(pData+4); } 5.1713 +- public void set_callback(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1714 ++ public long get_callback(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.1715 ++ public long get_callback() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1716 ++ public void set_callback(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1717 + 5.1718 + 5.1719 + String getName() { 5.1720 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMHotKeyTrigger.java 5.1721 +--- a/generated/sun/awt/X11/XIMHotKeyTrigger.java Tue May 27 21:14:08 2008 +0100 5.1722 ++++ b/generated/sun/awt/X11/XIMHotKeyTrigger.java Tue May 27 21:15:32 2008 +0100 5.1723 +@@ -8,7 +8,7 @@ public class XIMHotKeyTrigger extends XW 5.1724 + public class XIMHotKeyTrigger extends XWrapperBase { 5.1725 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1726 + private final boolean should_free_memory; 5.1727 +- public static int getSize() { return 12; } 5.1728 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(12):(16)); } 5.1729 + public int getDataSize() { return getSize(); } 5.1730 + 5.1731 + long pData; 5.1732 +@@ -39,10 +39,10 @@ public class XIMHotKeyTrigger extends XW 5.1733 + } 5.1734 + public long get_keysym() { log.finest("");return (Native.getLong(pData+0)); } 5.1735 + public void set_keysym(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.1736 +- public int get_modifier() { log.finest("");return (Native.getInt(pData+4)); } 5.1737 +- public void set_modifier(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.1738 +- public int get_modifier_mask() { log.finest("");return (Native.getInt(pData+8)); } 5.1739 +- public void set_modifier_mask(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.1740 ++ public int get_modifier() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1741 ++ public void set_modifier(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1742 ++ public int get_modifier_mask() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.1743 ++ public void set_modifier_mask(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.1744 + 5.1745 + 5.1746 + String getName() { 5.1747 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMHotKeyTriggers.java 5.1748 +--- a/generated/sun/awt/X11/XIMHotKeyTriggers.java Tue May 27 21:14:08 2008 +0100 5.1749 ++++ b/generated/sun/awt/X11/XIMHotKeyTriggers.java Tue May 27 21:15:32 2008 +0100 5.1750 +@@ -8,7 +8,7 @@ public class XIMHotKeyTriggers extends X 5.1751 + public class XIMHotKeyTriggers extends XWrapperBase { 5.1752 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1753 + private final boolean should_free_memory; 5.1754 +- public static int getSize() { return 8; } 5.1755 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.1756 + public int getDataSize() { return getSize(); } 5.1757 + 5.1758 + long pData; 5.1759 +@@ -39,9 +39,9 @@ public class XIMHotKeyTriggers extends X 5.1760 + } 5.1761 + public int get_num_hot_key() { log.finest("");return (Native.getInt(pData+0)); } 5.1762 + public void set_num_hot_key(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1763 +- public XIMHotKeyTrigger get_key(int index) { log.finest(""); return (Native.getLong(pData+4) != 0)?(new XIMHotKeyTrigger(Native.getLong(pData+4)+index*12)):(null); } 5.1764 +- public long get_key() { log.finest("");return Native.getLong(pData+4); } 5.1765 +- public void set_key(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1766 ++ public XIMHotKeyTrigger get_key(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))) != 0)?(new XIMHotKeyTrigger(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*((XlibWrapper.dataModel == 32)?(12):(16)))):(null); } 5.1767 ++ public long get_key() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1768 ++ public void set_key(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1769 + 5.1770 + 5.1771 + String getName() { 5.1772 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMPreeditDrawCallbackStruct.java 5.1773 +--- a/generated/sun/awt/X11/XIMPreeditDrawCallbackStruct.java Tue May 27 21:14:08 2008 +0100 5.1774 ++++ b/generated/sun/awt/X11/XIMPreeditDrawCallbackStruct.java Tue May 27 21:15:32 2008 +0100 5.1775 +@@ -8,7 +8,7 @@ public class XIMPreeditDrawCallbackStruc 5.1776 + public class XIMPreeditDrawCallbackStruct extends XWrapperBase { 5.1777 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1778 + private final boolean should_free_memory; 5.1779 +- public static int getSize() { return 16; } 5.1780 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.1781 + public int getDataSize() { return getSize(); } 5.1782 + 5.1783 + long pData; 5.1784 +@@ -43,9 +43,9 @@ public class XIMPreeditDrawCallbackStruc 5.1785 + public void set_chg_first(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.1786 + public int get_chg_length() { log.finest("");return (Native.getInt(pData+8)); } 5.1787 + public void set_chg_length(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.1788 +- public XIMText get_text(int index) { log.finest(""); return (Native.getLong(pData+12) != 0)?(new XIMText(Native.getLong(pData+12)+index*16)):(null); } 5.1789 +- public long get_text() { log.finest("");return Native.getLong(pData+12); } 5.1790 +- public void set_text(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.1791 ++ public XIMText get_text(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))) != 0)?(new XIMText(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.1792 ++ public long get_text() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))); } 5.1793 ++ public void set_text(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.1794 + 5.1795 + 5.1796 + String getName() { 5.1797 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java 5.1798 +--- a/generated/sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java Tue May 27 21:14:08 2008 +0100 5.1799 ++++ b/generated/sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java Tue May 27 21:15:32 2008 +0100 5.1800 +@@ -8,7 +8,7 @@ public class XIMPreeditStateNotifyCallba 5.1801 + public class XIMPreeditStateNotifyCallbackStruct extends XWrapperBase { 5.1802 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1803 + private final boolean should_free_memory; 5.1804 +- public static int getSize() { return 4; } 5.1805 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(4):(8)); } 5.1806 + public int getDataSize() { return getSize(); } 5.1807 + 5.1808 + long pData; 5.1809 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java 5.1810 +--- a/generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java Tue May 27 21:14:08 2008 +0100 5.1811 ++++ b/generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java Tue May 27 21:15:32 2008 +0100 5.1812 +@@ -8,7 +8,7 @@ public class XIMStatusDrawCallbackStruct 5.1813 + public class XIMStatusDrawCallbackStruct extends XWrapperBase { 5.1814 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1815 + private final boolean should_free_memory; 5.1816 +- public static int getSize() { return 8; } 5.1817 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.1818 + public int getDataSize() { return getSize(); } 5.1819 + 5.1820 + long pData; 5.1821 +@@ -39,8 +39,8 @@ public class XIMStatusDrawCallbackStruct 5.1822 + } 5.1823 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.1824 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.1825 +- public long get_data() { log.finest("");return (Native.getLong(pData+4)); } 5.1826 +- public void set_data(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.1827 ++ public long get_data() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.1828 ++ public void set_data(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1829 + 5.1830 + 5.1831 + String getName() { 5.1832 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMStringConversionCallbackStruct.java 5.1833 +--- a/generated/sun/awt/X11/XIMStringConversionCallbackStruct.java Tue May 27 21:14:08 2008 +0100 5.1834 ++++ b/generated/sun/awt/X11/XIMStringConversionCallbackStruct.java Tue May 27 21:15:32 2008 +0100 5.1835 +@@ -8,7 +8,7 @@ public class XIMStringConversionCallback 5.1836 + public class XIMStringConversionCallbackStruct extends XWrapperBase { 5.1837 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1838 + private final boolean should_free_memory; 5.1839 +- public static int getSize() { return 16; } 5.1840 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.1841 + public int getDataSize() { return getSize(); } 5.1842 + 5.1843 + long pData; 5.1844 +@@ -45,9 +45,9 @@ public class XIMStringConversionCallback 5.1845 + public void set_operation(short v) { log.finest(""); Native.putShort(pData+8, v); } 5.1846 + public short get_factor() { log.finest("");return (Native.getShort(pData+10)); } 5.1847 + public void set_factor(short v) { log.finest(""); Native.putShort(pData+10, v); } 5.1848 +- public XIMStringConversionText get_text(int index) { log.finest(""); return (Native.getLong(pData+12) != 0)?(new XIMStringConversionText(Native.getLong(pData+12)+index*16)):(null); } 5.1849 +- public long get_text() { log.finest("");return Native.getLong(pData+12); } 5.1850 +- public void set_text(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.1851 ++ public XIMStringConversionText get_text(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))) != 0)?(new XIMStringConversionText(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))+index*((XlibWrapper.dataModel == 32)?(16):(32)))):(null); } 5.1852 ++ public long get_text() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))); } 5.1853 ++ public void set_text(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.1854 + 5.1855 + 5.1856 + String getName() { 5.1857 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMStringConversionText.java 5.1858 +--- a/generated/sun/awt/X11/XIMStringConversionText.java Tue May 27 21:14:08 2008 +0100 5.1859 ++++ b/generated/sun/awt/X11/XIMStringConversionText.java Tue May 27 21:15:32 2008 +0100 5.1860 +@@ -8,7 +8,7 @@ public class XIMStringConversionText ext 5.1861 + public class XIMStringConversionText extends XWrapperBase { 5.1862 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1863 + private final boolean should_free_memory; 5.1864 +- public static int getSize() { return 16; } 5.1865 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(32)); } 5.1866 + public int getDataSize() { return getSize(); } 5.1867 + 5.1868 + long pData; 5.1869 +@@ -39,14 +39,14 @@ public class XIMStringConversionText ext 5.1870 + } 5.1871 + public short get_length() { log.finest("");return (Native.getShort(pData+0)); } 5.1872 + public void set_length(short v) { log.finest(""); Native.putShort(pData+0, v); } 5.1873 +- public long get_feedback(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.1874 +- public long get_feedback() { log.finest("");return Native.getLong(pData+4); } 5.1875 +- public void set_feedback(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1876 +- public boolean get_encoding_is_wchar() { log.finest("");return (Native.getBool(pData+8)); } 5.1877 +- public void set_encoding_is_wchar(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1878 +- public long get_string(int index) { log.finest(""); return Native.getLong(pData+12)+index*Native.getLongSize(); } 5.1879 +- public long get_string() { log.finest("");return Native.getLong(pData+12); } 5.1880 +- public void set_string(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.1881 ++ public long get_feedback(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.1882 ++ public long get_feedback() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1883 ++ public void set_feedback(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1884 ++ public boolean get_encoding_is_wchar() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1885 ++ public void set_encoding_is_wchar(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1886 ++ public long get_string(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))+index*Native.getLongSize(); } 5.1887 ++ public long get_string() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24))); } 5.1888 ++ public void set_string(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1889 + 5.1890 + 5.1891 + String getName() { 5.1892 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMStyles.java 5.1893 +--- a/generated/sun/awt/X11/XIMStyles.java Tue May 27 21:14:08 2008 +0100 5.1894 ++++ b/generated/sun/awt/X11/XIMStyles.java Tue May 27 21:15:32 2008 +0100 5.1895 +@@ -8,7 +8,7 @@ public class XIMStyles extends XWrapperB 5.1896 + public class XIMStyles extends XWrapperBase { 5.1897 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1898 + private final boolean should_free_memory; 5.1899 +- public static int getSize() { return 8; } 5.1900 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.1901 + public int getDataSize() { return getSize(); } 5.1902 + 5.1903 + long pData; 5.1904 +@@ -39,9 +39,9 @@ public class XIMStyles extends XWrapperB 5.1905 + } 5.1906 + public short get_count_styles() { log.finest("");return (Native.getShort(pData+0)); } 5.1907 + public void set_count_styles(short v) { log.finest(""); Native.putShort(pData+0, v); } 5.1908 +- public long get_supported_styles(int index) { log.finest(""); return Native.getLong(Native.getLong(pData+4)+index*Native.getLongSize()); } 5.1909 +- public long get_supported_styles() { log.finest("");return Native.getLong(pData+4); } 5.1910 +- public void set_supported_styles(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1911 ++ public long get_supported_styles(int index) { log.finest(""); return Native.getLong(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize()); } 5.1912 ++ public long get_supported_styles() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1913 ++ public void set_supported_styles(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1914 + 5.1915 + 5.1916 + String getName() { 5.1917 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMText.java 5.1918 +--- a/generated/sun/awt/X11/XIMText.java Tue May 27 21:14:08 2008 +0100 5.1919 ++++ b/generated/sun/awt/X11/XIMText.java Tue May 27 21:15:32 2008 +0100 5.1920 +@@ -8,7 +8,7 @@ public class XIMText extends XWrapperBas 5.1921 + public class XIMText extends XWrapperBase { 5.1922 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1923 + private final boolean should_free_memory; 5.1924 +- public static int getSize() { return 16; } 5.1925 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(32)); } 5.1926 + public int getDataSize() { return getSize(); } 5.1927 + 5.1928 + long pData; 5.1929 +@@ -39,14 +39,14 @@ public class XIMText extends XWrapperBas 5.1930 + } 5.1931 + public short get_length() { log.finest("");return (Native.getShort(pData+0)); } 5.1932 + public void set_length(short v) { log.finest(""); Native.putShort(pData+0, v); } 5.1933 +- public long get_feedback(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.1934 +- public long get_feedback() { log.finest("");return Native.getLong(pData+4); } 5.1935 +- public void set_feedback(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1936 +- public boolean get_encoding_is_wchar() { log.finest("");return (Native.getBool(pData+8)); } 5.1937 +- public void set_encoding_is_wchar(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.1938 +- public long get_string(int index) { log.finest(""); return Native.getLong(pData+12)+index*Native.getLongSize(); } 5.1939 +- public long get_string() { log.finest("");return Native.getLong(pData+12); } 5.1940 +- public void set_string(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.1941 ++ public long get_feedback(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.1942 ++ public long get_feedback() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1943 ++ public void set_feedback(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1944 ++ public boolean get_encoding_is_wchar() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.1945 ++ public void set_encoding_is_wchar(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.1946 ++ public long get_string(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))+index*Native.getLongSize(); } 5.1947 ++ public long get_string() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24))); } 5.1948 ++ public void set_string(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.1949 + 5.1950 + 5.1951 + String getName() { 5.1952 +diff -r ca3a8b43a54b generated/sun/awt/X11/XIMValuesList.java 5.1953 +--- a/generated/sun/awt/X11/XIMValuesList.java Tue May 27 21:14:08 2008 +0100 5.1954 ++++ b/generated/sun/awt/X11/XIMValuesList.java Tue May 27 21:15:32 2008 +0100 5.1955 +@@ -8,7 +8,7 @@ public class XIMValuesList extends XWrap 5.1956 + public class XIMValuesList extends XWrapperBase { 5.1957 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1958 + private final boolean should_free_memory; 5.1959 +- public static int getSize() { return 8; } 5.1960 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.1961 + public int getDataSize() { return getSize(); } 5.1962 + 5.1963 + long pData; 5.1964 +@@ -39,9 +39,9 @@ public class XIMValuesList extends XWrap 5.1965 + } 5.1966 + public short get_count_values() { log.finest("");return (Native.getShort(pData+0)); } 5.1967 + public void set_count_values(short v) { log.finest(""); Native.putShort(pData+0, v); } 5.1968 +- public long get_supported_values(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.1969 +- public long get_supported_values() { log.finest("");return Native.getLong(pData+4); } 5.1970 +- public void set_supported_values(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.1971 ++ public long get_supported_values(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.1972 ++ public long get_supported_values() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.1973 ++ public void set_supported_values(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.1974 + 5.1975 + 5.1976 + String getName() { 5.1977 +diff -r ca3a8b43a54b generated/sun/awt/X11/XImage.java 5.1978 +--- a/generated/sun/awt/X11/XImage.java Tue May 27 21:14:08 2008 +0100 5.1979 ++++ b/generated/sun/awt/X11/XImage.java Tue May 27 21:15:32 2008 +0100 5.1980 +@@ -8,7 +8,7 @@ public class XImage extends XWrapperBase 5.1981 + public class XImage extends XWrapperBase { 5.1982 + private Unsafe unsafe = XlibWrapper.unsafe; 5.1983 + private final boolean should_free_memory; 5.1984 +- public static int getSize() { return 88; } 5.1985 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(88):(136)); } 5.1986 + public int getDataSize() { return getSize(); } 5.1987 + 5.1988 + long pData; 5.1989 +@@ -48,47 +48,47 @@ public class XImage extends XWrapperBase 5.1990 + public byte get_data(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+16)+index*1); } 5.1991 + public long get_data() { log.finest("");return Native.getLong(pData+16); } 5.1992 + public void set_data(long v) { log.finest(""); Native.putLong(pData + 16, v); } 5.1993 +- public int get_byte_order() { log.finest("");return (Native.getInt(pData+20)); } 5.1994 +- public void set_byte_order(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.1995 +- public int get_bitmap_unit() { log.finest("");return (Native.getInt(pData+24)); } 5.1996 +- public void set_bitmap_unit(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.1997 +- public int get_bitmap_bit_order() { log.finest("");return (Native.getInt(pData+28)); } 5.1998 +- public void set_bitmap_bit_order(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.1999 +- public int get_bitmap_pad() { log.finest("");return (Native.getInt(pData+32)); } 5.2000 +- public void set_bitmap_pad(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.2001 +- public int get_depth() { log.finest("");return (Native.getInt(pData+36)); } 5.2002 +- public void set_depth(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.2003 +- public int get_bytes_per_line() { log.finest("");return (Native.getInt(pData+40)); } 5.2004 +- public void set_bytes_per_line(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.2005 +- public int get_bits_per_pixel() { log.finest("");return (Native.getInt(pData+44)); } 5.2006 +- public void set_bits_per_pixel(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.2007 +- public long get_red_mask() { log.finest("");return (Native.getLong(pData+48)); } 5.2008 +- public void set_red_mask(long v) { log.finest(""); Native.putLong(pData+48, v); } 5.2009 +- public long get_green_mask() { log.finest("");return (Native.getLong(pData+52)); } 5.2010 +- public void set_green_mask(long v) { log.finest(""); Native.putLong(pData+52, v); } 5.2011 +- public long get_blue_mask() { log.finest("");return (Native.getLong(pData+56)); } 5.2012 +- public void set_blue_mask(long v) { log.finest(""); Native.putLong(pData+56, v); } 5.2013 +- public long get_obdata(int index) { log.finest(""); return Native.getLong(pData+60)+index*Native.getLongSize(); } 5.2014 +- public long get_obdata() { log.finest("");return Native.getLong(pData+60); } 5.2015 +- public void set_obdata(long v) { log.finest(""); Native.putLong(pData + 60, v); } 5.2016 +- public long get_f_create_image(int index) { log.finest(""); return Native.getLong(pData+64)+index*Native.getLongSize(); } 5.2017 +- public long get_f_create_image() { log.finest("");return Native.getLong(pData+64); } 5.2018 +- public void set_f_create_image(long v) { log.finest(""); Native.putLong(pData + 64, v); } 5.2019 +- public long get_f_destroy_image(int index) { log.finest(""); return Native.getLong(pData+68)+index*Native.getLongSize(); } 5.2020 +- public long get_f_destroy_image() { log.finest("");return Native.getLong(pData+68); } 5.2021 +- public void set_f_destroy_image(long v) { log.finest(""); Native.putLong(pData + 68, v); } 5.2022 +- public long get_f_get_pixel(int index) { log.finest(""); return Native.getLong(pData+72)+index*Native.getLongSize(); } 5.2023 +- public long get_f_get_pixel() { log.finest("");return Native.getLong(pData+72); } 5.2024 +- public void set_f_get_pixel(long v) { log.finest(""); Native.putLong(pData + 72, v); } 5.2025 +- public long get_f_put_pixel(int index) { log.finest(""); return Native.getLong(pData+76)+index*Native.getLongSize(); } 5.2026 +- public long get_f_put_pixel() { log.finest("");return Native.getLong(pData+76); } 5.2027 +- public void set_f_put_pixel(long v) { log.finest(""); Native.putLong(pData + 76, v); } 5.2028 +- public long get_f_sub_image(int index) { log.finest(""); return Native.getLong(pData+80)+index*Native.getLongSize(); } 5.2029 +- public long get_f_sub_image() { log.finest("");return Native.getLong(pData+80); } 5.2030 +- public void set_f_sub_image(long v) { log.finest(""); Native.putLong(pData + 80, v); } 5.2031 +- public long get_f_add_pixel(int index) { log.finest(""); return Native.getLong(pData+84)+index*Native.getLongSize(); } 5.2032 +- public long get_f_add_pixel() { log.finest("");return Native.getLong(pData+84); } 5.2033 +- public void set_f_add_pixel(long v) { log.finest(""); Native.putLong(pData + 84, v); } 5.2034 ++ public int get_byte_order() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(24)))); } 5.2035 ++ public void set_byte_order(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(24)), v); } 5.2036 ++ public int get_bitmap_unit() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(28)))); } 5.2037 ++ public void set_bitmap_unit(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(28)), v); } 5.2038 ++ public int get_bitmap_bit_order() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(32)))); } 5.2039 ++ public void set_bitmap_bit_order(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(32)), v); } 5.2040 ++ public int get_bitmap_pad() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(36)))); } 5.2041 ++ public void set_bitmap_pad(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(36)), v); } 5.2042 ++ public int get_depth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(40)))); } 5.2043 ++ public void set_depth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(40)), v); } 5.2044 ++ public int get_bytes_per_line() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(44)))); } 5.2045 ++ public void set_bytes_per_line(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(44)), v); } 5.2046 ++ public int get_bits_per_pixel() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(48)))); } 5.2047 ++ public void set_bits_per_pixel(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(48)), v); } 5.2048 ++ public long get_red_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(48):(56)))); } 5.2049 ++ public void set_red_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(48):(56)), v); } 5.2050 ++ public long get_green_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(64)))); } 5.2051 ++ public void set_green_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(52):(64)), v); } 5.2052 ++ public long get_blue_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(72)))); } 5.2053 ++ public void set_blue_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(56):(72)), v); } 5.2054 ++ public long get_obdata(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(80)))+index*Native.getLongSize(); } 5.2055 ++ public long get_obdata() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(80))); } 5.2056 ++ public void set_obdata(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(60):(80)), v); } 5.2057 ++ public long get_f_create_image(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(64):(88)))+index*Native.getLongSize(); } 5.2058 ++ public long get_f_create_image() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(64):(88))); } 5.2059 ++ public void set_f_create_image(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(64):(88)), v); } 5.2060 ++ public long get_f_destroy_image(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(68):(96)))+index*Native.getLongSize(); } 5.2061 ++ public long get_f_destroy_image() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(68):(96))); } 5.2062 ++ public void set_f_destroy_image(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(68):(96)), v); } 5.2063 ++ public long get_f_get_pixel(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(72):(104)))+index*Native.getLongSize(); } 5.2064 ++ public long get_f_get_pixel() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(72):(104))); } 5.2065 ++ public void set_f_get_pixel(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(72):(104)), v); } 5.2066 ++ public long get_f_put_pixel(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(76):(112)))+index*Native.getLongSize(); } 5.2067 ++ public long get_f_put_pixel() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(76):(112))); } 5.2068 ++ public void set_f_put_pixel(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(76):(112)), v); } 5.2069 ++ public long get_f_sub_image(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(80):(120)))+index*Native.getLongSize(); } 5.2070 ++ public long get_f_sub_image() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(80):(120))); } 5.2071 ++ public void set_f_sub_image(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(80):(120)), v); } 5.2072 ++ public long get_f_add_pixel(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(128)))+index*Native.getLongSize(); } 5.2073 ++ public long get_f_add_pixel() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(128))); } 5.2074 ++ public void set_f_add_pixel(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(84):(128)), v); } 5.2075 + 5.2076 + 5.2077 + String getName() { 5.2078 +diff -r ca3a8b43a54b generated/sun/awt/X11/XKeyEvent.java 5.2079 +--- a/generated/sun/awt/X11/XKeyEvent.java Tue May 27 21:14:08 2008 +0100 5.2080 ++++ b/generated/sun/awt/X11/XKeyEvent.java Tue May 27 21:15:32 2008 +0100 5.2081 +@@ -8,7 +8,7 @@ public class XKeyEvent extends XWrapperB 5.2082 + public class XKeyEvent extends XWrapperBase { 5.2083 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2084 + private final boolean should_free_memory; 5.2085 +- public static int getSize() { return 60; } 5.2086 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(60):(96)); } 5.2087 + public int getDataSize() { return getSize(); } 5.2088 + 5.2089 + long pData; 5.2090 +@@ -39,34 +39,34 @@ public class XKeyEvent extends XWrapperB 5.2091 + } 5.2092 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2093 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2094 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2095 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2096 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2097 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2098 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2099 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2100 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2101 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2102 +- public long get_root() { log.finest("");return (Native.getLong(pData+20)); } 5.2103 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2104 +- public long get_subwindow() { log.finest("");return (Native.getLong(pData+24)); } 5.2105 +- public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.2106 +- public long get_time() { log.finest("");return (Native.getULong(pData+28)); } 5.2107 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+28, v); } 5.2108 +- public int get_x() { log.finest("");return (Native.getInt(pData+32)); } 5.2109 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.2110 +- public int get_y() { log.finest("");return (Native.getInt(pData+36)); } 5.2111 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.2112 +- public int get_x_root() { log.finest("");return (Native.getInt(pData+40)); } 5.2113 +- public void set_x_root(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.2114 +- public int get_y_root() { log.finest("");return (Native.getInt(pData+44)); } 5.2115 +- public void set_y_root(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.2116 +- public int get_state() { log.finest("");return (Native.getInt(pData+48)); } 5.2117 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.2118 +- public int get_keycode() { log.finest("");return (Native.getInt(pData+52)); } 5.2119 +- public void set_keycode(int v) { log.finest(""); Native.putInt(pData+52, v); } 5.2120 +- public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+56)); } 5.2121 +- public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+56, v); } 5.2122 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2123 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2124 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2125 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2126 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2127 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2128 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2129 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2130 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2131 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2132 ++ public long get_subwindow() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2133 ++ public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2134 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.2135 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.2136 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.2137 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.2138 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)))); } 5.2139 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)), v); } 5.2140 ++ public int get_x_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)))); } 5.2141 ++ public void set_x_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)), v); } 5.2142 ++ public int get_y_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)))); } 5.2143 ++ public void set_y_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)), v); } 5.2144 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.2145 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.2146 ++ public int get_keycode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(52):(84)))); } 5.2147 ++ public void set_keycode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(52):(84)), v); } 5.2148 ++ public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)))); } 5.2149 ++ public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)), v); } 5.2150 + 5.2151 + 5.2152 + String getName() { 5.2153 +diff -r ca3a8b43a54b generated/sun/awt/X11/XKeyboardState.java 5.2154 +--- a/generated/sun/awt/X11/XKeyboardState.java Tue May 27 21:14:08 2008 +0100 5.2155 ++++ b/generated/sun/awt/X11/XKeyboardState.java Tue May 27 21:15:32 2008 +0100 5.2156 +@@ -8,7 +8,7 @@ public class XKeyboardState extends XWra 5.2157 + public class XKeyboardState extends XWrapperBase { 5.2158 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2159 + private final boolean should_free_memory; 5.2160 +- public static int getSize() { return 56; } 5.2161 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(56):(64)); } 5.2162 + public int getDataSize() { return getSize(); } 5.2163 + 5.2164 + long pData; 5.2165 +@@ -47,11 +47,11 @@ public class XKeyboardState extends XWra 5.2166 + public void set_bell_duration(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.2167 + public long get_led_mask() { log.finest("");return (Native.getLong(pData+16)); } 5.2168 + public void set_led_mask(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2169 +- public int get_global_auto_repeat() { log.finest("");return (Native.getInt(pData+20)); } 5.2170 +- public void set_global_auto_repeat(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.2171 +- public byte get_auto_repeats(int index) { log.finest("");return Native.getByte(pData + 24+index*1); } 5.2172 +- public void set_auto_repeats(int index, byte v) { log.finest(""); Native.putByte(pData+24 + index*1, v); } 5.2173 +- public long get_auto_repeats() { log.finest("");return pData+24; } 5.2174 ++ public int get_global_auto_repeat() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(24)))); } 5.2175 ++ public void set_global_auto_repeat(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(24)), v); } 5.2176 ++ public byte get_auto_repeats(int index) { log.finest("");return Native.getByte(pData + ((XlibWrapper.dataModel == 32)?(24):(28))+index*1); } 5.2177 ++ public void set_auto_repeats(int index, byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(24):(28)) + index*1, v); } 5.2178 ++ public long get_auto_repeats() { log.finest("");return pData+((XlibWrapper.dataModel == 32)?(24):(28)); } 5.2179 + 5.2180 + 5.2181 + String getName() { 5.2182 +diff -r ca3a8b43a54b generated/sun/awt/X11/XKeymapEvent.java 5.2183 +--- a/generated/sun/awt/X11/XKeymapEvent.java Tue May 27 21:14:08 2008 +0100 5.2184 ++++ b/generated/sun/awt/X11/XKeymapEvent.java Tue May 27 21:15:32 2008 +0100 5.2185 +@@ -8,7 +8,7 @@ public class XKeymapEvent extends XWrapp 5.2186 + public class XKeymapEvent extends XWrapperBase { 5.2187 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2188 + private final boolean should_free_memory; 5.2189 +- public static int getSize() { return 52; } 5.2190 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(52):(72)); } 5.2191 + public int getDataSize() { return getSize(); } 5.2192 + 5.2193 + long pData; 5.2194 +@@ -39,17 +39,17 @@ public class XKeymapEvent extends XWrapp 5.2195 + } 5.2196 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2197 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2198 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2199 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2200 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2201 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2202 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2203 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2204 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2205 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2206 +- public byte get_key_vector(int index) { log.finest("");return Native.getByte(pData + 20+index*1); } 5.2207 +- public void set_key_vector(int index, byte v) { log.finest(""); Native.putByte(pData+20 + index*1, v); } 5.2208 +- public long get_key_vector() { log.finest("");return pData+20; } 5.2209 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2210 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2211 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2212 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2213 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2214 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2215 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2216 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2217 ++ public byte get_key_vector(int index) { log.finest("");return Native.getByte(pData + ((XlibWrapper.dataModel == 32)?(20):(40))+index*1); } 5.2218 ++ public void set_key_vector(int index, byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(20):(40)) + index*1, v); } 5.2219 ++ public long get_key_vector() { log.finest("");return pData+((XlibWrapper.dataModel == 32)?(20):(40)); } 5.2220 + 5.2221 + 5.2222 + String getName() { 5.2223 +diff -r ca3a8b43a54b generated/sun/awt/X11/XMapEvent.java 5.2224 +--- a/generated/sun/awt/X11/XMapEvent.java Tue May 27 21:14:08 2008 +0100 5.2225 ++++ b/generated/sun/awt/X11/XMapEvent.java Tue May 27 21:15:32 2008 +0100 5.2226 +@@ -8,7 +8,7 @@ public class XMapEvent extends XWrapperB 5.2227 + public class XMapEvent extends XWrapperBase { 5.2228 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2229 + private final boolean should_free_memory; 5.2230 +- public static int getSize() { return 28; } 5.2231 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(56)); } 5.2232 + public int getDataSize() { return getSize(); } 5.2233 + 5.2234 + long pData; 5.2235 +@@ -39,18 +39,18 @@ public class XMapEvent extends XWrapperB 5.2236 + } 5.2237 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2238 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2239 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2240 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2241 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2242 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2243 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2244 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2245 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.2246 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2247 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.2248 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2249 +- public int get_override_redirect() { log.finest("");return (Native.getInt(pData+24)); } 5.2250 +- public void set_override_redirect(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.2251 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2252 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2253 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2254 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2255 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2256 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2257 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2258 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2259 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2260 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2261 ++ public int get_override_redirect() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2262 ++ public void set_override_redirect(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2263 + 5.2264 + 5.2265 + String getName() { 5.2266 +diff -r ca3a8b43a54b generated/sun/awt/X11/XMapRequestEvent.java 5.2267 +--- a/generated/sun/awt/X11/XMapRequestEvent.java Tue May 27 21:14:08 2008 +0100 5.2268 ++++ b/generated/sun/awt/X11/XMapRequestEvent.java Tue May 27 21:15:32 2008 +0100 5.2269 +@@ -8,7 +8,7 @@ public class XMapRequestEvent extends XW 5.2270 + public class XMapRequestEvent extends XWrapperBase { 5.2271 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2272 + private final boolean should_free_memory; 5.2273 +- public static int getSize() { return 24; } 5.2274 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(24):(48)); } 5.2275 + public int getDataSize() { return getSize(); } 5.2276 + 5.2277 + long pData; 5.2278 +@@ -39,16 +39,16 @@ public class XMapRequestEvent extends XW 5.2279 + } 5.2280 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2281 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2282 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2283 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2284 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2285 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2286 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2287 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2288 +- public long get_parent() { log.finest("");return (Native.getLong(pData+16)); } 5.2289 +- public void set_parent(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2290 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.2291 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2292 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2293 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2294 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2295 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2296 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2297 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2298 ++ public long get_parent() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2299 ++ public void set_parent(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2300 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2301 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2302 + 5.2303 + 5.2304 + String getName() { 5.2305 +diff -r ca3a8b43a54b generated/sun/awt/X11/XMappingEvent.java 5.2306 +--- a/generated/sun/awt/X11/XMappingEvent.java Tue May 27 21:14:08 2008 +0100 5.2307 ++++ b/generated/sun/awt/X11/XMappingEvent.java Tue May 27 21:15:32 2008 +0100 5.2308 +@@ -8,7 +8,7 @@ public class XMappingEvent extends XWrap 5.2309 + public class XMappingEvent extends XWrapperBase { 5.2310 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2311 + private final boolean should_free_memory; 5.2312 +- public static int getSize() { return 32; } 5.2313 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(32):(56)); } 5.2314 + public int getDataSize() { return getSize(); } 5.2315 + 5.2316 + long pData; 5.2317 +@@ -39,20 +39,20 @@ public class XMappingEvent extends XWrap 5.2318 + } 5.2319 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2320 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2321 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2322 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2323 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2324 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2325 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2326 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2327 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2328 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2329 +- public int get_request() { log.finest("");return (Native.getInt(pData+20)); } 5.2330 +- public void set_request(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.2331 +- public int get_first_keycode() { log.finest("");return (Native.getInt(pData+24)); } 5.2332 +- public void set_first_keycode(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.2333 +- public int get_count() { log.finest("");return (Native.getInt(pData+28)); } 5.2334 +- public void set_count(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.2335 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2336 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2337 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2338 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2339 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2340 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2341 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2342 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2343 ++ public int get_request() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2344 ++ public void set_request(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2345 ++ public int get_first_keycode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)))); } 5.2346 ++ public void set_first_keycode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)), v); } 5.2347 ++ public int get_count() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(48)))); } 5.2348 ++ public void set_count(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(48)), v); } 5.2349 + 5.2350 + 5.2351 + String getName() { 5.2352 +diff -r ca3a8b43a54b generated/sun/awt/X11/XModifierKeymap.java 5.2353 +--- a/generated/sun/awt/X11/XModifierKeymap.java Tue May 27 21:14:08 2008 +0100 5.2354 ++++ b/generated/sun/awt/X11/XModifierKeymap.java Tue May 27 21:15:32 2008 +0100 5.2355 +@@ -8,7 +8,7 @@ public class XModifierKeymap extends XWr 5.2356 + public class XModifierKeymap extends XWrapperBase { 5.2357 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2358 + private final boolean should_free_memory; 5.2359 +- public static int getSize() { return 8; } 5.2360 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.2361 + public int getDataSize() { return getSize(); } 5.2362 + 5.2363 + long pData; 5.2364 +@@ -39,9 +39,9 @@ public class XModifierKeymap extends XWr 5.2365 + } 5.2366 + public int get_max_keypermod() { log.finest("");return (Native.getInt(pData+0)); } 5.2367 + public void set_max_keypermod(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2368 +- public long get_modifiermap(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.2369 +- public long get_modifiermap() { log.finest("");return Native.getLong(pData+4); } 5.2370 +- public void set_modifiermap(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.2371 ++ public long get_modifiermap(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.2372 ++ public long get_modifiermap() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.2373 ++ public void set_modifiermap(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2374 + 5.2375 + 5.2376 + String getName() { 5.2377 +diff -r ca3a8b43a54b generated/sun/awt/X11/XMotionEvent.java 5.2378 +--- a/generated/sun/awt/X11/XMotionEvent.java Tue May 27 21:14:08 2008 +0100 5.2379 ++++ b/generated/sun/awt/X11/XMotionEvent.java Tue May 27 21:15:32 2008 +0100 5.2380 +@@ -8,7 +8,7 @@ public class XMotionEvent extends XWrapp 5.2381 + public class XMotionEvent extends XWrapperBase { 5.2382 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2383 + private final boolean should_free_memory; 5.2384 +- public static int getSize() { return 60; } 5.2385 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(60):(96)); } 5.2386 + public int getDataSize() { return getSize(); } 5.2387 + 5.2388 + long pData; 5.2389 +@@ -39,34 +39,34 @@ public class XMotionEvent extends XWrapp 5.2390 + } 5.2391 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2392 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2393 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2394 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2395 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2396 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2397 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2398 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2399 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2400 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2401 +- public long get_root() { log.finest("");return (Native.getLong(pData+20)); } 5.2402 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2403 +- public long get_subwindow() { log.finest("");return (Native.getLong(pData+24)); } 5.2404 +- public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.2405 +- public long get_time() { log.finest("");return (Native.getULong(pData+28)); } 5.2406 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+28, v); } 5.2407 +- public int get_x() { log.finest("");return (Native.getInt(pData+32)); } 5.2408 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.2409 +- public int get_y() { log.finest("");return (Native.getInt(pData+36)); } 5.2410 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.2411 +- public int get_x_root() { log.finest("");return (Native.getInt(pData+40)); } 5.2412 +- public void set_x_root(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.2413 +- public int get_y_root() { log.finest("");return (Native.getInt(pData+44)); } 5.2414 +- public void set_y_root(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.2415 +- public int get_state() { log.finest("");return (Native.getInt(pData+48)); } 5.2416 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.2417 +- public byte get_is_hint() { log.finest("");return (Native.getByte(pData+52)); } 5.2418 +- public void set_is_hint(byte v) { log.finest(""); Native.putByte(pData+52, v); } 5.2419 +- public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+56)); } 5.2420 +- public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+56, v); } 5.2421 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2422 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2423 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2424 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2425 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2426 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2427 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2428 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2429 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2430 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2431 ++ public long get_subwindow() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2432 ++ public void set_subwindow(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2433 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.2434 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.2435 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.2436 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.2437 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)))); } 5.2438 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(68)), v); } 5.2439 ++ public int get_x_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)))); } 5.2440 ++ public void set_x_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(72)), v); } 5.2441 ++ public int get_y_root() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)))); } 5.2442 ++ public void set_y_root(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(76)), v); } 5.2443 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); } 5.2444 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); } 5.2445 ++ public byte get_is_hint() { log.finest("");return (Native.getByte(pData+((XlibWrapper.dataModel == 32)?(52):(84)))); } 5.2446 ++ public void set_is_hint(byte v) { log.finest(""); Native.putByte(pData+((XlibWrapper.dataModel == 32)?(52):(84)), v); } 5.2447 ++ public boolean get_same_screen() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)))); } 5.2448 ++ public void set_same_screen(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(56):(88)), v); } 5.2449 + 5.2450 + 5.2451 + String getName() { 5.2452 +diff -r ca3a8b43a54b generated/sun/awt/X11/XNoExposeEvent.java 5.2453 +--- a/generated/sun/awt/X11/XNoExposeEvent.java Tue May 27 21:14:08 2008 +0100 5.2454 ++++ b/generated/sun/awt/X11/XNoExposeEvent.java Tue May 27 21:15:32 2008 +0100 5.2455 +@@ -8,7 +8,7 @@ public class XNoExposeEvent extends XWra 5.2456 + public class XNoExposeEvent extends XWrapperBase { 5.2457 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2458 + private final boolean should_free_memory; 5.2459 +- public static int getSize() { return 28; } 5.2460 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(48)); } 5.2461 + public int getDataSize() { return getSize(); } 5.2462 + 5.2463 + long pData; 5.2464 +@@ -39,18 +39,18 @@ public class XNoExposeEvent extends XWra 5.2465 + } 5.2466 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2467 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2468 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2469 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2470 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2471 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2472 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2473 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2474 +- public long get_drawable() { log.finest("");return (Native.getLong(pData+16)); } 5.2475 +- public void set_drawable(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2476 +- public int get_major_code() { log.finest("");return (Native.getInt(pData+20)); } 5.2477 +- public void set_major_code(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.2478 +- public int get_minor_code() { log.finest("");return (Native.getInt(pData+24)); } 5.2479 +- public void set_minor_code(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.2480 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2481 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2482 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2483 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2484 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2485 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2486 ++ public long get_drawable() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2487 ++ public void set_drawable(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2488 ++ public int get_major_code() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2489 ++ public void set_major_code(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2490 ++ public int get_minor_code() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)))); } 5.2491 ++ public void set_minor_code(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)), v); } 5.2492 + 5.2493 + 5.2494 + String getName() { 5.2495 +diff -r ca3a8b43a54b generated/sun/awt/X11/XOMCharSetList.java 5.2496 +--- a/generated/sun/awt/X11/XOMCharSetList.java Tue May 27 21:14:08 2008 +0100 5.2497 ++++ b/generated/sun/awt/X11/XOMCharSetList.java Tue May 27 21:15:32 2008 +0100 5.2498 +@@ -8,7 +8,7 @@ public class XOMCharSetList extends XWra 5.2499 + public class XOMCharSetList extends XWrapperBase { 5.2500 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2501 + private final boolean should_free_memory; 5.2502 +- public static int getSize() { return 8; } 5.2503 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.2504 + public int getDataSize() { return getSize(); } 5.2505 + 5.2506 + long pData; 5.2507 +@@ -39,9 +39,9 @@ public class XOMCharSetList extends XWra 5.2508 + } 5.2509 + public int get_charset_count() { log.finest("");return (Native.getInt(pData+0)); } 5.2510 + public void set_charset_count(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2511 +- public long get_charset_list(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.2512 +- public long get_charset_list() { log.finest("");return Native.getLong(pData+4); } 5.2513 +- public void set_charset_list(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.2514 ++ public long get_charset_list(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.2515 ++ public long get_charset_list() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.2516 ++ public void set_charset_list(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2517 + 5.2518 + 5.2519 + String getName() { 5.2520 +diff -r ca3a8b43a54b generated/sun/awt/X11/XOMFontInfo.java 5.2521 +--- a/generated/sun/awt/X11/XOMFontInfo.java Tue May 27 21:14:08 2008 +0100 5.2522 ++++ b/generated/sun/awt/X11/XOMFontInfo.java Tue May 27 21:15:32 2008 +0100 5.2523 +@@ -8,7 +8,7 @@ public class XOMFontInfo extends XWrappe 5.2524 + public class XOMFontInfo extends XWrapperBase { 5.2525 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2526 + private final boolean should_free_memory; 5.2527 +- public static int getSize() { return 12; } 5.2528 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(12):(24)); } 5.2529 + public int getDataSize() { return getSize(); } 5.2530 + 5.2531 + long pData; 5.2532 +@@ -39,12 +39,12 @@ public class XOMFontInfo extends XWrappe 5.2533 + } 5.2534 + public int get_num_font() { log.finest("");return (Native.getInt(pData+0)); } 5.2535 + public void set_num_font(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2536 +- public long get_font_struct_list(int index) { log.finest(""); return Native.getLong(pData+4)+index*Native.getLongSize(); } 5.2537 +- public long get_font_struct_list() { log.finest("");return Native.getLong(pData+4); } 5.2538 +- public void set_font_struct_list(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.2539 +- public long get_font_name_list(int index) { log.finest(""); return Native.getLong(pData+8)+index*Native.getLongSize(); } 5.2540 +- public long get_font_name_list() { log.finest("");return Native.getLong(pData+8); } 5.2541 +- public void set_font_name_list(long v) { log.finest(""); Native.putLong(pData + 8, v); } 5.2542 ++ public long get_font_struct_list(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*Native.getLongSize(); } 5.2543 ++ public long get_font_struct_list() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.2544 ++ public void set_font_struct_list(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2545 ++ public long get_font_name_list(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))+index*Native.getLongSize(); } 5.2546 ++ public long get_font_name_list() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16))); } 5.2547 ++ public void set_font_name_list(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2548 + 5.2549 + 5.2550 + String getName() { 5.2551 +diff -r ca3a8b43a54b generated/sun/awt/X11/XOMOrientation.java 5.2552 +--- a/generated/sun/awt/X11/XOMOrientation.java Tue May 27 21:14:08 2008 +0100 5.2553 ++++ b/generated/sun/awt/X11/XOMOrientation.java Tue May 27 21:15:32 2008 +0100 5.2554 +@@ -8,7 +8,7 @@ public class XOMOrientation extends XWra 5.2555 + public class XOMOrientation extends XWrapperBase { 5.2556 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2557 + private final boolean should_free_memory; 5.2558 +- public static int getSize() { return 8; } 5.2559 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.2560 + public int getDataSize() { return getSize(); } 5.2561 + 5.2562 + long pData; 5.2563 +@@ -39,9 +39,9 @@ public class XOMOrientation extends XWra 5.2564 + } 5.2565 + public int get_num_orientation() { log.finest("");return (Native.getInt(pData+0)); } 5.2566 + public void set_num_orientation(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2567 +- public int get_orientation(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+4)+index*4); } 5.2568 +- public long get_orientation() { log.finest("");return Native.getLong(pData+4); } 5.2569 +- public void set_orientation(long v) { log.finest(""); Native.putLong(pData + 4, v); } 5.2570 ++ public int get_orientation(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))+index*4); } 5.2571 ++ public long get_orientation() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8))); } 5.2572 ++ public void set_orientation(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2573 + 5.2574 + 5.2575 + String getName() { 5.2576 +diff -r ca3a8b43a54b generated/sun/awt/X11/XPropertyEvent.java 5.2577 +--- a/generated/sun/awt/X11/XPropertyEvent.java Tue May 27 21:14:08 2008 +0100 5.2578 ++++ b/generated/sun/awt/X11/XPropertyEvent.java Tue May 27 21:15:32 2008 +0100 5.2579 +@@ -8,7 +8,7 @@ public class XPropertyEvent extends XWra 5.2580 + public class XPropertyEvent extends XWrapperBase { 5.2581 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2582 + private final boolean should_free_memory; 5.2583 +- public static int getSize() { return 32; } 5.2584 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(32):(64)); } 5.2585 + public int getDataSize() { return getSize(); } 5.2586 + 5.2587 + long pData; 5.2588 +@@ -39,20 +39,20 @@ public class XPropertyEvent extends XWra 5.2589 + } 5.2590 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2591 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2592 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2593 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2594 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2595 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2596 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2597 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2598 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2599 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2600 +- public long get_atom() { log.finest("");return (Native.getLong(pData+20)); } 5.2601 +- public void set_atom(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2602 +- public long get_time() { log.finest("");return (Native.getULong(pData+24)); } 5.2603 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+24, v); } 5.2604 +- public int get_state() { log.finest("");return (Native.getInt(pData+28)); } 5.2605 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.2606 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2607 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2608 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2609 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2610 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2611 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2612 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2613 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2614 ++ public long get_atom() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2615 ++ public void set_atom(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2616 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2617 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2618 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.2619 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.2620 + 5.2621 + 5.2622 + String getName() { 5.2623 +diff -r ca3a8b43a54b generated/sun/awt/X11/XReparentEvent.java 5.2624 +--- a/generated/sun/awt/X11/XReparentEvent.java Tue May 27 21:14:08 2008 +0100 5.2625 ++++ b/generated/sun/awt/X11/XReparentEvent.java Tue May 27 21:15:32 2008 +0100 5.2626 +@@ -8,7 +8,7 @@ public class XReparentEvent extends XWra 5.2627 + public class XReparentEvent extends XWrapperBase { 5.2628 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2629 + private final boolean should_free_memory; 5.2630 +- public static int getSize() { return 40; } 5.2631 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(40):(72)); } 5.2632 + public int getDataSize() { return getSize(); } 5.2633 + 5.2634 + long pData; 5.2635 +@@ -39,24 +39,24 @@ public class XReparentEvent extends XWra 5.2636 + } 5.2637 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2638 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2639 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2640 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2641 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2642 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2643 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2644 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2645 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.2646 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2647 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.2648 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2649 +- public long get_parent() { log.finest("");return (Native.getLong(pData+24)); } 5.2650 +- public void set_parent(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.2651 +- public int get_x() { log.finest("");return (Native.getInt(pData+28)); } 5.2652 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.2653 +- public int get_y() { log.finest("");return (Native.getInt(pData+32)); } 5.2654 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.2655 +- public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+36)); } 5.2656 +- public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+36, v); } 5.2657 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2658 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2659 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2660 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2661 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2662 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2663 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2664 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2665 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2666 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2667 ++ public long get_parent() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2668 ++ public void set_parent(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2669 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.2670 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.2671 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(60)))); } 5.2672 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(60)), v); } 5.2673 ++ public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(36):(64)))); } 5.2674 ++ public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(36):(64)), v); } 5.2675 + 5.2676 + 5.2677 + String getName() { 5.2678 +diff -r ca3a8b43a54b generated/sun/awt/X11/XResizeRequestEvent.java 5.2679 +--- a/generated/sun/awt/X11/XResizeRequestEvent.java Tue May 27 21:14:08 2008 +0100 5.2680 ++++ b/generated/sun/awt/X11/XResizeRequestEvent.java Tue May 27 21:15:32 2008 +0100 5.2681 +@@ -8,7 +8,7 @@ public class XResizeRequestEvent extends 5.2682 + public class XResizeRequestEvent extends XWrapperBase { 5.2683 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2684 + private final boolean should_free_memory; 5.2685 +- public static int getSize() { return 28; } 5.2686 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(48)); } 5.2687 + public int getDataSize() { return getSize(); } 5.2688 + 5.2689 + long pData; 5.2690 +@@ -39,18 +39,18 @@ public class XResizeRequestEvent extends 5.2691 + } 5.2692 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2693 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2694 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2695 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2696 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2697 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2698 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2699 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2700 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2701 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2702 +- public int get_width() { log.finest("");return (Native.getInt(pData+20)); } 5.2703 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.2704 +- public int get_height() { log.finest("");return (Native.getInt(pData+24)); } 5.2705 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.2706 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2707 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2708 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2709 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2710 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2711 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2712 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2713 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2714 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2715 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2716 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)))); } 5.2717 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(44)), v); } 5.2718 + 5.2719 + 5.2720 + String getName() { 5.2721 +diff -r ca3a8b43a54b generated/sun/awt/X11/XSelectionClearEvent.java 5.2722 +--- a/generated/sun/awt/X11/XSelectionClearEvent.java Tue May 27 21:14:08 2008 +0100 5.2723 ++++ b/generated/sun/awt/X11/XSelectionClearEvent.java Tue May 27 21:15:32 2008 +0100 5.2724 +@@ -8,7 +8,7 @@ public class XSelectionClearEvent extend 5.2725 + public class XSelectionClearEvent extends XWrapperBase { 5.2726 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2727 + private final boolean should_free_memory; 5.2728 +- public static int getSize() { return 28; } 5.2729 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(56)); } 5.2730 + public int getDataSize() { return getSize(); } 5.2731 + 5.2732 + long pData; 5.2733 +@@ -39,18 +39,18 @@ public class XSelectionClearEvent extend 5.2734 + } 5.2735 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2736 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2737 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2738 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2739 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2740 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2741 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2742 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2743 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.2744 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2745 +- public long get_selection() { log.finest("");return (Native.getLong(pData+20)); } 5.2746 +- public void set_selection(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2747 +- public long get_time() { log.finest("");return (Native.getULong(pData+24)); } 5.2748 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+24, v); } 5.2749 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2750 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2751 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2752 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2753 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2754 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2755 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2756 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2757 ++ public long get_selection() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2758 ++ public void set_selection(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2759 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2760 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2761 + 5.2762 + 5.2763 + String getName() { 5.2764 +diff -r ca3a8b43a54b generated/sun/awt/X11/XSelectionEvent.java 5.2765 +--- a/generated/sun/awt/X11/XSelectionEvent.java Tue May 27 21:14:08 2008 +0100 5.2766 ++++ b/generated/sun/awt/X11/XSelectionEvent.java Tue May 27 21:15:32 2008 +0100 5.2767 +@@ -8,7 +8,7 @@ public class XSelectionEvent extends XWr 5.2768 + public class XSelectionEvent extends XWrapperBase { 5.2769 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2770 + private final boolean should_free_memory; 5.2771 +- public static int getSize() { return 36; } 5.2772 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(36):(72)); } 5.2773 + public int getDataSize() { return getSize(); } 5.2774 + 5.2775 + long pData; 5.2776 +@@ -39,22 +39,22 @@ public class XSelectionEvent extends XWr 5.2777 + } 5.2778 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2779 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2780 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2781 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2782 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2783 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2784 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2785 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2786 +- public long get_requestor() { log.finest("");return (Native.getLong(pData+16)); } 5.2787 +- public void set_requestor(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2788 +- public long get_selection() { log.finest("");return (Native.getLong(pData+20)); } 5.2789 +- public void set_selection(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2790 +- public long get_target() { log.finest("");return (Native.getLong(pData+24)); } 5.2791 +- public void set_target(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.2792 +- public long get_property() { log.finest("");return (Native.getLong(pData+28)); } 5.2793 +- public void set_property(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.2794 +- public long get_time() { log.finest("");return (Native.getULong(pData+32)); } 5.2795 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+32, v); } 5.2796 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2797 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2798 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2799 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2800 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2801 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2802 ++ public long get_requestor() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2803 ++ public void set_requestor(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2804 ++ public long get_selection() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2805 ++ public void set_selection(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2806 ++ public long get_target() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2807 ++ public void set_target(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2808 ++ public long get_property() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.2809 ++ public void set_property(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.2810 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.2811 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.2812 + 5.2813 + 5.2814 + String getName() { 5.2815 +diff -r ca3a8b43a54b generated/sun/awt/X11/XSelectionRequestEvent.java 5.2816 +--- a/generated/sun/awt/X11/XSelectionRequestEvent.java Tue May 27 21:14:08 2008 +0100 5.2817 ++++ b/generated/sun/awt/X11/XSelectionRequestEvent.java Tue May 27 21:15:32 2008 +0100 5.2818 +@@ -8,7 +8,7 @@ public class XSelectionRequestEvent exte 5.2819 + public class XSelectionRequestEvent extends XWrapperBase { 5.2820 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2821 + private final boolean should_free_memory; 5.2822 +- public static int getSize() { return 40; } 5.2823 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(40):(80)); } 5.2824 + public int getDataSize() { return getSize(); } 5.2825 + 5.2826 + long pData; 5.2827 +@@ -39,24 +39,24 @@ public class XSelectionRequestEvent exte 5.2828 + } 5.2829 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.2830 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.2831 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.2832 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2833 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.2834 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.2835 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.2836 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2837 +- public long get_owner() { log.finest("");return (Native.getLong(pData+16)); } 5.2838 +- public void set_owner(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.2839 +- public long get_requestor() { log.finest("");return (Native.getLong(pData+20)); } 5.2840 +- public void set_requestor(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.2841 +- public long get_selection() { log.finest("");return (Native.getLong(pData+24)); } 5.2842 +- public void set_selection(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.2843 +- public long get_target() { log.finest("");return (Native.getLong(pData+28)); } 5.2844 +- public void set_target(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.2845 +- public long get_property() { log.finest("");return (Native.getLong(pData+32)); } 5.2846 +- public void set_property(long v) { log.finest(""); Native.putLong(pData+32, v); } 5.2847 +- public long get_time() { log.finest("");return (Native.getULong(pData+36)); } 5.2848 +- public void set_time(long v) { log.finest(""); Native.putULong(pData+36, v); } 5.2849 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2850 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2851 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2852 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2853 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2854 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2855 ++ public long get_owner() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2856 ++ public void set_owner(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2857 ++ public long get_requestor() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.2858 ++ public void set_requestor(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.2859 ++ public long get_selection() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.2860 ++ public void set_selection(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.2861 ++ public long get_target() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.2862 ++ public void set_target(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.2863 ++ public long get_property() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.2864 ++ public void set_property(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.2865 ++ public long get_time() { log.finest("");return (Native.getULong(pData+((XlibWrapper.dataModel == 32)?(36):(72)))); } 5.2866 ++ public void set_time(long v) { log.finest(""); Native.putULong(pData+((XlibWrapper.dataModel == 32)?(36):(72)), v); } 5.2867 + 5.2868 + 5.2869 + String getName() { 5.2870 +diff -r ca3a8b43a54b generated/sun/awt/X11/XSetWindowAttributes.java 5.2871 +--- a/generated/sun/awt/X11/XSetWindowAttributes.java Tue May 27 21:14:08 2008 +0100 5.2872 ++++ b/generated/sun/awt/X11/XSetWindowAttributes.java Tue May 27 21:15:32 2008 +0100 5.2873 +@@ -8,7 +8,7 @@ public class XSetWindowAttributes extend 5.2874 + public class XSetWindowAttributes extends XWrapperBase { 5.2875 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2876 + private final boolean should_free_memory; 5.2877 +- public static int getSize() { return 60; } 5.2878 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(60):(112)); } 5.2879 + public int getDataSize() { return getSize(); } 5.2880 + 5.2881 + long pData; 5.2882 +@@ -39,34 +39,34 @@ public class XSetWindowAttributes extend 5.2883 + } 5.2884 + public long get_background_pixmap() { log.finest("");return (Native.getLong(pData+0)); } 5.2885 + public void set_background_pixmap(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.2886 +- public long get_background_pixel() { log.finest("");return (Native.getLong(pData+4)); } 5.2887 +- public void set_background_pixel(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.2888 +- public long get_border_pixmap() { log.finest("");return (Native.getLong(pData+8)); } 5.2889 +- public void set_border_pixmap(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.2890 +- public long get_border_pixel() { log.finest("");return (Native.getLong(pData+12)); } 5.2891 +- public void set_border_pixel(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.2892 +- public int get_bit_gravity() { log.finest("");return (Native.getInt(pData+16)); } 5.2893 +- public void set_bit_gravity(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.2894 +- public int get_win_gravity() { log.finest("");return (Native.getInt(pData+20)); } 5.2895 +- public void set_win_gravity(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.2896 +- public int get_backing_store() { log.finest("");return (Native.getInt(pData+24)); } 5.2897 +- public void set_backing_store(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.2898 +- public long get_backing_planes() { log.finest("");return (Native.getLong(pData+28)); } 5.2899 +- public void set_backing_planes(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.2900 +- public long get_backing_pixel() { log.finest("");return (Native.getLong(pData+32)); } 5.2901 +- public void set_backing_pixel(long v) { log.finest(""); Native.putLong(pData+32, v); } 5.2902 +- public boolean get_save_under() { log.finest("");return (Native.getBool(pData+36)); } 5.2903 +- public void set_save_under(boolean v) { log.finest(""); Native.putBool(pData+36, v); } 5.2904 +- public long get_event_mask() { log.finest("");return (Native.getLong(pData+40)); } 5.2905 +- public void set_event_mask(long v) { log.finest(""); Native.putLong(pData+40, v); } 5.2906 +- public long get_do_not_propagate_mask() { log.finest("");return (Native.getLong(pData+44)); } 5.2907 +- public void set_do_not_propagate_mask(long v) { log.finest(""); Native.putLong(pData+44, v); } 5.2908 +- public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+48)); } 5.2909 +- public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+48, v); } 5.2910 +- public long get_colormap() { log.finest("");return (Native.getLong(pData+52)); } 5.2911 +- public void set_colormap(long v) { log.finest(""); Native.putLong(pData+52, v); } 5.2912 +- public long get_cursor() { log.finest("");return (Native.getLong(pData+56)); } 5.2913 +- public void set_cursor(long v) { log.finest(""); Native.putLong(pData+56, v); } 5.2914 ++ public long get_background_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2915 ++ public void set_background_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2916 ++ public long get_border_pixmap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.2917 ++ public void set_border_pixmap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.2918 ++ public long get_border_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.2919 ++ public void set_border_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.2920 ++ public int get_bit_gravity() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.2921 ++ public void set_bit_gravity(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.2922 ++ public int get_win_gravity() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(36)))); } 5.2923 ++ public void set_win_gravity(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(36)), v); } 5.2924 ++ public int get_backing_store() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(40)))); } 5.2925 ++ public void set_backing_store(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(40)), v); } 5.2926 ++ public long get_backing_planes() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(48)))); } 5.2927 ++ public void set_backing_planes(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(48)), v); } 5.2928 ++ public long get_backing_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(56)))); } 5.2929 ++ public void set_backing_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(32):(56)), v); } 5.2930 ++ public boolean get_save_under() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(36):(64)))); } 5.2931 ++ public void set_save_under(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(36):(64)), v); } 5.2932 ++ public long get_event_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(40):(72)))); } 5.2933 ++ public void set_event_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(40):(72)), v); } 5.2934 ++ public long get_do_not_propagate_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(44):(80)))); } 5.2935 ++ public void set_do_not_propagate_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(44):(80)), v); } 5.2936 ++ public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(48):(88)))); } 5.2937 ++ public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(48):(88)), v); } 5.2938 ++ public long get_colormap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(96)))); } 5.2939 ++ public void set_colormap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(52):(96)), v); } 5.2940 ++ public long get_cursor() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(104)))); } 5.2941 ++ public void set_cursor(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(56):(104)), v); } 5.2942 + 5.2943 + 5.2944 + String getName() { 5.2945 +diff -r ca3a8b43a54b generated/sun/awt/X11/XSizeHints.java 5.2946 +--- a/generated/sun/awt/X11/XSizeHints.java Tue May 27 21:14:08 2008 +0100 5.2947 ++++ b/generated/sun/awt/X11/XSizeHints.java Tue May 27 21:15:32 2008 +0100 5.2948 +@@ -8,7 +8,7 @@ public class XSizeHints extends XWrapper 5.2949 + public class XSizeHints extends XWrapperBase { 5.2950 + private Unsafe unsafe = XlibWrapper.unsafe; 5.2951 + private final boolean should_free_memory; 5.2952 +- public static int getSize() { return 72; } 5.2953 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(72):(80)); } 5.2954 + public int getDataSize() { return getSize(); } 5.2955 + 5.2956 + long pData; 5.2957 +@@ -39,40 +39,40 @@ public class XSizeHints extends XWrapper 5.2958 + } 5.2959 + public long get_flags() { log.finest("");return (Native.getLong(pData+0)); } 5.2960 + public void set_flags(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.2961 +- public int get_x() { log.finest("");return (Native.getInt(pData+4)); } 5.2962 +- public void set_x(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.2963 +- public int get_y() { log.finest("");return (Native.getInt(pData+8)); } 5.2964 +- public void set_y(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.2965 +- public int get_width() { log.finest("");return (Native.getInt(pData+12)); } 5.2966 +- public void set_width(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.2967 +- public int get_height() { log.finest("");return (Native.getInt(pData+16)); } 5.2968 +- public void set_height(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.2969 +- public int get_min_width() { log.finest("");return (Native.getInt(pData+20)); } 5.2970 +- public void set_min_width(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.2971 +- public int get_min_height() { log.finest("");return (Native.getInt(pData+24)); } 5.2972 +- public void set_min_height(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.2973 +- public int get_max_width() { log.finest("");return (Native.getInt(pData+28)); } 5.2974 +- public void set_max_width(int v) { log.finest(""); Native.putInt(pData+28, v); } 5.2975 +- public int get_max_height() { log.finest("");return (Native.getInt(pData+32)); } 5.2976 +- public void set_max_height(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.2977 +- public int get_width_inc() { log.finest("");return (Native.getInt(pData+36)); } 5.2978 +- public void set_width_inc(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.2979 +- public int get_height_inc() { log.finest("");return (Native.getInt(pData+40)); } 5.2980 +- public void set_height_inc(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.2981 +- public int get_min_aspect_x() { log.finest("");return (Native.getInt(pData+44)); } 5.2982 +- public void set_min_aspect_x(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.2983 +- public int get_min_aspect_y() { log.finest("");return (Native.getInt(pData+48)); } 5.2984 +- public void set_min_aspect_y(int v) { log.finest(""); Native.putInt(pData+48, v); } 5.2985 +- public int get_max_aspect_x() { log.finest("");return (Native.getInt(pData+52)); } 5.2986 +- public void set_max_aspect_x(int v) { log.finest(""); Native.putInt(pData+52, v); } 5.2987 +- public int get_max_aspect_y() { log.finest("");return (Native.getInt(pData+56)); } 5.2988 +- public void set_max_aspect_y(int v) { log.finest(""); Native.putInt(pData+56, v); } 5.2989 +- public int get_base_width() { log.finest("");return (Native.getInt(pData+60)); } 5.2990 +- public void set_base_width(int v) { log.finest(""); Native.putInt(pData+60, v); } 5.2991 +- public int get_base_height() { log.finest("");return (Native.getInt(pData+64)); } 5.2992 +- public void set_base_height(int v) { log.finest(""); Native.putInt(pData+64, v); } 5.2993 +- public int get_win_gravity() { log.finest("");return (Native.getInt(pData+68)); } 5.2994 +- public void set_win_gravity(int v) { log.finest(""); Native.putInt(pData+68, v); } 5.2995 ++ public int get_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.2996 ++ public void set_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.2997 ++ public int get_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.2998 ++ public void set_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.2999 ++ public int get_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(12):(16)))); } 5.3000 ++ public void set_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.3001 ++ public int get_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(16):(20)))); } 5.3002 ++ public void set_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(16):(20)), v); } 5.3003 ++ public int get_min_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(24)))); } 5.3004 ++ public void set_min_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(24)), v); } 5.3005 ++ public int get_min_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(28)))); } 5.3006 ++ public void set_min_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(28)), v); } 5.3007 ++ public int get_max_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(28):(32)))); } 5.3008 ++ public void set_max_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(28):(32)), v); } 5.3009 ++ public int get_max_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(36)))); } 5.3010 ++ public void set_max_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(36)), v); } 5.3011 ++ public int get_width_inc() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(40)))); } 5.3012 ++ public void set_width_inc(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(40)), v); } 5.3013 ++ public int get_height_inc() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(44)))); } 5.3014 ++ public void set_height_inc(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(44)), v); } 5.3015 ++ public int get_min_aspect_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(48)))); } 5.3016 ++ public void set_min_aspect_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(48)), v); } 5.3017 ++ public int get_min_aspect_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(52)))); } 5.3018 ++ public void set_min_aspect_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(52)), v); } 5.3019 ++ public int get_max_aspect_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(52):(56)))); } 5.3020 ++ public void set_max_aspect_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(52):(56)), v); } 5.3021 ++ public int get_max_aspect_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(56):(60)))); } 5.3022 ++ public void set_max_aspect_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(56):(60)), v); } 5.3023 ++ public int get_base_width() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(60):(64)))); } 5.3024 ++ public void set_base_width(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(60):(64)), v); } 5.3025 ++ public int get_base_height() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(64):(68)))); } 5.3026 ++ public void set_base_height(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(64):(68)), v); } 5.3027 ++ public int get_win_gravity() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(68):(72)))); } 5.3028 ++ public void set_win_gravity(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(68):(72)), v); } 5.3029 + 5.3030 + 5.3031 + String getName() { 5.3032 +diff -r ca3a8b43a54b generated/sun/awt/X11/XStandardColormap.java 5.3033 +--- a/generated/sun/awt/X11/XStandardColormap.java Tue May 27 21:14:08 2008 +0100 5.3034 ++++ b/generated/sun/awt/X11/XStandardColormap.java Tue May 27 21:15:32 2008 +0100 5.3035 +@@ -8,7 +8,7 @@ public class XStandardColormap extends X 5.3036 + public class XStandardColormap extends XWrapperBase { 5.3037 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3038 + private final boolean should_free_memory; 5.3039 +- public static int getSize() { return 40; } 5.3040 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(40):(80)); } 5.3041 + public int getDataSize() { return getSize(); } 5.3042 + 5.3043 + long pData; 5.3044 +@@ -39,24 +39,24 @@ public class XStandardColormap extends X 5.3045 + } 5.3046 + public long get_colormap() { log.finest("");return (Native.getLong(pData+0)); } 5.3047 + public void set_colormap(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.3048 +- public long get_red_max() { log.finest("");return (Native.getLong(pData+4)); } 5.3049 +- public void set_red_max(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.3050 +- public long get_red_mult() { log.finest("");return (Native.getLong(pData+8)); } 5.3051 +- public void set_red_mult(long v) { log.finest(""); Native.putLong(pData+8, v); } 5.3052 +- public long get_green_max() { log.finest("");return (Native.getLong(pData+12)); } 5.3053 +- public void set_green_max(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.3054 +- public long get_green_mult() { log.finest("");return (Native.getLong(pData+16)); } 5.3055 +- public void set_green_mult(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.3056 +- public long get_blue_max() { log.finest("");return (Native.getLong(pData+20)); } 5.3057 +- public void set_blue_max(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.3058 +- public long get_blue_mult() { log.finest("");return (Native.getLong(pData+24)); } 5.3059 +- public void set_blue_mult(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.3060 +- public long get_base_pixel() { log.finest("");return (Native.getLong(pData+28)); } 5.3061 +- public void set_base_pixel(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.3062 +- public long get_visualid() { log.finest("");return (Native.getLong(pData+32)); } 5.3063 +- public void set_visualid(long v) { log.finest(""); Native.putLong(pData+32, v); } 5.3064 +- public long get_killid() { log.finest("");return (Native.getLong(pData+36)); } 5.3065 +- public void set_killid(long v) { log.finest(""); Native.putLong(pData+36, v); } 5.3066 ++ public long get_red_max() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3067 ++ public void set_red_max(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3068 ++ public long get_red_mult() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.3069 ++ public void set_red_mult(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.3070 ++ public long get_green_max() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.3071 ++ public void set_green_max(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.3072 ++ public long get_green_mult() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.3073 ++ public void set_green_mult(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.3074 ++ public long get_blue_max() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.3075 ++ public void set_blue_max(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.3076 ++ public long get_blue_mult() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.3077 ++ public void set_blue_mult(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.3078 ++ public long get_base_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)))); } 5.3079 ++ public void set_base_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(56)), v); } 5.3080 ++ public long get_visualid() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(64)))); } 5.3081 ++ public void set_visualid(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(32):(64)), v); } 5.3082 ++ public long get_killid() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(36):(72)))); } 5.3083 ++ public void set_killid(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(36):(72)), v); } 5.3084 + 5.3085 + 5.3086 + String getName() { 5.3087 +diff -r ca3a8b43a54b generated/sun/awt/X11/XTextItem.java 5.3088 +--- a/generated/sun/awt/X11/XTextItem.java Tue May 27 21:14:08 2008 +0100 5.3089 ++++ b/generated/sun/awt/X11/XTextItem.java Tue May 27 21:15:32 2008 +0100 5.3090 +@@ -8,7 +8,7 @@ public class XTextItem extends XWrapperB 5.3091 + public class XTextItem extends XWrapperBase { 5.3092 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3093 + private final boolean should_free_memory; 5.3094 +- public static int getSize() { return 16; } 5.3095 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.3096 + public int getDataSize() { return getSize(); } 5.3097 + 5.3098 + long pData; 5.3099 +@@ -40,12 +40,12 @@ public class XTextItem extends XWrapperB 5.3100 + public long get_chars(int index) { log.finest(""); return Native.getLong(pData+0)+index*Native.getLongSize(); } 5.3101 + public long get_chars() { log.finest("");return Native.getLong(pData+0); } 5.3102 + public void set_chars(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.3103 +- public int get_nchars() { log.finest("");return (Native.getInt(pData+4)); } 5.3104 +- public void set_nchars(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.3105 +- public int get_delta() { log.finest("");return (Native.getInt(pData+8)); } 5.3106 +- public void set_delta(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3107 +- public long get_font() { log.finest("");return (Native.getLong(pData+12)); } 5.3108 +- public void set_font(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.3109 ++ public int get_nchars() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3110 ++ public void set_nchars(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3111 ++ public int get_delta() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.3112 ++ public void set_delta(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.3113 ++ public long get_font() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))); } 5.3114 ++ public void set_font(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.3115 + 5.3116 + 5.3117 + String getName() { 5.3118 +diff -r ca3a8b43a54b generated/sun/awt/X11/XTextItem16.java 5.3119 +--- a/generated/sun/awt/X11/XTextItem16.java Tue May 27 21:14:08 2008 +0100 5.3120 ++++ b/generated/sun/awt/X11/XTextItem16.java Tue May 27 21:15:32 2008 +0100 5.3121 +@@ -8,7 +8,7 @@ public class XTextItem16 extends XWrappe 5.3122 + public class XTextItem16 extends XWrapperBase { 5.3123 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3124 + private final boolean should_free_memory; 5.3125 +- public static int getSize() { return 16; } 5.3126 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.3127 + public int getDataSize() { return getSize(); } 5.3128 + 5.3129 + long pData; 5.3130 +@@ -40,12 +40,12 @@ public class XTextItem16 extends XWrappe 5.3131 + public XChar2b get_chars(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new XChar2b(Native.getLong(pData+0)+index*2)):(null); } 5.3132 + public long get_chars() { log.finest("");return Native.getLong(pData+0); } 5.3133 + public void set_chars(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.3134 +- public int get_nchars() { log.finest("");return (Native.getInt(pData+4)); } 5.3135 +- public void set_nchars(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.3136 +- public int get_delta() { log.finest("");return (Native.getInt(pData+8)); } 5.3137 +- public void set_delta(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3138 +- public long get_font() { log.finest("");return (Native.getLong(pData+12)); } 5.3139 +- public void set_font(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.3140 ++ public int get_nchars() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3141 ++ public void set_nchars(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3142 ++ public int get_delta() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.3143 ++ public void set_delta(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.3144 ++ public long get_font() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))); } 5.3145 ++ public void set_font(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.3146 + 5.3147 + 5.3148 + String getName() { 5.3149 +diff -r ca3a8b43a54b generated/sun/awt/X11/XTextProperty.java 5.3150 +--- a/generated/sun/awt/X11/XTextProperty.java Tue May 27 21:14:08 2008 +0100 5.3151 ++++ b/generated/sun/awt/X11/XTextProperty.java Tue May 27 21:15:32 2008 +0100 5.3152 +@@ -8,7 +8,7 @@ public class XTextProperty extends XWrap 5.3153 + public class XTextProperty extends XWrapperBase { 5.3154 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3155 + private final boolean should_free_memory; 5.3156 +- public static int getSize() { return 16; } 5.3157 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(32)); } 5.3158 + public int getDataSize() { return getSize(); } 5.3159 + 5.3160 + long pData; 5.3161 +@@ -40,12 +40,12 @@ public class XTextProperty extends XWrap 5.3162 + public byte get_value(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+0)+index*1); } 5.3163 + public long get_value() { log.finest("");return Native.getLong(pData+0); } 5.3164 + public void set_value(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.3165 +- public long get_encoding() { log.finest("");return (Native.getLong(pData+4)); } 5.3166 +- public void set_encoding(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.3167 +- public int get_format() { log.finest("");return (Native.getInt(pData+8)); } 5.3168 +- public void set_format(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3169 +- public long get_nitems() { log.finest("");return (Native.getLong(pData+12)); } 5.3170 +- public void set_nitems(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.3171 ++ public long get_encoding() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3172 ++ public void set_encoding(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3173 ++ public int get_format() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.3174 ++ public void set_format(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.3175 ++ public long get_nitems() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.3176 ++ public void set_nitems(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.3177 + 5.3178 + 5.3179 + String getName() { 5.3180 +diff -r ca3a8b43a54b generated/sun/awt/X11/XTimeCoord.java 5.3181 +--- a/generated/sun/awt/X11/XTimeCoord.java Tue May 27 21:14:08 2008 +0100 5.3182 ++++ b/generated/sun/awt/X11/XTimeCoord.java Tue May 27 21:15:32 2008 +0100 5.3183 +@@ -8,7 +8,7 @@ public class XTimeCoord extends XWrapper 5.3184 + public class XTimeCoord extends XWrapperBase { 5.3185 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3186 + private final boolean should_free_memory; 5.3187 +- public static int getSize() { return 8; } 5.3188 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.3189 + public int getDataSize() { return getSize(); } 5.3190 + 5.3191 + long pData; 5.3192 +@@ -39,10 +39,10 @@ public class XTimeCoord extends XWrapper 5.3193 + } 5.3194 + public long get_time() { log.finest("");return (Native.getULong(pData+0)); } 5.3195 + public void set_time(long v) { log.finest(""); Native.putULong(pData+0, v); } 5.3196 +- public short get_x() { log.finest("");return (Native.getShort(pData+4)); } 5.3197 +- public void set_x(short v) { log.finest(""); Native.putShort(pData+4, v); } 5.3198 +- public short get_y() { log.finest("");return (Native.getShort(pData+6)); } 5.3199 +- public void set_y(short v) { log.finest(""); Native.putShort(pData+6, v); } 5.3200 ++ public short get_x() { log.finest("");return (Native.getShort(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3201 ++ public void set_x(short v) { log.finest(""); Native.putShort(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3202 ++ public short get_y() { log.finest("");return (Native.getShort(pData+((XlibWrapper.dataModel == 32)?(6):(10)))); } 5.3203 ++ public void set_y(short v) { log.finest(""); Native.putShort(pData+((XlibWrapper.dataModel == 32)?(6):(10)), v); } 5.3204 + 5.3205 + 5.3206 + String getName() { 5.3207 +diff -r ca3a8b43a54b generated/sun/awt/X11/XUnmapEvent.java 5.3208 +--- a/generated/sun/awt/X11/XUnmapEvent.java Tue May 27 21:14:08 2008 +0100 5.3209 ++++ b/generated/sun/awt/X11/XUnmapEvent.java Tue May 27 21:15:32 2008 +0100 5.3210 +@@ -8,7 +8,7 @@ public class XUnmapEvent extends XWrappe 5.3211 + public class XUnmapEvent extends XWrapperBase { 5.3212 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3213 + private final boolean should_free_memory; 5.3214 +- public static int getSize() { return 28; } 5.3215 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(56)); } 5.3216 + public int getDataSize() { return getSize(); } 5.3217 + 5.3218 + long pData; 5.3219 +@@ -39,18 +39,18 @@ public class XUnmapEvent extends XWrappe 5.3220 + } 5.3221 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.3222 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.3223 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.3224 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.3225 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.3226 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.3227 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.3228 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.3229 +- public long get_event() { log.finest("");return (Native.getLong(pData+16)); } 5.3230 +- public void set_event(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.3231 +- public long get_window() { log.finest("");return (Native.getLong(pData+20)); } 5.3232 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.3233 +- public boolean get_from_configure() { log.finest("");return (Native.getBool(pData+24)); } 5.3234 +- public void set_from_configure(boolean v) { log.finest(""); Native.putBool(pData+24, v); } 5.3235 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3236 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3237 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.3238 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.3239 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.3240 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.3241 ++ public long get_event() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.3242 ++ public void set_event(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.3243 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.3244 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.3245 ++ public boolean get_from_configure() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(24):(48)))); } 5.3246 ++ public void set_from_configure(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(24):(48)), v); } 5.3247 + 5.3248 + 5.3249 + String getName() { 5.3250 +diff -r ca3a8b43a54b generated/sun/awt/X11/XVisibilityEvent.java 5.3251 +--- a/generated/sun/awt/X11/XVisibilityEvent.java Tue May 27 21:14:08 2008 +0100 5.3252 ++++ b/generated/sun/awt/X11/XVisibilityEvent.java Tue May 27 21:15:32 2008 +0100 5.3253 +@@ -8,7 +8,7 @@ public class XVisibilityEvent extends XW 5.3254 + public class XVisibilityEvent extends XWrapperBase { 5.3255 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3256 + private final boolean should_free_memory; 5.3257 +- public static int getSize() { return 24; } 5.3258 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(24):(48)); } 5.3259 + public int getDataSize() { return getSize(); } 5.3260 + 5.3261 + long pData; 5.3262 +@@ -39,16 +39,16 @@ public class XVisibilityEvent extends XW 5.3263 + } 5.3264 + public int get_type() { log.finest("");return (Native.getInt(pData+0)); } 5.3265 + public void set_type(int v) { log.finest(""); Native.putInt(pData+0, v); } 5.3266 +- public long get_serial() { log.finest("");return (Native.getLong(pData+4)); } 5.3267 +- public void set_serial(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.3268 +- public boolean get_send_event() { log.finest("");return (Native.getBool(pData+8)); } 5.3269 +- public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+8, v); } 5.3270 +- public long get_display() { log.finest("");return (Native.getLong(pData+12)); } 5.3271 +- public void set_display(long v) { log.finest(""); Native.putLong(pData+12, v); } 5.3272 +- public long get_window() { log.finest("");return (Native.getLong(pData+16)); } 5.3273 +- public void set_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.3274 +- public int get_state() { log.finest("");return (Native.getInt(pData+20)); } 5.3275 +- public void set_state(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.3276 ++ public long get_serial() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3277 ++ public void set_serial(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3278 ++ public boolean get_send_event() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.3279 ++ public void set_send_event(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.3280 ++ public long get_display() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); } 5.3281 ++ public void set_display(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); } 5.3282 ++ public long get_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))); } 5.3283 ++ public void set_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)), v); } 5.3284 ++ public int get_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)))); } 5.3285 ++ public void set_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(40)), v); } 5.3286 + 5.3287 + 5.3288 + String getName() { 5.3289 +diff -r ca3a8b43a54b generated/sun/awt/X11/XVisualInfo.java 5.3290 +--- a/generated/sun/awt/X11/XVisualInfo.java Tue May 27 21:14:08 2008 +0100 5.3291 ++++ b/generated/sun/awt/X11/XVisualInfo.java Tue May 27 21:15:32 2008 +0100 5.3292 +@@ -8,7 +8,7 @@ public class XVisualInfo extends XWrappe 5.3293 + public class XVisualInfo extends XWrapperBase { 5.3294 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3295 + private final boolean should_free_memory; 5.3296 +- public static int getSize() { return 40; } 5.3297 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(40):(64)); } 5.3298 + public int getDataSize() { return getSize(); } 5.3299 + 5.3300 + long pData; 5.3301 +@@ -40,24 +40,24 @@ public class XVisualInfo extends XWrappe 5.3302 + public long get_visual(int index) { log.finest(""); return Native.getLong(pData+0)+index*Native.getLongSize(); } 5.3303 + public long get_visual() { log.finest("");return Native.getLong(pData+0); } 5.3304 + public void set_visual(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.3305 +- public long get_visualid() { log.finest("");return (Native.getLong(pData+4)); } 5.3306 +- public void set_visualid(long v) { log.finest(""); Native.putLong(pData+4, v); } 5.3307 +- public int get_screen() { log.finest("");return (Native.getInt(pData+8)); } 5.3308 +- public void set_screen(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3309 +- public int get_depth() { log.finest("");return (Native.getInt(pData+12)); } 5.3310 +- public void set_depth(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.3311 +- public int get_class() { log.finest("");return (Native.getInt(pData+16)); } 5.3312 +- public void set_class(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.3313 +- public long get_red_mask() { log.finest("");return (Native.getLong(pData+20)); } 5.3314 +- public void set_red_mask(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.3315 +- public long get_green_mask() { log.finest("");return (Native.getLong(pData+24)); } 5.3316 +- public void set_green_mask(long v) { log.finest(""); Native.putLong(pData+24, v); } 5.3317 +- public long get_blue_mask() { log.finest("");return (Native.getLong(pData+28)); } 5.3318 +- public void set_blue_mask(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.3319 +- public int get_colormap_size() { log.finest("");return (Native.getInt(pData+32)); } 5.3320 +- public void set_colormap_size(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.3321 +- public int get_bits_per_rgb() { log.finest("");return (Native.getInt(pData+36)); } 5.3322 +- public void set_bits_per_rgb(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.3323 ++ public long get_visualid() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3324 ++ public void set_visualid(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3325 ++ public int get_screen() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); } 5.3326 ++ public void set_screen(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); } 5.3327 ++ public int get_depth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(12):(20)))); } 5.3328 ++ public void set_depth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(12):(20)), v); } 5.3329 ++ public int get_class() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(16):(24)))); } 5.3330 ++ public void set_class(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(16):(24)), v); } 5.3331 ++ public long get_red_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(32)))); } 5.3332 ++ public void set_red_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(32)), v); } 5.3333 ++ public long get_green_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(24):(40)))); } 5.3334 ++ public void set_green_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(24):(40)), v); } 5.3335 ++ public long get_blue_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(48)))); } 5.3336 ++ public void set_blue_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(48)), v); } 5.3337 ++ public int get_colormap_size() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)))); } 5.3338 ++ public void set_colormap_size(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(56)), v); } 5.3339 ++ public int get_bits_per_rgb() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)))); } 5.3340 ++ public void set_bits_per_rgb(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(60)), v); } 5.3341 + 5.3342 + 5.3343 + String getName() { 5.3344 +diff -r ca3a8b43a54b generated/sun/awt/X11/XWMHints.java 5.3345 +--- a/generated/sun/awt/X11/XWMHints.java Tue May 27 21:14:08 2008 +0100 5.3346 ++++ b/generated/sun/awt/X11/XWMHints.java Tue May 27 21:15:32 2008 +0100 5.3347 +@@ -8,7 +8,7 @@ public class XWMHints extends XWrapperBa 5.3348 + public class XWMHints extends XWrapperBase { 5.3349 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3350 + private final boolean should_free_memory; 5.3351 +- public static int getSize() { return 36; } 5.3352 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(36):(56)); } 5.3353 + public int getDataSize() { return getSize(); } 5.3354 + 5.3355 + long pData; 5.3356 +@@ -39,23 +39,23 @@ public class XWMHints extends XWrapperBa 5.3357 + } 5.3358 + public long get_flags() { log.finest("");return (Native.getLong(pData+0)); } 5.3359 + public void set_flags(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.3360 +- public int get_initial_state() { log.finest("");return (Native.getInt(pData+8)); } 5.3361 +- public void set_initial_state(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3362 +- public long get_icon_pixmap(int index) { log.finest(""); return Native.getLong(pData+12)+index*Native.getLongSize(); } 5.3363 +- public long get_icon_pixmap() { log.finest("");return Native.getLong(pData+12); } 5.3364 +- public void set_icon_pixmap(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.3365 +- public long get_icon_window() { log.finest("");return (Native.getLong(pData+16)); } 5.3366 +- public void set_icon_window(long v) { log.finest(""); Native.putLong(pData+16, v); } 5.3367 +- public int get_icon_x() { log.finest("");return (Native.getInt(pData+20)); } 5.3368 +- public void set_icon_x(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.3369 +- public int get_icon_y() { log.finest("");return (Native.getInt(pData+24)); } 5.3370 +- public void set_icon_y(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.3371 +- public long get_icon_mask() { log.finest("");return (Native.getLong(pData+28)); } 5.3372 +- public void set_icon_mask(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.3373 +- public boolean get_input() { log.finest("");return (Native.getBool(pData+4)); } 5.3374 +- public void set_input(boolean v) { log.finest(""); Native.putBool(pData+4, v); } 5.3375 +- public long get_window_group() { log.finest("");return (Native.getLong(pData+32)); } 5.3376 +- public void set_window_group(long v) { log.finest(""); Native.putLong(pData+32, v); } 5.3377 ++ public int get_initial_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.3378 ++ public void set_initial_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.3379 ++ public long get_icon_pixmap(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))+index*Native.getLongSize(); } 5.3380 ++ public long get_icon_pixmap() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))); } 5.3381 ++ public void set_icon_pixmap(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.3382 ++ public long get_icon_window() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(24)))); } 5.3383 ++ public void set_icon_window(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(16):(24)), v); } 5.3384 ++ public int get_icon_x() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(20):(32)))); } 5.3385 ++ public void set_icon_x(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(20):(32)), v); } 5.3386 ++ public int get_icon_y() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(36)))); } 5.3387 ++ public void set_icon_y(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(36)), v); } 5.3388 ++ public long get_icon_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(40)))); } 5.3389 ++ public void set_icon_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(40)), v); } 5.3390 ++ public boolean get_input() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3391 ++ public void set_input(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3392 ++ public long get_window_group() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(32):(48)))); } 5.3393 ++ public void set_window_group(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(32):(48)), v); } 5.3394 + 5.3395 + 5.3396 + String getName() { 5.3397 +diff -r ca3a8b43a54b generated/sun/awt/X11/XWindowAttributes.java 5.3398 +--- a/generated/sun/awt/X11/XWindowAttributes.java Tue May 27 21:14:08 2008 +0100 5.3399 ++++ b/generated/sun/awt/X11/XWindowAttributes.java Tue May 27 21:15:32 2008 +0100 5.3400 +@@ -8,7 +8,7 @@ public class XWindowAttributes extends X 5.3401 + public class XWindowAttributes extends XWrapperBase { 5.3402 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3403 + private final boolean should_free_memory; 5.3404 +- public static int getSize() { return 92; } 5.3405 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(92):(136)); } 5.3406 + public int getDataSize() { return getSize(); } 5.3407 + 5.3408 + long pData; 5.3409 +@@ -49,42 +49,42 @@ public class XWindowAttributes extends X 5.3410 + public void set_border_width(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.3411 + public int get_depth() { log.finest("");return (Native.getInt(pData+20)); } 5.3412 + public void set_depth(int v) { log.finest(""); Native.putInt(pData+20, v); } 5.3413 +- public Visual get_visual(int index) { log.finest(""); return (Native.getLong(pData+24) != 0)?(new Visual(Native.getLong(pData+24)+index*32)):(null); } 5.3414 ++ public Visual get_visual(int index) { log.finest(""); return (Native.getLong(pData+24) != 0)?(new Visual(Native.getLong(pData+24)+index*((XlibWrapper.dataModel == 32)?(32):(56)))):(null); } 5.3415 + public long get_visual() { log.finest("");return Native.getLong(pData+24); } 5.3416 + public void set_visual(long v) { log.finest(""); Native.putLong(pData + 24, v); } 5.3417 +- public long get_root() { log.finest("");return (Native.getLong(pData+28)); } 5.3418 +- public void set_root(long v) { log.finest(""); Native.putLong(pData+28, v); } 5.3419 +- public int get_class() { log.finest("");return (Native.getInt(pData+32)); } 5.3420 +- public void set_class(int v) { log.finest(""); Native.putInt(pData+32, v); } 5.3421 +- public int get_bit_gravity() { log.finest("");return (Native.getInt(pData+36)); } 5.3422 +- public void set_bit_gravity(int v) { log.finest(""); Native.putInt(pData+36, v); } 5.3423 +- public int get_win_gravity() { log.finest("");return (Native.getInt(pData+40)); } 5.3424 +- public void set_win_gravity(int v) { log.finest(""); Native.putInt(pData+40, v); } 5.3425 +- public int get_backing_store() { log.finest("");return (Native.getInt(pData+44)); } 5.3426 +- public void set_backing_store(int v) { log.finest(""); Native.putInt(pData+44, v); } 5.3427 +- public long get_backing_planes() { log.finest("");return (Native.getLong(pData+48)); } 5.3428 +- public void set_backing_planes(long v) { log.finest(""); Native.putLong(pData+48, v); } 5.3429 +- public long get_backing_pixel() { log.finest("");return (Native.getLong(pData+52)); } 5.3430 +- public void set_backing_pixel(long v) { log.finest(""); Native.putLong(pData+52, v); } 5.3431 +- public boolean get_save_under() { log.finest("");return (Native.getBool(pData+56)); } 5.3432 +- public void set_save_under(boolean v) { log.finest(""); Native.putBool(pData+56, v); } 5.3433 +- public long get_colormap() { log.finest("");return (Native.getLong(pData+60)); } 5.3434 +- public void set_colormap(long v) { log.finest(""); Native.putLong(pData+60, v); } 5.3435 +- public boolean get_map_installed() { log.finest("");return (Native.getBool(pData+64)); } 5.3436 +- public void set_map_installed(boolean v) { log.finest(""); Native.putBool(pData+64, v); } 5.3437 +- public int get_map_state() { log.finest("");return (Native.getInt(pData+68)); } 5.3438 +- public void set_map_state(int v) { log.finest(""); Native.putInt(pData+68, v); } 5.3439 +- public long get_all_event_masks() { log.finest("");return (Native.getLong(pData+72)); } 5.3440 +- public void set_all_event_masks(long v) { log.finest(""); Native.putLong(pData+72, v); } 5.3441 +- public long get_your_event_mask() { log.finest("");return (Native.getLong(pData+76)); } 5.3442 +- public void set_your_event_mask(long v) { log.finest(""); Native.putLong(pData+76, v); } 5.3443 +- public long get_do_not_propagate_mask() { log.finest("");return (Native.getLong(pData+80)); } 5.3444 +- public void set_do_not_propagate_mask(long v) { log.finest(""); Native.putLong(pData+80, v); } 5.3445 +- public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+84)); } 5.3446 +- public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+84, v); } 5.3447 +- public Screen get_screen(int index) { log.finest(""); return (Native.getLong(pData+88) != 0)?(new Screen(Native.getLong(pData+88)+index*80)):(null); } 5.3448 +- public long get_screen() { log.finest("");return Native.getLong(pData+88); } 5.3449 +- public void set_screen(long v) { log.finest(""); Native.putLong(pData + 88, v); } 5.3450 ++ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(28):(32)))); } 5.3451 ++ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(28):(32)), v); } 5.3452 ++ public int get_class() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(32):(40)))); } 5.3453 ++ public void set_class(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(32):(40)), v); } 5.3454 ++ public int get_bit_gravity() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(36):(44)))); } 5.3455 ++ public void set_bit_gravity(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(36):(44)), v); } 5.3456 ++ public int get_win_gravity() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(40):(48)))); } 5.3457 ++ public void set_win_gravity(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(40):(48)), v); } 5.3458 ++ public int get_backing_store() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(44):(52)))); } 5.3459 ++ public void set_backing_store(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(44):(52)), v); } 5.3460 ++ public long get_backing_planes() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(48):(56)))); } 5.3461 ++ public void set_backing_planes(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(48):(56)), v); } 5.3462 ++ public long get_backing_pixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(64)))); } 5.3463 ++ public void set_backing_pixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(52):(64)), v); } 5.3464 ++ public boolean get_save_under() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(56):(72)))); } 5.3465 ++ public void set_save_under(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(56):(72)), v); } 5.3466 ++ public long get_colormap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(80)))); } 5.3467 ++ public void set_colormap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(60):(80)), v); } 5.3468 ++ public boolean get_map_installed() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(64):(88)))); } 5.3469 ++ public void set_map_installed(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(64):(88)), v); } 5.3470 ++ public int get_map_state() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(68):(92)))); } 5.3471 ++ public void set_map_state(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(68):(92)), v); } 5.3472 ++ public long get_all_event_masks() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(72):(96)))); } 5.3473 ++ public void set_all_event_masks(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(72):(96)), v); } 5.3474 ++ public long get_your_event_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(76):(104)))); } 5.3475 ++ public void set_your_event_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(76):(104)), v); } 5.3476 ++ public long get_do_not_propagate_mask() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(80):(112)))); } 5.3477 ++ public void set_do_not_propagate_mask(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(80):(112)), v); } 5.3478 ++ public boolean get_override_redirect() { log.finest("");return (Native.getBool(pData+((XlibWrapper.dataModel == 32)?(84):(120)))); } 5.3479 ++ public void set_override_redirect(boolean v) { log.finest(""); Native.putBool(pData+((XlibWrapper.dataModel == 32)?(84):(120)), v); } 5.3480 ++ public Screen get_screen(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(128))) != 0)?(new Screen(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(128)))+index*((XlibWrapper.dataModel == 32)?(80):(128)))):(null); } 5.3481 ++ public long get_screen() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(128))); } 5.3482 ++ public void set_screen(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(88):(128)), v); } 5.3483 + 5.3484 + 5.3485 + String getName() { 5.3486 +diff -r ca3a8b43a54b generated/sun/awt/X11/XWindowChanges.java 5.3487 +--- a/generated/sun/awt/X11/XWindowChanges.java Tue May 27 21:14:08 2008 +0100 5.3488 ++++ b/generated/sun/awt/X11/XWindowChanges.java Tue May 27 21:15:32 2008 +0100 5.3489 +@@ -8,7 +8,7 @@ public class XWindowChanges extends XWra 5.3490 + public class XWindowChanges extends XWrapperBase { 5.3491 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3492 + private final boolean should_free_memory; 5.3493 +- public static int getSize() { return 28; } 5.3494 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(28):(40)); } 5.3495 + public int getDataSize() { return getSize(); } 5.3496 + 5.3497 + long pData; 5.3498 +@@ -47,10 +47,10 @@ public class XWindowChanges extends XWra 5.3499 + public void set_height(int v) { log.finest(""); Native.putInt(pData+12, v); } 5.3500 + public int get_border_width() { log.finest("");return (Native.getInt(pData+16)); } 5.3501 + public void set_border_width(int v) { log.finest(""); Native.putInt(pData+16, v); } 5.3502 +- public long get_sibling() { log.finest("");return (Native.getLong(pData+20)); } 5.3503 +- public void set_sibling(long v) { log.finest(""); Native.putLong(pData+20, v); } 5.3504 +- public int get_stack_mode() { log.finest("");return (Native.getInt(pData+24)); } 5.3505 +- public void set_stack_mode(int v) { log.finest(""); Native.putInt(pData+24, v); } 5.3506 ++ public long get_sibling() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(24)))); } 5.3507 ++ public void set_sibling(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(20):(24)), v); } 5.3508 ++ public int get_stack_mode() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(24):(32)))); } 5.3509 ++ public void set_stack_mode(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(24):(32)), v); } 5.3510 + 5.3511 + 5.3512 + String getName() { 5.3513 +diff -r ca3a8b43a54b generated/sun/awt/X11/XdbeSwapInfo.java 5.3514 +--- a/generated/sun/awt/X11/XdbeSwapInfo.java Tue May 27 21:14:08 2008 +0100 5.3515 ++++ b/generated/sun/awt/X11/XdbeSwapInfo.java Tue May 27 21:15:32 2008 +0100 5.3516 +@@ -8,7 +8,7 @@ public class XdbeSwapInfo extends XWrapp 5.3517 + public class XdbeSwapInfo extends XWrapperBase { 5.3518 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3519 + private final boolean should_free_memory; 5.3520 +- public static int getSize() { return 8; } 5.3521 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(8):(16)); } 5.3522 + public int getDataSize() { return getSize(); } 5.3523 + 5.3524 + long pData; 5.3525 +@@ -39,8 +39,8 @@ public class XdbeSwapInfo extends XWrapp 5.3526 + } 5.3527 + public long get_swap_window() { log.finest("");return (Native.getLong(pData+0)); } 5.3528 + public void set_swap_window(long v) { log.finest(""); Native.putLong(pData+0, v); } 5.3529 +- public int get_swap_action() { log.finest("");return (Native.getInt(pData+4)); } 5.3530 +- public void set_swap_action(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.3531 ++ public int get_swap_action() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3532 ++ public void set_swap_action(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3533 + 5.3534 + 5.3535 + String getName() { 5.3536 +diff -r ca3a8b43a54b generated/sun/awt/X11/XmbTextItem.java 5.3537 +--- a/generated/sun/awt/X11/XmbTextItem.java Tue May 27 21:14:08 2008 +0100 5.3538 ++++ b/generated/sun/awt/X11/XmbTextItem.java Tue May 27 21:15:32 2008 +0100 5.3539 +@@ -8,7 +8,7 @@ public class XmbTextItem extends XWrappe 5.3540 + public class XmbTextItem extends XWrapperBase { 5.3541 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3542 + private final boolean should_free_memory; 5.3543 +- public static int getSize() { return 16; } 5.3544 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.3545 + public int getDataSize() { return getSize(); } 5.3546 + 5.3547 + long pData; 5.3548 +@@ -40,13 +40,13 @@ public class XmbTextItem extends XWrappe 5.3549 + public byte get_chars(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+0)+index*1); } 5.3550 + public long get_chars() { log.finest("");return Native.getLong(pData+0); } 5.3551 + public void set_chars(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.3552 +- public int get_nchars() { log.finest("");return (Native.getInt(pData+4)); } 5.3553 +- public void set_nchars(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.3554 +- public int get_delta() { log.finest("");return (Native.getInt(pData+8)); } 5.3555 +- public void set_delta(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3556 +- public long get_font_set(int index) { log.finest(""); return Native.getLong(pData+12)+index*Native.getLongSize(); } 5.3557 +- public long get_font_set() { log.finest("");return Native.getLong(pData+12); } 5.3558 +- public void set_font_set(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.3559 ++ public int get_nchars() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3560 ++ public void set_nchars(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3561 ++ public int get_delta() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.3562 ++ public void set_delta(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.3563 ++ public long get_font_set(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))+index*Native.getLongSize(); } 5.3564 ++ public long get_font_set() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))); } 5.3565 ++ public void set_font_set(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.3566 + 5.3567 + 5.3568 + String getName() { 5.3569 +diff -r ca3a8b43a54b generated/sun/awt/X11/XwcTextItem.java 5.3570 +--- a/generated/sun/awt/X11/XwcTextItem.java Tue May 27 21:14:08 2008 +0100 5.3571 ++++ b/generated/sun/awt/X11/XwcTextItem.java Tue May 27 21:15:32 2008 +0100 5.3572 +@@ -8,7 +8,7 @@ public class XwcTextItem extends XWrappe 5.3573 + public class XwcTextItem extends XWrapperBase { 5.3574 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3575 + private final boolean should_free_memory; 5.3576 +- public static int getSize() { return 16; } 5.3577 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(16):(24)); } 5.3578 + public int getDataSize() { return getSize(); } 5.3579 + 5.3580 + long pData; 5.3581 +@@ -40,13 +40,13 @@ public class XwcTextItem extends XWrappe 5.3582 + public long get_chars(int index) { log.finest(""); return Native.getLong(pData+0)+index*Native.getLongSize(); } 5.3583 + public long get_chars() { log.finest("");return Native.getLong(pData+0); } 5.3584 + public void set_chars(long v) { log.finest(""); Native.putLong(pData + 0, v); } 5.3585 +- public int get_nchars() { log.finest("");return (Native.getInt(pData+4)); } 5.3586 +- public void set_nchars(int v) { log.finest(""); Native.putInt(pData+4, v); } 5.3587 +- public int get_delta() { log.finest("");return (Native.getInt(pData+8)); } 5.3588 +- public void set_delta(int v) { log.finest(""); Native.putInt(pData+8, v); } 5.3589 +- public long get_font_set(int index) { log.finest(""); return Native.getLong(pData+12)+index*Native.getLongSize(); } 5.3590 +- public long get_font_set() { log.finest("");return Native.getLong(pData+12); } 5.3591 +- public void set_font_set(long v) { log.finest(""); Native.putLong(pData + 12, v); } 5.3592 ++ public int get_nchars() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); } 5.3593 ++ public void set_nchars(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); } 5.3594 ++ public int get_delta() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)))); } 5.3595 ++ public void set_delta(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(8):(12)), v); } 5.3596 ++ public long get_font_set(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16)))+index*Native.getLongSize(); } 5.3597 ++ public long get_font_set() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(16))); } 5.3598 ++ public void set_font_set(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(12):(16)), v); } 5.3599 + 5.3600 + 5.3601 + String getName() { 5.3602 +diff -r ca3a8b43a54b generated/sun/awt/X11/awtImageData.java 5.3603 +--- a/generated/sun/awt/X11/awtImageData.java Tue May 27 21:14:08 2008 +0100 5.3604 ++++ b/generated/sun/awt/X11/awtImageData.java Tue May 27 21:15:32 2008 +0100 5.3605 +@@ -8,7 +8,7 @@ public class awtImageData extends XWrapp 5.3606 + public class awtImageData extends XWrapperBase { 5.3607 + private Unsafe unsafe = XlibWrapper.unsafe; 5.3608 + private final boolean should_free_memory; 5.3609 +- public static int getSize() { return 304; } 5.3610 ++ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(304):(560)); } 5.3611 + public int getDataSize() { return getSize(); } 5.3612 + 5.3613 + long pData;
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/icedtea/out-of-dir-build-05.diff Tue Jun 10 03:20:00 2008 +0100 6.3 @@ -0,0 +1,30 @@ 6.4 +diff -r 632581aea9a2 Makefile.am 6.5 +--- a/Makefile.am Tue May 27 22:01:47 2008 +0100 6.6 ++++ b/Makefile.am Wed May 28 10:34:24 2008 +0100 6.7 +@@ -782,9 +782,9 @@ clean-copy: 6.8 + done 6.9 + 6.10 + stamps/generated.stamp: 6.11 +- mkdir -p generated/java/lang 6.12 ++ mkdir -p $(abs_top_srcdir)/generated/java/lang 6.13 + cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \ 6.14 +- generated/java/lang/UNIXProcess.java ; 6.15 ++ $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ; 6.16 + touch stamps/generated.stamp 6.17 + 6.18 + SHARE = openjdk/jdk/src/share/classes 6.19 +diff -r 632581aea9a2 Makefile.in 6.20 +--- a/Makefile.in Tue May 27 22:01:47 2008 +0100 6.21 ++++ b/Makefile.in Wed May 28 10:34:24 2008 +0100 6.22 +@@ -1231,9 +1231,9 @@ clean-copy: 6.23 + done 6.24 + 6.25 + stamps/generated.stamp: 6.26 +- mkdir -p generated/java/lang 6.27 ++ mkdir -p $(abs_top_srcdir)/generated/java/lang 6.28 + cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \ 6.29 +- generated/java/lang/UNIXProcess.java ; 6.30 ++ $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ; 6.31 + touch stamps/generated.stamp 6.32 + 6.33 + # tools.jar class files.
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/icedtea/patch_fixes.diff Tue Jun 10 03:20:00 2008 +0100 7.3 @@ -0,0 +1,163 @@ 7.4 +diff -r c67694e0e00b Makefile.am 7.5 +--- a/Makefile.am Tue May 27 20:01:27 2008 +0100 7.6 ++++ b/Makefile.am Tue May 27 20:21:35 2008 +0100 7.7 +@@ -276,10 +276,8 @@ OPENJDK_PATCHES = \ 7.8 + # If ZERO_BUILD is set then we are building zero and need 7.9 + # to patch up to OpenJDK 7 HotSpot for the C++ interpreter. 7.10 + ZERO_PATCHES = \ 7.11 +- patches/icedtea-hotspot-6b06-7b24.patch \ 7.12 + patches/icedtea-hotspot7-build-fixes.patch \ 7.13 + patches/icedtea-bytecodeInterpreter.patch \ 7.14 +- patches/icedtea-bytecodeInterpreterWithChecks.patch \ 7.15 + patches/icedtea-signature-iterator.patch \ 7.16 + patches/icedtea-signed-types.patch \ 7.17 + patches/icedtea-test-atomic-operations.patch \ 7.18 +@@ -342,7 +340,8 @@ ICEDTEA_PATCHES = \ 7.19 + patches/icedtea-sparc.patch \ 7.20 + $(GCC_PATCH) \ 7.21 + $(DISTRIBUTION_PATCHES) \ 7.22 +- patches/icedtea-xslfix.patch 7.23 ++ patches/icedtea-xslfix.patch \ 7.24 ++ patches/icedtea-override.patch 7.25 + 7.26 + if WITH_CACAO 7.27 + ICEDTEA_PATCHES += \ 7.28 +diff -r c67694e0e00b Makefile.in 7.29 +--- a/Makefile.in Tue May 27 20:01:27 2008 +0100 7.30 ++++ b/Makefile.in Tue May 27 20:21:35 2008 +0100 7.31 +@@ -373,10 +373,8 @@ OPENJDK_PATCHES = \ 7.32 + # If ZERO_BUILD is set then we are building zero and need 7.33 + # to patch up to OpenJDK 7 HotSpot for the C++ interpreter. 7.34 + ZERO_PATCHES = \ 7.35 +- patches/icedtea-hotspot-6b06-7b24.patch \ 7.36 + patches/icedtea-hotspot7-build-fixes.patch \ 7.37 + patches/icedtea-bytecodeInterpreter.patch \ 7.38 +- patches/icedtea-bytecodeInterpreterWithChecks.patch \ 7.39 + patches/icedtea-signature-iterator.patch \ 7.40 + patches/icedtea-signed-types.patch \ 7.41 + patches/icedtea-test-atomic-operations.patch \ 7.42 +@@ -421,7 +419,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ 7.43 + patches/icedtea-directaudio-close-trick.patch \ 7.44 + patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \ 7.45 + $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \ 7.46 +- patches/icedtea-xslfix.patch $(am__append_7) 7.47 ++ patches/icedtea-xslfix.patch patches/icedtea-override.patch \ 7.48 ++ $(am__append_7) 7.49 + 7.50 + # Patch OpenJDK for plug replacements and ecj. 7.51 + ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch 7.52 +diff -r c67694e0e00b patches/icedtea-ecj.patch 7.53 +--- a/patches/icedtea-ecj.patch Tue May 27 20:01:27 2008 +0100 7.54 ++++ b/patches/icedtea-ecj.patch Tue May 27 20:21:35 2008 +0100 7.55 +@@ -1626,25 +1626,6 @@ diff -Nru openjdk-ecj.orig/jdk/src/share 7.56 + 7.57 + /** 7.58 + * Maximum exponent a finite {@code float} variable may have. It 7.59 +-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 7.60 +---- openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:27:49.000000000 +0100 7.61 +-+++ openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:28:38.000000000 +0100 7.62 +-@@ -113,7 +113,6 @@ 7.63 +- * @exception BadBinaryOpValueExpException 7.64 +- * 7.65 +- */ 7.66 +-- @Override 7.67 +- public ValueExp apply(ObjectName name) throws BadStringOperationException, BadBinaryOpValueExpException, 7.68 +- BadAttributeValueExpException, InvalidApplicationException { 7.69 +- Object result = getAttribute(name); 7.70 +-@@ -150,7 +149,6 @@ 7.71 +- evaluted an AttributeValueExp can only appear inside a QueryExp, 7.72 +- and that QueryExp will itself have done setMBeanServer. */ 7.73 +- @Deprecated 7.74 +-- @Override 7.75 +- public void setMBeanServer(MBeanServer s) { 7.76 +- } 7.77 +- 7.78 + diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile 7.79 + --- openjdk-ecj.orig/langtools/make/Makefile 2008-05-26 01:29:37.000000000 +0100 7.80 + +++ openjdk-ecj/langtools/make/Makefile 2008-05-26 01:35:42.000000000 +0100 7.81 +diff -r c67694e0e00b patches/icedtea-hotspot7-build-fixes.patch 7.82 +--- a/patches/icedtea-hotspot7-build-fixes.patch Tue May 27 20:01:27 2008 +0100 7.83 ++++ b/patches/icedtea-hotspot7-build-fixes.patch Tue May 27 20:21:35 2008 +0100 7.84 +@@ -1,7 +1,7 @@ diff -r 2323cafebabe openjdk/hotspot/src 7.85 +-diff -r 2323cafebabe openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 7.86 +---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-01-31 09:19:01.000000000 -0500 7.87 +-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-29 13:12:39.000000000 -0500 7.88 +-@@ -86,16 +86,12 @@ 7.89 ++diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 7.90 ++--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 00:56:04.000000000 +0100 7.91 +++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 20:14:16.000000000 +0100 7.92 ++@@ -88,16 +88,12 @@ 7.93 + #define VMLP "" 7.94 + #endif 7.95 + 7.96 +@@ -18,47 +18,3 @@ diff -r 2323cafebabe openjdk/hotspot/src 7.97 + 7.98 + #ifndef HOTSPOT_VM_DISTRO 7.99 + #error HOTSPOT_VM_DISTRO must be defined 7.100 +-diff -r 848a72e3bc9b openjdk/hotspot/build/linux/makefiles/top.make 7.101 +---- openjdk/hotspot/build/linux/makefiles/top.make Fri Feb 29 17:02:22 2008 +0000 7.102 +-+++ openjdk/hotspot/build/linux/makefiles/top.make Fri Feb 29 17:04:07 2008 +0000 7.103 +-@@ -67,7 +67,9 @@ Include_DBs/GC = $(VM)/includeD 7.104 +- $(VM)/gc_implementation/includeDB_gc_serial \ 7.105 +- $(VM)/gc_implementation/includeDB_gc_shared 7.106 +- 7.107 +--Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) 7.108 +-+Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \ 7.109 +-+ $(VM)/includeDB_jvmti \ 7.110 +-+ $(VM)/includeDB_features 7.111 +- Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 7.112 +- Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2 7.113 +- Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2 7.114 +-diff -r 2323cafebabe openjdk/hotspot/build/linux/makefiles/jvmti.make 7.115 +---- openjdk/hotspot/build/linux/makefiles/jvmti.make 2008-02-29 16:50:25.000000000 +0000 7.116 +-+++ openjdk/hotspot/build/linux/makefiles/jvmti.make 2008-02-29 10:21:43.000000000 +0000 7.117 +-@@ -36,6 +36,7 @@ 7.118 +- JvmtiOutDir = $(GENERATED)/jvmtifiles 7.119 +- 7.120 +- JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims 7.121 +-+InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter 7.122 +- Src_Dirs += $(JvmtiSrcDir) 7.123 +- 7.124 +- # set VPATH so make knows where to look for source files 7.125 +-@@ -47,6 +48,7 @@ 7.126 +- jvmtiEnter.cpp \ 7.127 +- jvmtiEnterTrace.cpp \ 7.128 +- jvmtiEnvRecommended.cpp\ 7.129 +-+ bytecodeInterpreterWithChecks.cpp \ 7.130 +- jvmti.h \ 7.131 +- 7.132 +- JvmtiEnvFillSource = $(JvmtiSrcDir)/jvmtiEnvFill.java 7.133 +-@@ -77,6 +79,10 @@ 7.134 +- @echo Generating $@ 7.135 +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti 7.136 +- 7.137 +-+$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl 7.138 +-+ @echo Generating $@ 7.139 +-+ $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp 7.140 +-+ 7.141 +- $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl 7.142 +- @echo Generating $@ 7.143 +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace 7.144 +diff -r c67694e0e00b patches/icedtea-override.patch 7.145 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.146 ++++ b/patches/icedtea-override.patch Tue May 27 20:21:35 2008 +0100 7.147 +@@ -0,0 +1,19 @@ 7.148 ++diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 7.149 ++--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:27:49.000000000 +0100 7.150 +++++ openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:28:38.000000000 +0100 7.151 ++@@ -113,7 +113,6 @@ 7.152 ++ * @exception BadBinaryOpValueExpException 7.153 ++ * 7.154 ++ */ 7.155 ++- @Override 7.156 ++ public ValueExp apply(ObjectName name) throws BadStringOperationException, BadBinaryOpValueExpException, 7.157 ++ BadAttributeValueExpException, InvalidApplicationException { 7.158 ++ Object result = getAttribute(name); 7.159 ++@@ -150,7 +149,6 @@ 7.160 ++ evaluted an AttributeValueExp can only appear inside a QueryExp, 7.161 ++ and that QueryExp will itself have done setMBeanServer. */ 7.162 ++ @Deprecated 7.163 ++- @Override 7.164 ++ public void setMBeanServer(MBeanServer s) { 7.165 ++ } 7.166 ++
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/icedtea/post-1.7.diff Tue Jun 10 03:20:00 2008 +0100 8.3 @@ -0,0 +1,104 @@ 8.4 +diff -r 79a70e3a3d61 NEWS 8.5 +--- a/NEWS Mon Jun 02 04:30:31 2008 +0100 8.6 ++++ b/NEWS Mon Jun 02 04:33:00 2008 +0100 8.7 +@@ -1,3 +1,5 @@ New in release 1.7 (2008-06-02) 8.8 ++New in release 1.8 (XXXX-XX-XX) 8.9 ++ 8.10 + New in release 1.7 (2008-06-02) 8.11 + 8.12 + IcedTea is based on the hard work of a lot of people that contributed to 8.13 +diff -r 79a70e3a3d61 configure 8.14 +--- a/configure Mon Jun 02 04:30:31 2008 +0100 8.15 ++++ b/configure Mon Jun 02 04:33:00 2008 +0100 8.16 +@@ -1,6 +1,6 @@ 8.17 + #! /bin/sh 8.18 + # Guess values for system-dependent variables and create Makefiles. 8.19 +-# Generated by GNU Autoconf 2.61 for icedtea 1.7. 8.20 ++# Generated by GNU Autoconf 2.61 for icedtea 1.8-pre. 8.21 + # 8.22 + # Report bugs to <fitzsim@redhat.com>. 8.23 + # 8.24 +@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} 8.25 + # Identity of this package. 8.26 + PACKAGE_NAME='icedtea' 8.27 + PACKAGE_TARNAME='icedtea' 8.28 +-PACKAGE_VERSION='1.7' 8.29 +-PACKAGE_STRING='icedtea 1.7' 8.30 ++PACKAGE_VERSION='1.8-pre' 8.31 ++PACKAGE_STRING='icedtea 1.8-pre' 8.32 + PACKAGE_BUGREPORT='fitzsim@redhat.com' 8.33 + 8.34 + ac_default_prefix=bootstrap 8.35 +@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then 8.36 + # Omit some internal or obsolete options to make the list less imposing. 8.37 + # This message is too long to be a string in the A/UX 3.1 sh. 8.38 + cat <<_ACEOF 8.39 +-\`configure' configures icedtea 1.7 to adapt to many kinds of systems. 8.40 ++\`configure' configures icedtea 1.8-pre to adapt to many kinds of systems. 8.41 + 8.42 + Usage: $0 [OPTION]... [VAR=VALUE]... 8.43 + 8.44 +@@ -1414,7 +1414,7 @@ fi 8.45 + 8.46 + if test -n "$ac_init_help"; then 8.47 + case $ac_init_help in 8.48 +- short | recursive ) echo "Configuration of icedtea 1.7:";; 8.49 ++ short | recursive ) echo "Configuration of icedtea 1.8-pre:";; 8.50 + esac 8.51 + cat <<\_ACEOF 8.52 + 8.53 +@@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat 8.54 + test -n "$ac_init_help" && exit $ac_status 8.55 + if $ac_init_version; then 8.56 + cat <<\_ACEOF 8.57 +-icedtea configure 1.7 8.58 ++icedtea configure 1.8-pre 8.59 + generated by GNU Autoconf 2.61 8.60 + 8.61 + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 8.62 +@@ -1586,7 +1586,7 @@ This file contains any messages produced 8.63 + This file contains any messages produced by compilers while 8.64 + running configure, to aid debugging if configure makes a mistake. 8.65 + 8.66 +-It was created by icedtea $as_me 1.7, which was 8.67 ++It was created by icedtea $as_me 1.8-pre, which was 8.68 + generated by GNU Autoconf 2.61. Invocation command line was 8.69 + 8.70 + $ $0 $@ 8.71 +@@ -2276,7 +2276,7 @@ fi 8.72 + 8.73 + # Define the identity of the package. 8.74 + PACKAGE='icedtea' 8.75 +- VERSION='1.7' 8.76 ++ VERSION='1.8-pre' 8.77 + 8.78 + 8.79 + cat >>confdefs.h <<_ACEOF 8.80 +@@ -12709,7 +12709,7 @@ exec 6>&1 8.81 + # report actual input values of CONFIG_FILES etc. instead of their 8.82 + # values after options handling. 8.83 + ac_log=" 8.84 +-This file was extended by icedtea $as_me 1.7, which was 8.85 ++This file was extended by icedtea $as_me 1.8-pre, which was 8.86 + generated by GNU Autoconf 2.61. Invocation command line was 8.87 + 8.88 + CONFIG_FILES = $CONFIG_FILES 8.89 +@@ -12756,7 +12756,7 @@ _ACEOF 8.90 + _ACEOF 8.91 + cat >>$CONFIG_STATUS <<_ACEOF 8.92 + ac_cs_version="\\ 8.93 +-icedtea config.status 1.7 8.94 ++icedtea config.status 1.8-pre 8.95 + configured by $0, generated by GNU Autoconf 2.61, 8.96 + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 8.97 + 8.98 +diff -r 79a70e3a3d61 configure.ac 8.99 +--- a/configure.ac Mon Jun 02 04:30:31 2008 +0100 8.100 ++++ b/configure.ac Mon Jun 02 04:33:00 2008 +0100 8.101 +@@ -1,5 +1,5 @@ AC_PREREQ([2.61]) 8.102 + AC_PREREQ([2.61]) 8.103 +-AC_INIT([icedtea], [1.7], [fitzsim@redhat.com]) 8.104 ++AC_INIT([icedtea], [1.8-pre], [fitzsim@redhat.com]) 8.105 + AM_INIT_AUTOMAKE([tar-pax]) 8.106 + AC_CONFIG_FILES([Makefile]) 8.107 + AC_CANONICAL_HOST
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/icedtea/trivial_patch_fix.diff Tue Jun 10 03:20:00 2008 +0100 9.3 @@ -0,0 +1,12 @@ 9.4 +diff -r 62c48476a238 patches/icedtea-override.patch 9.5 +--- a/patches/icedtea-override.patch Tue May 27 20:26:21 2008 +0100 9.6 ++++ b/patches/icedtea-override.patch Tue May 27 21:13:32 2008 +0100 9.7 +@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/jdk/src/share 9.8 + diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 9.9 +---- openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:27:49.000000000 +0100 9.10 +-+++ openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:28:38.000000000 +0100 9.11 ++--- openjdk.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:27:49.000000000 +0100 9.12 +++++ openjdk/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:28:38.000000000 +0100 9.13 + @@ -113,7 +113,6 @@ 9.14 + * @exception BadBinaryOpValueExpException 9.15 + *
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/icedtea/zero_patch.diff Tue Jun 10 03:20:00 2008 +0100 10.3 @@ -0,0 +1,35 @@ 10.4 +diff -r cbf3cb70d7c1 patches/icedtea-signed-types.patch 10.5 +--- a/patches/icedtea-signed-types.patch Tue May 27 21:16:59 2008 +0100 10.6 ++++ b/patches/icedtea-signed-types.patch Tue May 27 22:00:57 2008 +0100 10.7 +@@ -1,7 +1,7 @@ diff -r 9523b5ae0184 openjdk/hotspot/src 10.8 +-diff -r 9523b5ae0184 openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 10.9 +---- openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp Fri Nov 02 09:26:45 2007 +0000 10.10 +-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp Fri Nov 02 09:39:12 2007 +0000 10.11 +-@@ -81,7 +81,7 @@ class CodeSection VALUE_OBJ_CLASS_SPEC { 10.12 ++diff -Nru openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.hpp openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 10.13 ++--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.hpp 2008-05-27 21:18:54.000000000 +0100 10.14 +++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 2008-05-27 21:56:42.000000000 +0100 10.15 ++@@ -81,7 +81,7 @@ 10.16 + address _locs_point; // last relocated position (grows upward) 10.17 + bool _locs_own; // did I allocate the locs myself? 10.18 + bool _frozen; // no more expansion of this section 10.19 +@@ -10,14 +10,14 @@ diff -r 9523b5ae0184 openjdk/hotspot/src 10.20 + CodeBuffer* _outer; // enclosing CodeBuffer 10.21 + 10.22 + // (Note: _locs_point used to be called _last_reloc_offset.) 10.23 +-diff -r 9523b5ae0184 openjdk/hotspot/src/share/vm/utilities/ostream.cpp 10.24 +---- openjdk/hotspot/src/share/vm/utilities/ostream.cpp Fri Nov 02 09:26:45 2007 +0000 10.25 +-+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp Fri Nov 02 09:37:53 2007 +0000 10.26 +-@@ -829,7 +829,7 @@ bool networkStream::connect(const char * 10.27 ++diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp openjdk/hotspot/src/share/vm/utilities/ostream.cpp 10.28 ++--- openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp 2008-05-27 21:18:54.000000000 +0100 10.29 +++++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2008-05-27 21:59:01.000000000 +0100 10.30 ++@@ -829,7 +829,7 @@ 10.31 + server.sin_port = htons(port); 10.32 + 10.33 + server.sin_addr.s_addr = inet_addr(ip); 10.34 +-- if (server.sin_addr.s_addr == (unsigned long)-1) { 10.35 ++- if (server.sin_addr.s_addr == (uint32_t)-1) { 10.36 + + if (server.sin_addr.s_addr == (in_addr_t)-1) { 10.37 + #ifdef _WINDOWS 10.38 + struct hostent* host = hpi::get_host_by_name((char*)ip);