From aa5f38e53c5ce7888b14e65a768ae420c83bf2e1 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 23 Oct 2001 20:25:34 +0000 Subject: [PATCH] Add Jacob's patch for compiling without multimon.h. [originally from svn r1315] --- Makefile | 6 ++++++ window.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index feba78da..b30a6086 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,12 @@ # build, since at the time of writing this is known # not to be available in Cygwin. # +# - COMPAT=/DNO_MULTIMON +# Disables PuTTY's use of , which is not available +# with some development environments. This means that PuTTY's +# full-screen mode (configurable to work on Alt-Enter) will +# not behave usefully in a multi-monitor environment. +# # - RCFL=/DASCIICTLS # Uses ASCII rather than Unicode to specify the tab control in # the resource file. Probably most useful when compiling with diff --git a/window.c b/window.c index c0e7f3e5..26567d70 100644 --- a/window.c +++ b/window.c @@ -10,7 +10,7 @@ #endif #endif -#if WINVER < 0x0500 +#if (WINVER < 0x0500) && !defined(NO_MULTIMON) #define COMPILE_MULTIMON_STUBS #include #endif @@ -3843,7 +3843,7 @@ static void flip_full_screen(void) if (full_screen) { int x, y, cx, cy; -#ifdef MONITOR_DEFAULTTONEAREST +#if !defined(NO_MULTIMON) && defined(MONITOR_DEFAULTTONEAREST) /* The multi-monitor safe way of doing things */ HMONITOR mon; MONITORINFO mi; @@ -3887,4 +3887,3 @@ static void flip_full_screen(void) CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN, MF_BYCOMMAND| full_screen ? MF_CHECKED : MF_UNCHECKED); } -