vim: src/gui_w32.c comparison

comparison src/gui_w32.c @ 15597:536dd2bc5ac9 v8.1.0806

patch 8.1.0806: too many #ifdefs commit https://github.com/vim/vim/commit/fc3abf47fbe1e426f2b676c316c81ee9ff607075 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 24 15:54:21 2019 +0100 patch 8.1.0806: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate FEAT_MBYTE, part 2.

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 24 Jan 2019 16:00:08 +0100
parents	9bd2372432cf
children	8ab9ad27fca4

comparison

equal deleted inserted replaced

-:d614c94f60fd
+:536dd2bc5ac9
 #if defined(FEAT_DIRECTX)
 # include "gui_dwrite.h"
 #endif
 #if defined(FEAT_DIRECTX)
-# ifndef FEAT_MBYTE
-#  error FEAT_MBYTE is required for FEAT_DIRECTX.
-# endif
 static DWriteContext *s_dwc = NULL;
 static int s_directx_enabled = 0;
 static int s_directx_load_attempted = 0;
 # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL && enc_utf8)
 static int directx_enabled(void);
 static int		destroying = FALSE;	/* call DestroyWindow() ourselves */
 #ifdef MSWIN_FIND_REPLACE
 static UINT		s_findrep_msg = 0;	/* set in gui_w[16/32].c */
 static FINDREPLACE	s_findrep_struct;
-# ifdef FEAT_MBYTE
 static FINDREPLACEW	s_findrep_struct_w;
-# endif
 static HWND		s_findrep_hwnd = NULL;
 static int		s_findrep_is_find;	/* TRUE for find dialog, FALSE
 						   for find/replace dialog */
 #endif
 	DWriteContext_BindDC(s_dwc, s_hdc, &rect);
 }
 }
 #endif
-#if defined(FEAT_MBYTE) || defined(GLOBAL_IME)
+/* use of WindowProc depends on wide_WindowProc */
-/* use of WindowProc depends on wide_WindowProc */
+#define MyWindowProc vim_WindowProc
-# define MyWindowProc vim_WindowProc
-#else
-/* use ordinary WindowProc */
-# define MyWindowProc DefWindowProc
-#endif
 extern int current_font_height;	    /* this is in os_mswin.c */
 static struct
 {
 static int
 char_to_string(int ch, char_u *string, int slen, int had_alt)
 {
 int		len;
 int		i;
-#ifdef FEAT_MBYTE
 WCHAR	wstring[2];
 char_u	*ws = NULL;
 if (surrogate_pending_ch != 0)
 {
 	    vim_free(ws);
 	}
 }
 if (len == 0)
-#endif
 {
 	string[0] = ch;
 	len = 1;
 }
 	gui_menu_cb(pMenu);
 }
 #endif
 #ifdef MSWIN_FIND_REPLACE
-# ifdef FEAT_MBYTE
 /*
 * copy useful data from structure LPFINDREPLACE to structure LPFINDREPLACEW
 */
 static void
 findrep_atow(LPFINDREPLACEW lpfrw, LPFINDREPLACE lpfr)
 p = utf16_to_enc((short_u*)lpfrw->lpstrReplaceWith, NULL);
 vim_strncpy((char_u *)lpfr->lpstrReplaceWith, p, lpfr->wReplaceWithLen - 1);
 vim_free(p);
 }
-# endif
 /*
 * Handle a Find/Replace window message.
 */
 static void
 _OnFindRepl(void)
 {
 int	    flags = 0;
 int	    down;
-# ifdef FEAT_MBYTE
 /* If the OS is Windows NT, and 'encoding' differs from active codepage:
 * convert text from wide string. */
 if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 {
 	findrep_wtoa(&s_findrep_struct, &s_findrep_struct_w);
 }
-# endif
 if (s_findrep_struct.Flags & FR_DIALOGTERM)
 	/* Give main window the focus back. */
 	(void)SetFocus(s_hwnd);
 	default:
 	    return MyWindowProc(hwnd, uMsg, wParam, lParam);
 }
 }
-#if defined(FEAT_MBYTE) \
+#ifdef PROTO
-	|| defined(GLOBAL_IME) \
-	|| defined(PROTO)
-# ifdef PROTO
 typedef int WINAPI;
-# endif
+#endif
 LRESULT WINAPI
 vim_WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-# ifdef GLOBAL_IME
+#ifdef GLOBAL_IME
 return global_ime_DefWindowProc(hwnd, message, wParam, lParam);
-# else
+#else
 if (wide_WindowProc)
 	return DefWindowProcW(hwnd, message, wParam, lParam);
 return DefWindowProc(hwnd, message, wParam, lParam);
 #endif
 }
-#endif
 /*
 * Called when the foreground or background color has been changed.
 */
 void
 * Note: FrameRect() excludes right and bottom of rectangle.
 */
 rc.left = FILL_X(gui.col);
 rc.top = FILL_Y(gui.row);
 rc.right = rc.left + gui.char_width;
