[kaffe] CVS kaffe (alper): new Xynth Windowing System AWT backend

Tue Aug 22 05:56:14 PDT 2006

PatchSet 7392 
Date: 2006/08/22 12:54:38
Author: alper
Branch: HEAD
Tag: (none) 
Log:
new Xynth Windowing System AWT backend

Members: 
	ChangeLog:1.4894->1.4895 
	Makefile.am:1.115->1.116 
	WHATSNEW:1.57->1.58 
	configure.ac:1.247->1.248 
	FAQ/FAQ.awt:1.15->1.16 
	kaffe/kaffe/Makefile.am:1.35->1.36 
	kaffe/kaffe/main.c:1.100->1.101 
	libraries/clib/awt/Makefile.am:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4894 kaffe/ChangeLog:1.4895

--- kaffe/ChangeLog:1.4894	Tue Aug 22 12:24:34 2006
+++ kaffe/ChangeLog	Tue Aug 22 12:54:38 2006
@@ -1,3 +1,21 @@
+2006-08-22  Alper Akcan <distchx at yahoo.com>
+	* Makefile.am,
+	configure.ac,
+	WHATSNEW,
+	README.xynth,
+	libraries/javalib/Makefile.am,
+	libraries/clib/awt/xynth/graphic.c,
+	libraries/clib/awt/xynth/image.c,
+	libraries/clib/awt/xynth/font.c,
+	libraries/clib/awt/xynth/toolkit.h,
+	libraries/clib/awt/xynth/color.c,
+	libraries/clib/awt/xynth/window.c,
+	libraries/clib/awt/xynth/Makefile.am,
+	libraries/clib/awt/xynth/event.c,
+	libraries/clib/awt/xynth/toolkit.c:
+	
+	new xynth based awt backend.
+
 2006-08-22  Dalibor Topic  <robilad at kaffe.org>
 
 	Switched nio libraries to GNU Classpath's version.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.115 kaffe/Makefile.am:1.116
--- kaffe/Makefile.am:1.115	Tue Aug 22 12:24:38 2006
+++ kaffe/Makefile.am	Tue Aug 22 12:54:41 2006
@@ -240,6 +240,9 @@
 if COND_KAFFE_X_AWT
 DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/X
 endif
+if COND_KAFFE_XYNTH_AWT
+DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/xynth
+endif
 endif
 
 check-local:
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.57 kaffe/WHATSNEW:1.58
--- kaffe/WHATSNEW:1.57	Wed Aug  9 21:43:04 2006
+++ kaffe/WHATSNEW	Tue Aug 22 12:54:42 2006
@@ -5,6 +5,7 @@
 * Added --disable-zlib-zip optin to use GNU Classpath's
   java.util.zip implementation.
 * Removed comm, servlet, microsoft and pjava extensions.
+* Xynth Windowing System based AWT backend.
 
 What's New In Kaffe 1.1.7
 ------------------------------------------------------
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.247 kaffe/configure.ac:1.248
--- kaffe/configure.ac:1.247	Tue Aug 22 12:24:45 2006
+++ kaffe/configure.ac	Tue Aug 22 12:54:42 2006
@@ -2015,6 +2015,30 @@
    fi
 fi
 
