Compare commits

...

14 Commits

Author SHA1 Message Date
muwoo
6315ec12ae
Update main.yml 2025-07-24 14:13:59 +08:00
muwoo
3ba8250d7c
Update package.json 2025-07-24 14:12:18 +08:00
muwoo
706aa84374
Merge pull request #432 from magicedy/fix-key-conflicts
fix: resolve key conflicts between local-start-app and plugin-history
2025-07-24 14:11:24 +08:00
muwoo
f70bf3983e
Merge pull request #444 from lanxiuyun/ctrl+ctrl
Double click the modifer to pop up window
2025-07-24 14:10:09 +08:00
lanxiuyun
7cabbe26f5 删除提示重启文本 2025-06-12 15:09:38 +08:00
lanxiuyun
5c048c6341 优化代码可读性 2025-06-12 15:08:37 +08:00
lanxiuyun
e90a30c8a4 优化 uIOhook 逻辑 2025-06-12 15:04:10 +08:00
lanxiuyun
599538db76 Update package.json 2025-06-10 14:33:16 +08:00
lanxiuyun
e9c41b6bdb Update index.vue 2025-06-10 14:23:51 +08:00
lanxiuyun
1e7a8209b7 支持双击快捷键 2025-06-10 14:14:37 +08:00
lanxiuyun
481cd44ab3 Update registerHotKey.ts 2025-06-10 10:53:13 +08:00
lanxiuyun
d41caa742b Update index.vue 2025-06-10 10:39:44 +08:00
lanxiuyun
69218a728b Update index.vue 2025-06-10 10:25:25 +08:00
magicedy
986ad42ed7 fix: resolve key conflicts between local-start-app and plugin-history 2025-04-27 12:14:32 +08:00
6 changed files with 122 additions and 34 deletions

View File

@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-2019, ubuntu-latest]
os: [macos-latest, windows-2022, ubuntu-latest]
# create steps
steps:

View File

