[kaffe] CVS kaffe (alper): Code update for new Xynth graphics api.
PatchSet 7502
Date: 2007/07/31 19:53:31
Author: alper
Branch: HEAD
Tag: (none)
Log:
Code update for new Xynth graphics api.
Members:
ChangeLog:1.5001-1.5002
libraries/clib/awt/xynth/graphic.c:1.3-1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5001 kaffe/ChangeLog:1.5002
--- kaffe/ChangeLog:1.5001 Sat Jul 21 17:39:26 2007
+++ kaffe/ChangeLog Tue Jul 31 19:53:31 2007
@@ -1,3 +1,7 @@
+2007-07-31 Alper Akcan [EMAIL PROTECTED]
+
+ * libraries/clib/awt/xynth/graphic.c: Code update for new GRLib API.
+
2007-07-22 Kiyo Inaba [EMAIL PROTECTED]
* config/arm/jit-arm.def: FP reg numbering fix for jit.
Index: kaffe/libraries/clib/awt/xynth/graphic.c
diff -u kaffe/libraries/clib/awt/xynth/graphic.c:1.3
kaffe/libraries/clib/awt/xynth/graphic.c:1.4
--- kaffe/libraries/clib/awt/xynth/graphic.c:1.3Wed Feb 14 13:50:51 2007
+++ kaffe/libraries/clib/awt/xynth/graphic.cTue Jul 31 19:53:32 2007
@@ -160,8 +160,6 @@
int x1;
int y1;
int iw;
- char *vbufs;
- char *vbufi;
s_rect_t coor;
s_rect_t inter;
graphics_t *gr;
@@ -182,12 +180,12 @@
if (sx1 0) sx1 = 0;
if (sx0 = iw) sx0 = iw - 1;
if (sx1 = iw) sx1 = iw - 1;
- srfs = (s_surface_t *) AWT_MALLOC(sizeof(s_surface_t));
- vbufs = (char *) AWT_MALLOC((x1 - x0 + 1) * (y1 - y0 + 1) *
gr-surface-bytesperpixel);
- s_getsurfacevirtual(srfs, x1 - x0 + 1, y1 - y0 + 1,
gr-surface-bitsperpixel, vbufs);
- srfi = (s_surface_t *) AWT_MALLOC(sizeof(s_surface_t));
- vbufi = (char *) AWT_MALLOC(img-w * img-h *
gr-surface-bytesperpixel);
- s_getsurfacevirtual(srfi, img-w, img-h, gr-surface-bitsperpixel,
vbufi);
+ if (s_surface_create(srfs, x1 - x0 + 1, y1 - y0 + 1,
gr-surface-bitsperpixel)) {
+ goto out0;
+ }
+ if (s_surface_create(srfi, img-w, img-h, gr-surface-bitsperpixel))
{
+ goto out1;
+ }
s_fillbox(srfi, 0, 0, img-w, img-h, gr-bg);
s_putboxrgba(srfi, 0, 0, img-w, img-h, img-rgba);
s_scalebox(gr-surface, srfi-width, srfi-height, srfi-vbuf,
srfs-width, srfs-height, srfs-vbuf);
@@ -198,11 +196,10 @@
if (s_rect_intersect((gr-clip), coor, inter) == 0) {
s_putboxpart(gr-surface, inter.x, inter.y, inter.w, inter.h,
srfs-width, srfs-height, srfs-vbuf, inter.x - coor.x, inter.y - coor.y);
}
- AWT_FREE(vbufs);
- AWT_FREE(vbufi);
- AWT_FREE(srfs);
- AWT_FREE(srfi);
- DEBUGF(Leave);
+ s_surface_destroy(srfi);
+out1: s_surface_destroy(srfs);
+out0: DEBUGF(Leave);
+ return;
}
KAFFE_GR_FUNC_DECL(void, Java_java_awt_Toolkit_graDraw3DRect, jint x, jint y,
jint width, jint height, jboolean raised, jint rgb)
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (alper): Modified Files:
PatchSet 7471
Date: 2007/02/14 13:50:51
Author: alper
Branch: HEAD
Tag: (none)
Log:
2007-02-14 Alper Akcan [EMAIL PROTECTED]
Modified Files:
* libraries/clib/awt/xynth/Makefile.am,
libraries/clib/awt/xynth/Makefile.in,
libraries/clib/awt/xynth/color.c,
libraries/clib/awt/xynth/event.c,
libraries/clib/awt/xynth/font.c,
libraries/clib/awt/xynth/graphic.c,
libraries/clib/awt/xynth/image.c,
libraries/clib/awt/xynth/toolkit.c,
libraries/clib/awt/toolkit.h,
libraries/clib/awt/window.c : Minor improvements.
Members:
libraries/clib/awt/xynth/Makefile.am:1.2-1.3
libraries/clib/awt/xynth/Makefile.in:1.6-1.7
libraries/clib/awt/xynth/color.c:1.2-1.3
libraries/clib/awt/xynth/event.c:1.2-1.3
libraries/clib/awt/xynth/font.c:1.2-1.3
libraries/clib/awt/xynth/graphic.c:1.2-1.3
libraries/clib/awt/xynth/image.c:1.2-1.3
libraries/clib/awt/xynth/toolkit.c:1.2-1.3
libraries/clib/awt/xynth/toolkit.h:1.2-1.3
libraries/clib/awt/xynth/window.c:1.2-1.3
Index: kaffe/libraries/clib/awt/xynth/Makefile.am
diff -u kaffe/libraries/clib/awt/xynth/Makefile.am:1.2
kaffe/libraries/clib/awt/xynth/Makefile.am:1.3
--- kaffe/libraries/clib/awt/xynth/Makefile.am:1.2 Mon Aug 28 11:39:45 2006
+++ kaffe/libraries/clib/awt/xynth/Makefile.am Wed Feb 14 13:50:51 2007
@@ -1,6 +1,6 @@
# Xynth-based AWT support for standard Java libraries
#
-# Copyright (c) 2006
+# Copyright (c) 2006 - 2007
# Alper Akcan [EMAIL PROTECTED]
#
Index: kaffe/libraries/clib/awt/xynth/Makefile.in
diff -u kaffe/libraries/clib/awt/xynth/Makefile.in:1.6
kaffe/libraries/clib/awt/xynth/Makefile.in:1.7
--- kaffe/libraries/clib/awt/xynth/Makefile.in:1.6 Wed Jan 3 23:02:16 2007
+++ kaffe/libraries/clib/awt/xynth/Makefile.in Wed Feb 14 13:50:51 2007
@@ -16,7 +16,7 @@
# Xynth-based AWT support for standard Java libraries
#
-# Copyright (c) 2006
+# Copyright (c) 2006 - 2007
# Alper Akcan [EMAIL PROTECTED]
#
Index: kaffe/libraries/clib/awt/xynth/color.c
diff -u kaffe/libraries/clib/awt/xynth/color.c:1.2
kaffe/libraries/clib/awt/xynth/color.c:1.3
--- kaffe/libraries/clib/awt/xynth/color.c:1.2 Mon Aug 28 11:39:45 2006
+++ kaffe/libraries/clib/awt/xynth/color.c Wed Feb 14 13:50:51 2007
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2006
+ * Copyright (c) 2006 - 2007
* Alper Akcan [EMAIL PROTECTED], All rights reserved.
*
* See the file license.terms for information on usage and redistribution
Index: kaffe/libraries/clib/awt/xynth/event.c
diff -u kaffe/libraries/clib/awt/xynth/event.c:1.2
kaffe/libraries/clib/awt/xynth/event.c:1.3
--- kaffe/libraries/clib/awt/xynth/event.c:1.2 Mon Aug 28 11:39:45 2006
+++ kaffe/libraries/clib/awt/xynth/event.c Wed Feb 14 13:50:51 2007
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2006
+ * Copyright (c) 2006 - 2007
* Alper Akcan [EMAIL PROTECTED], All rights reserved.
*
* See the file license.terms for information on usage and redistribution
@@ -137,7 +137,7 @@
jevent = (*env)-CallStaticObjectMethod(env,
MouseEvent, getMouseEvent, idx, JMOUSE_MOVED, 0, event-mouse-x,
event-mouse-y);
}
}
- DEBUGF(Leave %d, xevent-window-client-id);
+ DEBUGF(Leave %d, xevent-window-id);
return jevent;
}
@@ -192,7 +192,7 @@
return NULL;
}
event = xevent-event;
- if (xevent-window-client-pri == 0) {
+ if (xevent-window-pri == 0) {
jevent = (*env)-CallStaticObjectMethod(env, FocusEvent,
getFocusEvent, idx, JFOCUS_GAINED, JNI_FALSE);
} else {
jevent = (*env)-CallStaticObjectMethod(env, FocusEvent,
getFocusEvent, idx, JFOCUS_LOST, JNI_FALSE);
@@ -266,7 +266,7 @@
void xynth_kaffe_atevent (s_window_t *window, s_event_t *event)
{
xynth_event_t *xevent;
- DEBUGF(Enter id: %d, window-client-id);
+ DEBUGF(Enter id: %d, window-id);
switch (event-type EVENT_MASK) {
case QUIT_EVENT:
case MOUSE_EVENT:
Index: kaffe/libraries/clib/awt/xynth/font.c
diff -u kaffe/libraries/clib/awt/xynth/font.c:1.2
kaffe/libraries/clib/awt/xynth/font.c:1.3
--- kaffe/libraries/clib/awt/xynth/font.c:1.2 Mon Aug 28 11:39:45 2006
+++ kaffe/libraries/clib/awt/xynth/font.c Wed Feb 14 13:50:51 2007
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2006
+ * Copyright (c) 2006 - 2007
* Alper Akcan [EMAIL PROTECTED], All rights reserved.
*
* See the file license.terms for information on usage and redistribution
@@ -119,7 +119,7 @@
s_font_get_glyph(font);
AWT_FREE(str);
DEBUGF(Leave);
- return font-img-w;
+ return font-glyph.img-w;
}
KAFFE_FONT_FUNC_DECL (jobject, Java_java_awt_Toolkit_fntGetWidths)
@@ -136,11 +136,10 @@
jw = (*env)-GetIntArrayElements(env, widths, isCopy);
for (n = 0; n
[kaffe] CVS kaffe (alper): Modified Files:
PatchSet 7472 Date: 2007/02/14 13:53:48 Author: alper Branch: HEAD Tag: (none) Log: 2007-02-14 Alper Akcan [EMAIL PROTECTED] Modified Files: * libraries/clib/awt/xynth/Makefile.am, libraries/clib/awt/xynth/Makefile.in, libraries/clib/awt/xynth/color.c, libraries/clib/awt/xynth/event.c, libraries/clib/awt/xynth/font.c, libraries/clib/awt/xynth/graphic.c, libraries/clib/awt/xynth/image.c, libraries/clib/awt/xynth/toolkit.c, libraries/clib/awt/toolkit.h, libraries/clib/awt/window.c : Minor improvements. Members: ChangeLog:1.4971-1.4972 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4971 kaffe/ChangeLog:1.4972 --- kaffe/ChangeLog:1.4971 Fri Feb 9 14:49:55 2007 +++ kaffe/ChangeLog Wed Feb 14 13:53:48 2007 @@ -1,3 +1,16 @@ +2007-02-14 Alper Akcan [EMAIL PROTECTED] + + * libraries/clib/awt/xynth/Makefile.am, + libraries/clib/awt/xynth/Makefile.in, + libraries/clib/awt/xynth/color.c, + libraries/clib/awt/xynth/event.c, + libraries/clib/awt/xynth/font.c, + libraries/clib/awt/xynth/graphic.c, + libraries/clib/awt/xynth/image.c, + libraries/clib/awt/xynth/toolkit.c, + libraries/clib/awt/toolkit.h, + libraries/clib/awt/window.c : Minor improvements. + 2007-02-09 Ito Kazumitsu [EMAIL PROTECTED] * libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java : ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (alper): corrected file locations..
PatchSet 7473 Date: 2007/02/14 14:39:45 Author: alper Branch: HEAD Tag: (none) Log: corrected file locations.. Members: ChangeLog:1.4972-1.4973 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4972 kaffe/ChangeLog:1.4973 --- kaffe/ChangeLog:1.4972 Wed Feb 14 13:53:48 2007 +++ kaffe/ChangeLog Wed Feb 14 14:39:45 2007 @@ -8,8 +8,8 @@ libraries/clib/awt/xynth/graphic.c, libraries/clib/awt/xynth/image.c, libraries/clib/awt/xynth/toolkit.c, - libraries/clib/awt/toolkit.h, - libraries/clib/awt/window.c : Minor improvements. + libraries/clib/awt/xynth/toolkit.h, + libraries/clib/awt/xynth/window.c : Minor improvements. 2007-02-09 Ito Kazumitsu [EMAIL PROTECTED] ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (alper): new Xynth Windowing System AWT backend
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 [EMAIL PROTECTED] + * 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 [EMAIL PROTECTED] 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.247Tue 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 != xno) + +if test x$enable_native_awt = xyes; then + if test x$with_kaffe_xynth_awt = xyes; 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 +
[kaffe] CVS kaffe (alper):
*** ERROR *** cvsps failed - lastCandidate was 0 ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