-#ifdef FEAT_MBYTE
 if (mb_lefthalve(gui.row, gui.col))
 	rc.right += gui.char_width;
-#endif
 rc.bottom = rc.top + gui.char_height;
 hbr = CreateSolidBrush(color);
 FrameRect(s_hdc, &rc, hbr);
 DeleteBrush(hbr);
 }
 GetTextExtentPoint(hdc, (LPCSTR)str, len, &size);
 return size.cx;
 }
-#ifdef FEAT_MBYTE
 /*
 * Return the width in pixels of the given text in the given DC, taking care
 * of 'encoding' to active codepage conversion.
 */
 static int
 	}
 }
 return GetTextWidth(hdc, str, len);
 }
-#else
-# define GetTextWidthEnc(h, s, l) GetTextWidth((h), (s), (l))
-#endif
 static void get_work_area(RECT *spi_rect);
 /*
 * A quick little routine that will center one window over another, handy for
 if (s_toolbarhwnd == NULL)
 	return;
 if (showit)
 {
-# ifdef FEAT_MBYTE
+# ifndef TB_SETUNICODEFORMAT
-#  ifndef TB_SETUNICODEFORMAT
 /* For older compilers.  We assume this never changes. */
-#   define TB_SETUNICODEFORMAT 0x2005
+#  define TB_SETUNICODEFORMAT 0x2005
-#  endif
+# endif
 	/* Enable/disable unicode support */
 	int uu = (enc_codepage >= 0 && (int)GetACP() != enc_codepage);
 	SendMessage(s_toolbarhwnd, TB_SETUNICODEFORMAT, (WPARAM)uu, (LPARAM)0);
-# endif
 	ShowWindow(s_toolbarhwnd, SW_SHOW);
 }
 else
 	ShowWindow(s_toolbarhwnd, SW_HIDE);
 }
 #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
 static void
 add_tabline_popup_menu_entry(HMENU pmenu, UINT item_id, char_u *item_text)
 {
-#ifdef FEAT_MBYTE
 WCHAR	*wn = NULL;
 if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 {
 	/* 'encoding' differs from active codepage: convert menu name
 	    vim_free(wn);
 	}
 }
 if (wn == NULL)
-#endif
 {
 	MENUITEMINFO	info;
 	info.cbSize = sizeof(info);
 	info.fMask = MIIM_TYPE | MIIM_ID;
 tabpage_T	*tp;
 TCITEM	tie;
 int		nr = 0;
 int		curtabidx = 0;
 int		tabadded = 0;
-#ifdef FEAT_MBYTE
 static int	use_unicode = FALSE;
 int		uu;
 WCHAR	*wstr = NULL;
-#endif
 if (s_tabhwnd == NULL)
 	return;
-#ifdef FEAT_MBYTE
+#ifndef CCM_SETUNICODEFORMAT
-# ifndef CCM_SETUNICODEFORMAT
 /* For older compilers.  We assume this never changes. */
-#  define CCM_SETUNICODEFORMAT 0x2005
+# define CCM_SETUNICODEFORMAT 0x2005
-# endif
+#endif
 uu = (enc_codepage >= 0 && (int)GetACP() != enc_codepage);
 if (uu != use_unicode)
 {
 	/* Enable/disable unicode support */
 	SendMessage(s_tabhwnd, CCM_SETUNICODEFORMAT, (WPARAM)uu, (LPARAM)0);
 	use_unicode = uu;
 }
-#endif
 tie.mask = TCIF_TEXT;
 tie.iImage = -1;
 /* Disable redraw for tab updates to eliminate O(N^2) draws. */
 	    tabadded = 1;
 	}
 	get_tabline_label(tp, FALSE);
 	tie.pszText = (LPSTR)NameBuff;
-#ifdef FEAT_MBYTE
 	wstr = NULL;
 	if (use_unicode)
 	{
 	    /* Need to go through Unicode. */
 	    wstr = enc_to_utf16(NameBuff, NULL);
 		SendMessage(s_tabhwnd, TCM_SETITEMW, (WPARAM)nr, (LPARAM)&tiw);
 		vim_free(wstr);
 	    }
 	}
 	if (wstr == NULL)
-#endif
 	{
 	    TabCtrl_SetItem(s_tabhwnd, nr, &tie);
 	}
 }
 #endif
 static void
 set_window_title(HWND hwnd, char *title)
 {
-#ifdef FEAT_MBYTE
 if (title != NULL && enc_codepage >= 0 && enc_codepage != (int)GetACP())
 {
 	WCHAR	*wbuf;
 	/* Convert the title from 'encoding' to UTF-16. */
 	    SetWindowTextW(hwnd, wbuf);
 	    vim_free(wbuf);
 	}
 	return;
 }
