smart-dev
/
Wox
mirror of https://github.com/Wox-launcher/Wox
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile issues on windows

This commit is contained in:
qianlifeng 2024-10-21 23:48:40 +08:00
parent 00b126ce2e
commit e0d83d6b47
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Wox/util/notifier/notify_linux.go
View File

@ -4,16 +4,14 @@ package notifier
#cgo LDFLAGS: -lX11 #cgo LDFLAGS: -lX11
#include <stdlib.h> #include <stdlib.h>
void showNotification(const char* title, const char* message); void showNotification(const char* message);
*/ */
import "C" import "C"
import "unsafe" import "unsafe"
func ShowNotification(title, message string) { func ShowNotification(message string) {
cTitle := C.CString(title)
cMessage := C.CString(message) cMessage := C.CString(message)
defer C.free(unsafe.Pointer(cTitle))
defer C.free(unsafe.Pointer(cMessage)) defer C.free(unsafe.Pointer(cMessage))
C.showNotification(cTitle, cMessage) C.showNotification(cMessage)
} }

30
Wox/util/notifier/notify_windows.c
View File

@ -19,16 +19,16 @@ typedef struct {
BOOL mouseInside; BOOL mouseInside;
} NotificationWindow; } NotificationWindow;
LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK NotificationWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
void DrawRoundedRectangle(HDC hdc, RECT rect, int radius); void DrawRoundedRectangle(HDC hdc, RECT rect, int radius);
void showNotification(const char* message) { void showNotification(const char* message) {
WNDCLASSEX wc = {0}; WNDCLASSEXA wc = {0};
wc.cbSize = sizeof(WNDCLASSEX); wc.cbSize = sizeof(WNDCLASSEXA);
wc.lpfnWndProc = WindowProc; wc.lpfnWndProc = NotificationWindowProc;
wc.hInstance = GetModuleHandle(NULL); wc.hInstance = GetModuleHandle(NULL);
wc.lpszClassName = L"WoxNotification"; wc.lpszClassName = "WoxNotification";
RegisterClassEx(&wc); RegisterClassExA(&wc);
int screenWidth = GetSystemMetrics(SM_CXSCREEN); int screenWidth = GetSystemMetrics(SM_CXSCREEN);
int screenHeight = GetSystemMetrics(SM_CYSCREEN); int screenHeight = GetSystemMetrics(SM_CYSCREEN);
@ -38,9 +38,9 @@ void showNotification(const char* message) {
NotificationWindow* nw = (NotificationWindow*)malloc(sizeof(NotificationWindow)); NotificationWindow* nw = (NotificationWindow*)malloc(sizeof(NotificationWindow));
memset(nw, 0, sizeof(NotificationWindow)); memset(nw, 0, sizeof(NotificationWindow));
nw->hwnd = CreateWindowEx( nw->hwnd = CreateWindowExA(
WS_EX_TOPMOST | WS_EX_LAYERED, WS_EX_TOPMOST | WS_EX_LAYERED,
L"WoxNotification", L"", "WoxNotification", "",
WS_POPUP, WS_POPUP,
xPos, yPos, WINDOW_WIDTH, WINDOW_HEIGHT, xPos, yPos, WINDOW_WIDTH, WINDOW_HEIGHT,
NULL, NULL, GetModuleHandle(NULL), NULL NULL, NULL, GetModuleHandle(NULL), NULL
@ -48,8 +48,8 @@ void showNotification(const char* message) {
SetWindowLongPtr(nw->hwnd, GWLP_USERDATA, (LONG_PTR)nw); SetWindowLongPtr(nw->hwnd, GWLP_USERDATA, (LONG_PTR)nw);
nw->messageFont = CreateFont(14, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, nw->messageFont = CreateFontA(14, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, L"Segoe UI"); OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, "Segoe UI");
MultiByteToWideChar(CP_UTF8, 0, message, -1, nw->messageText, 1024); MultiByteToWideChar(CP_UTF8, 0, message, -1, nw->messageText, 1024);
@ -58,9 +58,6 @@ void showNotification(const char* message) {
ShowWindow(nw->hwnd, SW_SHOWNA); ShowWindow(nw->hwnd, SW_SHOWNA);
UpdateWindow(nw->hwnd); UpdateWindow(nw->hwnd);
ANIMATION_INFO ai = {sizeof(ANIMATION_INFO)};
ai.dwTime = 300;
ai.dwFlags = AW_BLEND;
AnimateWindow(nw->hwnd, 300, AW_BLEND); AnimateWindow(nw->hwnd, 300, AW_BLEND);
nw->closeTimerId = SetTimer(nw->hwnd, CLOSE_TIMER, 3000, NULL); nw->closeTimerId = SetTimer(nw->hwnd, CLOSE_TIMER, 3000, NULL);
@ -74,7 +71,7 @@ void showNotification(const char* message) {
free(nw); free(nw);
} }
LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LRESULT CALLBACK NotificationWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
NotificationWindow* nw = (NotificationWindow*)GetWindowLongPtr(hwnd, GWLP_USERDATA); NotificationWindow* nw = (NotificationWindow*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (uMsg) { switch (uMsg) {
@ -98,9 +95,10 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetBkMode(memDC, TRANSPARENT); SetBkMode(memDC, TRANSPARENT);
SetTextColor(memDC, RGB(255, 255, 255)); SetTextColor(memDC, RGB(255, 255, 255));
SelectObject(memDC, nw->messageFont); char messageTextA[1024];
WideCharToMultiByte(CP_UTF8, 0, nw->messageText, -1, messageTextA, sizeof(messageTextA), NULL, NULL);
RECT messageRect = {20, 20, clientRect.right - 20, clientRect.bottom - 20}; RECT messageRect = {20, 20, clientRect.right - 20, clientRect.bottom - 20};
DrawText(memDC, nw->messageText, -1, &messageRect, DT_LEFT | DT_WORDBREAK); DrawTextA(memDC, messageTextA, -1, &messageRect, DT_LEFT | DT_WORDBREAK);
if (nw->mouseInside) { if (nw->mouseInside) {
HPEN pen = CreatePen(PS_SOLID, 1, RGB(255, 255, 255)); HPEN pen = CreatePen(PS_SOLID, 1, RGB(255, 255, 255));

8
Wox/util/notifier/notify_windows.go
View File

@ -4,16 +4,14 @@ package notifier
#cgo LDFLAGS: -luser32 -lgdi32 #cgo LDFLAGS: -luser32 -lgdi32
#include <stdlib.h> #include <stdlib.h>
void showNotification(const char* title, const char* message); void showNotification(const char* message);
*/ */
import "C" import "C"
import "unsafe" import "unsafe"
func ShowNotification(title, message string) { func ShowNotification(message string) {
cTitle := C.CString(title)
cMessage := C.CString(message) cMessage := C.CString(message)
defer C.free(unsafe.Pointer(cTitle))
defer C.free(unsafe.Pointer(cMessage)) defer C.free(unsafe.Pointer(cMessage))
C.showNotification(cTitle, cMessage) C.showNotification(cMessage)
} }