patches/realvnc-java-client-05-g11n-use-remote-im.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 11460 3cc4d920fb4b
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11460
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     1
--- vnc-4_1-javasrc/java/rfb/Keysyms.java.orig	2008-01-15 15:55:10.561444000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     2
+++ vnc-4_1-javasrc/java/rfb/Keysyms.java	2008-01-15 15:56:25.564721000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     3
@@ -63,6 +63,12 @@ public class Keysyms {
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     4
   public static final int script_switch = 0xFF7E;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     5
   public static final int Num_Lock = 0xFF7F;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     6
 
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     7
+  public static final int KP_Left = 0xFF96;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     8
+  public static final int KP_Up = 0xFF97;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     9
+  public static final int KP_Right = 0xFF98;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    10
+  public static final int KP_Down = 0xFF99;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    11
+  public static final int KP_Begin = 0xFF9d;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    12
+
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    13
   public static final int F1 = 0xFFBE;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    14
   public static final int F2 = 0xFFBF;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    15
   public static final int F3 = 0xFFC0;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    16
@@ -84,4 +90,7 @@ public class Keysyms {
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    17
   public static final int Meta_R = 0xFFE8;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    18
   public static final int Alt_L = 0xFFE9;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    19
   public static final int Alt_R = 0xFFEA;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    20
+
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    21
+  public static final int Kanji = 0xFF21;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    22
+  public static final int Henkan_Mode = 0xFF23;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    23
 }
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    24
--- vnc-4_1-javasrc/java/rfb/UnicodeToKeysym.java.orig	2008-01-15 15:12:34.345738000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    25
+++ vnc-4_1-javasrc/java/rfb/UnicodeToKeysym.java	2008-01-15 17:11:07.898546000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    26
@@ -775,6 +775,11 @@ public class UnicodeToKeysym {
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    27
         (unicode >= 0xa0 && unicode <= 0xff))
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    28
       return unicode;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    29
 
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    30
+    /* From HALFWIDTH IDEOGRAPHIC FULL STOP (U+FF61)
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    31
+     * To   HALFWIDTH KATAKANA SEMI-VOICED SOURND MARK (U+FF9F) */
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    32
+    if ((unicode >= 0xff61 && unicode <= 0xff9f))
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    33
+      return unicode - 64192;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    34
+
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    35
     int min = 0;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    36
     int max = table.length - 1;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    37
     int mid;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    38
--- vnc-4_1-javasrc/java/vncviewer/CConn.java.orig	2008-01-15 15:55:46.024607000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    39
+++ vnc-4_1-javasrc/java/vncviewer/CConn.java	2008-01-15 17:24:45.512185000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    40
@@ -521,6 +521,16 @@ public class CConn extends rfb.CConnecti
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    41
       case KeyEvent.VK_PRINTSCREEN:  keysym = rfb.Keysyms.Print; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    42
       case KeyEvent.VK_PAUSE:        keysym = rfb.Keysyms.Pause; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    43
       case KeyEvent.VK_INSERT:       keysym = rfb.Keysyms.Insert; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    44
+      case KeyEvent.VK_KP_LEFT:      keysym = rfb.Keysyms.KP_Left; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    45
+      case KeyEvent.VK_KP_UP:        keysym = rfb.Keysyms.KP_Up; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    46
+      case KeyEvent.VK_KP_RIGHT:     keysym = rfb.Keysyms.KP_Right; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    47
+      case KeyEvent.VK_KP_DOWN:      keysym = rfb.Keysyms.KP_Down; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    48
+      case KeyEvent.VK_BEGIN:        keysym = rfb.Keysyms.KP_Begin; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    49
+      case KeyEvent.VK_ACCEPT:       keysym = rfb.Keysyms.Execute; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    50
+      case KeyEvent.VK_CONVERT:      keysym = rfb.Keysyms.Kanji; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    51
+      case KeyEvent.VK_INPUT_METHOD_ON_OFF:
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    52
+                                     keysym = rfb.Keysyms.Henkan_Mode; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    53
+      case KeyEvent.VK_KANA_LOCK:    keysym = rfb.Keysyms.Mode_switch; break;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    54
       default: return;
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    55
       }
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    56
     }
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    57
--- vnc-4_1-javasrc/java/vncviewer/DesktopWindow.java.orig	2008-01-15 15:56:17.533387000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    58
+++ vnc-4_1-javasrc/java/vncviewer/DesktopWindow.java	2008-01-15 15:56:25.574174000 +0900
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    59
@@ -48,6 +48,8 @@ class DesktopWindow extends Canvas imple
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    60
     cursorBacking = new rfb.ManagedPixelBuffer();
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    61
     addMouseListener(this);
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    62
     addMouseMotionListener(this);
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    63
+    // Disable local input methods and use remote input methods.
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    64
+    enableInputMethods(false);
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    65
     addKeyListener(this);
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    66
     this.setFocusTraversalKeysEnabled(false);
3cc4d920fb4b 2008-01-16 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    67
     addFocusListener(this);