-#endif
 (void)SetWindowText(hwnd, (LPCSTR)title);
 }
 void
 gui_mch_find_dialog(exarg_T *eap)
 	    DestroyWindow(s_findrep_hwnd);
 	if (!IsWindow(s_findrep_hwnd))
 	{
 	    initialise_findrep(eap->arg);
-# ifdef FEAT_MBYTE
 	    /* If the OS is Windows NT, and 'encoding' differs from active
 	     * codepage: convert text and use wide function. */
 	    if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 	    {
 		findrep_atow(&s_findrep_struct_w, &s_findrep_struct);
 		s_findrep_hwnd = FindTextW(
 					(LPFINDREPLACEW) &s_findrep_struct_w);
 	    }
 	    else
-# endif
 		s_findrep_hwnd = FindText((LPFINDREPLACE) &s_findrep_struct);
 	}
 	set_window_title(s_findrep_hwnd, _("Find string"));
 	(void)SetFocus(s_findrep_hwnd);
 	    DestroyWindow(s_findrep_hwnd);
 	if (!IsWindow(s_findrep_hwnd))
 	{
 	    initialise_findrep(eap->arg);
-# ifdef FEAT_MBYTE
 	    if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 	    {
 		findrep_atow(&s_findrep_struct_w, &s_findrep_struct);
 		s_findrep_hwnd = ReplaceTextW(
 					(LPFINDREPLACEW) &s_findrep_struct_w);
 	    }
 	    else
-# endif
 		s_findrep_hwnd = ReplaceText(
 					   (LPFINDREPLACE) &s_findrep_struct);
 	}
 	set_window_title(s_findrep_hwnd, _("Find & Replace"));
 	PAINTSTRUCT ps;
 	out_flush();	    /* make sure all output has been processed */
 	(void)BeginPaint(hwnd, &ps);
-#ifdef FEAT_MBYTE
 	/* prevent multi-byte characters from misprinting on an invalid
 	 * rectangle */
 	if (has_mbyte)
 	{
 	    RECT rect;
 	    GetClientRect(hwnd, &rect);
 	    ps.rcPaint.left = rect.left;
 	    ps.rcPaint.right = rect.right;
 	}
-#endif
 	if (!IsRectEmpty(&ps.rcPaint))
 	{
 	    gui_redraw(ps.rcPaint.left, ps.rcPaint.top,
 		    ps.rcPaint.right - ps.rcPaint.left + 1,
 char	*charset_name;
 char	*quality_name;
 char	*font_name = lf.lfFaceName;
 charset_name = charset_id2name((int)lf.lfCharSet);
-#ifdef FEAT_MBYTE
 /* Convert a font name from the current codepage to 'encoding'.
 * TODO: Use Wide APIs (including LOGFONTW) instead of ANSI APIs. */
 if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 {
 	int	len;
 	acp_to_enc((char_u *)lf.lfFaceName, (int)strlen(lf.lfFaceName),
 						(char_u **)&font_name, &len);
 }
-#endif
 quality_name = quality_id2name((int)lf.lfQuality);
 res = (char *)alloc((unsigned)(strlen(font_name) + 20
 		    + (charset_name == NULL ? 0 : strlen(charset_name) + 2)));
 if (res != NULL)
 	    STRCAT(p, ":q");
 	    STRCAT(p, quality_name);
 	}
 }
-#ifdef FEAT_MBYTE
 if (font_name != lf.lfFaceName)
 	vim_free(font_name);
-#endif
 return (char_u *)res;
 }
 #ifdef FEAT_MBYTE_IME
 	norm_logfont = sub_logfont;
 im_set_font(&norm_logfont);
 }
 #endif
-#ifdef FEAT_MBYTE
 /*
 * Handler of gui.wide_font (p_guifontwide) changed notification.
 */
 void
 gui_mch_wide_font_changed(void)
 {
 LOGFONT lf;
-# ifdef FEAT_MBYTE_IME
+#ifdef FEAT_MBYTE_IME
 update_im_font();
-# endif
+#endif
 gui_mch_free_font(gui.wide_ital_font);
 gui.wide_ital_font = NOFONT;
 gui_mch_free_font(gui.wide_bold_font);
 gui.wide_bold_font = NOFONT;
 		gui.wide_boldital_font = get_font_handle(&lf);
 	    }
 	}
 }
 }
-#endif
 /*
 * Initialise vim to use the font with the given name.
 * Return FAIL if the font could not be loaded, OK otherwise.
 */
 }
 #endif
 #if defined(FEAT_BROWSE) || defined(PROTO)
 /*
-* The file browser exists in two versions: with "W" uses wide characters,
-* without "W" the current codepage.  When FEAT_MBYTE is defined and on
-* Windows NT/2000/XP the "W" functions are used.
-*/
-# ifdef FEAT_MBYTE
-/*
 * Wide version of convert_filter().
 */
 static WCHAR *
 convert_filterW(char_u *s)
 {
 vim_free(tmp);
 return res;
 }
 /*
-* Wide version of gui_mch_browse().  Keep in sync!
+* Pop open a file browser and return the file selected, in allocated memory,
+* or NULL if Cancel is hit.
+*  saving  - TRUE if the file will be saved to, FALSE if it will be opened.
+*  title   - Title message for the file browser dialog.
+*  dflt    - Default name of file.
+*  ext     - Default extension to be added to files without extensions.
+*  initdir - directory in which to open the browser (NULL = current dir)
+*  filter  - Filter for matched files to choose from.
 */
 static char_u *
