Mercurial > 510Connectbot
changeset 78:044b1a951925 tn5250
convert 5250 to vt320 attributes
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Sun, 15 Jun 2014 11:05:06 -0700 |
| parents | 0da8878ec057 |
| children | 01d939969b10 |
| files | src/org/tn5250j/framework/tn5250/Screen5250.java src/org/tn5250j/framework/tn5250/ScreenPlanes.java |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/org/tn5250j/framework/tn5250/Screen5250.java Sun Jun 15 10:58:26 2014 -0700 +++ b/src/org/tn5250j/framework/tn5250/Screen5250.java Sun Jun 15 11:05:06 2014 -0700 @@ -3846,13 +3846,13 @@ char co = planes.getCharColor(p); char at = planes.getCharExtended(p); if (ch < ' ') ch = ' '; - int bg = vt320color[(int)((co >> 8) && 0x0f)]; - int fg = vt320color[(int)(co && 0x0f)]; - int ul = (int)(at && EXTENDED_5250_UNDERLINE); - int nd = (int)(at && EXTENDED_5250_NON_DSP); - int vt_attr = (fg << COLOR_FG_SHIFT) + (bg << COLOR_BG_SHIFT); - if (ul > 0) vt_attr |= UNDERLINE; - if (nd > 0) vt_attr |= INVISIBLE; + int bg = vt320color[(int)((co >> 8) & 0x0f)]; + int fg = vt320color[(int)(co & 0x0f)]; + int ul = (int)(at & EXTENDED_5250_UNDERLINE); + int nd = (int)(at & EXTENDED_5250_NON_DSP); + int vt_attr = (fg << VDUBuffer.COLOR_FG_SHIFT) + (bg << VDUBuffer.COLOR_BG_SHIFT); + if (ul > 0) vt_attr |= VDUBuffer.UNDERLINE; + if (nd > 0) vt_attr |= VDUBuffer.INVISIBLE; buffer.putChar(c, r, ch, vt_attr); } }
--- a/src/org/tn5250j/framework/tn5250/ScreenPlanes.java Sun Jun 15 10:58:26 2014 -0700 +++ b/src/org/tn5250j/framework/tn5250/ScreenPlanes.java Sun Jun 15 11:05:06 2014 -0700 @@ -220,7 +220,7 @@ return screenAttr[pos]; } - protected final int getCharExtended(int pos) { + protected final char getCharExtended(int pos) { return screenExtended[pos]; }