From 16e1ae5719f8721dcfd5996a488bff07941b0778 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Fri, 7 Nov 2003 06:30:06 +0000
Subject: [PATCH] use more traditional Alt+Enter for toggling fullscreen

---
 main/automap.c  | 7 +++----
 main/gamecntl.c | 7 +++----
 main/movie.c    | 9 ++++-----
 main/titles.c   | 7 +++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/main/automap.c b/main/automap.c
index 844f4abe..602c976e 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -1,4 +1,4 @@
-/* $Id: automap.c,v 1.11 2003-10-10 09:36:34 btb Exp $ */
+/* $Id: automap.c,v 1.12 2003-11-07 06:30:06 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1514,9 +1514,8 @@ WIN(if (redraw_screen) redraw_screen = 0);
 				//increase res
 				break;
 #endif
-			case KEY_CTRLED+KEY_SHIFTED+KEY_PADENTER:
-			case KEY_ALTED+KEY_CTRLED+KEY_PADENTER:
-			case KEY_ALTED+KEY_SHIFTED+KEY_PADENTER:
+			case KEY_ALTED+KEY_ENTER:
+			case KEY_ALTED+KEY_PADENTER:
 				gr_toggle_fullscreen_game();
 				break;
 //end addition -MM
diff --git a/main/gamecntl.c b/main/gamecntl.c
index bf07c705..03aebf23 100644
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -1,4 +1,4 @@
-/* $Id: gamecntl.c,v 1.22 2003-10-11 09:28:38 btb Exp $ */
+/* $Id: gamecntl.c,v 1.23 2003-11-07 06:30:06 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1427,9 +1427,8 @@ int HandleSystemKey(int key)
 			//increase res
 			break;
 #endif
-		case KEY_CTRLED+KEY_SHIFTED+KEY_PADENTER:
-		case KEY_ALTED+KEY_CTRLED+KEY_PADENTER:
-		case KEY_ALTED+KEY_SHIFTED+KEY_PADENTER:
+		case KEY_ALTED+KEY_ENTER:
+		case KEY_ALTED+KEY_PADENTER:
 			gr_toggle_fullscreen_game();
 			break;
 //end addition -MM
diff --git a/main/movie.c b/main/movie.c
index 12461882..105302ee 100644
--- a/main/movie.c
+++ b/main/movie.c
@@ -1,4 +1,4 @@
-/* $Id: movie.c,v 1.31 2003-10-31 16:48:10 schaffner Exp $ */
+/* $Id: movie.c,v 1.32 2003-11-07 06:30:06 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: movie.c,v 1.31 2003-10-31 16:48:10 schaffner Exp $";
+static char rcsid[] = "$Id: movie.c,v 1.32 2003-11-07 06:30:06 btb Exp $";
 #endif
 
 #define DEBUG_LEVEL CON_NORMAL
@@ -382,9 +382,8 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy)
 		}
 
 #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE
-		if ((key == KEY_CTRLED+KEY_SHIFTED+KEY_PADENTER) ||
-			(key == KEY_ALTED+KEY_CTRLED+KEY_PADENTER) ||
-			(key == KEY_ALTED+KEY_SHIFTED+KEY_PADENTER))
+		if ((key == KEY_ALTED+KEY_ENTER) ||
+		    (key == KEY_ALTED+KEY_PADENTER))
 			gr_toggle_fullscreen();
 #endif
 
diff --git a/main/titles.c b/main/titles.c
index 09fb904c..b26b533a 100644
--- a/main/titles.c
+++ b/main/titles.c
@@ -1,4 +1,4 @@
-/* $Id: titles.c,v 1.26 2003-10-04 03:14:48 btb Exp $ */
+/* $Id: titles.c,v 1.27 2003-11-07 06:30:06 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1261,9 +1261,8 @@ int show_briefing_message(int screen_num, char *message)
 			delay_count = 0;
 
 #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE
-		if ((key_check == KEY_CTRLED+KEY_SHIFTED+KEY_PADENTER) ||
-			(key_check == KEY_ALTED+KEY_CTRLED+KEY_PADENTER) ||
-			(key_check == KEY_ALTED+KEY_SHIFTED+KEY_PADENTER))
+		if ((key_check == KEY_ALTED+KEY_ENTER) ||
+			(key_check == KEY_ALTED+KEY_PADENTER))
 			gr_toggle_fullscreen();
 #endif
 
-- 
2.39.2