-gui_mch_browseW(
+gui_mch_browse(
 	int saving,
 	char_u *title,
 	char_u *dflt,
 	char_u *ext,
 	char_u *initdir,
 /* Shorten the file name if possible */
 q = vim_strsave(shorten_fname1(p));
 vim_free(p);
 return q;
 }
-# endif /* FEAT_MBYTE */
 /*
 * Convert the string s to the proper format for a filter string by replacing
 * the \t and \n delimiters with \0.
 /* We fake this: Use a filter that doesn't select anything and a default
 * file name that won't be used. */
 return gui_mch_browse(0, title, (char_u *)_("Not Used"), NULL,
 			      initdir, (char_u *)_("Directory\t*.nothing\n"));
 }
-/*
-* Pop open a file browser and return the file selected, in allocated memory,
-* or NULL if Cancel is hit.
-*  saving  - TRUE if the file will be saved to, FALSE if it will be opened.
-*  title   - Title message for the file browser dialog.
-*  dflt    - Default name of file.
-*  ext     - Default extension to be added to files without extensions.
-*  initdir - directory in which to open the browser (NULL = current dir)
-*  filter  - Filter for matched files to choose from.
-*
-* Keep in sync with gui_mch_browseW() above!
-*/
-char_u *
-gui_mch_browse(
-	int saving,
-	char_u *title,
-	char_u *dflt,
-	char_u *ext,
-	char_u *initdir,
-	char_u *filter)
-{
-# ifdef FEAT_MBYTE
-return gui_mch_browseW(saving, title, dflt, ext, initdir, filter);
-# else
-OPENFILENAME	fileStruct;
-char_u		fileBuf[MAXPATHL];
-char_u		*initdirp = NULL;
-char_u		*filterp;
-char_u		*p;
-if (dflt == NULL)
-	fileBuf[0] = NUL;
-else
-	vim_strncpy(fileBuf, dflt, MAXPATHL - 1);
-/* Convert the filter to Windows format. */
-filterp = convert_filter(filter);
-vim_memset(&fileStruct, 0, sizeof(OPENFILENAME));
-#  ifdef OPENFILENAME_SIZE_VERSION_400
-/* be compatible with Windows NT 4.0 */
-fileStruct.lStructSize = OPENFILENAME_SIZE_VERSION_400;
-#  else
-fileStruct.lStructSize = sizeof(fileStruct);
-#  endif
-fileStruct.lpstrTitle = (LPSTR)title;
-fileStruct.lpstrDefExt = (LPSTR)ext;
-fileStruct.lpstrFile = (LPSTR)fileBuf;
-fileStruct.nMaxFile = MAXPATHL;
-fileStruct.lpstrFilter = (LPSTR)filterp;
-fileStruct.hwndOwner = s_hwnd;		/* main Vim window is owner*/
-/* has an initial dir been specified? */
-if (initdir != NULL && *initdir != NUL)
-{
-	/* Must have backslashes here, no matter what 'shellslash' says */
-	initdirp = vim_strsave(initdir);
-	if (initdirp != NULL)
-	    for (p = initdirp; *p != NUL; ++p)
-		if (*p == '/')
-		    *p = '\\';
-	fileStruct.lpstrInitialDir = (LPSTR)initdirp;
-}
-/*
-* TODO: Allow selection of multiple files.  Needs another arg to this
-* function to ask for it, and need to use OFN_ALLOWMULTISELECT below.
-* Also, should we use OFN_FILEMUSTEXIST when opening?  Vim can edit on
-* files that don't exist yet, so I haven't put it in.  What about
-* OFN_PATHMUSTEXIST?
-* Don't use OFN_OVERWRITEPROMPT, Vim has its own ":confirm" dialog.
-*/
-fileStruct.Flags = (OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY);
-#  ifdef FEAT_SHORTCUT
-if (curbuf->b_p_bin)
-	fileStruct.Flags |= OFN_NODEREFERENCELINKS;
-#  endif
-if (saving)
-{
-	if (!GetSaveFileName(&fileStruct))
-	    return NULL;
-}
-else
-{
-	if (!GetOpenFileName(&fileStruct))
-	    return NULL;
-}
-vim_free(filterp);
-vim_free(initdirp);
-/* Give focus back to main window (when using MDI). */
-SetFocus(s_hwnd);
-/* Shorten the file name if possible */
-return vim_strsave(shorten_fname1((char_u *)fileBuf));
-# endif
-}
 #endif /* FEAT_BROWSE */
 static void
 _OnDropFiles(
 HWND hwnd UNUSED,
 HDROP hDrop)
 {
 #define BUFPATHLEN _MAX_PATH
 #define DRAGQVAL 0xFFFFFFFF
-#ifdef FEAT_MBYTE
 WCHAR   wszFile[BUFPATHLEN];
-#endif
 char    szFile[BUFPATHLEN];
 UINT    cFiles = DragQueryFile(hDrop, DRAGQVAL, NULL, 0);
 UINT    i;
 char_u  **fnames;
 POINT   pt;
 fnames = (char_u **)alloc(cFiles * sizeof(char_u *));
 if (fnames != NULL)
 	for (i = 0; i < cFiles; ++i)
 	{
-#ifdef FEAT_MBYTE
 	    if (DragQueryFileW(hDrop, i, wszFile, BUFPATHLEN) > 0)
 		fnames[i] = utf16_to_enc(wszFile, NULL);
 	    else
-#endif
 	    {
 		DragQueryFile(hDrop, i, szFile, BUFPATHLEN);
 		fnames[i] = vim_strsave((char_u *)szFile);
 	    }
 	}
 char	**argv = NULL;
 int		round;
 *tofree = NULL;
-#ifdef FEAT_MBYTE
 /* Try using the Unicode version first, it takes care of conversion when
 * 'encoding' is changed. */
 argc = get_cmd_argsW(&argv);
 if (argc != 0)
 	goto done;
-#endif
 /* Handle the program name.  Remove the ".exe" extension, and find the 1st
 * non-space. */
 p = strrchr(prog, '.');
 if (p != NULL)
 		}
 		else
 		{
 		    if (pnew != NULL)
 			*pnew++ = *p;
-#ifdef FEAT_MBYTE
 		    /* Can't use mb_* functions, because 'encoding' is not
 		     * initialized yet here. */
 		    if (IsDBCSLeadByte(*p))
 		    {
 			++p;
 			if (pnew != NULL)
 			    *pnew++ = *p;
 		    }
-#endif
 		    ++p;
 		}
 	    }
 	    if (pnew != NULL)
 	    pnew = newcmdline;
 	    *tofree = newcmdline;
 	}
 }
