kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor(windows): move os_icon_xx functions

Browse Source
This commit is contained in:
Justin M. Keyes 2022-10-13 15:25:23 +02:00
parent ffc6d14af5
commit 1ca3a3749f
2 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/nvim/main.c
View File

@ -206,50 +206,6 @@ void early_init(mparm_T *paramp)
init_signs();
}
#ifdef MSWIN
HWND hWnd = NULL;
static HICON hOrigIconSmall = NULL;
static HICON hOrigIcon = NULL;
static void os_icon_set(HWND hWindow, HICON hIconSmall, HICON hIcon)
{
if (hWindow == NULL) {
return;
}
if (hIconSmall != NULL) {
SendMessage(hWnd, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIconSmall);
}
if (hIcon != NULL) {
SendMessage(hWnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);
}
}
/// Sets Nvim logo as Windows console icon.
///
/// Saves the original icon so it can be restored at exit.
static void os_icon_init(void)
{
if ((hWnd = GetConsoleWindow()) == NULL) {
return;
}
// Save Windows console icon to be restored later.
hOrigIconSmall = (HICON)SendMessage(hWnd, WM_GETICON, (WPARAM)ICON_SMALL, (LPARAM)0);
hOrigIcon = (HICON)SendMessage(hWnd, WM_GETICON, (WPARAM)ICON_BIG, (LPARAM)0);
const char *vimruntime = os_getenv("VIMRUNTIME");
if (vimruntime != NULL) {
snprintf(NameBuff, MAXPATHL, "%s" _PATHSEPSTR "neovim.ico", vimruntime);
if (!os_path_exists(NameBuff)) {
WLOG("neovim.ico not found: %s", NameBuff);
} else {
HICON hVimIcon = LoadImage(NULL, NameBuff, IMAGE_ICON, 64, 64,
LR_LOADFROMFILE | LR_LOADMAP3DCOLORS);
os_icon_set(hWnd, hVimIcon, hVimIcon);
}
}
}
#endif
#ifdef MAKE_LIB
int nvim_main(int argc, char **argv); // silence -Wmissing-prototypes
int nvim_main(int argc, char **argv)
@ -771,7 +727,7 @@ void getout(int exitval)
#ifdef MSWIN
// Restore Windows console icon before exiting.
os_icon_set(hWnd, hOrigIconSmall, hOrigIcon);
os_icon_set(NULL, NULL);
#endif
os_exit(exitval);

47
src/nvim/os/os_win_console.c
View File

@ -2,6 +2,7 @@
// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
#include "nvim/os/input.h"
#include "nvim/os/os.h"
#include "nvim/os/os_win_console.h"
#include "nvim/vim.h"
@ -9,6 +10,10 @@
# include "os/os_win_console.c.generated.h"
#endif
static HWND hWnd = NULL;
static HICON hOrigIconSmall = NULL;
static HICON hOrigIcon = NULL;
int os_get_conin_fd(void)
{
const HANDLE conin_handle = CreateFile("CONIN$",
@ -45,3 +50,45 @@ void os_replace_stdout_and_stderr_to_conout(void)
const int conerr_fd = _open_osfhandle((intptr_t)conout_handle, 0);
assert(conerr_fd == STDERR_FILENO);
}
/// Sets Windows console icon, or pass NULL to restore original icon.
void os_icon_set(HICON hIconSmall, HICON hIcon)
{
if (hWnd == NULL) {
return;
}
hIconSmall = hIconSmall ? hIconSmall : hOrigIconSmall;
hIcon = hIcon ? hIcon : hOrigIcon;
if (hIconSmall != NULL) {
SendMessage(hWnd, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIconSmall);
}
if (hIcon != NULL) {
SendMessage(hWnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);
}
}
/// Sets Nvim logo as Windows console icon.
///
/// Saves the original icon so it can be restored at exit.
void os_icon_init(void)
{
if ((hWnd = GetConsoleWindow()) == NULL) {
return;
}
// Save Windows console icon to be restored later.
hOrigIconSmall = (HICON)SendMessage(hWnd, WM_GETICON, (WPARAM)ICON_SMALL, (LPARAM)0);
hOrigIcon = (HICON)SendMessage(hWnd, WM_GETICON, (WPARAM)ICON_BIG, (LPARAM)0);
const char *vimruntime = os_getenv("VIMRUNTIME");
if (vimruntime != NULL) {
snprintf(NameBuff, MAXPATHL, "%s" _PATHSEPSTR "neovim.ico", vimruntime);
if (!os_path_exists(NameBuff)) {
WLOG("neovim.ico not found: %s", NameBuff);
} else {
HICON hVimIcon = LoadImage(NULL, NameBuff, IMAGE_ICON, 64, 64,
LR_LOADFROMFILE | LR_LOADMAP3DCOLORS);
os_icon_set(hVimIcon, hVimIcon);
}
}
}