aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.3699: the +title feature adds a lot of #ifdef but little code

Browse Source 
Problem:    The +title feature adds a lot of #ifdef but little code.
Solution:   Graduate the +title feature.
This commit is contained in:
Bram Moolenaar
2021-11-29 20:39:38 +00:00
parent 0c359af5c0
commit 651fca85c7
34 changed files with 56 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/os_mswin.c
View File

@@ -32,7 +32,7 @@
#endif
#ifndef PROTO
# if defined(FEAT_TITLE) && !defined(FEAT_GUI_MSWIN)
# if !defined(FEAT_GUI_MSWIN)
# include <shellapi.h>
# endif
@@ -265,7 +265,6 @@ mch_input_isatty(void)
#endif
}
#ifdef FEAT_TITLE
/*
* mch_settitle(): set titlebar of our window
*/
@@ -274,16 +273,16 @@ mch_settitle(
char_u *title,
char_u *icon UNUSED)
{
# ifdef FEAT_GUI_MSWIN
# ifdef VIMDLL
#ifdef FEAT_GUI_MSWIN
# ifdef VIMDLL
if (gui.in_use)
# endif
# endif
{
gui_mch_settitle(title, icon);
return;
}
# endif
# if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
#endif
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
if (title != NULL)
{
WCHAR *wp = enc_to_utf16(title, NULL);
@@ -295,7 +294,7 @@ mch_settitle(
vim_free(wp);
return;
}
# endif
#endif
}
@@ -309,12 +308,12 @@ mch_settitle(
void
mch_restore_title(int which UNUSED)
{
# if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
# ifdef VIMDLL
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
# ifdef VIMDLL
if (!gui.in_use)
# endif
SetConsoleTitle(g_szOrigTitle);
# endif
SetConsoleTitle(g_szOrigTitle);
#endif
}
@@ -336,7 +335,6 @@ mch_can_restore_icon(void)
{
return FALSE;
}
#endif // FEAT_TITLE
/*
@@ -937,9 +935,7 @@ Trace(
#endif //_DEBUG
#if !defined(FEAT_GUI) || defined(VIMDLL) || defined(PROTO)
# ifdef FEAT_TITLE
extern HWND g_hWnd; // This is in os_win32.c.
# endif
/*
* Showing the printer dialog is tricky since we have no GUI
@@ -953,14 +949,12 @@ GetConsoleHwnd(void)
if (s_hwnd != 0)
return;
# ifdef FEAT_TITLE
// Window handle may have been found by init code (Windows NT only)
if (g_hWnd != 0)
{
s_hwnd = g_hWnd;
return;
}
# endif
s_hwnd = GetConsoleWindow();
}
@@ -2301,9 +2295,7 @@ serverSetName(char_u *name)
{
// Remember the name
serverName = ok_name;
# ifdef FEAT_TITLE
need_maketitle = TRUE; // update Vim window title later
# endif
// Update the message window title
SetWindowText(message_window, (LPCSTR)ok_name);