-#ifdef FEAT_MBYTE
 done:
-#endif
 argv[argc] = NULL;		/* NULL-terminated list */
 *argvp = argv;
 return argc;
 }
 HINSTANCE  hinst;
 UINT       uFlags;
 LPARAM     lParam;
 } NMTTDISPINFO_NEW;
-#ifdef FEAT_MBYTE
 typedef struct tagTOOLINFOW_NEW
 {
 UINT       cbSize;
 UINT       uFlags;
 HWND       hwnd;
 HINSTANCE  hinst;
 UINT       uFlags;
 LPARAM     lParam;
 } NMTTDISPINFOW_NEW;
-#endif
 typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
 #ifndef TTM_SETMAXTIPWIDTH
 # define TTM_SETMAXTIPWIDTH	(WM_USER+24)
 #endif
 UINT	uFlags;
 LPARAM	lParam;
 } NMTTDISPINFOA, *LPNMTTDISPINFOA;
 #  define LPNMTTDISPINFO LPNMTTDISPINFOA
-#  ifdef FEAT_MBYTE
 typedef struct tagNMTTDISPINFOW {
 NMHDR	hdr;
 LPWSTR	lpszText;
 WCHAR	szText[80];
 HINSTANCE	hinst;
 UINT	uFlags;
 LPARAM	lParam;
 } NMTTDISPINFOW, *LPNMTTDISPINFOW;
