[commit-cp] classpath ChangeLog java/awt/event/KeyEvent.jav...

[Sven de Marothy]

CVSROOT:        /sources/classpath
Module name:    classpath
Changes by:     Sven de Marothy <smarothy>      06/06/18 03:45:29

Modified files:
        .              : ChangeLog 
        java/awt/event : KeyEvent.java 
        native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkWindowPeer.c 

Log message:
        2006-06-18  Sven de Marothy  <address@hidden>
        
                * java/awt/event/KeyEvent.java:
                (VK_WINDOWS, VK_CONTEXT_MENU, VK_BEGIN): Add new keysym fields.
                *  natve/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
                Implement WINDOWS, ALT_GR and CONTEXT_MENU keysyms.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7864&r2=1.7865
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/event/KeyEvent.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c?cvsroot=classpath&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7864
retrieving revision 1.7865
diff -u -b -r1.7864 -r1.7865
--- ChangeLog   18 Jun 2006 02:43:55 -0000      1.7864
+++ ChangeLog   18 Jun 2006 03:45:27 -0000      1.7865
@@ -1,3 +1,10 @@
+2006-06-18  Sven de Marothy  <address@hidden>
+
+       * java/awt/event/KeyEvent.java:
+       (VK_WINDOWS, VK_CONTEXT_MENU, VK_BEGIN): Add new keysym fields.
+       *  natve/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+       Implement WINDOWS, ALT_GR and CONTEXT_MENU keysyms.
+
 2006-06-18  Raif S. Naffah  <address@hidden>
 
        * gnu/java/security/util/Prime2.java: Removed.

Index: java/awt/event/KeyEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/KeyEvent.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- java/awt/event/KeyEvent.java        12 Sep 2005 03:46:42 -0000      1.14
+++ java/awt/event/KeyEvent.java        18 Jun 2006 03:45:28 -0000      1.15
@@ -993,6 +993,27 @@
   public static final int VK_ALT_GRAPH = 65406;
 
   /**
+   * The 'begin' key VK_BEGIN
+   *
+   * @since 1.5
+   */
+  public static final int VK_BEGIN = 65368;
+
+  /**
+   * The context-menu key VK_CONTEXT_MENU
+   *
+   * @since 1.5
+   */
+  public static final int VK_CONTEXT_MENU = 525;
+
+  /**
+   * The 'Windows' key VK_WINDOWS
+   *
+   * @since 1.5
+   */
+  public static final int VK_WINDOWS = 524;
+
+  /**
    * The virtual key VK_UNDEFINED. This is used for key typed events, which
    * do not have a virtual key.
    */

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: 
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c   8 Apr 2006 
22:58:56 -0000       1.66
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c   18 Jun 2006 
03:45:28 -0000      1.67
@@ -246,6 +246,10 @@
 #define VK_COMPOSE 65312
 #define VK_ALT_GRAPH 65406
 #define VK_UNDEFINED 0
+#define VK_BEGIN 65368
+#define VK_CONTEXT_MENU 525
+#define VK_WINDOWS 524
+
 
 #define AWT_KEY_CHAR_UNDEFINED 0
 
@@ -721,14 +725,28 @@
       return VK_CUT;
       return VK_COPY;
       return VK_PASTE;
+      */
+    case GDK_Undo:
       return VK_UNDO;
+    case GDK_Redo:
       return VK_AGAIN;
+      /*
       return VK_FIND;
       return VK_PROPS;
       return VK_STOP;
       return VK_COMPOSE;
+      */
+    case GDK_ISO_Level3_Shift:
       return VK_ALT_GRAPH;
+      /*
+       case VK_BEGIN:
       */
+    case GDK_Menu:
+      return VK_CONTEXT_MENU;
+    case GDK_Super_L:
+    case GDK_Super_R:
+      return VK_WINDOWS;
+
     default:
       return VK_UNDEFINED;
     }
@@ -2115,14 +2133,27 @@
     case VK_CUT:
     case VK_COPY:
     case VK_PASTE:
+      */
     case VK_UNDO:
+      return GDK_Undo;
     case VK_AGAIN:
+      return GDK_Redo;
+      /*
     case VK_FIND:
     case VK_PROPS:
     case VK_STOP:
     case VK_COMPOSE:
+      */
     case VK_ALT_GRAPH:
+      return GDK_ISO_Level3_Shift;
+      /*
+       case VK_BEGIN:
       */
+    case VK_CONTEXT_MENU:
+      return GDK_Menu;
+    case VK_WINDOWS:
+      return GDK_Super_R;
+
     default:
       return GDK_VoidSymbol;
     }