On Thu, Apr 17, 2008 at 07:55:45PM -0700, mooling wrote: > diff -Nur vim7o\src/feature.h vim7\src/feature.h > --- vim7o\src/feature.h 2008-04-17 11:28:44.000000000 +0800 > +++ vim7\src/feature.h 2008-04-17 20:05:00.000000000 +0800 > @@ -745,6 +745,11 @@ > # define FEAT_TOOLBAR > #endif > > +#define FEAT_GUI_FULLSCR
This probably shouldn't be unconditionally defined.
> +#if defined(FEAT_GUI_FULLSCR)
> +#define FEAT_FULLSCR
> +#endif
> +
>
> #if defined(FEAT_TOOLBAR) && !defined(FEAT_MENU)
> # define FEAT_MENU
> diff -Nur vim7o\src/gui_w32.c vim7\src/gui_w32.c
> --- vim7o\src/gui_w32.c 2008-04-17 11:28:44.000000000 +0800
> +++ vim7\src/gui_w32.c 2008-04-17 20:03:22.000000000 +0800
> @@ -338,6 +338,10 @@
> static int get_toolbar_bitmap(vimmenu_T *menu);
> #endif
>
> +#ifdef FEAT_FULLSCR
> +static void initialise_fullscr(void);
> +#endif
> +
> #ifdef FEAT_GUI_TABLINE
> static void initialise_tabline(void);
> #endif
> @@ -429,6 +433,28 @@
> return (os_version.dwPlatformId == VER_PLATFORM_WIN32s);
> }
>
> +#ifdef FEAT_FULLSCR
> + static int
> +gui_mswin_get_full_height(void)
> +{
> + if (gui.full_is_active)
> + return 0;
> + else
> + return
> GetSystemMetrics(SM_CYCAPTION)+GetSystemMetrics(SM_CYFRAME)
> * 2;
> +}
> + static int
> +gui_mswin_get_full_width(void)
> +{
> + if (gui.full_is_active)
> + return 0;
> + else
> + return GetSystemMetrics(SM_CXFRAME) * 2;
> +}
> +
> +
> +#endif
> +
> +
> #ifdef FEAT_MENU
> /*
> * Figure out how high the menu bar is at the moment.
> @@ -1562,6 +1588,12 @@
> */
> initialise_toolbar();
> #endif
> +#ifdef FEAT_FULLSCR
> + /*
> + * Full Screen Initialise
> + */
> + initialise_fullscr();
> +#endif
> #ifdef FEAT_GUI_TABLINE
> /*
> * Create the tabline
> @@ -1602,7 +1634,7 @@
> _MONITORINFO moninfo;
>
> /* use these functions only if available */
> - if (pMonitorFromWindow != NULL && pGetMonitorInfo != NULL)
> + if (0 && pMonitorFromWindow != NULL && pGetMonitorInfo != NULL)
You're unconditionally excluding this if block from ever running.
> {
> /* work out which monitor the window is on, and get *it's* work area
> */
> mon = pMonitorFromWindow(s_hwnd, 1 /*MONITOR_DEFAULTTOPRIMARY*/);
> @@ -2526,7 +2558,9 @@
> * the window size can be made to fit on the screen. */
> *screen_h = workarea_rect.bottom - workarea_rect.top
> - GetSystemMetrics(SM_CYFRAME) * 2
> +#ifndef FEAT_FULLSCR
> - GetSystemMetrics(SM_CYCAPTION)
> +#endif
> #ifdef FEAT_MENU
> - gui_mswin_get_menu_height(FALSE)
> #endif
> @@ -4164,6 +4198,16 @@
> }
> #endif
>
> +#if defined(FEAT_GUI_FULLSCR)
> +
> + static void
> +initialise_fullscr(void)
> +{
> + gui_mch_show_fullscr(vim_strchr(p_go, GO_FULLSRN) != NULL);
> +}
> +
> +
> +#endif
> #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
> static void
> initialise_tabline(void)
It looks like the patch still includes some changes that were meant for
debugging purposes. I'd suggest reviewing the patch to remove anything that
isn't necessary and reposting it.
--
James
GPG Key: 1024D/61326D40 2003-09-02 James Vega <[EMAIL PROTECTED]>
signature.asc
Description: Digital signature
