Public-Mirror/LunaTranslator
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaTranslator.git synced 2024-12-28 08:04:13 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-04-26 00:40:07 +08:00
parent 77649c0e7b
commit f762155fdf
21 changed files with 198 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
LunaTranslator/LunaTranslator/LunaTranslator.py
View File

@ -21,6 +21,9 @@ from myutils.utils import (
getfilemd5,
stringfyerror,
)
import os, hashlib
from PyQt5.QtWidgets import QApplication
from PyQt5.QtCore import Qt, QSize, QObject, QEvent
from myutils.wrapper import threader
from gui.showword import searchwordW
from myutils.hwnd import getpidexe, testprivilege, ListProcess
@ -754,6 +757,30 @@ class MAINUI:
time.sleep(0.5)
def aa(self):
class WindowEventFilter(QObject):
def eventFilter(_, obj, event):
if event.type() == QEvent.Type.WinIdChange:
hwnd = obj.winId()
if hwnd: # window create/destroy,when destroy winId is None
if (
self.currentisdark is not None
and obj.testAttribute(Qt.WA_TranslucentBackground) == False
):
winsharedutils.SetTheme(
int(obj.winId()),
self.currentisdark,
globalconfig["WindowBackdrop"],
)
windows.SetProp(
int(obj.winId()), "Magpie.ToolWindow", windows.HANDLE(1)
)
return False
self.currentisdark = None
self.__filter = WindowEventFilter() # keep ref
QApplication.instance().installEventFilter(self.__filter)
self.translation_ui = gui.translatorUI.QUnFrameWindow()
self.translation_ui.show()

14
LunaTranslator/LunaTranslator/gui/settin.py
View File

@ -259,20 +259,8 @@ class Settin(closeashidewindow):
dark = isDark()
darklight = ["light", "dark"][dark]
class WindowEventFilter(QObject):
def eventFilter(_, obj, event):
if event.type() == QEvent.Type.WinIdChange:
if obj.testAttribute(Qt.WA_TranslucentBackground):
return False
hwnd = obj.winId()
if hwnd: # window create/destroy,when destroy winId is None
winsharedutils.SetTheme(
int(obj.winId()), dark, globalconfig["WindowBackdrop"]
)
return False
gobject.baseobject.currentisdark = dark
self.__filter = WindowEventFilter() # keep ref
QApplication.instance().installEventFilter(self.__filter)
for widget in QApplication.topLevelWidgets():
if widget.testAttribute(Qt.WA_TranslucentBackground):
continue

9
LunaTranslator/LunaTranslator/gui/settingpage_quick.py
View File

@ -41,10 +41,11 @@ def setTab_quick_direct(self):
"_21": lambda: grabwindow(),
"_22": gobject.baseobject.translation_ui.muteprocessignal.emit,
"_23": lambda: gobject.baseobject.translation_ui.clickRange_signal.emit(True),
"_25": lambda: windows.SendMessage(
windows.FindWindow("Magpie_Core_CLI_Message", None),
windows.RegisterWindowMessage("Magpie_Core_CLI_Message_ToggleOverlay"),
),
# 暂时有问题
# "_25": lambda: windows.SendMessage(
# windows.FindWindow("WNDCLS_Magpie_Core_CLI_Message", None),
# windows.RegisterWindowMessage("Magpie_Core_CLI_Message_ToggleOverlay"),
# ),
"_26": gobject.baseobject.translation_ui.ocr_once_signal.emit,
"_27": gobject.baseobject.translation_ui.simulate_key_enter,
}

6
LunaTranslator/LunaTranslator/gui/translatorUI.py
View File

@ -657,6 +657,7 @@ class QUnFrameWindow(resizableframeless):
self.casthira2kata = str.maketrans(
static_data["allhira"], static_data["allkata"]
)
self.fullscreenmanager_busy = False
self.isletgamefullscreened = False
self.fullscreenmanager = None
self.fullscreenmethod = None
@ -725,7 +726,11 @@ class QUnFrameWindow(resizableframeless):
self.isletgamefullscreened = current
self.refreshtooliconsignal.emit()
@threader
def _fullsgame(self):
if self.fullscreenmanager_busy:
return
self.fullscreenmanager_busy = True
try:
if gobject.baseobject.textsource and gobject.baseobject.textsource.hwnd:
_hwnd = gobject.baseobject.textsource.hwnd
@ -756,6 +761,7 @@ class QUnFrameWindow(resizableframeless):
) # , self.isletgamefullscreened)
except:
print_exc()
self.fullscreenmanager_busy = False
def changemousetransparentstate(self, idx):
if idx == 0:

1
LunaTranslator/LunaTranslator/scalemethod/SW_SHOWMAXIMIZED.py
View File

