From fee9ca6a8fed85b4aa5c70ca66520f35b91c56da Mon Sep 17 00:00:00 2001 From: fitzsim Date: Tue, 5 Aug 2003 18:04:09 +0000 Subject: 2003-08-05 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GtkComponentPeer.java (postKeyEvent): Add keyLocation parameter. * java/awt/event/KeyEvent.java (getKeyText): Fix "NumPad-" string. (paramString): Generate keyChar string according to keyChar, not keyCode. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (state_to_awt_mods): Handle ALT key. (keyevent_state_to_awt_mods): New function. (get_first_keyval_from_keymap): New function. (keysym_to_awt_keycode): Get virtual key code from keymap. Handle missing VK_ values. (keysym_to_awt_keylocation): New function. (keyevent_to_awt_keychar): New function. (generates_key_typed_event): Handle non-text-component case. Handle GDK_KP_Delete and GDK_KP_Enter. (awt_event_handler): Call new functions to get postKeyEvent parameters. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gtkInit): Update postKeyEvent method signature. * jni/gtk-peer/gtkpeer.h: Add KEY_LOCATION defines. Add missing VK_ defines. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70178 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java | 10 +++++----- libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'libjava/gnu/java/awt') diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 43ada95cf00..ac092c8f4d1 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -350,13 +350,13 @@ public class GtkComponentPeer extends GtkGenericPeer new Rectangle (x, y, width, height))); } - protected void postKeyEvent (int id, long when, int mods, - int keyCode, char keyChar) + protected void postKeyEvent (int id, long when, int mods, + int keyCode, char keyChar, int keyLocation) { - q.postEvent (new KeyEvent (awtComponent, id, when, mods, - keyCode, keyChar)); + q.postEvent (new KeyEvent (awtComponent, id, when, mods, + keyCode, keyChar, keyLocation)); } - + protected void postFocusEvent (int id, boolean temporary) { q.postEvent (new FocusEvent (awtComponent, id, temporary)); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java index 7439f2085bf..b3199d87c9a 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java @@ -55,8 +55,9 @@ public class GtkTextComponentPeer extends GtkComponentPeer setText (tc.getText ()); } - + public native void connectHooks (); + public native int getCaretPosition (); public native void setCaretPosition (int pos); public native int getSelectionStart (); -- cgit v1.2.3