-#  endif
 # endif
 #endif
 #ifndef TTN_GETDISPINFOW
 # define TTN_GETDISPINFOW	(TTN_FIRST - 10)
 #if defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)
 case WM_NOTIFY:
 	switch (((LPNMHDR) lParam)->code)
 	{
-# ifdef FEAT_MBYTE
 	    case TTN_GETDISPINFOW:
-# endif
 	    case TTN_GETDISPINFO:
 		{
 		    LPNMHDR		hdr = (LPNMHDR)lParam;
 		    char_u		*str = NULL;
 		    static void		*tt_text = NULL;
 			    str = pMenu->strings[MENU_INDEX_TIP];
 		    }
 # endif
 		    if (str != NULL)
 		    {
-# ifdef FEAT_MBYTE
 			if (hdr->code == TTN_GETDISPINFOW)
 			{
 			    LPNMTTDISPINFOW	lpdi = (LPNMTTDISPINFOW)lParam;
 			    /* Set the maximum width, this also enables using
 			    tt_text = enc_to_utf16(str, NULL);
 			    lpdi->lpszText = tt_text;
 			    /* can't show tooltip if failed */
 			}
 			else
-# endif
 			{
 			    LPNMTTDISPINFO	lpdi = (LPNMTTDISPINFO)lParam;
 			    /* Set the maximum width, this also enables using
 			     * \n for line break. */
 gui_mch_init(void)
 {
 const char szVimWndClass[] = VIM_CLASS;
 const char szTextAreaClass[] = "VimTextArea";
 WNDCLASS wndclass;
-#ifdef FEAT_MBYTE
 const WCHAR szVimWndClassW[] = VIM_CLASSW;
 const WCHAR szTextAreaClassW[] = L"VimTextArea";
 WNDCLASSW wndclassw;
-#endif
 #ifdef GLOBAL_IME
 ATOM	atom;
 #endif
 /* Return here if the window was already opened (happens when
 #endif
 gui.border_width = 0;
 s_brush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
-#ifdef FEAT_MBYTE
 /* First try using the wide version, so that we can use any title.
 * Otherwise only characters in the active codepage will work. */
 if (GetClassInfoW(s_hinst, szVimWndClassW, &wndclassw) == 0)
 {
 	wndclassw.style = CS_DBLCLKS;
 	else
 	    wide_WindowProc = TRUE;
 }
 if (!wide_WindowProc)
-#endif
+	if (GetClassInfo(s_hinst, szVimWndClass, &wndclass) == 0)
+	{
-if (GetClassInfo(s_hinst, szVimWndClass, &wndclass) == 0)
+	    wndclass.style = CS_DBLCLKS;
-{
+	    wndclass.lpfnWndProc = _WndProc;
-	wndclass.style = CS_DBLCLKS;
+	    wndclass.cbClsExtra = 0;
-	wndclass.lpfnWndProc = _WndProc;
+	    wndclass.cbWndExtra = 0;
-	wndclass.cbClsExtra = 0;
+	    wndclass.hInstance = s_hinst;
-	wndclass.cbWndExtra = 0;
+	    wndclass.hIcon = LoadIcon(wndclass.hInstance, "IDR_VIM");
-	wndclass.hInstance = s_hinst;
+	    wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wndclass.hIcon = LoadIcon(wndclass.hInstance, "IDR_VIM");
+	    wndclass.hbrBackground = s_brush;
-	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
+	    wndclass.lpszMenuName = NULL;
-	wndclass.hbrBackground = s_brush;
+	    wndclass.lpszClassName = szVimWndClass;
-	wndclass.lpszMenuName = NULL;
-	wndclass.lpszClassName = szVimWndClass;
+	    if ((
-	if ((
 #ifdef GLOBAL_IME
-		    atom =
+			atom =
 #endif
-		    RegisterClass(&wndclass)) == 0)
+			RegisterClass(&wndclass)) == 0)
-	    return FAIL;
+		return FAIL;
-}
+	}
 if (vim_parent_hwnd != NULL)
 {
 #ifdef HAVE_TRY_EXCEPT
 	__try
 #if defined(FEAT_MBYTE_IME) && defined(DYNAMIC_IME)
 dyn_imm_load();
 #endif
 /* Create the text area window */
-#ifdef FEAT_MBYTE
 if (wide_WindowProc)
 {
 	if (GetClassInfoW(s_hinst, szTextAreaClassW, &wndclassw) == 0)
 	{
 	    wndclassw.style = CS_OWNDC;
 	    100,				// Any value will do for now
 	    100,				// Any value will do for now
 	    s_hwnd, NULL,
 	    s_hinst, NULL);
 }
-else
+else if (GetClassInfo(s_hinst, szTextAreaClass, &wndclass) == 0)
-#endif
-if (GetClassInfo(s_hinst, szTextAreaClass, &wndclass) == 0)
 {
 	wndclass.style = CS_OWNDC;
 	wndclass.lpfnWndProc = _TextAreaWndProc;
 	wndclass.cbClsExtra = 0;
 	wndclass.cbWndExtra = 0;
 s_findrep_struct.lpstrFindWhat[0] = NUL;
 s_findrep_struct.lpstrReplaceWith = (LPSTR)alloc(MSWIN_FR_BUFSIZE);
 s_findrep_struct.lpstrReplaceWith[0] = NUL;
 s_findrep_struct.wFindWhatLen = MSWIN_FR_BUFSIZE;
 s_findrep_struct.wReplaceWithLen = MSWIN_FR_BUFSIZE;
-# ifdef FEAT_MBYTE
 s_findrep_struct_w.lStructSize = sizeof(s_findrep_struct_w);
 s_findrep_struct_w.lpstrFindWhat =
 			      (LPWSTR)alloc(MSWIN_FR_BUFSIZE * sizeof(WCHAR));
 s_findrep_struct_w.lpstrFindWhat[0] = NUL;
 s_findrep_struct_w.lpstrReplaceWith =
 			      (LPWSTR)alloc(MSWIN_FR_BUFSIZE * sizeof(WCHAR));
 s_findrep_struct_w.lpstrReplaceWith[0] = NUL;
 s_findrep_struct_w.wFindWhatLen = MSWIN_FR_BUFSIZE;
 s_findrep_struct_w.wReplaceWithLen = MSWIN_FR_BUFSIZE;
-# endif
 #endif
 #ifdef FEAT_EVAL
 # if !defined(_MSC_VER) || (_MSC_VER < 1400)
 /* Define HandleToLong for old MS and non-MS compilers if not defined. */
 return status;
 }
 #endif /* FEAT_MBYTE_IME */
-#if defined(FEAT_MBYTE) && !defined(FEAT_MBYTE_IME) && defined(GLOBAL_IME)
+#if !defined(FEAT_MBYTE_IME) && defined(GLOBAL_IME)
 /* Win32 with GLOBAL IME */
 /*
 * Notify cursor position to IM.
 */
 {
 return global_ime_get_status();
 }
 #endif
-#ifdef FEAT_MBYTE
 /*
 * Convert latin9 text "text[len]" to ucs-2 in "unicodebuf".
 */
 static void
 latin9_to_ucs(char_u *text, int len, WCHAR *unicodebuf)
 	    case 0xbe: c = 0x0178; break;   /* Y */
 	}
 	*unicodebuf++ = c;
 }
 }
-#endif
 #ifdef FEAT_RIGHTLEFT
 /*
 * What is this for?  In the case where you are using Win98 or Win2K or later,
 * and you are using a Hebrew font (or Arabic!), Windows does you a favor and
 static int	*padding = NULL;
 static int	pad_size = 0;
 int		i;
 const RECT	*pcliprect = NULL;
 UINT	foptions = 0;
-#ifdef FEAT_MBYTE
 static WCHAR *unicodebuf = NULL;
 static int   *unicodepdy = NULL;
 static int	unibuflen = 0;
 int		n = 0;
-#endif
 int		y;
 /*
 * Italic and bold text seems to have an extra row of pixels at the bottom
 * (below where the bottom of the character should be).  If we draw the
 	 * Clear background first.
 	 * Note: FillRect() excludes right and bottom of rectangle.
 	 */
 	rc.left = FILL_X(col);
 	rc.top = FILL_Y(row);
-#ifdef FEAT_MBYTE
 	if (has_mbyte)
 	{
 	    /* Compute the length in display cells. */
 	    rc.right = FILL_X(col + mb_string2cells(text, len));
 	}
 	else
-#endif
 	    rc.right = FILL_X(col + len);
 	rc.bottom = FILL_Y(row + 1);
 	/* Cache the created brush, that saves a lot of time.  We need two:
 	 * one for cursor background and one for the normal background. */
 * of fixed-width fonts are often one pixel or so wider than their normal
 * versions.
 * No check for DRAW_BOLD, Windows will have done it already.
 */
-#ifdef FEAT_MBYTE
 /* Check if there are any UTF-8 characters.  If not, use normal text
 * output to speed up output. */
 if (enc_utf8)
 	for (n = 0; n < len; ++n)
 	    if (text[n] >= 0x80)
 		break;
-# if defined(FEAT_DIRECTX)
+#if defined(FEAT_DIRECTX)
 /* Quick hack to enable DirectWrite.  To use DirectWrite (antialias), it is
 * required that unicode drawing routine, currently.  So this forces it
 * enabled. */
 if (IS_ENABLE_DIRECTX())
 	n = 0; /* Keep n < len, to enter block for unicode. */
-# endif
+#endif
 /* Check if the Unicode buffer exists and is big enough.  Create it
 * with the same length as the multi-byte string, the number of wide
 * characters is always equal or smaller. */
 if ((enc_utf8
 	    }
 	    cells += cw;
 	    i += utf_ptr2len_len(text + i, len - i);
 	    ++clen;
 	}
-# if defined(FEAT_DIRECTX)
+#if defined(FEAT_DIRECTX)
 	if (IS_ENABLE_DIRECTX())
 	{
 	    /* Add one to "cells" for italics. */
 	    DWriteContext_DrawText(s_dwc, unicodebuf, wlen,
 		    TEXT_X(col), TEXT_Y(row), FILL_X(cells + 1), FILL_Y(1),
 		    gui.char_width, gui.currFgColor,
 		    foptions, pcliprect, unicodepdy);
 	}
 	else
-# endif
+#endif
 	    ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
 		    foptions, pcliprect, unicodebuf, wlen, unicodepdy);
 	len = cells;	/* used for underlining */
 }
 else if ((enc_codepage > 0 && (int)GetACP() != enc_codepage) || enc_latin9)
 			    foptions, pcliprect, unicodebuf, len, unicodepdy);
 	    }
 	}
 }
 else