+AC_ARG_WITH([kaffe-xynth-awt],
+	AS_HELP_STRING([--with-kaffe-xynth-awt],
+			[enable build of Kaffe's Xynth AWT engine (not built by default)]),
+	[],
+	[with_kaffe_xynth_awt=no]
+)
+
+AM_CONDITIONAL(COND_KAFFE_XYNTH_AWT, test x"$with_kaffe_xynth_awt" != x"no")
+
+if test x"$enable_native_awt" = x"yes"; then
+   if test x"$with_kaffe_xynth_awt" = x"yes"; then
+
+   	dnl -----------------------------------------------------------------------
+	dnl 	Xynth AWT support
+	dnl -----------------------------------------------------------------------
+
+	AWT_LIBS="-lxynth"
+	AWT_LIBS="$CTLIBS $AWT_LIBS"
+	AC_SUBST(AWT_LIBS)
+			
+	AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/xynth/libxynthawt.la"
+   fi
+fi
+
 dnl -------------------------------------------------------------------------
 dnl Configure sound backend
 dnl -------------------------------------------------------------------------
@@ -2551,6 +2575,7 @@
 AC_CONFIG_FILES([libraries/clib/awt/X/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/qt/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/nano-X/Makefile])
+AC_CONFIG_FILES([libraries/clib/awt/xynth/Makefile])
 AC_CONFIG_FILES([libraries/clib/sound/Makefile])
 AC_CONFIG_FILES([libraries/clib/sound/alsa/Makefile])
 AC_CONFIG_FILES([libraries/clib/sound/common/Makefile])
Index: kaffe/FAQ/FAQ.awt
diff -u kaffe/FAQ/FAQ.awt:1.15 kaffe/FAQ/FAQ.awt:1.16
--- kaffe/FAQ/FAQ.awt:1.15	Sat Mar 25 13:16:15 2006
+++ kaffe/FAQ/FAQ.awt	Tue Aug 22 12:54:42 2006
@@ -164,6 +164,22 @@
 
   kaffe -Xkaffe-nanox-awt YourClass
 
+* --with-kaffe-xynth-awt
+
+  an Xynth Windowing System based AWT backend.
+
+  The Xynth based AWT backend has been written by Alper Akcan from
+  Xynth Team.
+
+  See http://www.xynth.org for information on Xynth Window System.
+  Additional url: http://gsulinux.org/~distch/projects/xynth
+
+  You need to run kaffe with -Xkaffe-xynth-awt option, in order for it
+  to load the correct classes for this AWT. So you should run your
+  code with
+
+  kaffe -Xkaffe-xynth-awt YourClass
+
 Troubleshooting
 ---------------
 
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.35 kaffe/kaffe/kaffe/Makefile.am:1.36
--- kaffe/kaffe/kaffe/Makefile.am:1.35	Sun Jul  9 16:58:43 2006
+++ kaffe/kaffe/kaffe/Makefile.am	Tue Aug 22 12:54:42 2006
@@ -30,6 +30,10 @@
 INCLUDE_KAFFE_NANOX_AWT = -DKAFFE_NANOX_AWT_INCLUDED
 endif
 
+if COND_KAFFE_XYNTH_AWT
+INCLUDE_KAFFE_XYNTH_AWT = -DKAFFE_XYNTH_AWT_INCLUDED
+endif
+
 AM_CPPFLAGS = \
 	-I../kaffevm \
 	-I$(srcdir)/../kaffevm \
@@ -42,7 +46,8 @@
 	-I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \
 	$(INCLUDE_KAFFE_X_AWT) \
 	$(INCLUDE_KAFFE_QT_AWT) \
-	$(INCLUDE_KAFFE_NANOX_AWT)
+	$(INCLUDE_KAFFE_NANOX_AWT) \
+	$(INCLUDE_KAFFE_XYNTH_AWT)
 
 kaffe_bin_SOURCES = \
 	main.c \
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.100 kaffe/kaffe/kaffe/main.c:1.101
--- kaffe/kaffe/kaffe/main.c:1.100	Wed Apr 19 23:07:44 2006
+++ kaffe/kaffe/kaffe/main.c	Tue Aug 22 12:54:43 2006
@@ -375,7 +375,7 @@
  */
 
 #if defined (KAFFE_X_AWT_INCLUDED) || defined (KAFFE_QT_AWT_INCLUDED)	\
-  || defined (KAFFE_NANOX_AWT_INCLUDED)
+  || defined (KAFFE_NANOX_AWT_INCLUDED) || defined(KAFFE_XYNTH_AWT_INCLUDED)
 static 
 userProperty*
 setKaffeAWT(const char * propStr)
@@ -534,6 +534,13 @@
 			prop = setKaffeAWT("kaffe.awt.nativelib=nanoxawt");
 		}
 #endif
+#ifdef KAFFE_XYNTH_AWT_INCLUDED
+		/* Extra option to use kaffe's Xynth AWT backend.
+		 */
+		else if (strncmp(argv[i], "-Xkaffe-xynth-awt", (j=17)) == 0) {
+			prop = setKaffeAWT("kaffe.awt.nativelib=xynthawt");
+		}
+#endif
 #if defined(USE_GMP)
 		/* Extra option to use gmp for native, fast bignums.
 		 * Only available with binreloc, since binreloc is used to
@@ -1006,6 +1013,9 @@
 #endif
 #ifdef KAFFE_NANOX_AWT_INCLUDED
 	fprintf(stderr, "%s", _("	-Xkaffe-nanox-awt	 Use Kaffe's Nano-X AWT backend\n"));
+#endif
+#ifdef KAFFE_XYNTH_AWT_INCLUDED
+	fprintf(stderr, _("	-Xkaffe-xynth-awt	 Use Kaffe's Xynth AWT backend\n"));
 #endif
 
 	fprintf(stderr, "%s", _("  * Option currently ignored.\n"
Index: kaffe/libraries/clib/awt/Makefile.am
diff -u kaffe/libraries/clib/awt/Makefile.am:1.14 kaffe/libraries/clib/awt/Makefile.am:1.15
--- kaffe/libraries/clib/awt/Makefile.am:1.14	Sat Jul  8 14:44:21 2006
+++ kaffe/libraries/clib/awt/Makefile.am	Tue Aug 22 12:54:43 2006
@@ -30,10 +30,15 @@
 MAYBE_KAFFE_NANOX_AWT = nano-X
 endif
 
+if COND_KAFFE_XYNTH_AWT
+MAYBE_KAFFE_XYNTH_AWT = xynth
+endif
+
 SUBDIRS = \
 	$(MAYBE_KAFFE_X_AWT) \
 	$(MAYBE_KAFFE_QT_AWT) \
-	$(MAYBE_KAFFE_NANOX_AWT) 
+	$(MAYBE_KAFFE_NANOX_AWT) \
+	$(MAYBE_KAFFE_XYNTH_AWT)
 
 EXTRA_DIST = \
 	win32/btn.cpp \