@ -274,12 +274,16 @@ const state = reactive({
custom: {},
});
// lastKeyPressTime
const lastKeyPressTime = ref(0);
const DOUBLE_CLICK_THRESHOLD = 300; //
const isWindows = window?.rubick?.isWindows();
const tipText = computed(() => {
const optionKeyName = isWindows ? 'Alt' : 'Option、Command';
return t('feature.settings.global.addShortcutKeyTips', {
optionKeyName: optionKeyName,
});
}) + `此外你也可以双击修饰键如Ctrl+Ctrl`;
});
const currentSelect = ref(['userInfo']);
@ -314,33 +318,60 @@ watch(state, setConfig);
const changeShortCut = (e, key) => {
let compose = '';
//
let incluFuncKeys = false;
const currentTime = Date.now();
const isDoubleClick = currentTime - lastKeyPressTime.value < DOUBLE_CLICK_THRESHOLD;
lastKeyPressTime.value = currentTime;
// F1-F12
if (e.keyCode >= 112 && e.keyCode <= 123) {
state.shortCut[key] = keycodes[e.keyCode].toUpperCase();
return;
}
//
if (isDoubleClick) {
if (e.keyCode === 17) { // Ctrl
state.shortCut[key] = 'Ctrl+Ctrl';
return;
}
if (e.keyCode === 18) { // Alt
state.shortCut[key] = 'Option+Option';
return;
}
if (e.keyCode === 16) { // Shift
state.shortCut[key] = 'Shift+Shift';
return;
}
if (e.keyCode === 93) { // Command
state.shortCut[key] = 'Command+Command';
return;
}
}
// +
let hasModifierKey = false;
if (e.ctrlKey && e.keyCode !== 17) {
compose += '+Ctrl';
incluFuncKeys = true;
hasModifierKey = true;
}
if (e.shiftKey && e.keyCode !== 16) {
compose += '+Shift';
incluFuncKeys = true;
hasModifierKey = true;
}
if (e.altKey && e.keyCode !== 18) {
compose += '+Option';
incluFuncKeys = true;
hasModifierKey = true;
}
if (e.metaKey && e.keyCode !== 93) {
compose += '+Command';
incluFuncKeys = true;
hasModifierKey = true;
}
//
if (hasModifierKey) {
compose += '+' + keycodes[e.keyCode].toUpperCase();
compose = compose.substring(1);
if (
incluFuncKeys &&
e.keyCode !== 16 &&
e.keyCode !== 17 &&
e.keyCode !== 18 &&
e.keyCode !== 93
) {
state.shortCut[key] = compose;
} else {
//

View File

@ -1,6 +1,6 @@
{
"name": "rubick",
"version": "4.3.3",
"version": "4.3.4",
"author": "muwoo <2424880409@qq.com>",
"private": true,
"scripts": {
@ -39,6 +39,7 @@
"pouchdb-load": "^1.4.6",
"pouchdb-replication-stream": "^1.2.9",
"simple-plist": "0.2.1",
"uiohook-napi": "^1.5.4",
"vue": "^3.0.0",
"vue-router": "^4.0.0-0",
"vuex": "^4.0.0-0",

View File

@ -4,6 +4,6 @@ import path from 'path';
const appPath = app.getPath('userData');
const PLUGIN_INSTALL_DIR = path.join(appPath, './rubick-plugins-new');
const PLUGIN_HISTORY = 'rubick-local-start-app';
const PLUGIN_HISTORY = 'rubick-plugin-history';
export { PLUGIN_INSTALL_DIR, PLUGIN_HISTORY };

View File

@ -10,6 +10,7 @@ import {
import screenCapture from '@/core/screen-capture';
import localConfig from '@/main/common/initLocalConfig';
import winPosition from './getWinPosition';
import { uIOhook, UiohookKey } from 'uiohook-napi';
const registerHotKey = (mainWindow: BrowserWindow): void => {
// 设置开机启动
@ -57,14 +58,8 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
}
};
const init = async () => {
await setAutoLogin();
await setDarkMode();
await setTheme();
const config = await localConfig.getConfig();
globalShortcut.unregisterAll();
// 注册偏好快捷键
globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
// 显示主窗口
function mainWindowPopUp() {
const currentShow = mainWindow.isVisible() && mainWindow.isFocused();
if (currentShow) return mainWindow.hide();
const { x: wx, y: wy } = winPosition.getPosition();
@ -76,8 +71,30 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
});
mainWindow.setPosition(wx, wy);
mainWindow.show();
});
}
const init = async () => {
await setAutoLogin();
await setDarkMode();
await setTheme();
const config = await localConfig.getConfig();
globalShortcut.unregisterAll();
// 注册偏好快捷键
// 处理显示/隐藏快捷键的注册
const doublePressShortcuts = ['Ctrl+Ctrl', 'Option+Option', 'Shift+Shift', 'Command+Command'];
const isDoublePressShortcut = doublePressShortcuts.includes(config.perf.shortCut.showAndHidden);
if (isDoublePressShortcut) {
// 双击快捷键(如 Ctrl+Ctrl详见 uIOhookRegister 函数实现
} else {
// 注册普通快捷键(如 Ctrl+Space、F8 等)
globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
mainWindowPopUp();
});
}
// 截图快捷键
globalShortcut.register(config.perf.shortCut.capture, () => {
screenCapture(mainWindow, (data) => {
data &&
@ -107,9 +124,48 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
});
});
};
uIOhookRegister(mainWindowPopUp);
init();
ipcMain.on('re-register', () => {
init();
});
};
export default registerHotKey;
function uIOhookRegister(callback: () => void) {
let lastModifierPress = Date.now();
uIOhook.on('keydown', async (uio_event) => {
const config = await localConfig.getConfig(); // 此处还有优化空间
if (
![
'Ctrl+Ctrl',
'Option+Option',
'Shift+Shift',
'Command+Command',
].includes(config.perf.shortCut.showAndHidden)
) {
return;
}
// 双击快捷键,如 Ctrl+Ctrl
const modifers = config.perf.shortCut.showAndHidden.split('+');
const showAndHiddenKeyStr = modifers.pop(); // Ctrl
const keyStr2uioKeyCode = {
Ctrl: UiohookKey.Ctrl,
Shift: UiohookKey.Shift,
Option: UiohookKey.Alt,
Command: UiohookKey.Comma,
};
if (uio_event.keycode === keyStr2uioKeyCode[showAndHiddenKeyStr]) {
const currentTime = Date.now();
if (currentTime - lastModifierPress < 300) {
callback(); // 调用 mainWindowPopUp
}
lastModifierPress = currentTime;
}
});
uIOhook.start();
}

View File

@ -46,7 +46,7 @@ const createPluginManager = (): any => {
const initLocalStartPlugin = () => {
const result = ipcRenderer.sendSync('msg-trigger', {
type: 'dbGet',
data: { id: PLUGIN_HISTORY },
data: { id: 'rubick-local-start-app' },
});
if (result && result.value) {
appList.value.push(...result.value);