-#endif
 {
 #ifdef FEAT_RIGHTLEFT
 	/* Windows will mess up RL text, so we have to draw it character by
 	 * character.  Only do this if RL is on, since it's slow. */
 	if (curwin->w_p_rl)
 menu->submenu_id = CreatePopupMenu();
 menu->id = s_menu_id++;
 if (menu_is_menubar(menu->name))
 {
-#ifdef FEAT_MBYTE
 	WCHAR	*wn = NULL;
 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 	{
 	    /* 'encoding' differs from active codepage: convert menu name
 		vim_free(wn);
 	    }
 	}
 	if (wn == NULL)
-#endif
 	{
 	    MENUITEMINFO	info;
 	    info.cbSize = sizeof(info);
 	    info.fMask = MIIM_DATA | MIIM_TYPE | MIIM_ID | MIIM_SUBMENU;
 	menu->submenu_id = (HMENU)-1;
 }
 else
 #endif
 {
-#ifdef FEAT_MBYTE
 	WCHAR	*wn = NULL;
 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 	{
 	    /* 'encoding' differs from active codepage: convert menu item name
 			(UINT)menu->id, wn);
 		vim_free(wn);
 	    }
 	}
 	if (wn == NULL)
-#endif
 	    InsertMenu(parent->submenu_id, (UINT)idx,
 		(menu_is_separator(menu->name) ? MF_SEPARATOR : MF_STRING)
 							      | MF_BYPOSITION,
 		(UINT)menu->id, (LPCTSTR)menu->name);
 #ifdef FEAT_TEAROFF
 	    return TRUE;
 	/* If the edit box exists, copy the string. */
 	if (s_textfield != NULL)
 	{
-# ifdef FEAT_MBYTE
 	    /* If the OS is Windows NT, and 'encoding' differs from active
 	     * codepage: use wide function and convert text. */
 	    if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 	    {
 	       WCHAR  *wp = (WCHAR *)alloc(IOSIZE * sizeof(WCHAR));
 	       vim_strncpy(s_textfield, p, IOSIZE);
 	       vim_free(p);
 	       vim_free(wp);
 	    }
 	    else
-# endif
 		GetDlgItemText(hwnd, DLG_NONBUTTON_CONTROL + 2,
 						(LPSTR)s_textfield, IOSIZE);
 	}
 	/*
 	 * wrapped lines. */
 	textWidth = 0;
 	last_white = NULL;
 	for (pend = pstart; *pend != NUL && *pend != '\n'; )
 	{
-#ifdef FEAT_MBYTE
 	    l = (*mb_ptr2len)(pend);
-#else
-	    l = 1;
-#endif
 	    if (l == 1 && VIM_ISWHITE(*pend)
 					&& textWidth > maxDialogWidth * 3 / 4)
 		last_white = pend;
 	    textWidth += GetTextWidthEnc(hdc, pend, l);
 	    if (textWidth >= maxDialogWidth)
 LPWORD lpWCStr,
 LPSTR lpAnsiIn,
 BOOL use_enc)
 {
 int		nChar = 0;
-#ifdef FEAT_MBYTE
 int		len = lstrlen(lpAnsiIn) + 1;	/* include NUL character */
 int		i;
 WCHAR	*wn;
 if (use_enc && enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 		lpAnsiIn, len,
 		lpWCStr, len);
 for (i = 0; i < nChar; ++i)
 	if (lpWCStr[i] == (WORD)'\t')	/* replace tabs with spaces */
 	    lpWCStr[i] = (WORD)' ';
-#else
-do
-{
-	if (*lpAnsiIn == '\t')
-	    *lpWCStr++ = (WORD)' ';
-	else
-	    *lpWCStr++ = (WORD)*lpAnsiIn;
-	nChar++;
-} while (*lpAnsiIn++);
-#endif
 return nChar;
 }
 }
 multiline_tip = FALSE;
 return multiline_tip;
 }
-#ifdef FEAT_MBYTE
 static void
 make_tooltipw(BalloonEval *beval, char *text, POINT pt)
 {
 TOOLINFOW	*pti;
 int		ToolInfoSize;
 */
 mouse_event(MOUSEEVENTF_MOVE, 2, 2, 0, 0);
 mouse_event(MOUSEEVENTF_MOVE, (DWORD)-1, (DWORD)-1, 0, 0);
 vim_free(pti);
 }
-#endif
 static void
 make_tooltip(BalloonEval *beval, char *text, POINT pt)
 {
 TOOLINFO	*pti;
 int		ToolInfoSize;
-#ifdef FEAT_MBYTE
 if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
 {
 	make_tooltipw(beval, text, pt);
 	return;
 }
-#endif
 if (multiline_balloon_available() == TRUE)
 	ToolInfoSize = sizeof(TOOLINFO_NEW);
 else
 	ToolInfoSize = sizeof(TOOLINFO);
 		NMTTDISPINFO_NEW *info = (NMTTDISPINFO_NEW *)pnmh;
 		info->lpszText = (LPSTR)info->lParam;
 		info->uFlags |= TTF_DI_SETITEM;
 	    }
 	    break;
-#ifdef FEAT_MBYTE
 	case TTN_GETDISPINFOW:
 	    {
 		// if we get here then we have new common controls
 		NMTTDISPINFOW_NEW *info = (NMTTDISPINFOW_NEW *)pnmh;
 		info->lpszText = (LPWSTR)info->lParam;
 		info->uFlags |= TTF_DI_SETITEM;
 	    }
 	    break;
-#endif
 	}
 }
 }
 static void

Mercurial > vim

comparison src/gui_w32.c @ 15597:536dd2bc5ac9 v8.1.0806