# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1402855506 25200
# Node ID 044b1a9519257e8ea947b6746e5c1c8e7ba1b879
# Parent  0da8878ec0577c214e43f7f09698d821b4910b01
convert 5250 to vt320 attributes

diff -r 0da8878ec057 -r 044b1a951925 src/org/tn5250j/framework/tn5250/Screen5250.java
--- 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);
             }
         }
diff -r 0da8878ec057 -r 044b1a951925 src/org/tn5250j/framework/tn5250/ScreenPlanes.java
--- 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];
 	}