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)->Ge
