Index: viewer.cpp
===================================================================
--- viewer.cpp	(revision 5864)
+++ viewer.cpp	(working copy)
@@ -74,6 +74,15 @@
 
 static int ViewerID=0;
 
+static int utf8_to_WideChar(const char *s, int nc, wchar_t *w1,wchar_t *w2, int wlen, int &tail);
+//
+//#define REPLACE_CHAR 0xFEFF // Zero Width No-Break Space
+#define REPLACE_CHAR 0xFFFD  // Replacement
+//
+//#define CONTINUE_CHAR 0x00BB // Right-Pointing Double Angle Quotation Mark
+#define CONTINUE_CHAR 0x203A // Single Right-Pointing Angle Quotation Mark
+//#define CONTINUE_CHAR 0x2026 // Horizontal Ellipse
+
 Viewer::Viewer(bool bQuickView, UINT aCodePage):
 	ViOpt(Opt.ViOpt),
 	Reader(ViewFile),
@@ -350,13 +359,6 @@
 			CodePageChangedByUser=TRUE;
 		}
 
-		// BUGBUG
-		// ���� ��� �������� �������� hex � UTF8, ��� �� ��������.
-		if (VM.Hex && VM.CodePage==CP_UTF8)
-		{
-			VM.CodePage=Opt.ViOpt.AnsiCodePageAsDefault?GetACP():GetOEMCP();
-		}
-
 		if (!IsUnicodeOrUtfCodePage(VM.CodePage))
 		{
 			ViewFile.SetPointer(0, nullptr, FILE_BEGIN);
@@ -710,6 +712,74 @@
 					wcscat(OutStr, BorderLine);
 			}
 		}
