Colocate buffer types in buffer/Types.ts
The import/no-cycle refactor had moved IBuffer, IBufferSet, and related cell/line types into src/common/Types.ts, with buffer/Types.ts only re-exporting them. That inverted the natural module boundary and made buffer code depend on the top-level types hub. Define buffer-owned types in buffer/Types.ts instead: - CharData, IExtendedAttrs, IAttributeData, ICellData, IBufferLine - IMarker, IBuffer, IBufferSet, BufferIndex Restore UnderlineStyle to buffer/Constants.ts (used by IExtendedAttrs) and remove those definitions from Types.ts. buffer/Types.ts imports only what it needs from outside the buffer layer: ICircularList and ICharset from Types, IDisposable from Lifecycle, IEvent from Event, and UnderlineStyle from Constants. Types.ts does not import buffer/Types.ts, so the previous Types <-> buffer cycle stays broken. Update imports across common, browser, headless, addons, and tests to use common/buffer/Types for buffer types rather than common/Types. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -9,7 +9,8 @@ import { IDisposable, IMarker, Terminal } from '@xterm/xterm';
|
|||||||
import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/buffer/Constants';
|
import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/buffer/Constants';
|
||||||
import type { AttributeData } from 'common/buffer/AttributeData';
|
import type { AttributeData } from 'common/buffer/AttributeData';
|
||||||
import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from 'common/parser/Types';
|
import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from 'common/parser/Types';
|
||||||
import type { IBufferLine, IExtendedAttrs, IInputHandler } from 'common/Types';
|
import type { IInputHandler } from 'common/Types';
|
||||||
|
import type { IBufferLine, IExtendedAttrs } from 'common/buffer/Types';
|
||||||
import type { ITerminal, ReadonlyColorSet } from 'browser/Types';
|
import type { ITerminal, ReadonlyColorSet } from 'browser/Types';
|
||||||
import type { IRenderDimensions } from 'browser/renderer/shared/Types';
|
import type { IRenderDimensions } from 'browser/renderer/shared/Types';
|
||||||
import type { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
|
import type { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
|
|
||||||
import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm';
|
import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm';
|
||||||
import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize';
|
import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize';
|
||||||
import { IAttributeData, IColor } from 'common/Types';
|
import { IColor } from 'common/Types';
|
||||||
|
import { IAttributeData } from 'common/buffer/Types';
|
||||||
import { DEFAULT_ANSI_COLORS } from 'browser/Types';
|
import { DEFAULT_ANSI_COLORS } from 'browser/Types';
|
||||||
import { UnderlineStyle } from 'common/buffer/Constants';
|
import { UnderlineStyle } from 'common/buffer/Constants';
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
|
|||||||
import { ReadonlyColorSet } from 'browser/Types';
|
import { ReadonlyColorSet } from 'browser/Types';
|
||||||
import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants';
|
import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants';
|
||||||
import { IDecorationService, IOptionsService } from 'common/services/Services';
|
import { IDecorationService, IOptionsService } from 'common/services/Services';
|
||||||
import { ICellData } from 'common/Types';
|
import { ICellData } from 'common/buffer/Types';
|
||||||
import { Terminal } from '@xterm/xterm';
|
import { Terminal } from '@xterm/xterm';
|
||||||
import { rgba } from 'common/Color';
|
import { rgba } from 'common/Color';
|
||||||
import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils';
|
import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils';
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { CursorBlinkStateManager } from './CursorBlinkStateManager';
|
|||||||
import { observeDevicePixelDimensions } from './DevicePixelObserver';
|
import { observeDevicePixelDimensions } from './DevicePixelObserver';
|
||||||
import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types';
|
import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types';
|
||||||
import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'browser/services/Services';
|
import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'browser/services/Services';
|
||||||
import { CharData, IBufferLine, ICellData } from 'common/Types';
|
import { CharData, IBufferLine, ICellData } from 'common/buffer/Types';
|
||||||
import { AttributeData } from 'common/buffer/AttributeData';
|
import { AttributeData } from 'common/buffer/AttributeData';
|
||||||
import { CellData } from 'common/buffer/CellData';
|
import { CellData } from 'common/buffer/CellData';
|
||||||
import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/buffer/Constants';
|
import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/buffer/Constants';
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import { OscLinkProvider } from './OscLinkProvider';
|
|||||||
import { ILink } from './Types';
|
import { ILink } from './Types';
|
||||||
import { createCellData, MockBufferService, MockOptionsService } from '../common/TestUtils.test';
|
import { createCellData, MockBufferService, MockOptionsService } from '../common/TestUtils.test';
|
||||||
import { IBufferService, IOscLinkService } from '../common/services/Services';
|
import { IBufferService, IOscLinkService } from '../common/services/Services';
|
||||||
import { IBufferLine, IOscLinkData } from '../common/Types';
|
import { IOscLinkData } from '../common/Types';
|
||||||
|
import { IBufferLine } from '../common/buffer/Types';
|
||||||
|
|
||||||
class TestOscLinkService implements IOscLinkService {
|
class TestOscLinkService implements IOscLinkService {
|
||||||
public serviceBrand: any;
|
public serviceBrand: any;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import { IBufferRange, ILink } from './Types';
|
import { IBufferRange, ILink } from './Types';
|
||||||
import { ILinkProvider } from './services/Services';
|
import { ILinkProvider } from './services/Services';
|
||||||
import { CellData } from '../common/buffer/CellData';
|
import { CellData } from '../common/buffer/CellData';
|
||||||
import { IBufferLine } from '../common/Types';
|
import { IBufferLine } from '../common/buffer/Types';
|
||||||
import { IBufferService, IOptionsService, IOscLinkService } from '../common/services/Services';
|
import { IBufferService, IOptionsService, IOscLinkService } from '../common/services/Services';
|
||||||
|
|
||||||
export class OscLinkProvider implements ILinkProvider {
|
export class OscLinkProvider implements ILinkProvider {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { assert } from 'chai';
|
|||||||
import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
|
import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
|
||||||
import { CellData } from '../common/buffer/CellData';
|
import { CellData } from '../common/buffer/CellData';
|
||||||
import { MockUnicodeService, createCellData } from '../common/TestUtils.test';
|
import { MockUnicodeService, createCellData } from '../common/TestUtils.test';
|
||||||
import { IMarker } from '../common/Types';
|
import { IMarker } from '../common/buffer/Types';
|
||||||
|
|
||||||
const INIT_COLS = 80;
|
const INIT_COLS = 80;
|
||||||
const INIT_ROWS = 24;
|
const INIT_ROWS = 24;
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import { IDisposable, IMarker, ILinkProvider, IDecorationOptions, IDecoration, I
|
|||||||
import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
|
import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
|
||||||
import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from './renderer/shared/Types';
|
import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from './renderer/shared/Types';
|
||||||
import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from './Types';
|
import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from './Types';
|
||||||
import { IBuffer, IBufferSet } from '../common/buffer/Types';
|
import { IAttributeData, IBuffer, IBufferLine, IBufferSet, ICellData } from '../common/buffer/Types';
|
||||||
import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from '../common/Types';
|
import { ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from '../common/Types';
|
||||||
import { Buffer } from '../common/buffer/Buffer';
|
import { Buffer } from '../common/buffer/Buffer';
|
||||||
import * as Browser from '../common/Platform';
|
import * as Browser from '../common/Platform';
|
||||||
import { CoreBrowserTerminal } from './CoreBrowserTerminal';
|
import { CoreBrowserTerminal } from './CoreBrowserTerminal';
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { CharData, IColor, ITerminalOptions } from '../common/Types';
|
import { IColor, ITerminalOptions } from '../common/Types';
|
||||||
|
import { CharData, IBuffer } from '../common/buffer/Types';
|
||||||
import { ICoreTerminal } from '../common/CoreTerminal';
|
import { ICoreTerminal } from '../common/CoreTerminal';
|
||||||
import { IBuffer } from '../common/buffer/Types';
|
|
||||||
import { IDisposable, IRenderDimensions as IRenderDimensionsApi, Terminal as ITerminalApi } from '@xterm/xterm';
|
import { IDisposable, IRenderDimensions as IRenderDimensionsApi, Terminal as ITerminalApi } from '@xterm/xterm';
|
||||||
import { channels, css } from '../common/Color';
|
import { channels, css } from '../common/Color';
|
||||||
import type { IEvent } from '../common/Event';
|
import type { IEvent } from '../common/Event';
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { DomRendererRowFactory } from './DomRendererRowFactory';
|
|||||||
import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR, DEFAULT_ATTR, FgFlags, BgFlags, Attributes, UnderlineStyle } from '../../../common/buffer/Constants';
|
import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR, DEFAULT_ATTR, FgFlags, BgFlags, Attributes, UnderlineStyle } from '../../../common/buffer/Constants';
|
||||||
import { BufferLine, DEFAULT_ATTR_DATA } from '../../../common/buffer/BufferLine';
|
import { BufferLine, DEFAULT_ATTR_DATA } from '../../../common/buffer/BufferLine';
|
||||||
import { BufferLineStringCache } from '../../../common/buffer/BufferLineStringCache';
|
import { BufferLineStringCache } from '../../../common/buffer/BufferLineStringCache';
|
||||||
import { IBufferLine } from '../../../common/Types';
|
import { IBufferLine } from '../../../common/buffer/Types';
|
||||||
import { CellData } from '../../../common/buffer/CellData';
|
import { CellData } from '../../../common/buffer/CellData';
|
||||||
import { MockCoreService, MockDecorationService, MockOptionsService, createCellData, NULL_CELL_DATA } from '../../../common/TestUtils.test';
|
import { MockCoreService, MockDecorationService, MockOptionsService, createCellData, NULL_CELL_DATA } from '../../../common/TestUtils.test';
|
||||||
import { MockCharacterJoinerService, MockCoreBrowserService, MockThemeService } from '../../TestUtils.test';
|
import { MockCharacterJoinerService, MockCoreBrowserService, MockThemeService } from '../../TestUtils.test';
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IBufferLine, ICellData, IColor } from '../../../common/Types';
|
import { IColor } from '../../../common/Types';
|
||||||
|
import { IBufferLine, ICellData } from '../../../common/buffer/Types';
|
||||||
import { INVERTED_DEFAULT_COLOR } from '../shared/Constants';
|
import { INVERTED_DEFAULT_COLOR } from '../shared/Constants';
|
||||||
import { WHITESPACE_CELL_CHAR, Attributes } from '../../../common/buffer/Constants';
|
import { WHITESPACE_CELL_CHAR, Attributes } from '../../../common/buffer/Constants';
|
||||||
import { CellData } from '../../../common/buffer/CellData';
|
import { CellData } from '../../../common/buffer/CellData';
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { ICharacterJoinerService } from './Services';
|
|||||||
import { CharacterJoinerService } from './CharacterJoinerService';
|
import { CharacterJoinerService } from './CharacterJoinerService';
|
||||||
import { BufferLine } from '../../common/buffer/BufferLine';
|
import { BufferLine } from '../../common/buffer/BufferLine';
|
||||||
import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache';
|
import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache';
|
||||||
import { IBufferLine } from '../../common/Types';
|
import { IBufferLine } from '../../common/buffer/Types';
|
||||||
import { CellData } from '../../common/buffer/CellData';
|
import { CellData } from '../../common/buffer/CellData';
|
||||||
import { MockBufferService, createCellData } from '../../common/TestUtils.test';
|
import { MockBufferService, createCellData } from '../../common/TestUtils.test';
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IBufferLine, ICellData, CharData } from '../../common/Types';
|
import { CharData, IBufferLine, ICellData } from '../../common/buffer/Types';
|
||||||
import { ICharacterJoiner } from '../Types';
|
import { ICharacterJoiner } from '../Types';
|
||||||
import { AttributeData } from '../../common/buffer/AttributeData';
|
import { AttributeData } from '../../common/buffer/AttributeData';
|
||||||
import { WHITESPACE_CELL_CHAR, Content } from '../../common/buffer/Constants';
|
import { WHITESPACE_CELL_CHAR, Content } from '../../common/buffer/Constants';
|
||||||
|
|||||||
@@ -6,14 +6,13 @@
|
|||||||
import { assert } from 'chai';
|
import { assert } from 'chai';
|
||||||
import { SelectionService, SelectionMode } from './SelectionService';
|
import { SelectionService, SelectionMode } from './SelectionService';
|
||||||
import { SelectionModel } from '../selection/SelectionModel';
|
import { SelectionModel } from '../selection/SelectionModel';
|
||||||
import { IBufferLine } from '../../common/Types';
|
import { IBuffer, IBufferLine } from '../../common/buffer/Types';
|
||||||
import { MockBufferService, MockOptionsService, MockCoreService, MockMouseStateService, createCellData } from '../../common/TestUtils.test';
|
import { MockBufferService, MockOptionsService, MockCoreService, MockMouseStateService, createCellData } from '../../common/TestUtils.test';
|
||||||
import { BufferLine } from '../../common/buffer/BufferLine';
|
import { BufferLine } from '../../common/buffer/BufferLine';
|
||||||
import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache';
|
import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache';
|
||||||
import { IBufferService, IOptionsService } from '../../common/services/Services';
|
import { IBufferService, IOptionsService } from '../../common/services/Services';
|
||||||
import { MockCoreBrowserService, MockMouseService, MockRenderService } from '../TestUtils.test';
|
import { MockCoreBrowserService, MockMouseService, MockRenderService } from '../TestUtils.test';
|
||||||
import { CellData } from '../../common/buffer/CellData';
|
import { CellData } from '../../common/buffer/CellData';
|
||||||
import { IBuffer } from '../../common/buffer/Types';
|
|
||||||
import { IRenderService } from './Services';
|
import { IRenderService } from './Services';
|
||||||
|
|
||||||
const TEST_STRING_CACHE = new BufferLineStringCache();
|
const TEST_STRING_CACHE = new BufferLineStringCache();
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from
|
|||||||
import { ICoreBrowserService, IMouseCoordsService, IRenderService, ISelectionService } from './Services';
|
import { ICoreBrowserService, IMouseCoordsService, IRenderService, ISelectionService } from './Services';
|
||||||
import { Disposable, MutableDisposable, toDisposable } from '../../common/Lifecycle';
|
import { Disposable, MutableDisposable, toDisposable } from '../../common/Lifecycle';
|
||||||
import * as Browser from '../../common/Platform';
|
import * as Browser from '../../common/Platform';
|
||||||
import { IBufferLine, ICellData, IDisposable } from '../../common/Types';
|
import { IDisposable } from '../../common/Types';
|
||||||
|
import { IBuffer, IBufferLine, ICellData } from '../../common/buffer/Types';
|
||||||
import { getRangeLength } from '../../common/buffer/BufferRange';
|
import { getRangeLength } from '../../common/buffer/BufferRange';
|
||||||
import { CellData } from '../../common/buffer/CellData';
|
import { CellData } from '../../common/buffer/CellData';
|
||||||
import { IBuffer } from '../../common/buffer/Types';
|
|
||||||
import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../../common/services/Services';
|
import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../../common/services/Services';
|
||||||
import { Emitter } from '../../common/Event';
|
import { Emitter } from '../../common/Event';
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ import { InstantiationService } from './services/InstantiationService';
|
|||||||
import { LogService } from './services/LogService';
|
import { LogService } from './services/LogService';
|
||||||
import { BufferService, BufferServiceConstants } from './services/BufferService';
|
import { BufferService, BufferServiceConstants } from './services/BufferService';
|
||||||
import { OptionsService } from './services/OptionsService';
|
import { OptionsService } from './services/OptionsService';
|
||||||
import { IDisposable, IAttributeData, IScrollEvent, ITerminalOptions, IParams } from './Types';
|
import { IDisposable, IScrollEvent, ITerminalOptions, IParams } from './Types';
|
||||||
|
import { IAttributeData, IBufferSet } from './buffer/Types';
|
||||||
import { CoreService } from './services/CoreService';
|
import { CoreService } from './services/CoreService';
|
||||||
import { MouseStateService } from './services/MouseStateService';
|
import { MouseStateService } from './services/MouseStateService';
|
||||||
import { UnicodeV6 } from './input/UnicodeV6';
|
import { UnicodeV6 } from './input/UnicodeV6';
|
||||||
@@ -34,7 +35,6 @@ import { UnicodeService } from './services/UnicodeService';
|
|||||||
import { CharsetService } from './services/CharsetService';
|
import { CharsetService } from './services/CharsetService';
|
||||||
import { updateWindowsModeWrappedState } from './WindowsMode';
|
import { updateWindowsModeWrappedState } from './WindowsMode';
|
||||||
import { IFunctionIdentifier } from './parser/Types';
|
import { IFunctionIdentifier } from './parser/Types';
|
||||||
import { IBufferSet } from './buffer/Types';
|
|
||||||
import { InputHandler } from './InputHandler';
|
import { InputHandler } from './InputHandler';
|
||||||
import { WriteBuffer } from './input/WriteBuffer';
|
import { WriteBuffer } from './input/WriteBuffer';
|
||||||
import { OscLinkService } from './services/OscLinkService';
|
import { OscLinkService } from './services/OscLinkService';
|
||||||
|
|||||||
@@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
import { assert } from 'chai';
|
import { assert } from 'chai';
|
||||||
import { InputHandler } from './InputHandler';
|
import { InputHandler } from './InputHandler';
|
||||||
import { IBufferLine, IAttributeData, IColorEvent, ColorRequestType, SpecialColorIndex } from './Types';
|
import { IColorEvent, ColorRequestType, SpecialColorIndex } from './Types';
|
||||||
|
import { IAttributeData, IBufferLine } from './buffer/Types';
|
||||||
import { DEFAULT_ATTR_DATA } from './buffer/BufferLine';
|
import { DEFAULT_ATTR_DATA } from './buffer/BufferLine';
|
||||||
import { CellData } from './buffer/CellData';
|
import { CellData } from './buffer/CellData';
|
||||||
import { Attributes, BgFlags, UnderlineStyle } from './buffer/Constants';
|
import { Attributes, BgFlags, UnderlineStyle } from './buffer/Constants';
|
||||||
|
|||||||
@@ -4,7 +4,8 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IInputHandler, IAttributeData, IDisposable, IWindowOptions, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from './Types';
|
import { IInputHandler, IDisposable, IWindowOptions, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from './Types';
|
||||||
|
import { IAttributeData, IBuffer } from './buffer/Types';
|
||||||
import { C0, C1 } from './data/EscapeSequences';
|
import { C0, C1 } from './data/EscapeSequences';
|
||||||
import { CHARSETS, DEFAULT_CHARSET } from './data/Charsets';
|
import { CHARSETS, DEFAULT_CHARSET } from './data/Charsets';
|
||||||
import { EscapeSequenceParser } from './parser/EscapeSequenceParser';
|
import { EscapeSequenceParser } from './parser/EscapeSequenceParser';
|
||||||
@@ -20,7 +21,6 @@ import { UnicodeService } from './services/UnicodeService';
|
|||||||
import { OscHandler } from './parser/OscParser';
|
import { OscHandler } from './parser/OscParser';
|
||||||
import { DcsHandler } from './parser/DcsParser';
|
import { DcsHandler } from './parser/DcsParser';
|
||||||
import { ApcHandler } from './parser/ApcParser';
|
import { ApcHandler } from './parser/ApcParser';
|
||||||
import { IBuffer } from './buffer/Types';
|
|
||||||
import { parseColor } from './input/XParseColor';
|
import { parseColor } from './input/XParseColor';
|
||||||
import { Emitter } from './Event';
|
import { Emitter } from './Event';
|
||||||
import { XTERM_VERSION } from './Version';
|
import { XTERM_VERSION } from './Version';
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
import { IBufferService, ICoreService, ILogService, IOptionsService, ITerminalOptions, IMouseStateService, ICharsetService, UnicodeCharProperties, UnicodeCharWidth, IUnicodeService, IUnicodeVersionProvider, LogLevelEnum, IDecorationService, IInternalDecoration, IOscLinkService, type IBufferResizeEvent } from './services/Services';
|
import { IBufferService, ICoreService, ILogService, IOptionsService, ITerminalOptions, IMouseStateService, ICharsetService, UnicodeCharProperties, UnicodeCharWidth, IUnicodeService, IUnicodeVersionProvider, LogLevelEnum, IDecorationService, IInternalDecoration, IOscLinkService, type IBufferResizeEvent } from './services/Services';
|
||||||
import { UnicodeService } from './services/UnicodeService';
|
import { UnicodeService } from './services/UnicodeService';
|
||||||
import { DEFAULT_OPTIONS } from './services/OptionsService';
|
import { DEFAULT_OPTIONS } from './services/OptionsService';
|
||||||
import { IBufferSet, IBuffer } from './buffer/Types';
|
import { IAttributeData, IBuffer, IBufferLine, IBufferSet, IExtendedAttrs } from './buffer/Types';
|
||||||
import { BufferSet } from './buffer/BufferSet';
|
import { BufferSet } from './buffer/BufferSet';
|
||||||
import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IAttributeData, IOscLinkData, IDisposable, IBufferLine, IExtendedAttrs } from './Types';
|
import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IOscLinkData, IDisposable } from './Types';
|
||||||
import { UnicodeV6 } from './input/UnicodeV6';
|
import { UnicodeV6 } from './input/UnicodeV6';
|
||||||
import { IDecorationOptions, IDecoration } from '@xterm/xterm';
|
import { IDecorationOptions, IDecoration } from '@xterm/xterm';
|
||||||
import { Emitter, type IEvent } from './Event';
|
import { Emitter, type IEvent } from './Event';
|
||||||
|
|||||||
@@ -41,15 +41,6 @@ export interface IParams {
|
|||||||
getSubParamsAll(): {[idx: number]: Int32Array};
|
getSubParamsAll(): {[idx: number]: Int32Array};
|
||||||
}
|
}
|
||||||
|
|
||||||
export const enum UnderlineStyle {
|
|
||||||
NONE = 0,
|
|
||||||
SINGLE = 1,
|
|
||||||
DOUBLE = 2,
|
|
||||||
CURLY = 3,
|
|
||||||
DOTTED = 4,
|
|
||||||
DASHED = 5
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IDisposable {
|
export interface IDisposable {
|
||||||
dispose(): void;
|
dispose(): void;
|
||||||
}
|
}
|
||||||
@@ -126,24 +117,12 @@ export interface ICharset {
|
|||||||
[key: string]: string | undefined;
|
[key: string]: string | undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type CharData = [attr: number, char: string, width: number, code: number];
|
|
||||||
|
|
||||||
export interface IColor {
|
export interface IColor {
|
||||||
readonly css: string;
|
readonly css: string;
|
||||||
readonly rgba: number; // 32-bit int with rgba in each byte
|
readonly rgba: number; // 32-bit int with rgba in each byte
|
||||||
}
|
}
|
||||||
export type IColorRGB = [red: number, green: number, blue: number];
|
export type IColorRGB = [red: number, green: number, blue: number];
|
||||||
|
|
||||||
export interface IExtendedAttrs {
|
|
||||||
ext: number;
|
|
||||||
underlineStyle: UnderlineStyle;
|
|
||||||
underlineColor: number;
|
|
||||||
underlineVariantOffset: number;
|
|
||||||
urlId: number;
|
|
||||||
clone(): IExtendedAttrs;
|
|
||||||
isEmpty(): boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tracks the current hyperlink. Since these are treated as extended attirbutes, these get passed on
|
* Tracks the current hyperlink. Since these are treated as extended attirbutes, these get passed on
|
||||||
* to the linkifier when anything is printed. Doing it this way ensures that even when the cursor
|
* to the linkifier when anything is printed. Doing it this way ensures that even when the cursor
|
||||||
@@ -155,183 +134,6 @@ export interface IOscLinkData {
|
|||||||
uri: string;
|
uri: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* An object that represents all attributes of a cell.
|
|
||||||
*/
|
|
||||||
export interface IAttributeData {
|
|
||||||
/**
|
|
||||||
* "fg" is a 32-bit unsigned integer that stores the foreground color of the cell in the 24 least
|
|
||||||
* significant bits and additional flags in the remaining 8 bits.
|
|
||||||
*/
|
|
||||||
fg: number;
|
|
||||||
/**
|
|
||||||
* "bg" is a 32-bit unsigned integer that stores the background color of the cell in the 24 least
|
|
||||||
* significant bits and additional flags in the remaining 8 bits.
|
|
||||||
*/
|
|
||||||
bg: number;
|
|
||||||
/**
|
|
||||||
* "extended", aka "ext", stores extended attributes beyond those available in fg and bg. This
|
|
||||||
* data is optional on a cell and encodes less common data.
|
|
||||||
*/
|
|
||||||
extended: IExtendedAttrs;
|
|
||||||
|
|
||||||
clone(): IAttributeData;
|
|
||||||
|
|
||||||
// flags
|
|
||||||
isInverse(): number;
|
|
||||||
isBold(): number;
|
|
||||||
isUnderline(): number;
|
|
||||||
isBlink(): number;
|
|
||||||
isInvisible(): number;
|
|
||||||
isItalic(): number;
|
|
||||||
isDim(): number;
|
|
||||||
isStrikethrough(): number;
|
|
||||||
isProtected(): number;
|
|
||||||
isOverline(): number;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The color mode of the foreground color which determines how to decode {@link getFgColor},
|
|
||||||
* possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
|
|
||||||
* {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
|
|
||||||
*/
|
|
||||||
getFgColorMode(): number;
|
|
||||||
/**
|
|
||||||
* The color mode of the background color which determines how to decode {@link getBgColor},
|
|
||||||
* possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
|
|
||||||
* {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
|
|
||||||
*/
|
|
||||||
getBgColorMode(): number;
|
|
||||||
isFgRGB(): boolean;
|
|
||||||
isBgRGB(): boolean;
|
|
||||||
isFgPalette(): boolean;
|
|
||||||
isBgPalette(): boolean;
|
|
||||||
isFgDefault(): boolean;
|
|
||||||
isBgDefault(): boolean;
|
|
||||||
isAttributeDefault(): boolean;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets an integer representation of the foreground color, how to decode the color depends on the
|
|
||||||
* color mode {@link getFgColorMode}.
|
|
||||||
*/
|
|
||||||
getFgColor(): number;
|
|
||||||
/**
|
|
||||||
* Gets an integer representation of the background color, how to decode the color depends on the
|
|
||||||
* color mode {@link getBgColorMode}.
|
|
||||||
*/
|
|
||||||
getBgColor(): number;
|
|
||||||
|
|
||||||
// extended attrs
|
|
||||||
hasExtendedAttrs(): number;
|
|
||||||
updateExtended(): void;
|
|
||||||
getUnderlineColor(): number;
|
|
||||||
getUnderlineColorMode(): number;
|
|
||||||
isUnderlineColorRGB(): boolean;
|
|
||||||
isUnderlineColorPalette(): boolean;
|
|
||||||
isUnderlineColorDefault(): boolean;
|
|
||||||
getUnderlineStyle(): number;
|
|
||||||
getUnderlineVariantOffset(): number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Cell data */
|
|
||||||
export interface ICellData extends IAttributeData {
|
|
||||||
content: number;
|
|
||||||
combinedData: string;
|
|
||||||
isCombined(): number;
|
|
||||||
getWidth(): number;
|
|
||||||
getChars(): string;
|
|
||||||
getCode(): number;
|
|
||||||
setFromCharData(value: CharData): void;
|
|
||||||
getAsCharData(): CharData;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Interface for a line in the terminal buffer.
|
|
||||||
*/
|
|
||||||
export interface IBufferLine {
|
|
||||||
length: number;
|
|
||||||
isWrapped: boolean;
|
|
||||||
get(index: number): CharData;
|
|
||||||
set(index: number, value: CharData): void;
|
|
||||||
loadCell(index: number, cell: ICellData): ICellData;
|
|
||||||
setCell(index: number, cell: ICellData): void;
|
|
||||||
setCellFromCodepoint(index: number, codePoint: number, width: number, attrs: IAttributeData): void;
|
|
||||||
addCodepointToCell(index: number, codePoint: number, width: number): void;
|
|
||||||
insertCells(pos: number, n: number, ch: ICellData): void;
|
|
||||||
deleteCells(pos: number, n: number, fill: ICellData): void;
|
|
||||||
replaceCells(start: number, end: number, fill: ICellData, respectProtect?: boolean): void;
|
|
||||||
resize(cols: number, fill: ICellData): boolean;
|
|
||||||
cleanupMemory(): number;
|
|
||||||
fill(fillCellData: ICellData, respectProtect?: boolean): void;
|
|
||||||
copyFrom(line: IBufferLine): void;
|
|
||||||
clone(): IBufferLine;
|
|
||||||
getTrimmedLength(): number;
|
|
||||||
getNoBgTrimmedLength(): number;
|
|
||||||
translateToString(trimRight?: boolean, startCol?: number, endCol?: number, outColumns?: number[]): string;
|
|
||||||
|
|
||||||
/* direct access to cell attrs */
|
|
||||||
getWidth(index: number): number;
|
|
||||||
hasWidth(index: number): number;
|
|
||||||
getFg(index: number): number;
|
|
||||||
getBg(index: number): number;
|
|
||||||
hasContent(index: number): number;
|
|
||||||
getCodePoint(index: number): number;
|
|
||||||
isCombined(index: number): number;
|
|
||||||
getString(index: number): string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IMarker extends IDisposable {
|
|
||||||
readonly id: number;
|
|
||||||
readonly isDisposed: boolean;
|
|
||||||
readonly line: number;
|
|
||||||
onDispose: IEvent<void>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IBuffer {
|
|
||||||
readonly lines: ICircularList<IBufferLine>;
|
|
||||||
ydisp: number;
|
|
||||||
ybase: number;
|
|
||||||
y: number;
|
|
||||||
x: number;
|
|
||||||
tabs: any;
|
|
||||||
scrollBottom: number;
|
|
||||||
scrollTop: number;
|
|
||||||
hasScrollback: boolean;
|
|
||||||
savedY: number;
|
|
||||||
savedX: number;
|
|
||||||
savedCharset: ICharset | undefined;
|
|
||||||
savedCharsets: (ICharset | undefined)[];
|
|
||||||
savedGlevel: number;
|
|
||||||
savedOriginMode: boolean;
|
|
||||||
savedWraparoundMode: boolean;
|
|
||||||
savedCurAttrData: IAttributeData;
|
|
||||||
isCursorInViewport: boolean;
|
|
||||||
markers: IMarker[];
|
|
||||||
translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol?: number, endCol?: number): string;
|
|
||||||
getWrappedRangeForLine(y: number): { first: number, last: number };
|
|
||||||
nextStop(x?: number): number;
|
|
||||||
prevStop(x?: number): number;
|
|
||||||
getBlankLine(attr: IAttributeData, isWrapped?: boolean): IBufferLine;
|
|
||||||
getNullCell(attr?: IAttributeData): ICellData;
|
|
||||||
getWhitespaceCell(attr?: IAttributeData): ICellData;
|
|
||||||
addMarker(y: number): IMarker;
|
|
||||||
clearMarkers(y: number): void;
|
|
||||||
clearAllMarkers(): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IBufferSet extends IDisposable {
|
|
||||||
alt: IBuffer;
|
|
||||||
normal: IBuffer;
|
|
||||||
active: IBuffer;
|
|
||||||
|
|
||||||
onBufferActivate: IEvent<{ activeBuffer: IBuffer, inactiveBuffer: IBuffer }>;
|
|
||||||
|
|
||||||
activateNormalBuffer(): void;
|
|
||||||
activateAltBuffer(fillAttr?: IAttributeData): void;
|
|
||||||
reset(): void;
|
|
||||||
resize(newCols: number, newRows: number): void;
|
|
||||||
setupTabStops(i?: number): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IModes {
|
export interface IModes {
|
||||||
insertMode: boolean;
|
insertMode: boolean;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IAttributeData, IColorRGB, IExtendedAttrs } from '../Types';
|
import { IColorRGB } from '../Types';
|
||||||
|
import { IAttributeData, IExtendedAttrs } from './Types';
|
||||||
import { Attributes, FgFlags, BgFlags, UnderlineStyle, ExtFlags } from './Constants';
|
import { Attributes, FgFlags, BgFlags, UnderlineStyle, ExtFlags } from './Constants';
|
||||||
|
|
||||||
export class AttributeData implements IAttributeData {
|
export class AttributeData implements IAttributeData {
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
import { CircularList, IInsertEvent } from '../CircularList';
|
import { CircularList, IInsertEvent } from '../CircularList';
|
||||||
import { Disposable, toDisposable } from '../Lifecycle';
|
import { Disposable, toDisposable } from '../Lifecycle';
|
||||||
import { IdleTaskQueue } from '../TaskQueue';
|
import { IdleTaskQueue } from '../TaskQueue';
|
||||||
import { IAttributeData, IBufferLine, ICellData, ICharset } from '../Types';
|
import { ICharset } from '../Types';
|
||||||
|
import { IAttributeData, IBuffer, IBufferLine, ICellData } from './Types';
|
||||||
import { ExtendedAttrs } from './AttributeData';
|
import { ExtendedAttrs } from './AttributeData';
|
||||||
import { BufferLine, DEFAULT_ATTR_DATA } from './BufferLine';
|
import { BufferLine, DEFAULT_ATTR_DATA } from './BufferLine';
|
||||||
import { BufferLineStringCache } from './BufferLineStringCache';
|
import { BufferLineStringCache } from './BufferLineStringCache';
|
||||||
@@ -14,7 +15,6 @@ import { getWrappedLineTrimmedLength, reflowLargerApplyNewLayout, reflowLargerCr
|
|||||||
import { CellData } from './CellData';
|
import { CellData } from './CellData';
|
||||||
import { NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, WHITESPACE_CELL_WIDTH } from './Constants';
|
import { NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, WHITESPACE_CELL_WIDTH } from './Constants';
|
||||||
import { Marker } from './Marker';
|
import { Marker } from './Marker';
|
||||||
import { IBuffer } from './Types';
|
|
||||||
import { DEFAULT_CHARSET } from '../data/Charsets';
|
import { DEFAULT_CHARSET } from '../data/Charsets';
|
||||||
import { IBufferService, ILogService, IOptionsService } from '../services/Services';
|
import { IBufferService, ILogService, IOptionsService } from '../services/Services';
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR, Content,
|
|||||||
import { BufferLine } from './BufferLine';
|
import { BufferLine } from './BufferLine';
|
||||||
import { BufferLineStringCache } from './BufferLineStringCache';
|
import { BufferLineStringCache } from './BufferLineStringCache';
|
||||||
import { CellData } from './CellData';
|
import { CellData } from './CellData';
|
||||||
import { CharData, IBufferLine, ICellData } from '../Types';
|
import { CharData, IBufferLine, ICellData } from './Types';
|
||||||
import { assert } from 'chai';
|
import { assert } from 'chai';
|
||||||
import { AttributeData } from './AttributeData';
|
import { AttributeData } from './AttributeData';
|
||||||
import { createCellData, NULL_CELL_DATA, extendedAttributes } from '../TestUtils.test';
|
import { createCellData, NULL_CELL_DATA, extendedAttributes } from '../TestUtils.test';
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from '../Types';
|
import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from './Types';
|
||||||
import { AttributeData } from './AttributeData';
|
import { AttributeData } from './AttributeData';
|
||||||
import { CellData } from './CellData';
|
import { CellData } from './CellData';
|
||||||
import { Attributes, BgFlags, CHAR_DATA_ATTR_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, Content, NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR } from './Constants';
|
import { Attributes, BgFlags, CHAR_DATA_ATTR_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, Content, NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR } from './Constants';
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
import { BufferLine } from './BufferLine';
|
import { BufferLine } from './BufferLine';
|
||||||
import { CircularList } from '../CircularList';
|
import { CircularList } from '../CircularList';
|
||||||
import { IBufferLine, ICellData } from '../Types';
|
import { IBufferLine, ICellData } from './Types';
|
||||||
|
|
||||||
export interface INewLayoutResult {
|
export interface INewLayoutResult {
|
||||||
layout: number[];
|
layout: number[];
|
||||||
|
|||||||
@@ -4,9 +4,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { Disposable, MutableDisposable } from '../Lifecycle';
|
import { Disposable, MutableDisposable } from '../Lifecycle';
|
||||||
import { IAttributeData } from '../Types';
|
|
||||||
import { Buffer } from './Buffer';
|
import { Buffer } from './Buffer';
|
||||||
import { IBuffer, IBufferSet } from './Types';
|
import { IAttributeData, IBuffer, IBufferSet } from './Types';
|
||||||
import { IBufferService, ILogService, IOptionsService } from '../services/Services';
|
import { IBufferService, ILogService, IOptionsService } from '../services/Services';
|
||||||
import { Emitter } from '../Event';
|
import { Emitter } from '../Event';
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { CharData, ICellData, IExtendedAttrs } from '../Types';
|
import { CharData, ICellData, IExtendedAttrs } from './Types';
|
||||||
import { stringFromCodePoint } from '../input/TextDecoder';
|
import { stringFromCodePoint } from '../input/TextDecoder';
|
||||||
import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_ATTR_INDEX, Content } from './Constants';
|
import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_ATTR_INDEX, Content } from './Constants';
|
||||||
import { AttributeData, ExtendedAttrs } from './AttributeData';
|
import { AttributeData, ExtendedAttrs } from './AttributeData';
|
||||||
|
|||||||
@@ -147,4 +147,11 @@ export const enum ExtFlags {
|
|||||||
VARIANT_OFFSET = 0xE0000000
|
VARIANT_OFFSET = 0xE0000000
|
||||||
}
|
}
|
||||||
|
|
||||||
export { UnderlineStyle } from '../Types';
|
export const enum UnderlineStyle {
|
||||||
|
NONE = 0,
|
||||||
|
SINGLE = 1,
|
||||||
|
DOUBLE = 2,
|
||||||
|
CURLY = 3,
|
||||||
|
DOTTED = 4,
|
||||||
|
DASHED = 5
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IDisposable, IMarker } from '../Types';
|
import { dispose, IDisposable } from '../Lifecycle';
|
||||||
|
import { IMarker } from './Types';
|
||||||
import { Emitter } from '../Event';
|
import { Emitter } from '../Event';
|
||||||
import { dispose } from '../Lifecycle';
|
|
||||||
|
|
||||||
export class Marker implements IMarker {
|
export class Marker implements IMarker {
|
||||||
private static _nextId = 1;
|
private static _nextId = 1;
|
||||||
|
|||||||
+193
-1
@@ -3,7 +3,199 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export type { IBuffer, IBufferSet } from '../Types';
|
import type { IEvent } from '../Event';
|
||||||
|
import type { ICircularList, ICharset } from '../Types';
|
||||||
|
import type { IDisposable } from '../Lifecycle';
|
||||||
|
import type { UnderlineStyle } from './Constants';
|
||||||
|
|
||||||
// BufferIndex denotes a position in the buffer: [rowIndex, colIndex]
|
// BufferIndex denotes a position in the buffer: [rowIndex, colIndex]
|
||||||
export type BufferIndex = [number, number];
|
export type BufferIndex = [number, number];
|
||||||
|
|
||||||
|
export type CharData = [attr: number, char: string, width: number, code: number];
|
||||||
|
|
||||||
|
export interface IExtendedAttrs {
|
||||||
|
ext: number;
|
||||||
|
underlineStyle: UnderlineStyle;
|
||||||
|
underlineColor: number;
|
||||||
|
underlineVariantOffset: number;
|
||||||
|
urlId: number;
|
||||||
|
clone(): IExtendedAttrs;
|
||||||
|
isEmpty(): boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An object that represents all attributes of a cell.
|
||||||
|
*/
|
||||||
|
export interface IAttributeData {
|
||||||
|
/**
|
||||||
|
* "fg" is a 32-bit unsigned integer that stores the foreground color of the cell in the 24 least
|
||||||
|
* significant bits and additional flags in the remaining 8 bits.
|
||||||
|
*/
|
||||||
|
fg: number;
|
||||||
|
/**
|
||||||
|
* "bg" is a 32-bit unsigned integer that stores the background color of the cell in the 24 least
|
||||||
|
* significant bits and additional flags in the remaining 8 bits.
|
||||||
|
*/
|
||||||
|
bg: number;
|
||||||
|
/**
|
||||||
|
* "extended", aka "ext", stores extended attributes beyond those available in fg and bg. This
|
||||||
|
* data is optional on a cell and encodes less common data.
|
||||||
|
*/
|
||||||
|
extended: IExtendedAttrs;
|
||||||
|
|
||||||
|
clone(): IAttributeData;
|
||||||
|
|
||||||
|
// flags
|
||||||
|
isInverse(): number;
|
||||||
|
isBold(): number;
|
||||||
|
isUnderline(): number;
|
||||||
|
isBlink(): number;
|
||||||
|
isInvisible(): number;
|
||||||
|
isItalic(): number;
|
||||||
|
isDim(): number;
|
||||||
|
isStrikethrough(): number;
|
||||||
|
isProtected(): number;
|
||||||
|
isOverline(): number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The color mode of the foreground color which determines how to decode {@link getFgColor},
|
||||||
|
* possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
|
||||||
|
* {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
|
||||||
|
*/
|
||||||
|
getFgColorMode(): number;
|
||||||
|
/**
|
||||||
|
* The color mode of the background color which determines how to decode {@link getBgColor},
|
||||||
|
* possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
|
||||||
|
* {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
|
||||||
|
*/
|
||||||
|
getBgColorMode(): number;
|
||||||
|
isFgRGB(): boolean;
|
||||||
|
isBgRGB(): boolean;
|
||||||
|
isFgPalette(): boolean;
|
||||||
|
isBgPalette(): boolean;
|
||||||
|
isFgDefault(): boolean;
|
||||||
|
isBgDefault(): boolean;
|
||||||
|
isAttributeDefault(): boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets an integer representation of the foreground color, how to decode the color depends on the
|
||||||
|
* color mode {@link getFgColorMode}.
|
||||||
|
*/
|
||||||
|
getFgColor(): number;
|
||||||
|
/**
|
||||||
|
* Gets an integer representation of the background color, how to decode the color depends on the
|
||||||
|
* color mode {@link getBgColorMode}.
|
||||||
|
*/
|
||||||
|
getBgColor(): number;
|
||||||
|
|
||||||
|
// extended attrs
|
||||||
|
hasExtendedAttrs(): number;
|
||||||
|
updateExtended(): void;
|
||||||
|
getUnderlineColor(): number;
|
||||||
|
getUnderlineColorMode(): number;
|
||||||
|
isUnderlineColorRGB(): boolean;
|
||||||
|
isUnderlineColorPalette(): boolean;
|
||||||
|
isUnderlineColorDefault(): boolean;
|
||||||
|
getUnderlineStyle(): number;
|
||||||
|
getUnderlineVariantOffset(): number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Cell data */
|
||||||
|
export interface ICellData extends IAttributeData {
|
||||||
|
content: number;
|
||||||
|
combinedData: string;
|
||||||
|
isCombined(): number;
|
||||||
|
getWidth(): number;
|
||||||
|
getChars(): string;
|
||||||
|
getCode(): number;
|
||||||
|
setFromCharData(value: CharData): void;
|
||||||
|
getAsCharData(): CharData;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface for a line in the terminal buffer.
|
||||||
|
*/
|
||||||
|
export interface IBufferLine {
|
||||||
|
length: number;
|
||||||
|
isWrapped: boolean;
|
||||||
|
get(index: number): CharData;
|
||||||
|
set(index: number, value: CharData): void;
|
||||||
|
loadCell(index: number, cell: ICellData): ICellData;
|
||||||
|
setCell(index: number, cell: ICellData): void;
|
||||||
|
setCellFromCodepoint(index: number, codePoint: number, width: number, attrs: IAttributeData): void;
|
||||||
|
addCodepointToCell(index: number, codePoint: number, width: number): void;
|
||||||
|
insertCells(pos: number, n: number, ch: ICellData): void;
|
||||||
|
deleteCells(pos: number, n: number, fill: ICellData): void;
|
||||||
|
replaceCells(start: number, end: number, fill: ICellData, respectProtect?: boolean): void;
|
||||||
|
resize(cols: number, fill: ICellData): boolean;
|
||||||
|
cleanupMemory(): number;
|
||||||
|
fill(fillCellData: ICellData, respectProtect?: boolean): void;
|
||||||
|
copyFrom(line: IBufferLine): void;
|
||||||
|
clone(): IBufferLine;
|
||||||
|
getTrimmedLength(): number;
|
||||||
|
getNoBgTrimmedLength(): number;
|
||||||
|
translateToString(trimRight?: boolean, startCol?: number, endCol?: number, outColumns?: number[]): string;
|
||||||
|
|
||||||
|
/* direct access to cell attrs */
|
||||||
|
getWidth(index: number): number;
|
||||||
|
hasWidth(index: number): number;
|
||||||
|
getFg(index: number): number;
|
||||||
|
getBg(index: number): number;
|
||||||
|
hasContent(index: number): number;
|
||||||
|
getCodePoint(index: number): number;
|
||||||
|
isCombined(index: number): number;
|
||||||
|
getString(index: number): string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface IMarker extends IDisposable {
|
||||||
|
readonly id: number;
|
||||||
|
readonly isDisposed: boolean;
|
||||||
|
readonly line: number;
|
||||||
|
onDispose: IEvent<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface IBuffer {
|
||||||
|
readonly lines: ICircularList<IBufferLine>;
|
||||||
|
ydisp: number;
|
||||||
|
ybase: number;
|
||||||
|
y: number;
|
||||||
|
x: number;
|
||||||
|
tabs: any;
|
||||||
|
scrollBottom: number;
|
||||||
|
scrollTop: number;
|
||||||
|
hasScrollback: boolean;
|
||||||
|
savedY: number;
|
||||||
|
savedX: number;
|
||||||
|
savedCharset: ICharset | undefined;
|
||||||
|
savedCharsets: (ICharset | undefined)[];
|
||||||
|
savedGlevel: number;
|
||||||
|
savedOriginMode: boolean;
|
||||||
|
savedWraparoundMode: boolean;
|
||||||
|
savedCurAttrData: IAttributeData;
|
||||||
|
isCursorInViewport: boolean;
|
||||||
|
markers: IMarker[];
|
||||||
|
translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol?: number, endCol?: number): string;
|
||||||
|
getWrappedRangeForLine(y: number): { first: number, last: number };
|
||||||
|
nextStop(x?: number): number;
|
||||||
|
prevStop(x?: number): number;
|
||||||
|
getBlankLine(attr: IAttributeData, isWrapped?: boolean): IBufferLine;
|
||||||
|
getNullCell(attr?: IAttributeData): ICellData;
|
||||||
|
getWhitespaceCell(attr?: IAttributeData): ICellData;
|
||||||
|
addMarker(y: number): IMarker;
|
||||||
|
clearMarkers(y: number): void;
|
||||||
|
clearAllMarkers(): void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface IBufferSet extends IDisposable {
|
||||||
|
alt: IBuffer;
|
||||||
|
normal: IBuffer;
|
||||||
|
active: IBuffer;
|
||||||
|
|
||||||
|
onBufferActivate: IEvent<{ activeBuffer: IBuffer, inactiveBuffer: IBuffer }>;
|
||||||
|
|
||||||
|
activateNormalBuffer(): void;
|
||||||
|
activateAltBuffer(fillAttr?: IAttributeData): void;
|
||||||
|
reset(): void;
|
||||||
|
resize(newCols: number, newRows: number): void;
|
||||||
|
setupTabStops(i?: number): void;
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { CellData } from '../buffer/CellData';
|
import { CellData } from '../buffer/CellData';
|
||||||
import { IBufferLine, ICellData } from '../Types';
|
import { IBufferLine, ICellData } from '../buffer/Types';
|
||||||
import { IBufferCell as IBufferCellApi, IBufferLine as IBufferLineApi } from '@xterm/xterm';
|
import { IBufferCell as IBufferCellApi, IBufferLine as IBufferLineApi } from '@xterm/xterm';
|
||||||
|
|
||||||
export class BufferLineApiView implements IBufferLineApi {
|
export class BufferLineApiView implements IBufferLineApi {
|
||||||
|
|||||||
@@ -4,9 +4,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { Disposable } from '../Lifecycle';
|
import { Disposable } from '../Lifecycle';
|
||||||
import { IAttributeData, IBufferLine } from '../Types';
|
import { IAttributeData, IBuffer, IBufferLine, IBufferSet } from '../buffer/Types';
|
||||||
import { BufferSet } from '../buffer/BufferSet';
|
import { BufferSet } from '../buffer/BufferSet';
|
||||||
import { IBuffer, IBufferSet } from '../buffer/Types';
|
|
||||||
import { IBufferService, ILogService, IOptionsService, type IBufferResizeEvent } from './Services';
|
import { IBufferService, ILogService, IOptionsService, type IBufferResizeEvent } from './Services';
|
||||||
import { Emitter } from '../Event';
|
import { Emitter } from '../Event';
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
import { assert } from 'chai';
|
import { assert } from 'chai';
|
||||||
import { DecorationLineCache, DecorationService } from './DecorationService';
|
import { DecorationLineCache, DecorationService } from './DecorationService';
|
||||||
import { IMarker } from '../Types';
|
import { IMarker } from '../buffer/Types';
|
||||||
import { Disposable } from '../Lifecycle';
|
import { Disposable } from '../Lifecycle';
|
||||||
import { Emitter } from '../Event';
|
import { Emitter } from '../Event';
|
||||||
import { MockLogService, MockBufferService, MockOptionsService } from '../TestUtils.test';
|
import { MockLogService, MockBufferService, MockOptionsService } from '../TestUtils.test';
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
import { IBufferService, IOscLinkService } from './Services';
|
import { IBufferService, IOscLinkService } from './Services';
|
||||||
import { IMarker, IOscLinkData } from '../Types';
|
import { IOscLinkData } from '../Types';
|
||||||
|
import { IMarker } from '../buffer/Types';
|
||||||
|
|
||||||
export class OscLinkService implements IOscLinkService {
|
export class OscLinkService implements IOscLinkService {
|
||||||
public serviceBrand: any;
|
public serviceBrand: any;
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import type { IDecoration, IDecorationOptions, ILinkHandler, ILogger, IWindowsPty, IOverviewRulerOptions } from '@xterm/xterm';
|
import type { IDecoration, IDecorationOptions, ILinkHandler, ILogger, IWindowsPty, IOverviewRulerOptions } from '@xterm/xterm';
|
||||||
import { CoreMouseEncoding, CoreMouseEventType, CursorInactiveStyle, CursorStyle, IAttributeData, ICharset, IColor, ICoreMouseEvent, ICoreMouseProtocol, IDecPrivateModes, IDisposable, IKittyKeyboardState, IModes, IOscLinkData, IWindowOptions } from '../Types';
|
import { CoreMouseEncoding, CoreMouseEventType, CursorInactiveStyle, CursorStyle, ICharset, IColor, ICoreMouseEvent, ICoreMouseProtocol, IDecPrivateModes, IDisposable, IKittyKeyboardState, IModes, IOscLinkData, IWindowOptions } from '../Types';
|
||||||
import { IBuffer, IBufferSet } from '../buffer/Types';
|
import { IAttributeData, IBuffer, IBufferSet } from '../buffer/Types';
|
||||||
import { createDecorator, IServiceIdentifier } from './ServiceRegistry';
|
import { createDecorator, IServiceIdentifier } from './ServiceRegistry';
|
||||||
import type { Emitter, IEvent } from '../Event';
|
import type { Emitter, IEvent } from '../Event';
|
||||||
|
|
||||||
|
|||||||
@@ -22,9 +22,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
|
import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
|
||||||
import { IBuffer } from '../common/buffer/Types';
|
import { IBuffer, IMarker } from '../common/buffer/Types';
|
||||||
import { CoreTerminal } from '../common/CoreTerminal';
|
import { CoreTerminal } from '../common/CoreTerminal';
|
||||||
import { IMarker, ITerminalOptions } from '../common/Types';
|
import { ITerminalOptions } from '../common/Types';
|
||||||
import { Emitter, EventUtils } from '../common/Event';
|
import { Emitter, EventUtils } from '../common/Event';
|
||||||
|
|
||||||
export class Terminal extends CoreTerminal {
|
export class Terminal extends CoreTerminal {
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ import { Browser, JSHandle, Page } from '@playwright/test';
|
|||||||
import { deepStrictEqual, strictEqual } from 'assert';
|
import { deepStrictEqual, strictEqual } from 'assert';
|
||||||
import type { IRenderDimensions as IRenderDimensionsInternal } from '../../src/browser/renderer/shared/Types';
|
import type { IRenderDimensions as IRenderDimensionsInternal } from '../../src/browser/renderer/shared/Types';
|
||||||
import type { IRenderService } from '../../src/browser/services/Services';
|
import type { IRenderService } from '../../src/browser/services/Services';
|
||||||
import type { IDisposable, IMarker } from '../../src/common/Types';
|
import type { IDisposable } from '../../src/common/Types';
|
||||||
|
import type { IMarker } from '../../src/common/buffer/Types';
|
||||||
import type { ICoreTerminal } from '../../src/common/CoreTerminal';
|
import type { ICoreTerminal } from '../../src/common/CoreTerminal';
|
||||||
import * as playwright from '@playwright/test';
|
import * as playwright from '@playwright/test';
|
||||||
import { IBuffer, IBufferCell, IBufferLine, IBufferNamespace, IBufferRange, IDecoration, IDecorationOptions, IModes, IRenderDimensions, ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from '@xterm/xterm';
|
import { IBuffer, IBufferCell, IBufferLine, IBufferNamespace, IBufferRange, IDecoration, IDecorationOptions, IModes, IRenderDimensions, ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from '@xterm/xterm';
|
||||||
|
|||||||
Reference in New Issue
Block a user