cleanup sendEvent, switch reported button during move
This commit is contained in:
+23
-35
@@ -713,46 +713,41 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
|
|
||||||
// get mouse coordinates
|
// get mouse coordinates
|
||||||
pos = self._mouseService.getRawByteCoords(ev, self.screenElement, self.cols, self.rows);
|
pos = self._mouseService.getRawByteCoords(ev, self.screenElement, self.cols, self.rows);
|
||||||
if (!pos) return;
|
if (!pos) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
let but: ICoreMouseEvent['button'];
|
let but: ICoreMouseEvent['button'];
|
||||||
let action: ICoreMouseEvent['action'];
|
let action: ICoreMouseEvent['action'];
|
||||||
let code: number;
|
|
||||||
// FIXME: cleanup the switch mess
|
|
||||||
switch ((<any>ev).overrideType || ev.type) {
|
switch ((<any>ev).overrideType || ev.type) {
|
||||||
case 'mousemove':
|
case 'mousemove':
|
||||||
action = 'move';
|
action = 'move';
|
||||||
if (ev.buttons !== undefined) {
|
but = 'none';
|
||||||
but = ev.buttons & 1 ? 'left' : ev.buttons & 2 ? 'right' : ev.buttons & 4 ? 'middle' : 'none';
|
if (!ev.buttons) {
|
||||||
} else {
|
|
||||||
but = 'none';
|
but = 'none';
|
||||||
|
// buttons is not supported on macOS, try to get a value from button instead
|
||||||
|
if (ev.button !== undefined) {
|
||||||
|
but = ev.button === 0 ? 'left' : ev.button === 1 ? 'middle' : ev.button === 2 ? 'right' : 'none';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
but = ev.buttons & 1 ? 'left' : ev.buttons & 4 ? 'middle' : ev.buttons & 2 ? 'right' : 'none';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'mouseup':
|
case 'mouseup':
|
||||||
action = 'up';
|
action = 'up';
|
||||||
code = ev.button !== null && ev.button !== undefined
|
but = ev.button === 0 ? 'left' : ev.button === 1 ? 'middle' : ev.button === 2 ? 'right' : 'none';
|
||||||
? +ev.button
|
|
||||||
: ev.which !== null && ev.which !== undefined
|
|
||||||
? ev.which - 1
|
|
||||||
: null;
|
|
||||||
but = code === 0 ? 'left' : code === 1 ? 'middle' : 'right';
|
|
||||||
break;
|
break;
|
||||||
case 'mousedown':
|
case 'mousedown':
|
||||||
action = 'down';
|
action = 'down';
|
||||||
code = ev.button !== null && ev.button !== undefined
|
but = ev.button === 0 ? 'left' : ev.button === 1 ? 'middle' : ev.button === 2 ? 'right' : 'none';
|
||||||
? +ev.button
|
|
||||||
: ev.which !== null && ev.which !== undefined
|
|
||||||
? ev.which - 1
|
|
||||||
: null;
|
|
||||||
but = code === 0 ? 'left' : code === 1 ? 'middle' : 'right';
|
|
||||||
break;
|
break;
|
||||||
case 'DOMMouseScroll':
|
case 'DOMMouseScroll':
|
||||||
but = 'wheel';
|
|
||||||
action = ev.detail < 0 ? 'up' : 'down';
|
action = ev.detail < 0 ? 'up' : 'down';
|
||||||
|
but = 'wheel';
|
||||||
break;
|
break;
|
||||||
case 'wheel':
|
case 'wheel':
|
||||||
but = 'wheel';
|
|
||||||
action = (<WheelEvent>ev).deltaY < 0 ? 'up' : 'down';
|
action = (<WheelEvent>ev).deltaY < 0 ? 'up' : 'down';
|
||||||
|
but = 'wheel';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return self._coreMouseService.triggerMouseEvent({
|
return self._coreMouseService.triggerMouseEvent({
|
||||||
@@ -804,7 +799,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mousemove: (ev: MouseEvent) => {
|
mousemove: (ev: MouseEvent) => {
|
||||||
// deal only with move eithout any button
|
// deal only with move without any button
|
||||||
if (!ev.buttons) {
|
if (!ev.buttons) {
|
||||||
sendEvent(ev);
|
sendEvent(ev);
|
||||||
}
|
}
|
||||||
@@ -812,26 +807,19 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
};
|
};
|
||||||
this._coreMouseService.onProtocolChange(events => {
|
this._coreMouseService.onProtocolChange(events => {
|
||||||
// apply global changes on events
|
// apply global changes on events
|
||||||
|
this.mouseEvents = events;
|
||||||
if (events.length) {
|
if (events.length) {
|
||||||
this._logService.info('Binding to mouse events:', events);
|
this._logService.info('Binding to mouse events:', events);
|
||||||
this.mouseEvents = events;
|
this.element.classList.add('enable-mouse-events');
|
||||||
if (this.element) {
|
this._selectionService.disable();
|
||||||
this.element.classList.add('enable-mouse-events');
|
|
||||||
}
|
|
||||||
if (this._selectionService) {
|
|
||||||
this._selectionService.disable();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this._logService.info('Unbinding from mouse events.');
|
this._logService.info('Unbinding from mouse events.');
|
||||||
this.mouseEvents = events;
|
this.element.classList.remove('enable-mouse-events');
|
||||||
if (this.element) {
|
this._selectionService.enable();
|
||||||
this.element.classList.remove('enable-mouse-events');
|
|
||||||
}
|
|
||||||
if (this._selectionService) {
|
|
||||||
this._selectionService.enable();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// add/remove handlers from requestedEvents
|
||||||
|
|
||||||
if (events.indexOf('mousemove') === -1) {
|
if (events.indexOf('mousemove') === -1) {
|
||||||
el.removeEventListener('mousemove', requestedEvents.mousemove);
|
el.removeEventListener('mousemove', requestedEvents.mousemove);
|
||||||
requestedEvents.mousemove = null;
|
requestedEvents.mousemove = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user