~vcs-imports/ipfire/ipfire-2.x

« back to all changes in this revision

Viewing changes to src/patches/slang-utf8-fix.patch

  • Committer: Dirk Wagner
  • Date: 2014-12-23 08:02:23 UTC
  • mfrom: (4405.56.108)
  • Revision ID: git-v1:601f8347ccb1e9c5e3f250ff26d4097ecd698875
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- slang-1.4.5/src/slsmg.c.jj  2003-02-21 12:11:37.000000000 -0500
2
 
+++ slang-1.4.5/src/slsmg.c     2003-02-21 14:09:28.000000000 -0500
3
 
@@ -378,8 +378,10 @@ void SLsmg_write_nwchars (wchar_t *str, 
4
 
   for (i = 0; i < n; i++, str) {
5
 
     ch = *str++;
6
 
 #ifndef IBMPC_SYSTEM
7
 
-    if (alt_char_set_flag)
8
 
+    if (alt_char_set_flag) {
9
 
       ch = Alt_Char_Set[ch & 0x7F];
10
 
+      w = 1;
11
 
+    } else
12
 
 #endif
13
 
     w = wcwidth(ch);
14
 
 
15
 
--- slang-1.4.5/src/sldisply.c.jj       2003-02-21 12:11:37.000000000 -0500
16
 
+++ slang-1.4.5/src/sldisply.c  2003-02-21 15:51:43.000000000 -0500
17
 
@@ -1498,6 +1498,17 @@ static void write_wstring_with_care (SLs
18
 
          }
19
 
      }
20
 
 
21
 
+   if (Current_Fgbg & SLTT_ALTC_MASK)
22
 
+     {
23
 
+       char c;
24
 
+       while (len--)
25
 
+         {
26
 
+            c = *str++;
27
 
+            tt_write(&c, 1);
28
 
+         }
29
 
+       return;
30
 
+     }
31
 
+
32
 
    memset (&mbstate, 0, sizeof (mbstate));
33
 
    while (len--)
34
 
      {