Changeset 21056 for platform

Timestamp:

10/09/08 20:55:38 (3 months ago)

Author:

hashy1126

Message:

漢字キー対応＆VisualStudio?2005対応

Location:

platform/windows/win2vnc_jp/trunk

Files:

• ClientConnection.cpp (modified) (1 diff)
• ClientConnectionClipboard.cpp (modified) (2 diffs)
• KeyMap.cpp (modified) (2 diffs)
• KeyMap.h (modified) (2 diffs)
• MRU.cpp (modified) (1 diff)
• VNCOptions.cpp (modified) (1 diff)
• WIN2VNC.sln (added)
• res/vncviewer.rc (modified) (1 diff)
• win2vnc.vcproj (added)

platform/windows/win2vnc_jp/trunk/ClientConnection.cpp

@@ -643 +643 @@
     // We do rather assume that the most recent encoding is the most
     // desirable!
-    for (i = LASTENCODING; i >= rfbEncodingRaw; i--) {
+    for (int i = LASTENCODING; i >= rfbEncodingRaw; i--) {
         if ((m_opts.m_PreferredEncoding != i) &&
             (m_opts.m_UseEnc[i])) {

platform/windows/win2vnc_jp/trunk/ClientConnectionClipboard.cpp

@@ -69 +69 @@
 
                 // Translate to Unix-format lines before sending
-                for (int i = 0, j = 0; contents[i] != '\0'; i++) {
+                                int i,j;
+                for (i = 0, j = 0; contents[i] != '\0'; i++) {
                     if (contents[i] != '\x0d')
                         unixcontents[j++] = contents[i];
@@ -105 +106 @@
     char *wincontents = new char[(len * 2) + 1];
 
-    for (int i = 0, j = 0; buf[i] != 0; i++, j++) {
+        int i,j;
+    for (i = 0, j = 0; buf[i] != 0; i++, j++) {
         if (buf[i] == '\x0a') {
             wincontents[j++] = '\x0d';

platform/windows/win2vnc_jp/trunk/KeyMap.cpp

@@ -112 +112 @@
     }
 
-    for (i = 0; i < (sizeof(downUnicode) / sizeof(WCHAR)); i++) {
+    for (int i = 0; i < (sizeof(downUnicode) / sizeof(WCHAR)); i++) {
         downUnicode[i] = NULL;
     }
@@ -774 +774 @@
         downKeysym[extVkey] = XK_VoidSymbol;
     } else {
-        log.Print(4, _T("No associated KeySym\n"));
+        log.Print(4, _T("No associated KeySym(%x)\n"), extVkey);
     }
 }

platform/windows/win2vnc_jp/trunk/KeyMap.h

@@ -33 +33 @@
 #include <map>
 #include "keysym.h"
+#include <ime.h>
 #include "rfb.h"
 #include "ClientConnection.h"
@@ -154 +155 @@
     {XK_KP_8                , VK_NUMPAD8        , 0},
     {XK_KP_9                , VK_NUMPAD9        , 0},
+
+  // Japanese stuff - almost certainly wrong...
+
+    {XK_Kanji               , VK_KANJI          , 0 },          /* 0x19: Kanji, Kanji convert */
+    {XK_Henkan              , VK_CONVERT        , 0 },          /* 0x1c: Conversion */
+    {XK_Muhenkan            , VK_NONCONVERT     , 0 },          /* 0x1d: Cancel Conversion */
+    {XK_Romaji              , VK_DBE_ROMAN      , 0 },          /* 0xf5: to Romaji */
+    {XK_Hiragana            , VK_DBE_HIRAGANA   , 0 },          /* 0xf2: to Hiragana */
+    {XK_Katakana            , VK_DBE_KATAKANA   , 0 },          /* 0xf1: to Katakana */
+    {XK_Zenkaku             , VK_DBE_SBCSCHAR   , 0 },          /* 0xf3: to Zenkaku */
+    {XK_Hankaku             , VK_DBE_DBCSCHAR   , 0 },          /* 0xf4: to Hankaku */
+    {XK_Eisu_toggle         , VK_DBE_ALPHANUMERIC, 0 },         /* 0xf0: Alphanumeric toggle */
+
 };
 

platform/windows/win2vnc_jp/trunk/MRU.cpp

@@ -244 +244 @@
     //   hold the names of keys which should be deleted.
     TCHAR **dudValues = new TCHAR*[numValues];
-    for (i = 0; i < (int) numValues; i++)
+    int i;
+        for (i = 0; i < (int) numValues; i++)
         dudValues[i] = NULL;
     UINT numDudValues = 0;

platform/windows/win2vnc_jp/trunk/VNCOptions.cpp

@@ -1029 +1029 @@
     bool result = true;
 
-        result = GuiGetAutoReconnectValue( hwnd, true );
+        GuiGetAutoReconnectValue( hwnd, true );
 
     HWND hShared = GetDlgItem(hwnd, IDC_SHARED);

platform/windows/win2vnc_jp/trunk/res/vncviewer.rc

@@ -73 +73 @@
 //
 
-1                       24      MOVEABLE PURE   "win2vnc.exe.manifest"
+//1                       24      MOVEABLE PURE   "win2vnc.exe.manifest"
 
 #ifdef APSTUDIO_INVOKED