uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MouseButtonMacroAction serialization

Browse Source
This commit is contained in:
Farkas József
2016-09-17 17:14:55 +02:00
parent 997046c4c1
commit 7464948f1c
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/config-serializer/config-items/macro-action/MacroActions.ts
View File

@@ -1,12 +1,12 @@
import {ClassArray} from '../../ClassArray';
import {UhkBuffer} from '../../UhkBuffer';
import {DelayMacroAction} from './DelayMacroAction';
import {KeyMacroAction} from './KeyMacroAction';
import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
import {MouseButtonMacroAction} from './MouseButtonMacroAction';
import {MoveMouseMacroAction} from './MoveMouseMacroAction';
import {ScrollMouseMacroAction} from './ScrollMouseMacroAction';
import {TextMacroAction} from './TextMacroAction';
import { ClassArray } from '../../ClassArray';
import { UhkBuffer } from '../../UhkBuffer';
import { DelayMacroAction } from './DelayMacroAction';
import { KeyMacroAction } from './KeyMacroAction';
import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
import { MouseButtonMacroAction } from './MouseButtonMacroAction';
import { MoveMouseMacroAction } from './MoveMouseMacroAction';
import { ScrollMouseMacroAction } from './ScrollMouseMacroAction';
import { TextMacroAction } from './TextMacroAction';
export class MacroActions extends ClassArray<MacroAction> {
@@ -40,10 +40,13 @@ export class MacroActions extends ClassArray<MacroAction> {
if (macroActionFirstByte >= MacroActionId.KeyMacroAction && macroActionFirstByte <= MacroActionId.LastKeyMacroAction) {
return new KeyMacroAction().fromBinary(buffer);
} else if (
macroActionFirstByte >= MacroActionId.MouseButtonMacroAction &&
macroActionFirstByte <= MacroActionId.LastMouseButtonMacroAction
) {
return new MouseButtonMacroAction().fromBinary(buffer);
}
switch (macroActionFirstByte) {
case MacroActionId.MouseButtonMacroAction:
return new MouseButtonMacroAction().fromBinary(buffer);
case MacroActionId.MoveMouseMacroAction:
return new MoveMouseMacroAction().fromBinary(buffer);
case MacroActionId.ScrollMouseMacroAction:

5
src/config-serializer/config-items/macro-action/MouseButtonMacroAction.ts
View File

@@ -29,7 +29,8 @@ export class MouseButtonMacroAction extends MacroAction {
}
_fromBinary(buffer: UhkBuffer): MouseButtonMacroAction {
this.readAndAssertMacroActionId(buffer);
let macroActionId: MacroActionId = this.readAndAssertMacroActionId(buffer);
this.action = macroActionId - MacroActionId.MouseButtonMacroAction;
this.mouseButtonsMask = buffer.readUInt8();
return this;
}
@@ -43,7 +44,7 @@ export class MouseButtonMacroAction extends MacroAction {
}
_toBinary(buffer: UhkBuffer): void {
buffer.writeUInt8(MacroActionId.MouseButtonMacroAction);
buffer.writeUInt8(MacroActionId.MouseButtonMacroAction + this.action);
buffer.writeUInt8(this.mouseButtonsMask);
}