X-Git-Url: https://git.proxmox.com/?p=mirror_xterm.js.git;a=blobdiff_plain;f=src%2Faddons%2Fsearch%2FSearchHelper.ts;h=43d6dc1858a5fffef9f5d8fdd31e48dc09c333e1;hp=f28514475ab650c42f39efd490d659a791b6799f;hb=f8e3fa5a994b8bfdd57529e2309cd726cca545c5;hpb=05d308a37a06ce5b35a73cee3b7e4a8c15fca3d2 diff --git a/src/addons/search/SearchHelper.ts b/src/addons/search/SearchHelper.ts index f285144..43d6dc1 100644 --- a/src/addons/search/SearchHelper.ts +++ b/src/addons/search/SearchHelper.ts @@ -35,14 +35,14 @@ export class SearchHelper { let result: ISearchResult; - let startRow = this._terminal.ydisp; + let startRow = this._terminal.buffer.ydisp; if (this._terminal.selectionManager.selectionEnd) { // Start from the selection end if there is a selection startRow = this._terminal.selectionManager.selectionEnd[1]; } // Search from ydisp + 1 to end - for (let y = startRow + 1; y < this._terminal.ybase + this._terminal.rows; y++) { + for (let y = startRow + 1; y < this._terminal.buffer.ybase + this._terminal.rows; y++) { result = this._findInLine(term, y); if (result) { break; @@ -76,7 +76,7 @@ export class SearchHelper { let result: ISearchResult; - let startRow = this._terminal.ydisp; + let startRow = this._terminal.buffer.ydisp; if (this._terminal.selectionManager.selectionStart) { // Start from the selection end if there is a selection startRow = this._terminal.selectionManager.selectionStart[1]; @@ -92,7 +92,7 @@ export class SearchHelper { // Search from the top to the current ydisp if (!result) { - for (let y = this._terminal.ybase + this._terminal.rows - 1; y > startRow; y--) { + for (let y = this._terminal.buffer.ybase + this._terminal.rows - 1; y > startRow; y--) { result = this._findInLine(term, y); if (result) { break; @@ -111,7 +111,7 @@ export class SearchHelper { * @return The search result if it was found. */ private _findInLine(term: string, y: number): ISearchResult { - const bufferLine = this._terminal.lines.get(y); + const bufferLine = this._terminal.buffer.lines.get(y); const lowerStringLine = this._translateBufferLineToString(bufferLine, true).toLowerCase(); const lowerTerm = term.toLowerCase(); const searchIndex = lowerStringLine.indexOf(lowerTerm); @@ -134,7 +134,7 @@ export class SearchHelper { return false; } this._terminal.selectionManager.setSelection(result.col, result.row, result.term.length); - this._terminal.scrollDisp(result.row - this._terminal.ydisp, false); + this._terminal.scrollDisp(result.row - this._terminal.buffer.ydisp, false); return true; } }