+
+      else if ( CP_UTF8 == VM.CodePage )
+      {
+         __int64 fpos = vtell();
+         unsigned char line[16+3];
+         DWORD nr = 0;
+         Reader.Read(line, (DWORD)sizeof(line), &nr);
+         if (nr > 16)
+            Reader.Unread(nr-16);
+
+         if (!nr)
+            wcscpy(OutStr,L"");
+         else
+         {
+            int out_len = (int)wcslen(OutStr);
+            int border_len = (int)wcslen(BorderLine);
+            if (SelectSize)
+            {
+               if (SelectPos >= fpos && SelectPos < fpos+16)
+               {
+                  int off = (int)(SelectPos - fpos);
+                  bSelStartFound = true;
+                  SelStart = out_len + 3*off + (off < 8 ? 0 : border_len); 
+                  SelSize = SelectSize;
+               }
+               __int64 selectEnd = SelectPos + SelectSize - 1;
+               if (selectEnd >= fpos && selectEnd < fpos+16)
+               {
+                  int off = (int)(selectEnd - fpos);
+                  bSelEndFound = true;
+                  SelEnd = out_len + 3*off + (off < 8 ? 0 : border_len) + 1; 
+                  SelSize = SelectSize;
+               }
+            }
+            for (X=0; X<16; X++)
+            {
+               int off = out_len + 3*X + (X < 8 ? 0 : border_len);
+               if (X == 8)
+                  wcscpy(OutStr+off-border_len, BorderLine);
+               if (X < (int)nr)
+                  _snwprintf(OutStr+off, ARRAYSIZE(OutStr)-off, L"%02X ", (int)line[X]);
+               else
+                  wcscpy(OutStr+off, L"   ");
+               TextStr[X] = L' ';
+            }
+
+            wchar_t w1[16], w2[16];
+            int tail, nw, ib=0, iw=0;
+            nw = utf8_to_WideChar((char *)line, (int)nr, w1, w2, 16, tail);
+            bool first = true;
+            while (ib < 16 && iw < nw)
+            {
+               if (first && w1[iw] == REPLACE_CHAR && w2[iw] == L'?')
+                  TextStr[ib++] = CONTINUE_CHAR; // ��� ����� �� �� ������ ��������� �� '����' utf-8
+               else                              // �� ������� ��-�� ����� ��� �� ��� ���� �� �����...
+               {
+                  first = false;
+                  TextStr[ib++] = w1[iw] ? w1[iw] : L' ';
+               }
+               int clen = WideCharToMultiByte(CP_UTF8, 0, w2+iw, 1, NULL,0, NULL,NULL);
+               while (--clen > 0 && ib < 16)
+                  TextStr[ib++] = CONTINUE_CHAR; 
+               ++iw;
+            }
+            TextPos = 16;
+         }
+      }
+
 		else
 		{
 			for (X=0; X<16; X++)
@@ -782,14 +852,7 @@
 
 		wcscat(OutStr,L" ");
 		wcscat(OutStr,TextStr);
-#if 0
 
-		for (size_t I=0; I < wcslen(OutStr); ++I)
-			if (OutStr[I] == (wchar_t)0xFFFF)
-				OutStr[I]=L'?';
-
-#endif
-
 		if (StrLength(OutStr)>HexLeftPos)
 		{
 			FS<<fmt::LeftAlign()<<fmt::Width(ObjWidth)<<fmt::Precision(ObjWidth)<<OutStr+static_cast<size_t>(HexLeftPos);
@@ -1393,13 +1456,6 @@
 		{
 			UINT nCodePage = SelectCodePage(VM.CodePage, true, true);
 
-			// BUGBUG
-			// ���� ��� �������� �������� hex � UTF8, ��� �� ��������.
-			if (VM.Hex && nCodePage==CP_UTF8)
-			{
-				return TRUE;
-			}
-
 			if (nCodePage!=(UINT)-1)
 			{
 				CodePageChangedByUser=TRUE;
@@ -2726,8 +2782,6 @@
 
 static int utf8_to_WideChar(const char *s, int nc, wchar_t *w1,wchar_t *w2, int wlen, int &tail )
 {
-#define REPLACEMENT 0xFFFD // L'?'
-
 	if ( wlen <= 0 )
 	{
 		tail = nc;
@@ -2754,7 +2808,7 @@
 				else
 				{
 					tail = 0;
-					w1[0] = REPLACEMENT;
+					w1[0] = REPLACE_CHAR;
 					if (w2)
 						w2[0] = L'?';
 					nw = 1;
@@ -2762,7 +2816,7 @@
 				return nw;
 			}
 			c2 = ((const unsigned char *)s)[ic];
-			if ( 0x80 != (c2 & 0xC0)        // illegal 2-st byte
+			if ( 0x80 != (c2 & 0xC0)        // illegal 2-nd byte
 				|| (0xE0 == c1 && c2 <= 0x9F) // illegal 3-byte start (overlaps with 2-byte)
 				|| (0xF0 == c1 && c2 <= 0x8F) // illegal 4-byte start (overlaps with 3-byte)
 				|| (0xF4 == c1 && c2 >= 0x90) // illegal 4-byte (out of unicode range)
@@ -2811,7 +2865,7 @@
 						if (nw >= wlen)
 						{
 							--nw;
-							wc = REPLACEMENT;
+							wc = REPLACE_CHAR;
 						}
 					}
 				}
@@ -2826,7 +2880,7 @@
 		}
 		else
 		{
-			w1[nw] = REPLACEMENT;
+			w1[nw] = REPLACE_CHAR;
 			if (w2)
 				w2[nw] = L'?';
 		}
@@ -3482,14 +3536,6 @@
 
 int Viewer::ProcessHexMode(int newMode, bool isRedraw)
 {
-	// BUGBUG
-	// �� �� ���, ���� �� ����� ���������� ��������� hex-�������� � UTF8 - ����� ������� � OEM.
-	// ��� ����� ��� �� ��������, � ��������� �������� ��� �����������.
-	if (VM.CodePage==CP_UTF8 && newMode)
-	{
-		VM.CodePage=Opt.ViOpt.AnsiCodePageAsDefault?GetACP():GetOEMCP();
-	}
-
 	int oldHex=VM.Hex;
 	VM.Hex=newMode&1;