follow naming scheme

This commit is contained in:
Jörg Breitbart
2019-01-13 23:50:58 +01:00
parent c444eebd89
commit 70ded42bee
3 changed files with 22 additions and 22 deletions
+2 -2
View File
@@ -220,8 +220,8 @@ export class AttributeData implements IAttributeData {
public isDim(): number { return this.bg & BgFlags.DIM; } public isDim(): number { return this.bg & BgFlags.DIM; }
// color modes // color modes
public getColormodeFg(): number { return this.fg & Attributes.CM_MASK; } public getFgColormode(): number { return this.fg & Attributes.CM_MASK; }
public getColormodeBg(): number { return this.bg & Attributes.CM_MASK; } public getBgColormode(): number { return this.bg & Attributes.CM_MASK; }
public isFgRGB(): boolean { return (this.fg & Attributes.CM_MASK) === Attributes.CM_RGB; } public isFgRGB(): boolean { return (this.fg & Attributes.CM_MASK) === Attributes.CM_RGB; }
public isBgRGB(): boolean { return (this.bg & Attributes.CM_MASK) === Attributes.CM_RGB; } public isBgRGB(): boolean { return (this.bg & Attributes.CM_MASK) === Attributes.CM_RGB; }
public isFgPalette(): boolean { return (this.fg & Attributes.CM_MASK) === Attributes.CM_P16 || (this.fg & Attributes.CM_MASK) === Attributes.CM_P256; } public isFgPalette(): boolean { return (this.fg & Attributes.CM_MASK) === Attributes.CM_P16 || (this.fg & Attributes.CM_MASK) === Attributes.CM_P256; }
+18 -18
View File
@@ -447,53 +447,53 @@ describe('InputHandler', () => {
assert.equal(!!term.curAttrData.isInvisible(), false); assert.equal(!!term.curAttrData.isInvisible(), false);
}); });
it('colormode palette 16', () => { it('colormode palette 16', () => {
assert.equal(term.curAttrData.getColormodeFg(), 0); // DEFAULT assert.equal(term.curAttrData.getFgColormode(), 0); // DEFAULT
assert.equal(term.curAttrData.getColormodeBg(), 0); // DEFAULT assert.equal(term.curAttrData.getBgColormode(), 0); // DEFAULT
// lower 8 colors // lower 8 colors
for (let i = 0; i < 8; ++i) { for (let i = 0; i < 8; ++i) {
term.writeSync(`\x1b[${i + 30};${i + 40}m`); term.writeSync(`\x1b[${i + 30};${i + 40}m`);
assert.equal(term.curAttrData.getColormodeFg(), Attributes.CM_P16); assert.equal(term.curAttrData.getFgColormode(), Attributes.CM_P16);
assert.equal(term.curAttrData.getFgColor(), i); assert.equal(term.curAttrData.getFgColor(), i);
assert.equal(term.curAttrData.getColormodeBg(), Attributes.CM_P16); assert.equal(term.curAttrData.getBgColormode(), Attributes.CM_P16);
assert.equal(term.curAttrData.getBgColor(), i); assert.equal(term.curAttrData.getBgColor(), i);
} }
// reset to DEFAULT // reset to DEFAULT
term.writeSync(`\x1b[39;49m`); term.writeSync(`\x1b[39;49m`);
assert.equal(term.curAttrData.getColormodeFg(), 0); assert.equal(term.curAttrData.getFgColormode(), 0);
assert.equal(term.curAttrData.getColormodeBg(), 0); assert.equal(term.curAttrData.getBgColormode(), 0);
}); });
it('colormode palette 256', () => { it('colormode palette 256', () => {
assert.equal(term.curAttrData.getColormodeFg(), 0); // DEFAULT assert.equal(term.curAttrData.getFgColormode(), 0); // DEFAULT
assert.equal(term.curAttrData.getColormodeBg(), 0); // DEFAULT assert.equal(term.curAttrData.getBgColormode(), 0); // DEFAULT
// lower 8 colors // lower 8 colors
for (let i = 0; i < 256; ++i) { for (let i = 0; i < 256; ++i) {
term.writeSync(`\x1b[38;5;${i};48;5;${i}m`); term.writeSync(`\x1b[38;5;${i};48;5;${i}m`);
assert.equal(term.curAttrData.getColormodeFg(), Attributes.CM_P256); assert.equal(term.curAttrData.getFgColormode(), Attributes.CM_P256);
assert.equal(term.curAttrData.getFgColor(), i); assert.equal(term.curAttrData.getFgColor(), i);
assert.equal(term.curAttrData.getColormodeBg(), Attributes.CM_P256); assert.equal(term.curAttrData.getBgColormode(), Attributes.CM_P256);
assert.equal(term.curAttrData.getBgColor(), i); assert.equal(term.curAttrData.getBgColor(), i);
} }
// reset to DEFAULT // reset to DEFAULT
term.writeSync(`\x1b[39;49m`); term.writeSync(`\x1b[39;49m`);
assert.equal(term.curAttrData.getColormodeFg(), 0); assert.equal(term.curAttrData.getFgColormode(), 0);
assert.equal(term.curAttrData.getFgColor(), -1); assert.equal(term.curAttrData.getFgColor(), -1);
assert.equal(term.curAttrData.getColormodeBg(), 0); assert.equal(term.curAttrData.getBgColormode(), 0);
assert.equal(term.curAttrData.getBgColor(), -1); assert.equal(term.curAttrData.getBgColor(), -1);
}); });
it('colormode RGB', () => { it('colormode RGB', () => {
assert.equal(term.curAttrData.getColormodeFg(), 0); // DEFAULT assert.equal(term.curAttrData.getFgColormode(), 0); // DEFAULT
assert.equal(term.curAttrData.getColormodeBg(), 0); // DEFAULT assert.equal(term.curAttrData.getBgColormode(), 0); // DEFAULT
term.writeSync(`\x1b[38;2;1;2;3;48;2;4;5;6m`); term.writeSync(`\x1b[38;2;1;2;3;48;2;4;5;6m`);
assert.equal(term.curAttrData.getColormodeFg(), Attributes.CM_RGB); assert.equal(term.curAttrData.getFgColormode(), Attributes.CM_RGB);
assert.equal(term.curAttrData.getFgColor(), 1 << 16 | 2 << 8 | 3); assert.equal(term.curAttrData.getFgColor(), 1 << 16 | 2 << 8 | 3);
assert.deepEqual(term.curAttrData.getFgColor(true), [1, 2, 3]); assert.deepEqual(term.curAttrData.getFgColor(true), [1, 2, 3]);
assert.equal(term.curAttrData.getColormodeBg(), Attributes.CM_RGB); assert.equal(term.curAttrData.getBgColormode(), Attributes.CM_RGB);
assert.deepEqual(term.curAttrData.getBgColor(true), [4, 5, 6]); assert.deepEqual(term.curAttrData.getBgColor(true), [4, 5, 6]);
// reset to DEFAULT // reset to DEFAULT
term.writeSync(`\x1b[39;49m`); term.writeSync(`\x1b[39;49m`);
assert.equal(term.curAttrData.getColormodeFg(), 0); assert.equal(term.curAttrData.getFgColormode(), 0);
assert.equal(term.curAttrData.getFgColor(), -1); assert.equal(term.curAttrData.getFgColor(), -1);
assert.equal(term.curAttrData.getColormodeBg(), 0); assert.equal(term.curAttrData.getBgColormode(), 0);
assert.equal(term.curAttrData.getBgColor(), -1); assert.equal(term.curAttrData.getBgColor(), -1);
}); });
it('should zero missing RGB values', () => { it('should zero missing RGB values', () => {
+2 -2
View File
@@ -532,8 +532,8 @@ export interface IAttributeData {
isDim(): number; isDim(): number;
// color modes // color modes
getColormodeFg(): number; getFgColormode(): number;
getColormodeBg(): number; getBgColormode(): number;
isFgRGB(): boolean; isFgRGB(): boolean;
isBgRGB(): boolean; isBgRGB(): boolean;
isFgPalette(): boolean; isFgPalette(): boolean;