git-svn-id: svn://db.shs.com.ru/pip@697 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2019-02-06 15:05:29 +00:00
parent 39e8e1b52a
commit 2eda52d800

View File

@@ -96,17 +96,17 @@ namespace PIScreenTypes {
typedef PIFlags<FocusFlag> FocusFlags; typedef PIFlags<FocusFlag> FocusFlags;
union PIP_EXPORT CellFormat { union PIP_EXPORT CellFormat {
CellFormat(uint f = 0) {raw_format = f;} CellFormat(ushort f = 0) {raw_format = f;}
CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) { CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) {
color_char = col_char; color_char = col_char;
color_back = col_back; color_back = col_back;
flags = flags_; flags = flags_;
} }
uint raw_format; ushort raw_format;
struct { struct {
uchar color_char; ushort color_char : 4;
uchar color_back; ushort color_back : 4;
ushort flags; ushort flags : 8;
}; };
bool operator ==(const CellFormat & c) const {return raw_format == c.raw_format;} bool operator ==(const CellFormat & c) const {return raw_format == c.raw_format;}
bool operator !=(const CellFormat & c) const {return raw_format != c.raw_format;} bool operator !=(const CellFormat & c) const {return raw_format != c.raw_format;}