Merge pull request #4093 from jerch/sgr_pixels

SGR-pixels mouse report
This commit is contained in:
jerch
2022-09-01 18:04:50 +02:00
committed by GitHub
11 changed files with 380 additions and 341 deletions
+22 -5
View File
@@ -4,7 +4,7 @@
* *
* Script to test different mouse modes in terminal emulators. * Script to test different mouse modes in terminal emulators.
* Tests for protocols DECSET 9, 1000, 1002, 1003 with different * Tests for protocols DECSET 9, 1000, 1002, 1003 with different
* report encodings (default, UTF8, SGR, URXVT). * report encodings (default, UTF8, SGR, URXVT, SGR-pixels).
* *
* VT200 Highlight mode (DECSET 1001) is not implemented. * VT200 Highlight mode (DECSET 1001) is not implemented.
* *
@@ -152,13 +152,27 @@ const ENC = {
], ],
'URXVT': [ 'URXVT': [
'\x1b[?1015h', '\x1b[?1015h',
// format: CSI <button + 32> ; Prow ; Pcol M // format: CSI <button + 32> ; Prow ; Pcol M
report => { report => {
// strip off introducer + M // strip off introducer + M
const sReport = report.toString().slice(2, -1); const sReport = report.toString().slice(2, -1);
const [button, col, row] = sReport.split(';'); const [button, col, row] = sReport.split(';');
return {state: evalButtonCode(button - 32), row, col}; return {state: evalButtonCode(button - 32), row, col};
} }
],
'SGR_PIXELS' : [
'\x1b[?1016h',
// format: CSI < Pbutton ; Prow ; Pcol M
report => {
// strip off introducer + M
const sReport = report.toString().slice(3, -1);
const [buttonCode, col, row] = sReport.split(';');
const state = evalButtonCode(buttonCode);
if (report[report.length - 1] === 'm'.charCodeAt(0)) {
state.action = 'release';
}
return {state, row, col};
}
] ]
} }
@@ -203,9 +217,12 @@ function activate() {
function applyReportData(data) { function applyReportData(data) {
let {state, row, col} = ENC[Object.keys(ENC)[activeEnc]][1](data); let {state, row, col} = ENC[Object.keys(ENC)[activeEnc]][1](data);
console.log('\x1b[2KButton:', state.button, 'Action:', state.action, 'Modifier:', state.modifier, 'row:', row, 'col:', col); if (Object.keys(ENC)[activeEnc] !== 'SGR_PIXELS') {
// apply to cursor position console.log('\x1b[2KButton:', state.button, 'Action:', state.action, 'Modifier:', state.modifier, 'row:', row, 'col:', col);
process.stdout.write(`\x1b[${row};${col}H`); process.stdout.write(`\x1b[${row};${col}H`);
} else {
console.log('\x1b[2KButton:', state.button, 'Action:', state.action, 'Modifier:', state.modifier, 'x:', row, 'y:', col);
}
} }
printMenu(); printMenu();
+9 -7
View File
@@ -645,7 +645,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
// send event to CoreMouseService // send event to CoreMouseService
function sendEvent(ev: MouseEvent | WheelEvent): boolean { function sendEvent(ev: MouseEvent | WheelEvent): boolean {
// get mouse coordinates // get mouse coordinates
const pos = self._mouseService!.getRawByteCoords(ev, self.screenElement!, self.cols, self.rows); const pos = self._mouseService!.getMouseReportCoords(ev, self.screenElement!);
if (!pos) { if (!pos) {
return false; return false;
} }
@@ -699,8 +699,10 @@ export class Terminal extends CoreTerminal implements ITerminal {
} }
return self.coreMouseService.triggerMouseEvent({ return self.coreMouseService.triggerMouseEvent({
col: pos.x - 33, // FIXME: why -33 here? col: pos.col,
row: pos.y - 33, row: pos.row,
x: pos.x,
y: pos.y,
button: but, button: but,
action, action,
ctrl: ev.ctrlKey, ctrl: ev.ctrlKey,
@@ -1320,13 +1322,13 @@ export class Terminal extends CoreTerminal implements ITerminal {
switch (type) { switch (type) {
case WindowsOptionsReportType.GET_WIN_SIZE_PIXELS: case WindowsOptionsReportType.GET_WIN_SIZE_PIXELS:
const canvasWidth = this._renderService.dimensions.scaledCanvasWidth.toFixed(0); const canvasWidth = this._renderService.dimensions.canvasWidth.toFixed(0);
const canvasHeight = this._renderService.dimensions.scaledCanvasHeight.toFixed(0); const canvasHeight = this._renderService.dimensions.canvasHeight.toFixed(0);
this.coreService.triggerDataEvent(`${C0.ESC}[4;${canvasHeight};${canvasWidth}t`); this.coreService.triggerDataEvent(`${C0.ESC}[4;${canvasHeight};${canvasWidth}t`);
break; break;
case WindowsOptionsReportType.GET_CELL_SIZE_PIXELS: case WindowsOptionsReportType.GET_CELL_SIZE_PIXELS:
const cellWidth = this._renderService.dimensions.scaledCellWidth.toFixed(0); const cellWidth = this._renderService.dimensions.actualCellWidth.toFixed(0);
const cellHeight = this._renderService.dimensions.scaledCellHeight.toFixed(0); const cellHeight = this._renderService.dimensions.actualCellHeight.toFixed(0);
this.coreService.triggerDataEvent(`${C0.ESC}[6;${cellHeight};${cellWidth}t`); this.coreService.triggerDataEvent(`${C0.ESC}[6;${cellHeight};${cellWidth}t`);
break; break;
} }
+1 -1
View File
@@ -359,7 +359,7 @@ export class MockMouseService implements IMouseService {
throw new Error('Not implemented'); throw new Error('Not implemented');
} }
public getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number, y: number } | undefined { public getMouseReportCoords(event: MouseEvent, element: HTMLElement): { col: number, row: number, x: number, y: number } | undefined {
throw new Error('Not implemented'); throw new Error('Not implemented');
} }
} }
-14
View File
@@ -48,17 +48,3 @@ export function getCoords(window: Pick<Window, 'getComputedStyle'>, event: {clie
return coords; return coords;
} }
/**
* Gets coordinates within the terminal for a particular mouse event, wrapping
* them to the bounds of the terminal and adding 32 to both the x and y values
* as expected by xterm.
*/
export function getRawByteCoords(coords: [number, number] | undefined): { x: number, y: number } | undefined {
if (!coords) {
return undefined;
}
// xterm sends raw bytes and starts at 32 (SP) for each.
return { x: coords[0] + 32, y: coords[1] + 32 };
}
+20 -4
View File
@@ -4,7 +4,7 @@
*/ */
import { ICharSizeService, IRenderService, IMouseService } from './Services'; import { ICharSizeService, IRenderService, IMouseService } from './Services';
import { getCoords, getRawByteCoords } from 'browser/input/Mouse'; import { getCoords, getCoordsRelativeToElement } from 'browser/input/Mouse';
export class MouseService implements IMouseService { export class MouseService implements IMouseService {
public serviceBrand: undefined; public serviceBrand: undefined;
@@ -29,8 +29,24 @@ export class MouseService implements IMouseService {
); );
} }
public getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number, y: number } | undefined { public getMouseReportCoords(event: MouseEvent, element: HTMLElement): { col: number, row: number, x: number, y: number } | undefined {
const coords = this.getCoords(event, element, colCount, rowCount); const coords = getCoordsRelativeToElement(window, event, element);
return getRawByteCoords(coords);
// due to rounding issues in zoom states pixel values might be negative or overflow actual canvas
// ignore those events effectively narrowing mouse area a tiny bit at the edges
if (!this._charSizeService.hasValidSize
|| coords[0] < 0
|| coords[1] < 0
|| coords[0] >= this._renderService.dimensions.canvasWidth
|| coords[1] >= this._renderService.dimensions.canvasHeight) {
return undefined;
}
return {
col: Math.floor(coords[0] / this._renderService.dimensions.actualCellWidth),
row: Math.floor(coords[1] / this._renderService.dimensions.actualCellHeight),
x: Math.floor(coords[0]),
y: Math.floor(coords[1])
};
} }
} }
+1 -1
View File
@@ -35,7 +35,7 @@ export interface IMouseService {
serviceBrand: undefined; serviceBrand: undefined;
getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined; getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined;
getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number, y: number } | undefined; getMouseReportCoords(event: MouseEvent, element: HTMLElement): { col: number, row: number, x: number, y: number } | undefined;
} }
export const IRenderService = createDecorator<IRenderService>('RenderService'); export const IRenderService = createDecorator<IRenderService>('RenderService');
+8
View File
@@ -1908,6 +1908,7 @@ export class InputHandler extends Disposable implements IInputHandler {
* | 1005 | Enable UTF-8 Mouse Mode. | #N | * | 1005 | Enable UTF-8 Mouse Mode. | #N |
* | 1006 | Enable SGR Mouse Mode. | #Y | * | 1006 | Enable SGR Mouse Mode. | #Y |
* | 1015 | Enable urxvt Mouse Mode. | #N | * | 1015 | Enable urxvt Mouse Mode. | #N |
* | 1016 | Enable SGR-Pixels Mouse Mode. | #Y |
* | 1047 | Use Alternate Screen Buffer. | #Y | * | 1047 | Use Alternate Screen Buffer. | #Y |
* | 1048 | Save cursor as in DECSC. | #Y | * | 1048 | Save cursor as in DECSC. | #Y |
* | 1049 | Save cursor and switch to alternate buffer clearing it. | #P[Does not clear the alternate buffer.] | * | 1049 | Save cursor and switch to alternate buffer clearing it. | #P[Does not clear the alternate buffer.] |
@@ -1989,6 +1990,9 @@ export class InputHandler extends Disposable implements IInputHandler {
case 1015: // urxvt ext mode mouse - removed in #2507 case 1015: // urxvt ext mode mouse - removed in #2507
this._logService.debug('DECSET 1015 not supported (see #2507)'); this._logService.debug('DECSET 1015 not supported (see #2507)');
break; break;
case 1016: // sgr pixels mode mouse
this._coreMouseService.activeEncoding = 'SGR_PIXELS';
break;
case 25: // show cursor case 25: // show cursor
this._coreService.isCursorHidden = false; this._coreService.isCursorHidden = false;
break; break;
@@ -2149,6 +2153,7 @@ export class InputHandler extends Disposable implements IInputHandler {
* | 1005 | Disable UTF-8 Mouse Mode. | #N | * | 1005 | Disable UTF-8 Mouse Mode. | #N |
* | 1006 | Disable SGR Mouse Mode. | #Y | * | 1006 | Disable SGR Mouse Mode. | #Y |
* | 1015 | Disable urxvt Mouse Mode. | #N | * | 1015 | Disable urxvt Mouse Mode. | #N |
* | 1006 | Disable SGR-Pixels Mouse Mode. | #Y |
* | 1047 | Use Normal Screen Buffer (clearing screen if in alt). | #Y | * | 1047 | Use Normal Screen Buffer (clearing screen if in alt). | #Y |
* | 1048 | Restore cursor as in DECRC. | #Y | * | 1048 | Restore cursor as in DECRC. | #Y |
* | 1049 | Use Normal Screen Buffer and restore cursor. | #Y | * | 1049 | Use Normal Screen Buffer and restore cursor. | #Y |
@@ -2210,6 +2215,9 @@ export class InputHandler extends Disposable implements IInputHandler {
case 1015: // urxvt ext mode mouse - removed in #2507 case 1015: // urxvt ext mode mouse - removed in #2507
this._logService.debug('DECRST 1015 not supported (see #2507)'); this._logService.debug('DECRST 1015 not supported (see #2507)');
break; break;
case 1006: // sgr pixels mode mouse
this._coreMouseService.activeEncoding = 'DEFAULT';
break;
case 25: // hide cursor case 25: // hide cursor
this._coreService.isCursorHidden = true; this._coreService.isCursorHidden = true;
break; break;
+3
View File
@@ -281,6 +281,9 @@ export interface ICoreMouseEvent {
col: number; col: number;
/** row (zero based). */ /** row (zero based). */
row: number; row: number;
/** xy pixel positions. */
x: number;
y: number;
/** /**
* Button the action occured. Due to restrictions of the tracking protocols * Button the action occured. Due to restrictions of the tracking protocols
* it is not possible to report multiple buttons at once. * it is not possible to report multiple buttons at once.
+70 -62
View File
@@ -34,7 +34,7 @@ describe('CoreMouseService', () => {
}); });
it('default encodings - DEFAULT, SGR', () => { it('default encodings - DEFAULT, SGR', () => {
const cms = new CoreMouseService(bufferService, coreService); const cms = new CoreMouseService(bufferService, coreService);
assert.deepEqual(Object.keys((cms as any)._encodings), ['DEFAULT', 'SGR']); assert.deepEqual(Object.keys((cms as any)._encodings), ['DEFAULT', 'SGR', 'SGR_PIXELS']);
}); });
it('protocol/encoding setter, reset', () => { it('protocol/encoding setter, reset', () => {
const cms = new CoreMouseService(bufferService, coreService); const cms = new CoreMouseService(bufferService, coreService);
@@ -82,68 +82,68 @@ describe('CoreMouseService', () => {
coreService.triggerBinaryEvent = (data: string) => reports.push(data); coreService.triggerBinaryEvent = (data: string) => reports.push(data);
}); });
it('NONE', () => { it('NONE', () => {
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), false);
}); });
it('X10', () => { it('X10', () => {
cms.activeProtocol = 'X10'; cms.activeProtocol = 'X10';
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), false);
}); });
it('VT200', () => { it('VT200', () => {
cms.activeProtocol = 'VT200'; cms.activeProtocol = 'VT200';
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), false);
}); });
it('DRAG', () => { it('DRAG', () => {
cms.activeProtocol = 'DRAG'; cms.activeProtocol = 'DRAG';
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), true);
}); });
it('ANY', () => { it('ANY', () => {
cms.activeProtocol = 'ANY'; cms.activeProtocol = 'ANY';
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE }), true);
// should not report in any case // should not report in any case
// invalid button + action combinations // invalid button + action combinations
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.MOVE }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.MOVE }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.UP }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.UP }), false);
// invalid coords // invalid coords
assert.equal(cms.triggerMouseEvent({ col: -1, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: -1, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 500, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 500, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: -1, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: -1, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 500, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false); assert.equal(cms.triggerMouseEvent({ col: 0, row: 500, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), false);
}); });
describe('coords', () => { describe('coords', () => {
it('DEFAULT encoding', () => { it('DEFAULT encoding', () => {
cms.activeProtocol = 'ANY'; cms.activeProtocol = 'ANY';
for (let i = 0; i < bufferService.cols; ++i) { for (let i = 0; i < bufferService.cols; ++i) {
assert.equal(cms.triggerMouseEvent({ col: i, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: i, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
if (i > 222) { if (i > 222) {
// supress mouse reports if we are out of addressible range (max. 222) // supress mouse reports if we are out of addressible range (max. 222)
assert.deepEqual(toBytes(reports.pop()), []); assert.deepEqual(toBytes(reports.pop()), []);
@@ -156,46 +156,54 @@ describe('CoreMouseService', () => {
cms.activeProtocol = 'ANY'; cms.activeProtocol = 'ANY';
cms.activeEncoding = 'SGR'; cms.activeEncoding = 'SGR';
for (let i = 0; i < bufferService.cols; ++i) { for (let i = 0; i < bufferService.cols; ++i) {
assert.equal(cms.triggerMouseEvent({ col: i, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true); assert.equal(cms.triggerMouseEvent({ col: i, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
assert.deepEqual(reports.pop(), `\x1b[<0;${i + 1};1M`); assert.deepEqual(reports.pop(), `\x1b[<0;${i + 1};1M`);
} }
}); });
it('SGR_PIXELS encoding', () => {
cms.activeProtocol = 'ANY';
cms.activeEncoding = 'SGR_PIXELS';
for (let i = 0; i < 500; ++i) {
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: i, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
assert.deepEqual(reports.pop(), `\x1b[<0;${i};0M`);
}
});
}); });
it('eventCodes with modifiers (DEFAULT encoding)', () => { it('eventCodes with modifiers (DEFAULT encoding)', () => {
// TODO: implement AUX button tests // TODO: implement AUX button tests
cms.activeProtocol = 'ANY'; cms.activeProtocol = 'ANY';
cms.activeEncoding = 'DEFAULT'; cms.activeEncoding = 'DEFAULT';
// all buttons + down + no modifer // all buttons + down + no modifer
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true);
assert.deepEqual(reports, ['\x1b[M !!', '\x1b[M!!!', '\x1b[M"!!', '\x1b[Ma!!']); assert.deepEqual(reports, ['\x1b[M !!', '\x1b[M!!!', '\x1b[M"!!', '\x1b[Ma!!']);
reports = []; reports = [];
// all buttons + up + no modifier // all buttons + up + no modifier
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
assert.deepEqual(reports, ['\x1b[M#!!', '\x1b[M#!!', '\x1b[M#!!', '\x1b[M`!!']); assert.deepEqual(reports, ['\x1b[M#!!', '\x1b[M#!!', '\x1b[M#!!', '\x1b[M`!!']);
reports = []; reports = [];
// all buttons + move + no modifier // all buttons + move + no modifier
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.MIDDLE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
assert.deepEqual(reports, ['\x1b[M@!!', '\x1b[MA!!', '\x1b[MB!!', '\x1b[MC!!']); assert.deepEqual(reports, ['\x1b[M@!!', '\x1b[MA!!', '\x1b[MB!!', '\x1b[MC!!']);
reports = []; reports = [];
// button none + move + modifiers // button none + move + modifiers
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: false, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: false, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: true, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: true, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: true }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: true }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: true, shift: false }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: true, shift: false }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: true, shift: true }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: true, shift: true }), true);
assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: true, shift: true }), true); assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, x: 0, y: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: true, shift: true }), true);
assert.deepEqual(reports, ['\x1b[MS!!', '\x1b[MK!!', '\x1b[MG!!', '\x1b[M[!!', '\x1b[MO!!', '\x1b[M_!!']); assert.deepEqual(reports, ['\x1b[MS!!', '\x1b[MK!!', '\x1b[MG!!', '\x1b[M[!!', '\x1b[MO!!', '\x1b[M_!!']);
reports = []; reports = [];
}); });
+23 -11
View File
@@ -9,7 +9,7 @@ import { ICoreMouseProtocol, ICoreMouseEvent, CoreMouseEncoding, CoreMouseEventT
/** /**
* Supported default protocols. * Supported default protocols.
*/ */
const DEFAULT_PROTOCOLS: {[key: string]: ICoreMouseProtocol} = { const DEFAULT_PROTOCOLS: { [key: string]: ICoreMouseProtocol } = {
/** /**
* NONE * NONE
* Events: none * Events: none
@@ -117,7 +117,7 @@ const S = String.fromCharCode;
/** /**
* Supported default encodings. * Supported default encodings.
*/ */
const DEFAULT_ENCODINGS: {[key: string]: CoreMouseEncoding} = { const DEFAULT_ENCODINGS: { [key: string]: CoreMouseEncoding } = {
/** /**
* DEFAULT - CSI M Pb Px Py * DEFAULT - CSI M Pb Px Py
* Single byte encoding for coords and event code. * Single byte encoding for coords and event code.
@@ -142,6 +142,10 @@ const DEFAULT_ENCODINGS: {[key: string]: CoreMouseEncoding} = {
SGR: (e: ICoreMouseEvent) => { SGR: (e: ICoreMouseEvent) => {
const final = (e.action === CoreMouseAction.UP && e.button !== CoreMouseButton.WHEEL) ? 'm' : 'M'; const final = (e.action === CoreMouseAction.UP && e.button !== CoreMouseButton.WHEEL) ? 'm' : 'M';
return `\x1b[<${eventCode(e, true)};${e.col};${e.row}${final}`; return `\x1b[<${eventCode(e, true)};${e.col};${e.row}${final}`;
},
SGR_PIXELS: (e: ICoreMouseEvent) => {
const final = (e.action === CoreMouseAction.UP && e.button !== CoreMouseButton.WHEEL) ? 'm' : 'M';
return `\x1b[<${eventCode(e, true)};${e.x};${e.y}${final}`;
} }
}; };
@@ -162,8 +166,8 @@ const DEFAULT_ENCODINGS: {[key: string]: CoreMouseEncoding} = {
* To send a mouse event call `triggerMouseEvent`. * To send a mouse event call `triggerMouseEvent`.
*/ */
export class CoreMouseService implements ICoreMouseService { export class CoreMouseService implements ICoreMouseService {
private _protocols: {[name: string]: ICoreMouseProtocol} = {}; private _protocols: { [name: string]: ICoreMouseProtocol } = {};
private _encodings: {[name: string]: CoreMouseEncoding} = {}; private _encodings: { [name: string]: CoreMouseEncoding } = {};
private _activeProtocol: string = ''; private _activeProtocol: string = '';
private _activeEncoding: string = ''; private _activeEncoding: string = '';
private _onProtocolChange = new EventEmitter<CoreMouseEventType>(); private _onProtocolChange = new EventEmitter<CoreMouseEventType>();
@@ -241,7 +245,7 @@ export class CoreMouseService implements ICoreMouseService {
public triggerMouseEvent(e: ICoreMouseEvent): boolean { public triggerMouseEvent(e: ICoreMouseEvent): boolean {
// range check for col/row // range check for col/row
if (e.col < 0 || e.col >= this._bufferService.cols if (e.col < 0 || e.col >= this._bufferService.cols
|| e.row < 0 || e.row >= this._bufferService.rows) { || e.row < 0 || e.row >= this._bufferService.rows) {
return false; return false;
} }
@@ -260,8 +264,11 @@ export class CoreMouseService implements ICoreMouseService {
e.col++; e.col++;
e.row++; e.row++;
// debounce move at grid level // debounce move events at grid or pixel level
if (e.action === CoreMouseAction.MOVE && this._lastEvent && this._compareEvents(this._lastEvent, e)) { if (e.action === CoreMouseAction.MOVE
&& this._lastEvent
&& this._equalEvents(this._lastEvent, e, this._activeEncoding === 'SGR_PIXELS')
) {
return false; return false;
} }
@@ -286,7 +293,7 @@ export class CoreMouseService implements ICoreMouseService {
return true; return true;
} }
public explainEvents(events: CoreMouseEventType): {[event: string]: boolean} { public explainEvents(events: CoreMouseEventType): { [event: string]: boolean } {
return { return {
down: !!(events & CoreMouseEventType.DOWN), down: !!(events & CoreMouseEventType.DOWN),
up: !!(events & CoreMouseEventType.UP), up: !!(events & CoreMouseEventType.UP),
@@ -296,9 +303,14 @@ export class CoreMouseService implements ICoreMouseService {
}; };
} }
private _compareEvents(e1: ICoreMouseEvent, e2: ICoreMouseEvent): boolean { private _equalEvents(e1: ICoreMouseEvent, e2: ICoreMouseEvent, pixels: boolean): boolean {
if (e1.col !== e2.col) return false; if (pixels) {
if (e1.row !== e2.row) return false; if (e1.x !== e2.x) return false;
if (e1.y !== e2.y) return false;
} else {
if (e1.col !== e2.col) return false;
if (e1.row !== e2.row) return false;
}
if (e1.button !== e2.button) return false; if (e1.button !== e2.button) return false;
if (e1.action !== e2.action) return false; if (e1.action !== e2.action) return false;
if (e1.ctrl !== e2.ctrl) return false; if (e1.ctrl !== e2.ctrl) return false;
+223 -236
View File
@@ -21,9 +21,6 @@ const fontSize = 6;
const cols = 260; const cols = 260;
const rows = 50; const rows = 50;
// Wheel events are hacked using private API that is only available in Chromium
const isChromium = false;
// for some reason shift gets not caught by selection manager on macos // for some reason shift gets not caught by selection manager on macos
const noShift = process.platform === 'darwin' ? false : true; const noShift = process.platform === 'darwin' ? false : true;
@@ -74,26 +71,16 @@ async function mouseDown(button: 'left' | 'right' | 'middle' | undefined): Promi
async function mouseUp(button: 'left' | 'right' | 'middle' | undefined): Promise<void> { async function mouseUp(button: 'left' | 'right' | 'middle' | undefined): Promise<void> {
return await page.mouse.up({ button }); return await page.mouse.up({ button });
} }
async function wheelUp(): Promise<void> { // FIXME: wheel event dont work anymore (playwright issue?)
const self = (page.mouse as any); // --> commented out in the tests below
return await self._raw._client.send('Input.dispatchMouseEvent', { // async function wheelUp(): Promise<void> {
type: 'mouseWheel', // return await page.mouse.wheel(0, -10);
x: self._x, // }
y: self._y, // async function wheelDown(): Promise<void> {
deltaX: 0, // return await page.mouse.wheel(0, 10);
deltaY: -10 // }
});
} // FIXME: complex Shift tests dont work anymore, also commented out
async function wheelDown(): Promise<void> {
const self = (page.mouse as any);
return await self._raw._client.send('Input.dispatchMouseEvent', {
type: 'mouseWheel',
x: self._x,
y: self._y,
deltaX: 0,
deltaY: 10
});
}
function toModifiersMask(modifiers: Set<String>): number { function toModifiersMask(modifiers: Set<String>): number {
let mask = 0; let mask = 0;
@@ -208,7 +195,7 @@ function parseReport(encoding: string, msg: number[]): { state: any, row: number
describe('Mouse Tracking Tests', async () => { describe('Mouse Tracking Tests', async () => {
const browserType = getBrowserType(); const browserType = getBrowserType();
browserType.name() === 'chromium'; browserType.name() === 'chromium';
const itMouse = isChromium ? it : it.skip; const itMouse = it;
before(async function(): Promise<void> { before(async function(): Promise<void> {
browser = await launchBrowser(); browser = await launchBrowser();
@@ -302,12 +289,12 @@ describe('Mouse Tracking Tests', async () => {
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } }]); await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } }]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), []); // await pollFor(page, () => getReports(encoding), []);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), []); // await pollFor(page, () => getReports(encoding), []);
// modifiers // modifiers
// CTRL // CTRL
@@ -317,7 +304,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]); await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
@@ -329,7 +316,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]); await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
@@ -343,7 +330,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); await page.keyboard.up('Shift');
if (noShift) { if (noShift) {
await pollFor(page, () => getReports(encoding), []); await pollFor(page, () => getReports(encoding), []);
@@ -363,7 +350,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
@@ -422,12 +409,12 @@ describe('Mouse Tracking Tests', async () => {
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } }]); await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } }]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), []); // await pollFor(page, () => getReports(encoding), []);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), []); // await pollFor(page, () => getReports(encoding), []);
// modifiers // modifiers
// CTRL // CTRL
@@ -437,7 +424,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]); await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
@@ -449,7 +436,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]); await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
@@ -461,7 +448,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); await page.keyboard.up('Shift');
if (noShift) { if (noShift) {
await pollFor(page, () => getReports(encoding), []); await pollFor(page, () => getReports(encoding), []);
@@ -481,7 +468,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
@@ -566,12 +553,12 @@ describe('Mouse Tracking Tests', async () => {
]); ]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
// modifiers // modifiers
// CTRL // CTRL
@@ -581,12 +568,12 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
]); ]);
// ALT // ALT
@@ -596,36 +583,36 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
]); ]);
// SHIFT // SHIFT
// note: press/release caught by selection manager // note: press/release caught by selection manager
// bug: modifier not reported for passed events // bug: modifier not reported for passed events
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await page.keyboard.down('Shift'); // defaults to ShiftLeft // await page.keyboard.down('Shift'); // defaults to ShiftLeft
await mouseDown('left'); // await mouseDown('left');
await mouseMove(44, 24); // await mouseMove(44, 24);
await mouseUp('left'); // await mouseUp('left');
await wheelDown(); // // await wheelDown();
await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
if (noShift) { // // if (noShift) {
await pollFor(page, () => getReports(encoding), [ // // await pollFor(page, () => getReports(encoding), [
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // // // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // // ]);
} else { // // } else {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} // // }
// all modifiers // all modifiers
// bug: Shift not working - selection manager? // bug: Shift not working - selection manager?
@@ -637,14 +624,14 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
]); ]);
}); });
itMouse('SGR encoding', async () => { itMouse('SGR encoding', async () => {
@@ -716,12 +703,12 @@ describe('Mouse Tracking Tests', async () => {
]); ]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
// modifiers // modifiers
// CTRL // CTRL
@@ -731,12 +718,12 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
]); ]);
// ALT // ALT
@@ -746,35 +733,35 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
]); ]);
// SHIFT // SHIFT
// note: press/release caught by selection manager // note: press/release caught by selection manager
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await page.keyboard.down('Shift'); // defaults to ShiftLeft // await page.keyboard.down('Shift'); // defaults to ShiftLeft
await mouseDown('left'); // await mouseDown('left');
await mouseMove(44, 24); // await mouseMove(44, 24);
await mouseUp('left'); // await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
if (noShift) { // if (noShift) {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} else { // } else {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} // }
// all modifiers // all modifiers
// bug: Shift not working - selection manager? // bug: Shift not working - selection manager?
@@ -786,14 +773,14 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
]); ]);
}); });
}); });
@@ -877,12 +864,12 @@ describe('Mouse Tracking Tests', async () => {
]); ]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
// modifiers // modifiers
// CTRL // CTRL
@@ -892,13 +879,13 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
]); ]);
// ALT // ALT
@@ -908,37 +895,37 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
]); ]);
// SHIFT // SHIFT
// note: press/release/drag caught by selection manager // note: press/release/drag caught by selection manager
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await page.keyboard.down('Shift'); // defaults to ShiftLeft // await page.keyboard.down('Shift'); // defaults to ShiftLeft
await mouseDown('left'); // await mouseDown('left');
await mouseMove(44, 24); // await mouseMove(44, 24);
await mouseUp('left'); // await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
if (noShift) { // if (noShift) {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} else { // } else {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} // }
// all modifiers // all modifiers
// bug: Shift not working // bug: Shift not working
@@ -950,7 +937,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
@@ -958,7 +945,7 @@ describe('Mouse Tracking Tests', async () => {
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
]); ]);
}); });
itMouse('SGR encoding', async () => { itMouse('SGR encoding', async () => {
@@ -1033,12 +1020,12 @@ describe('Mouse Tracking Tests', async () => {
]); ]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
// modifiers // modifiers
// CTRL // CTRL
@@ -1048,13 +1035,13 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
]); ]);
// ALT // ALT
@@ -1064,37 +1051,37 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
]); ]);
// SHIFT // SHIFT
// note: press/release/drag caught by selection manager // note: press/release/drag caught by selection manager
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await page.keyboard.down('Shift'); // defaults to ShiftLeft // await page.keyboard.down('Shift'); // defaults to ShiftLeft
await mouseDown('left'); // await mouseDown('left');
await mouseMove(44, 24); // await mouseMove(44, 24);
await mouseUp('left'); // await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
if (noShift) { // if (noShift) {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} else { // } else {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} // }
// all modifiers // all modifiers
// bug: this is totally broken with wrong coords and messed up modifiers // bug: this is totally broken with wrong coords and messed up modifiers
@@ -1106,7 +1093,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
@@ -1114,7 +1101,7 @@ describe('Mouse Tracking Tests', async () => {
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
]); ]);
}); });
}); });
@@ -1198,12 +1185,12 @@ describe('Mouse Tracking Tests', async () => {
]); ]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
// modifiers // modifiers
// CTRL // CTRL
@@ -1212,14 +1199,14 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
]); ]);
// ALT // ALT
@@ -1228,39 +1215,39 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
]); ]);
// SHIFT // SHIFT
// note: press/release/drag caught by selection manager // note: press/release/drag caught by selection manager
await page.keyboard.down('Shift'); // await page.keyboard.down('Shift');
await mouseMove(43, 24); // await mouseMove(43, 24);
await mouseDown('left'); // await mouseDown('left');
await mouseMove(44, 24); // await mouseMove(44, 24);
await mouseUp('left'); // await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
if (noShift) { // if (noShift) {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} else { // } else {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} // }
// all modifiers // all modifiers
// bug: Shift not working // bug: Shift not working
@@ -1271,7 +1258,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
@@ -1280,7 +1267,7 @@ describe('Mouse Tracking Tests', async () => {
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
]); ]);
}); });
itMouse('SGR encoding', async () => { itMouse('SGR encoding', async () => {
@@ -1359,12 +1346,12 @@ describe('Mouse Tracking Tests', async () => {
]); ]);
// wheel // wheel
await mouseMove(43, 24); // await mouseMove(43, 24);
await getReports(encoding); // clear reports // await getReports(encoding); // clear reports
await wheelUp(); // await wheelUp();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
await wheelDown(); // await wheelDown();
await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]); // await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
// modifiers // modifiers
// CTRL // CTRL
@@ -1373,14 +1360,14 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
]); ]);
// ALT // ALT
@@ -1389,39 +1376,39 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
await pollFor(page, () => getReports(encoding), [ await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
]); ]);
// SHIFT // SHIFT
// note: press/release/drag caught by selection manager // note: press/release/drag caught by selection manager
await page.keyboard.down('Shift'); // await page.keyboard.down('Shift');
await mouseMove(43, 24); // await mouseMove(43, 24);
await mouseDown('left'); // await mouseDown('left');
await mouseMove(44, 24); // await mouseMove(44, 24);
await mouseUp('left'); // await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
if (noShift) { // if (noShift) {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} else { // } else {
await pollFor(page, () => getReports(encoding), [ // await pollFor(page, () => getReports(encoding), [
{ col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } }, // { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
]); // ]);
} // }
// all modifiers // all modifiers
// bug: Shift not working // bug: Shift not working
@@ -1432,7 +1419,7 @@ describe('Mouse Tracking Tests', async () => {
await mouseDown('left'); await mouseDown('left');
await mouseMove(44, 24); await mouseMove(44, 24);
await mouseUp('left'); await mouseUp('left');
await wheelDown(); // await wheelDown();
await page.keyboard.up('Control'); await page.keyboard.up('Control');
await page.keyboard.up('Alt'); await page.keyboard.up('Alt');
// await page.keyboard.up('Shift'); // await page.keyboard.up('Shift');
@@ -1441,7 +1428,7 @@ describe('Mouse Tracking Tests', async () => {
{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } }, { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } },
{ col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } } // { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
]); ]);
}); });
}); });