@ -8,3 +8,4 @@ class Method(scalebase):
self.savewindowstatus = letfullscreen(hwnd)
else:
recoverwindow(hwnd, self.savewindowstatus)
return True

1
LunaTranslator/LunaTranslator/scalemethod/alt_enter.py
View File

@ -10,3 +10,4 @@ class Method(scalebase):
windows.keybd_event(13, 0, windows.KEYEVENTF_KEYUP, 0)
windows.keybd_event(18, 0, windows.KEYEVENTF_KEYUP, 0)
return True

26
LunaTranslator/LunaTranslator/scalemethod/base.py
View File

@ -1,3 +1,6 @@
from myutils.wrapper import threader
class scalebase:
def __init__(self, setuistatus) -> None:
self._setuistatus = setuistatus
@ -12,18 +15,25 @@ class scalebase:
self._setuistatus(current)
self.full = not current
@threader
def callstatuschange(self, hwnd):
self.hwnd = hwnd
self.changestatus(hwnd, self.full)
self.setuistatus(self.full)
self.callstatuschange_(hwnd)
def callstatuschange_(self, hwnd):
self.hwnd = hwnd
if self.changestatus(hwnd, self.full):
self.setuistatus(self.full)
@threader
def endX(self):
if not self.full and self.hwnd:
self.callstatuschange(self.hwnd)
self.end()
return True
self.hasend = True
return False
ret = False
if not self.full and self.hwnd:
self.callstatuschange_(self.hwnd)
ret = True
self.end()
return ret
def changestatus(self, hwnd, full):
raise Exception

3
LunaTranslator/LunaTranslator/scalemethod/external_lossless.py
View File

@ -55,7 +55,7 @@ class Method(scalebase):
os.environ["LOCALAPPDATA"], "Lossless Scaling/Settings.xml"
)
if os.path.exists(configpath) == False:
return
return False
with open(configpath, "r", encoding="utf8") as ff:
config = ff.read()
@ -74,3 +74,4 @@ class Method(scalebase):
windows.keybd_event(vkcode, 0, windows.KEYEVENTF_KEYUP, 0)
for k in mods:
windows.keybd_event(mp1[k], 0, windows.KEYEVENTF_KEYUP, 0)
return True

3
LunaTranslator/LunaTranslator/scalemethod/external_magpie.py
View File

@ -74,7 +74,7 @@ class Method(scalebase):
break
if os.path.exists(configpath) == False:
return
return False
with open(configpath, "r", encoding="utf8") as ff:
config = json.load(ff)
@ -101,3 +101,4 @@ class Method(scalebase):
for k in mp:
if shortcuts & k != 0:
windows.keybd_event(mp1[mp[k]], 0, windows.KEYEVENTF_KEYUP, 0)
return True

61
LunaTranslator/LunaTranslator/scalemethod/magpie_builtin.py
View File

