Ticket #1465: filezilla_unicode_status.patch

StatusCtrl.cpp

@@ -47 +47 @@
 {
 }
 
-
 BEGIN_MESSAGE_MAP(CStatusCtrl, CRichEditCtrl)
     //{{AFX_MSG_MAP(CStatusCtrl)
     ON_WM_ERASEBKGND()
@@ -184 +183 @@
         Copy();
 }
 
-/* Unused Unicode code
+/* Unused Unicode code*/
 BOOL CStatusCtrl::Create(DWORD in_dwStyle,  const RECT& in_rcRect,
                              CWnd* in_pParentWnd, UINT in_nID)
 {
@@ -231 +230 @@
     }
     
     return l_pState->m_hInstRichEdit20 != NULL ;
-}*/
+}/**/
 
 int CStatusCtrl::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
@@ -239 +238 @@
         return -1;
 
     USES_CONVERSION;
-    
+
+#ifdef _UNICODE
+    m_RTFHeader = "{\\rtf1\\ansi\\deff0\\ud";
+#else
     m_RTFHeader = "{\\rtf1\\ansi\\deff0";
+#endif
 
     HFONT hSysFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
 
@@ -317 +320 @@
     status.Replace(_T("\r"), _T(""));
     status.Replace(_T("\n"), _T("\\status"));
 
+#ifdef _UNICODE
+    int len = status.GetLength();
+    int i;
+    CString ustatus = "\\uc0";
+    bool last_unicode = false;
+    for (i = 0; i < len; i++) {
+        wchar_t x;
+        char buf[20];
+
+        x = status[i];
+        if (x < 256) {
+            if (last_unicode && x >= '0' && x <= '9') {
+                ustatus += "{";
+                ustatus += x;
+                ustatus += "}";
+            }
+            else
+                ustatus += x;
+            last_unicode = false;
+        }
+        else {
+            sprintf(buf, "\\u%d.", (signed short)x);
+            ustatus += buf;
+            last_unicode = true;
+        }
+    }
+    status = ustatus;
+#endif
+
     CString stime;
     if (timestamps)
     {
@@ -501 +525 @@
 
 void CStatusCtrl::ChangeFont(void)
 {
+#ifdef _UNICODE
+    m_RTFHeader = "{\\rtf1\\ansi\\deff0\\ud";
+#else
     m_RTFHeader = "{\\rtf1\\ansi\\deff0";
+#endif
 
     HFONT hSysFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
 

StatusCtrl.h

@@ -42 +42 @@
     virtual ~CStatusCtrl();
 
     void ShowStatus(CString status, int nType);
-
-//  virtual BOOL Create( DWORD in_dwStyle, const RECT& in_rcRect, 
-//                         CWnd* in_pParentWnd, UINT in_nID );
+/**/
+    virtual BOOL Create( DWORD in_dwStyle, const RECT& in_rcRect, 
+                         CWnd* in_pParentWnd, UINT in_nID );
 
     // Generierte Nachrichtenzuordnungsfunktionen
 protected:
@@ -76 +76 @@
     void ChangeFont(void);
 };
 
-/*class _AFX_RICHEDITEX_STATE
+/**/class _AFX_RICHEDITEX_STATE
 {
 public:
     _AFX_RICHEDITEX_STATE();
@@ -86 +86 @@
 };
 
 BOOL PASCAL AfxInitRichEditEx();
-*/
+/**/
 
 /////////////////////////////////////////////////////////////////////////////