From 722b0627d0f11c566ddd66213180a49080b0a035 Mon Sep 17 00:00:00 2001
From: hpsolo <>
Date: Fri, 1 Jun 2001 04:47:57 +0000
Subject: [PATCH] Added in 4:3 ratio windows (640x480, 800x600, 1024x768)

---
 zsnes/src/cfgload.asm        |  5 +++--
 zsnes/src/linux/sdlintrf.asm | 43 +++++++++++++++++++-----------------
 zsnes/src/linux/sdllink.c    |  6 ++---
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm
index 368d7ab8..0197bb7d 100644
--- a/zsnes/src/cfgload.asm
+++ b/zsnes/src/cfgload.asm
@@ -599,7 +599,7 @@ db 'VideoMode = %U',13,10
 db '',13,10
 %elifdef __LINUX__
 %ifdef __OPENGL__
-db '; Video Mode, 0 - 12',13,10
+db '; Video Mode, 0 - 15',13,10
 %else
 db '; Video Mode, 0 - 3',13,10
 %endif
@@ -610,7 +610,8 @@ db ';   4 = 256x224  OGL WIN      5 = 512x448  OGL WIN',13,10
 db ';   6 = 640x480  OGL FULL     7 = 640x576  OGL WIN',13,10
 db ';   8 = 768x672  OGL WIN      9 = 896x784  OGL WIN',13,10
 db ';  10 = 1024x896 OGL WIN     11 = 800x600  OGL FULL',13,10
-db ';  12 = 1024x768 OGL FULL',13,10
+db ';  12 = 1024x768 OGL FULL    13 = 640x480  OGL WIN',13,10
+db ';  14 = 800x600  OGL WIN     15 = 1024x768 OGL WIN',13,10
 %endif
 db '',13,10
 db 'VideoMode = %U',13,10
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index 1df7d1a6..376628f0 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -970,7 +970,7 @@ SECTION .data
 
 ; Total Number of Video Modes
 %ifdef __OPENGL__
-NEWSYM NumVideoModes, dd 13
+NEWSYM NumVideoModes, dd 136
 %else
 NEWSYM NumVideoModes, dd 4
 %endif
@@ -992,29 +992,32 @@ db '896x784  OGL WIN ',0  ;9
 db '1024x896 OGL WIN ',0  ;10
 db '800x600  OGL FULL',0  ;11
 db '1024x768 OGL FULL',0  ;12
+db '640x480  OGL WIN ',0  ;13
+db '800x600  OGL WIN ',0  ;14
+db '1024x768 OGL WIN ',0  ;15
 %endif	
 
 ; Video Mode Feature Availability (1 = Available, 0 = Not Available)
 ; Left side starts with Video Mode 0
-; vid mode column = 0,1,2,3,4,5,6,7,8,9,0,1,2 
-NEWSYM GUI16VID, db 1,1,1,1,1,1,1,1,1,1,1,1,1       ; 16-bit mode
-NEWSYM GUINGVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; New Graphics Mode Available
-NEWSYM GUISLVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Scanlines
-NEWSYM GUIINVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Interpolation
-NEWSYM GUII2VID, db 0,0,1,1,0,0,0,0,0,0,0,0,0       ; Interpolation(w)
-NEWSYM GUIEAVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Eagle
-NEWSYM GUIIEVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; (Interp | Eagle)
-NEWSYM GUIFSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Full Screen
-NEWSYM GUISSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Small Screen
-NEWSYM GUITBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Triple Buffering
-NEWSYM GUIHSVID, db 0,0,1,1,0,0,0,0,0,0,0,0,0       ; Half/Quarter Scanlines
-NEWSYM GUI2xVID, db 0,0,1,1,0,0,0,0,0,0,0,0,0       ; 2xSaI/Super Eagle Engines
-NEWSYM GUIM7VID, db 0,0,1,1,0,0,0,0,0,0,0,0,0       ; ?Mode 7 video thing?
-NEWSYM GUIWFVID, db 0,1,0,1,0,0,1,0,0,0,0,1,1       ; If Windows Full Screen
-NEWSYM GUIDSIZE, db 0,0,1,1,0,0,0,0,0,0,0,0,0
-NEWSYM GUIRATIO, db 0,1,0,0,0,0,1,0,0,0,0,0,0
-NEWSYM GUIBIFIL, db 0,0,0,0,1,1,1,1,1,1,1,1,1       ; binlinear = 1, nearest = 0
-NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0       ; Triple Buffering (Win)
+; vid mode column = 0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5 
+NEWSYM GUI16VID, db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1       ; 16-bit mode
+NEWSYM GUINGVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; New Graphics Mode Available
+NEWSYM GUISLVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Scanlines
+NEWSYM GUIINVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Interpolation
+NEWSYM GUII2VID, db 0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0       ; Interpolation(w)
+NEWSYM GUIEAVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Eagle
+NEWSYM GUIIEVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; (Interp | Eagle)
+NEWSYM GUIFSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Full Screen
+NEWSYM GUISSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Small Screen
+NEWSYM GUITBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Triple Buffering
+NEWSYM GUIHSVID, db 0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0       ; Half/Quarter Scanlines
+NEWSYM GUI2xVID, db 0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0       ; 2xSaI/Super Eagle Engines
+NEWSYM GUIM7VID, db 0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0       ; ?Mode 7 video thing?
+NEWSYM GUIWFVID, db 0,1,0,1,0,0,1,0,0,0,0,1,1,0,0,0       ; If Windows Full Screen
+NEWSYM GUIDSIZE, db 0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0
+NEWSYM GUIRATIO, db 0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0
+NEWSYM GUIBIFIL, db 0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1       ; binlinear = 1, nearest = 0
+NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Triple Buffering (Win)
 	
 SECTION .text
 
diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index 52ae3da7..616a925f 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -680,7 +680,7 @@ void initwinvideo(void)
 		SurfaceX = 512;
 		SurfaceY = 448;
 		break;
-	    case 3: case 6:
+	    case 3: case 6: case 13:
 		WindowWidth = 640;
 		WindowHeight = 480;
 		SurfaceX = 640;
@@ -710,13 +710,13 @@ void initwinvideo(void)
 		SurfaceX = 1024;
 		SurfaceY = 896;
 		break;
-	    case 11:
+	    case 11: case 14:
 		WindowWidth = 800;
 		WindowHeight = 600;
 		SurfaceX = 800;
 		SurfaceY = 600;
 		break;
-	    case 12:
+	    case 12: case 15:
 		WindowWidth = 1024;
 		WindowHeight = 768;
 		SurfaceX = 1024;