@ -4,13 +4,43 @@ import windows
from myutils.config import globalconfig, magpie_config
from myutils.subproc import subproc_w
from myutils.wrapper import threader
from winsharedutils import startmaglistener, endmaglistener
class Method(scalebase):
def saveconfig(self):
with open(self.jspath, "w", encoding="utf-8") as ff:
ff.write(
json.dumps(magpie_config, ensure_ascii=False, sort_keys=False, indent=4)
)
@threader
def _waitenginestop_magpie(self):
self.engine.wait()
self.setuistatus(False)
def statuslistener(self):
listener = windows.AutoHandle(startmaglistener())
while not self.hasend:
status = windows.c_int.from_buffer_copy(windows.ReadFile(listener, 4)).value
self.setuistatus(status)
endmaglistener(listener)
def init(self):
self.statuslistener()
self.jspath = os.path.abspath("./cache/magpie.config.json")
self.engine = subproc_w(
'./files/plugins/Magpie/Magpie.Core.exe "{}"'.format(self.jspath),
cwd="./files/plugins/Magpie/",
)
waitsignal = "Magpie_notify_prepared_ok_" + str(self.engine.pid)
windows.WaitForSingleObject(
windows.AutoHandle(windows.CreateEvent(False, False, waitsignal)),
windows.INFINITE,
)
def end(self):
windows.SendMessage(
windows.FindWindow("WNDCLS_Magpie_Core_CLI_Message", None),
windows.RegisterWindowMessage("Magpie_Core_CLI_Message_Exit"),
)
def changestatus(self, hwnd, full):
if full:
@ -18,22 +48,19 @@ class Method(scalebase):
if profiles_index > len(magpie_config["profiles"]):
profiles_index = 0
jspath = os.path.abspath("./userconfig/magpie_config.json")
with open(jspath, "w", encoding="utf-8") as ff:
ff.write(
json.dumps(
magpie_config, ensure_ascii=False, sort_keys=False, indent=4
)
)
self.engine = subproc_w(
'./files/plugins/Magpie/Magpie.Core.exe {} {} "{}"'.format(
profiles_index, hwnd, jspath
),
cwd="./files/plugins/Magpie/",
#显示帧率暂时有问题
magpie_config["profiles"][profiles_index]["showFPS"] = False
self.saveconfig()
windows.SendMessage(
windows.FindWindow("WNDCLS_Magpie_Core_CLI_Message", None),
windows.RegisterWindowMessage("Magpie_Core_CLI_Message_Start"),
profiles_index,
hwnd,
)
self._waitenginestop_magpie()
else:
windows.SendMessage(
windows.FindWindow("Magpie_Core_CLI_Message", None),
windows.FindWindow("WNDCLS_Magpie_Core_CLI_Message", None),
windows.RegisterWindowMessage("Magpie_Core_CLI_Message_Stop"),
)
return False

4
LunaTranslator/LunaTranslator/textsource/texthook.py
View File

@ -228,7 +228,7 @@ class texthook(basetext):
@threader
def solveeventthread(self):
while self.ending == False:
message = windows.ReadFile(self.hRead, sizeof(Message), None)
message = windows.ReadFile(self.hRead, sizeof(Message))
if len(message) != sizeof(Message):
break
message = Message.from_buffer_copy(message)
@ -426,7 +426,7 @@ class texthook(basetext):
def ReadThread(hread):
while True:
message = windows.ReadFile(hread, sizeof(simplehooks), None)
message = windows.ReadFile(hread, sizeof(simplehooks))
if len(message) != sizeof(simplehooks):
break
message = simplehooks.from_buffer_copy(message)

2
LunaTranslator/LunaTranslator/translator/dreye.py
View File

@ -69,7 +69,7 @@ class TS(basetrans):
continue
windows.WriteFile(self.hPipe, line.encode(codes[self.srclang]))
ress.append(
windows.ReadFile(self.hPipe, 4096, None).decode(codes[self.tgtlang])
windows.ReadFile(self.hPipe, 4096).decode(codes[self.tgtlang])
)
return "\n".join(ress)

2
LunaTranslator/LunaTranslator/translator/jb7.py
View File

@ -96,7 +96,7 @@ class TS(basetrans):
continue
code1 = line.encode("utf-16-le")
windows.WriteFile(self.hPipe, self.packuint32(int(self.tgtlang)) + code1)
xx = windows.ReadFile(self.hPipe, 65535, None)
xx = windows.ReadFile(self.hPipe, 65535)
xx = xx.decode("utf-16-le", errors="ignore")
ress.append(xx)
return "\n".join(ress)

2
LunaTranslator/LunaTranslator/translator/kingsoft.py
View File

@ -71,7 +71,7 @@ class TS(basetrans):
if len(line) == 0:
continue
windows.WriteFile(self.hPipe, line.encode("utf-16-le"))
x = windows.ReadFile(self.hPipe, 4096, None)
x = windows.ReadFile(self.hPipe, 4096)
ress.append(x.decode("utf-16-le"))
return "\n".join(ress)

2
LunaTranslator/LunaTranslator/tts/NeoSpeech.py
View File

@ -85,6 +85,6 @@ class TTS(TTSbase):
windows.WriteFile(self.hPipe, bytes(ctypes.c_uint(rate)))
buf = ctypes.create_unicode_buffer(content, 10000)
windows.WriteFile(self.hPipe, bytes(buf))
fname = windows.ReadFile(self.hPipe, 1024, None).decode("utf-16-le")
fname = windows.ReadFile(self.hPipe, 1024).decode("utf-16-le")
if os.path.exists(fname):
return fname

2
LunaTranslator/LunaTranslator/tts/voiceroid2.py
View File

@ -139,6 +139,6 @@ class TTS(TTSbase):
# print(code1)
windows.WriteFile(self.hPipe, code1)
fname = windows.ReadFile(self.hPipe, 1024, None).decode("utf8")
fname = windows.ReadFile(self.hPipe, 1024).decode("utf8")
if os.path.exists(fname):
return fname

2
LunaTranslator/LunaTranslator/tts/voiceroidplus.py
View File

@ -129,6 +129,6 @@ class TTS(TTSbase):
# print(code1)
windows.WriteFile(self.hPipe, code1)
fname = windows.ReadFile(self.hPipe, 1024, None).decode("utf8")
fname = windows.ReadFile(self.hPipe, 1024).decode("utf8")
if os.path.exists(fname):
return fname

15
LunaTranslator/LunaTranslator/windows.py
View File

@ -533,8 +533,8 @@ def CloseHandle(handle):
return _CloseHandle(handle)
def SendMessage(hwnd, message):
return _SendMessage(hwnd, message, 0, 0)
def SendMessage(hwnd, message, wp=None, lp=None):
return _SendMessage(hwnd, message, wp, lp)
def keybd_event(bVk, bScan, dwFlags, _):
@ -671,7 +671,7 @@ _ReadFile = _kernel32.ReadFile
_ReadFile.argtypes = HANDLE, c_char_p, c_uint, c_void_p, c_void_p
def ReadFile(handle, nNumberOfBytesToRead, lpOverlapped):
def ReadFile(handle, nNumberOfBytesToRead, lpOverlapped=None):
buf = create_string_buffer(nNumberOfBytesToRead)
dwread = c_int()
_ReadFile(handle, buf, nNumberOfBytesToRead, pointer(dwread), lpOverlapped)
@ -940,3 +940,12 @@ _CopyFile.restype = BOOL
def CopyFile(src, dst, bFailIfExists):
return _CopyFile(src, dst, bFailIfExists)
_SetPropW = _user32.SetPropW
_SetPropW.argtypes = HWND, LPCWSTR, HANDLE
_SetPropW.restype = BOOL
def SetProp(hwnd, string, hdata):
return _SetPropW(hwnd, string, hdata)

5
LunaTranslator/LunaTranslator/winsharedutils.py
View File

@ -347,3 +347,8 @@ Is64bit.restype = c_bool
isDark = utilsdll.isDark
isDark.restype = c_bool
startmaglistener = utilsdll.startmaglistener
startmaglistener.restype = HANDLE
endmaglistener = utilsdll.endmaglistener
endmaglistener.argtypes = (HANDLE,)

2
plugins/winsharedutils/CMakeLists.txt
View File

@ -2,7 +2,7 @@
project(winsharedutils)
add_library(winsharedutils MODULE hwnd.cpp darklistener.cpp theme.cpp version.cpp otsu.cpp cinterface.cpp clipboard.cpp lnk.cpp dllmain.cpp levenshtein.cpp muteprocess.cpp sapi_dll.cpp simplemecab.cpp SimpleBrowser.cpp MWebBrowser.cpp icon.cpp)
add_library(winsharedutils MODULE hwnd.cpp darklistener.cpp theme.cpp version.cpp otsu.cpp cinterface.cpp clipboard.cpp lnk.cpp dllmain.cpp levenshtein.cpp muteprocess.cpp sapi_dll.cpp simplemecab.cpp SimpleBrowser.cpp MWebBrowser.cpp icon.cpp maglistener.cpp)
target_link_libraries(winsharedutils dwmapi)
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
set_target_properties(winsharedutils PROPERTIES OUTPUT_NAME "winsharedutils64")

64
plugins/winsharedutils/maglistener.cpp Normal file
View File

@ -0,0 +1,64 @@
#include <windows.h>
#include <thread>
#include <string>
#include "define.h"
static UINT WM_MAGPIE_SCALINGCHANGED = RegisterWindowMessage(L"MagpieScalingChanged");
static HWND listener = 0;
static HANDLE hwrite = 0;
DECLARE HANDLE startmaglistener()
{
ChangeWindowMessageFilter(WM_MAGPIE_SCALINGCHANGED, MSGFLT_ADD);
auto CLASS_NAME = L"MagpieWatcher";
WNDCLASS wc = {};
wc.lpfnWndProc = [](HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if (message == WM_MAGPIE_SCALINGCHANGED && hwrite)
{
int send = wParam;
DWORD _;
WriteFile(hwrite, &send, 4, &_, 0);
}
switch (message)
{
case WM_DESTROY:
{
CloseHandle(hwrite);
PostQuitMessage(0);
}
}
return DefWindowProc(hWnd, message, wParam, lParam);
};
wc.hInstance = GetModuleHandle(0);
wc.lpszClassName = CLASS_NAME;
static auto _ = RegisterClass(&wc);
HANDLE hread;
CreatePipe(&hread, &hwrite, 0, 0);
std::thread([=]()
{
listener = CreateWindowEx(
WS_EX_CLIENTEDGE, CLASS_NAME, CLASS_NAME, WS_OVERLAPPEDWINDOW,
0, 0, 0, 0,
NULL, NULL, GetModuleHandle(0), hwrite);;
MSG msg = {};
while (GetMessage(&msg, NULL, 0, 0))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
} })
.detach();
return hread;
}
DECLARE void endmaglistener(HANDLE hread)
{
if (listener)
{
DestroyWindow(listener);
listener = 0;
hwrite = 0;
}
}