Shikong/scrcpy-mask
1
0
Fork 0
mirror of https://github.com/AkiChase/scrcpy-mask synced 2024-11-14 05:21:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(hotkey): add resize listener

Browse Source
This commit is contained in:
AkiChase 2024-05-21 11:50:12 +08:00
parent cd8c5663c3
commit 8da161d0b4
7 changed files with 80 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/publish.yml vendored
View File

@ -1,5 +1,4 @@
name: "publish"
name: "Multi platform compile"
on:
push:
# 匹配特定标签 (refs/tags)

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "scrcpy-mask",
"private": true,
"version": "0.3.1",
"version": "0.4.0-rc5",
"type": "module",
"scripts": {
"dev": "vite",

2
src-tauri/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "scrcpy-mask"
version = "0.3.1"
version = "0.4.0-rc5"
description = "A Tauri App"
authors = ["AkiChase"]
edition = "2021"

2
src-tauri/src/adb.rs
View File

@ -89,7 +89,7 @@ impl Adb {
{
let mut cmd = Command::new("adb");
cmd.creation_flags(0x08000000); // CREATE_NO_WINDOW
cmd
return cmd;
}
Command::new("adb")
}

2
src-tauri/tauri.conf.json
View File

@ -1,6 +1,6 @@
{
"productName": "scrcpy-mask",
"version": "0.3.1",
"version": "0.4.0-rc5",
"identifier": "com.akichase.mask",
"build": {
"beforeDevCommand": "pnpm dev",

16
src/components/Mask.vue
View File

@ -8,7 +8,6 @@ import {
clearShortcuts,
listenToEvent,
unlistenToEvent,
updateScreenSizeAndMaskArea,
} from "../hotkey";
import { KeyMappingConfig, KeySteeringWheel } from "../keyMappingConfig";
import { getVersion } from "@tauri-apps/api/app";
@ -44,15 +43,11 @@ onActivated(async () => {
const maskElement = document.getElementById("maskElement") as HTMLElement;
if (store.controledDevice) {
updateScreenSizeAndMaskArea(
[store.screenSizeW, store.screenSizeH],
[maskElement.clientWidth, maskElement.clientHeight]
);
if (
applyShortcuts(
maskElement,
store.keyMappingConfigList[store.curKeyMappingIndex],
store,
message,
t
)
@ -84,15 +79,6 @@ async function checkAdb() {
async function loadLocalStore() {
const localStore = new Store("store.bin");
// loading screenSize from local store
const screenSize = await localStore.get<{ sizeW: number; sizeH: number }>(
"screenSize"
);
if (screenSize !== null) {
store.screenSizeW = screenSize.sizeW;
store.screenSizeH = screenSize.sizeH;
}
// loading keyMappingConfigList from local store
let keyMappingConfigList = await localStore.get<KeyMappingConfig[]>(
"keyMappingConfigList"

140
src/hotkey.ts
View File

@ -24,17 +24,18 @@ import {
import { useGlobalStore } from "./store/global";
import { LogicalPosition, getCurrent } from "@tauri-apps/api/window";
import { useI18n } from "vue-i18n";
import { UnlistenFn } from "@tauri-apps/api/event";
function clientxToPosx(clientx: number) {
return clientx < 70
? 0
: Math.floor((clientx - 70) * (screenSizeW / maskSizeW));
: Math.floor((clientx - 70) * (store.screenSizeW / maskSizeW));
}
function clientyToPosy(clienty: number) {
return clienty < 30
? 0
: Math.floor((clienty - 30) * (screenSizeH / maskSizeH));
: Math.floor((clienty - 30) * (store.screenSizeH / maskSizeH));
}
function clientxToPosOffsetx(clientx: number, posx: number, scale = 1) {
@ -51,7 +52,7 @@ function clientPosToSkillOffset(
clientPos: { x: number; y: number },
range: number
): { offsetX: number; offsetY: number } {
const maxLength = (120 / maskSizeH) * screenSizeH;
const maxLength = (120 / maskSizeH) * store.screenSizeH;
const centerX = maskSizeW * 0.5;
const centerY = maskSizeH * 0.5;
@ -95,7 +96,7 @@ function calculateMacroPosX(
relativeSizeW: number
): number {
if (typeof posX === "number") {
return Math.round(posX * (screenSizeW / relativeSizeW));
return Math.round(posX * (store.screenSizeW / relativeSizeW));
}
if (typeof posX === "string") {
return clientxToPosx(mouseX);
@ -103,7 +104,7 @@ function calculateMacroPosX(
if (posX[0] === "mouse") {
return (
clientxToPosx(mouseX) +
Math.round(posX[1] * (screenSizeW / relativeSizeW))
Math.round(posX[1] * (store.screenSizeW / relativeSizeW))
);
} else {
throw new Error("Invalid pos");
@ -117,7 +118,7 @@ function calculateMacroPosY(
relativeSizeH: number
): number {
if (typeof posY === "number") {
return Math.round(posY * (screenSizeH / relativeSizeH));
return Math.round(posY * (store.screenSizeH / relativeSizeH));
}
if (typeof posY === "string") {
return clientyToPosy(mouseY);
@ -125,7 +126,7 @@ function calculateMacroPosY(
if (posY[0] === "mouse") {
return (
clientyToPosy(mouseY) +
Math.round(posY[1] * (screenSizeH / relativeSizeH))
Math.round(posY[1] * (store.screenSizeH / relativeSizeH))
);
} else {
throw new Error("Invalid pos");
@ -157,8 +158,8 @@ function addObservationShortcuts(
) {
let observationMouseX = 0;
let observationMouseY = 0;
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
addShortcut(
key,
async () => {
@ -195,8 +196,8 @@ function addTapShortcuts(
posY: number,
pointerId: number
) {
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
addShortcut(
key,
async () => {
@ -216,8 +217,8 @@ function addCancelSkillShortcuts(
posY: number,
pointerId: number
) {
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
addShortcut(
key,
async () => {
@ -259,8 +260,8 @@ function addTriggerWhenPressedSkillShortcuts(
rangeOrTime: number,
pointerId: number
) {
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
if (directional) {
addShortcut(
key,
@ -276,8 +277,8 @@ function addTriggerWhenPressedSkillShortcuts(
action: SwipeAction.Default,
pointerId,
screen: {
w: screenSizeW,
h: screenSizeH,
w: store.screenSizeW,
h: store.screenSizeH,
},
pos: [
{ x: posX, y: posY },
@ -316,8 +317,8 @@ function addTriggerWhenDoublePressedSkillShortcuts(
range: number,
pointerId: number
) {
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
doublePressedDownKey.set(key, false);
addShortcut(
key,
@ -333,8 +334,8 @@ function addTriggerWhenDoublePressedSkillShortcuts(
action: SwipeAction.NoUp,
pointerId,
screen: {
w: screenSizeW,
h: screenSizeH,
w: store.screenSizeW,
h: store.screenSizeH,
},
pos: [
{ x: posX, y: posY },
@ -392,8 +393,8 @@ function addDirectionlessSkillShortcuts(
posY: number,
pointerId: number
) {
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
addShortcut(
key,
// down
@ -410,8 +411,8 @@ function addDirectionlessSkillShortcuts(
action: TouchAction.Up,
pointerId,
screen: {
w: screenSizeW,
h: screenSizeH,
w: store.screenSizeW,
h: store.screenSizeH,
},
pos: {
x: posX,
@ -442,8 +443,8 @@ function addDirectionalSkillShortcuts(
range: number,
pointerId: number
) {
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
addShortcut(
key,
// down
@ -458,8 +459,8 @@ function addDirectionalSkillShortcuts(
action: SwipeAction.NoUp,
pointerId,
screen: {
w: screenSizeW,
h: screenSizeH,
w: store.screenSizeW,
h: store.screenSizeH,
},
pos: [
{ x: posX, y: posY },
@ -514,8 +515,8 @@ function addSteeringWheelKeyboardShortcuts(
let loopFlag = false;
let curPosX = 0;
let curPosY = 0;
posX = Math.round((posX / relativeSize.w) * screenSizeW);
posY = Math.round((posY / relativeSize.h) * screenSizeH);
posX = Math.round((posX / relativeSize.w) * store.screenSizeW);
posY = Math.round((posY / relativeSize.h) * store.screenSizeH);
// calculate the end coordinates of the eight directions of the direction wheel
let offsetHalf = Math.round(offset / 1.414);
@ -657,18 +658,18 @@ function addSightShortcuts(
const sightClientX = 70 + sightKeyMapping.posX;
const sightClientY = 30 + sightKeyMapping.posY;
const sightDeviceX = Math.round(
(sightKeyMapping.posX / relativeSize.w) * screenSizeW
(sightKeyMapping.posX / relativeSize.w) * store.screenSizeW
);
const sightDeviceY = Math.round(
(sightKeyMapping.posY / relativeSize.h) * screenSizeH
(sightKeyMapping.posY / relativeSize.h) * store.screenSizeH
);
const fireDeviceX = fireKeyMapping
? Math.round((fireKeyMapping.posX / relativeSize.w) * screenSizeW)
? Math.round((fireKeyMapping.posX / relativeSize.w) * store.screenSizeW)
: 0;
const fireDeviceY = fireKeyMapping
? Math.round((fireKeyMapping.posY / relativeSize.h) * screenSizeH)
? Math.round((fireKeyMapping.posY / relativeSize.h) * store.screenSizeH)
: 0;
const removeShortcut = (key: string) => {
@ -715,7 +716,7 @@ function addSightShortcuts(
fireDeviceX +
accOffsetX +
clientxToPosOffsetx(mouseX, sightDeviceX, fireKeyMapping.scaleX),
fireDeviceY +
fireDeviceY +
accOffsetY +
clientyToPosOffsety(mouseY, sightDeviceY, fireKeyMapping.scaleY)
);
@ -892,7 +893,7 @@ function addSightShortcuts(
sightDeviceX,
fireKeyMapping.scaleX
),
fireDeviceY +
fireDeviceY +
clientyToPosOffsety(mouseY, sightDeviceY, fireKeyMapping.scaleY)
);
// touch down sight
@ -917,22 +918,6 @@ function addSightShortcuts(
});
}
let screenSizeW: number;
let screenSizeH: number;
let maskSizeW: number;
let maskSizeH: number;
let mouseX = 0;
let mouseY = 0;
let maskElement: HTMLElement;
let message: ReturnType<typeof useMessage>;
let t: ReturnType<typeof useI18n>["t"];
const downKeyMap: Map<string, boolean> = new Map();
const downKeyCBMap: Map<string, () => Promise<void>> = new Map();
const loopDownKeyCBMap: Map<string, () => Promise<void>> = new Map();
const upKeyCBMap: Map<string, () => Promise<void>> = new Map();
const cancelAbleKeyList: string[] = [];
function handleKeydown(event: KeyboardEvent) {
event.preventDefault();
if (event.repeat) return;
@ -1166,8 +1151,8 @@ async function execMacro(
action: swipeAction,
pointerId: cmd.args[1],
screen: {
w: screenSizeW,
h: screenSizeH,
w: store.screenSizeW,
h: store.screenSizeH,
},
pos: calculateMacroPosList(cmd.args[2], relativeSize),
intervalBetweenPos: cmd.args[3],
@ -1356,8 +1341,8 @@ async function touchX(
action,
pointerId,
screen: {
w: screenSizeW,
h: screenSizeH,
w: store.screenSizeW,
h: store.screenSizeH,
},
pos: {
x: posX,
@ -1395,28 +1380,51 @@ export function clearShortcuts() {
loopDownKeyCBMap.clear();
upKeyCBMap.clear();
cancelAbleKeyList.length = 0;
}
export function updateScreenSizeAndMaskArea(
screenSize: [number, number],
maskArea: [number, number]
) {
screenSizeW = screenSize[0];
screenSizeH = screenSize[1];
maskSizeW = maskArea[0];
maskSizeH = maskArea[1];
// unlisten to resize
unlistenResize();
}
export function applyShortcuts(
element: HTMLElement,
keyMappingConfig: KeyMappingConfig,
globalStore: ReturnType<typeof useGlobalStore>,
messageAPI: ReturnType<typeof useMessage>,
i18nT: ReturnType<typeof useI18n>["t"]
) {
store = globalStore;
maskElement = element;
message = messageAPI;
t = i18nT;
maskSizeW = maskElement.clientWidth;
maskSizeH = maskElement.clientHeight;
// listen to resize to update mask size
getCurrent()
.onResized(() => {
maskSizeW = maskElement.clientWidth;
maskSizeH = maskElement.clientHeight;
})
.then((f) => (unlistenResize = f));
addClickShortcuts("M0", 0);
return applyKeyMappingConfigShortcuts(keyMappingConfig);
}
let maskSizeW: number;
let maskSizeH: number;
let mouseX = 0;
let mouseY = 0;
let store: ReturnType<typeof useGlobalStore>;
let maskElement: HTMLElement;
let message: ReturnType<typeof useMessage>;
let t: ReturnType<typeof useI18n>["t"];
let unlistenResize: UnlistenFn;
const downKeyMap: Map<string, boolean> = new Map();
const downKeyCBMap: Map<string, () => Promise<void>> = new Map();
const loopDownKeyCBMap: Map<string, () => Promise<void>> = new Map();
const upKeyCBMap: Map<string, () => Promise<void>> = new Map();
const cancelAbleKeyList: string[] = [];