Incorporate differences in version 3.48.

Support recent versions of Firefox. Support Fn key as a shortcut key.

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index b8f1a80..95fd9b5 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -302,7 +302,7 @@ static const KeyName KeyNames[] = {
        {VK_NONAME,             _T("Noname")},\r
        {VK_PA1,                _T("PA1")},\r
        {VK_OEM_CLEAR,  _T("OEM Clear")},\r
-       {0xff,                  _T("")},\r
+       {0xff,                  _T("Fn")},\r
 };\r
 \r
 CData CProfile::m_XkeymacsData[MAX_APP];\r
@@ -855,7 +855,7 @@ int CProfile::KeyBind2CommandType(LPCTSTR szKeyBind)
 \r
 int CProfile::KeyBind2Key(LPCTSTR szKey)\r
 {\r
-       for (int nKey = 1; nKey < 0xff; ++nKey) {\r
+       for (int nKey = 1; nKey <= 0xff; ++nKey) {\r
                if (!_tcscmp(szKey, Key2String(nKey))) {\r
                        return nKey;\r
                }\r

diff --git a/xkeymacs/xkeymacs.rc b/xkeymacs/xkeymacs.rc
index 646687f..0fc7673 100644 (file)
--- a/xkeymacs/xkeymacs.rc
+++ b/xkeymacs/xkeymacs.rc
@@ -2675,8 +2675,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 3,47,0,0\r
- PRODUCTVERSION 3,47,0,0\r
+ FILEVERSION 3,48,0,0\r
+ PRODUCTVERSION 3,48,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -2694,14 +2694,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "\0"\r
             VALUE "FileDescription", "XKeymacs MFC Application\0"\r
-            VALUE "FileVersion", "3, 47, 0, 0\0"\r
+            VALUE "FileVersion", "3, 48, 0, 0\0"\r
             VALUE "InternalName", "xkeymacs\0"\r
             VALUE "LegalCopyright", "Copyright (C) 2001-2008\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "xkeymacs.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
             VALUE "ProductName", "XKeymacs Application\0"\r
-            VALUE "ProductVersion", "3, 47, 0, 0\0"\r
+            VALUE "ProductVersion", "3, 48, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/xkeymacsdll/Utils.cpp b/xkeymacsdll/Utils.cpp
index a8680d2..2019db5 100644 (file)
--- a/xkeymacsdll/Utils.cpp
+++ b/xkeymacsdll/Utils.cpp
@@ -132,7 +132,8 @@ BOOL CUtils::IsMicrosoftWord()
 \r
 BOOL CUtils::IsMozilla()\r
 {\r
-       return !_tcsicmp(m_szApplicationName, _T("mozilla.exe"));\r
+       return !_tcsicmp(m_szApplicationName, _T("mozilla.exe"))\r
+               || !_tcsicmp(m_szApplicationName, _T("firefox.exe"));\r
 }\r
 \r
 BOOL CUtils::IsMuleForWin32()\r

diff --git a/xkeymacsdll/xkeymacsdll.rc b/xkeymacsdll/xkeymacsdll.rc
index 179cfe4..9d535b5 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.rc
+++ b/xkeymacsdll/xkeymacsdll.rc
@@ -66,8 +66,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 3,47,0,0\r
- PRODUCTVERSION 3,47,0,0\r
+ FILEVERSION 3,48,0,0\r
+ PRODUCTVERSION 3,48,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -85,14 +85,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "\0"\r
             VALUE "FileDescription", "XKeymacs DLL\0"\r
-            VALUE "FileVersion", "3, 47, 0, 0\0"\r
+            VALUE "FileVersion", "3, 48, 0, 0\0"\r
             VALUE "InternalName", "xkeymacsdll\0"\r
             VALUE "LegalCopyright", "Copyright (C) 2001-2008\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "xkeymacs.dll\0"\r
             VALUE "PrivateBuild", "\0"\r
             VALUE "ProductName", "XKeymacs Dynamic Link Library\0"\r
-            VALUE "ProductVersion", "3, 47, 0, 0\0"\r
+            VALUE "ProductVersion", "3, 48, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r