← Back to branch summary

~ubuntu-branches/debian/jessie/screen/jessie

« back to all changes in this revision

Viewing changes to display.c

  • Committer: Package Import Robot
  • Author(s): Axel Beckert
  • Date: 2014-04-28 02:32:48 UTC
  • mfrom: (7.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20140428023248-cvg9q8x93w5tyn0a
Tags: 4.2.0-2
Upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
display.c
594
594
# ifdef UTF8
595
595
  if (D_encoding == UTF8)
596
596
    {
597
 
      c = (c & 255) | (unsigned char)D_rend.font << 8;
 
597
      c = (c & 255) | (unsigned char)D_rend.font << 8 | (unsigned char)D_rend.fontx << 16;
598
598
#  ifdef DW_CHARS
599
599
      if (D_mbcs)
600
600
        {
1882
1882
#ifdef FONT
1883
1883
  if (D_rend.font != mc->font)
1884
1884
    SetFont(mc->font);
 
1885
#ifdef UTF8
 
1886
  if (D_encoding == UTF8)
 
1887
    D_rend.fontx = mc->fontx;
 
1888
#endif
1885
1889
#endif
1886
1890
}
1887
1891
 
1934
1938
#ifdef FONT
1935
1939
  if (D_rend.font != ml->font[x])
1936
1940
    SetFont(ml->font[x]);
 
1941
#ifdef UTF8
 
1942
  if (D_encoding == UTF8)
 
1943
    D_rend.fontx = ml->fontx[x];
 
1944
#endif
1937
1945
#endif
1938
1946
}
1939
1947