From 0d90a9bb6f95c056b61cf09fe1b4074a27c14811 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Sun, 9 Sep 2001 19:02:59 +0000
Subject: [PATCH] Added key to toggle display of FPS

---
 zsnes/src/gui/gui.asm      |  1 +
 zsnes/src/gui/guimouse.inc |  1 +
 zsnes/src/gui/guiwindp.inc |  6 +++++-
 zsnes/src/vcache.asm       | 10 +++++++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index c2822e4d..3eb9f55d 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -596,6 +596,7 @@ NEWSYM KeyQuickMinimize, dd 0
 NEWSYM AutoIncSaveSlot, db 0
 NEWSYM TCPIPAddress, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 NEWSYM SoundInterpType, db 2
+NEWSYM KeyDisplayFPS, dd 0
 
 GUIsave equ $-GUIRAdd
 
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 336fae0a..8b338c7f 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2694,6 +2694,7 @@ DisplayGameOptnsClick:
     DGOptnsProcBox 178,68,[KeyVolDown]
     DGOptnsProcBox 178,76,[KeyFRateUp]
     DGOptnsProcBox 178,84,[KeyFRateDown]
+    DGOptnsProcBox 178,92,[KeyDisplayFPS]
 ;    cmp byte[OSPort],3
 ;    jne near .notwin32
 %ifndef __MSDOS__
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 8b7d7322..f034265f 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -4451,6 +4451,7 @@ DisplayGameOptns:
     GUIOuttextwin2 9,109,70,GUIGameOptnsTextN
     GUIOuttextwin2 9,109,78,GUIGameOptnsTextO
     GUIOuttextwin2 9,109,86,GUIGameOptnsTextP
+    GUIOuttextwin2 9,109,94,GUIGameOptnsTextX
     mov al,byte[GUIGameOptnsColA]
     mov byte[GUItextcolor],al
     GUIOuttextwin2 9,6,104,GUIGameOptnsText1
@@ -4546,7 +4547,7 @@ DisplayGameOptns:
     GUIOuttextwin2 9,8,69,GUIGameOptnsTextE
     GUIOuttextwin2 9,8,77,GUIGameOptnsTextF
     GUIOuttextwin2 9,8,85,GUIGameOptnsTextG
-    GUIOuttextwin2 9,8,94,GUIGameOptnsTextT
+    GUIOuttextwin2 9,8,93,GUIGameOptnsTextT
 ;    cmp byte[OSPort],3
 ;    jne near .notwin32b
 %ifndef __MSDOS__
@@ -4558,6 +4559,7 @@ DisplayGameOptns:
     GUIOuttextwin2 9,108,69,GUIGameOptnsTextN
     GUIOuttextwin2 9,108,77,GUIGameOptnsTextO
     GUIOuttextwin2 9,108,85,GUIGameOptnsTextP
+    GUIOuttextwin2 9,108,93,GUIGameOptnsTextX
     mov al,byte[GUIGameOptnsColA]
     mov byte[GUItextcolor],al
     GUIOuttextwin2 9,5,103,GUIGameOptnsText1
@@ -4645,6 +4647,7 @@ DisplayGameOptns:
     DGOptnsDrawBox 178,68,[KeyVolDown]
     DGOptnsDrawBox 178,76,[KeyFRateUp]
     DGOptnsDrawBox 178,84,[KeyFRateDown]
+    DGOptnsDrawBox 178,92,[KeyDisplayFPS]
     DGOptnsDrawBox 27,112,[KeyDisableSC0]
     DGOptnsDrawBox 27+45,112,[KeyDisableSC1]
     DGOptnsDrawBox 27+45*2,112,[KeyDisableSC2]
@@ -4711,6 +4714,7 @@ GUIGameOptnsTextS db 'REWIND KEY',0
 GUIGameOptnsTextT db 'SLOWDWN KEY',0
 GUIGameOptnsTextU db 'CLOCK',0
 GUIGameOptnsTextV db 'MINIMIZE',0
+GUIGameOptnsTextX db 'DISPLAY FPS',0
 
 DisplayGUIOptns:
     GUIDrawWindowBox 10,GUIGUIDisp
diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm
index aa3acc5d..633ed614 100644
--- a/zsnes/src/vcache.asm
+++ b/zsnes/src/vcache.asm
@@ -44,7 +44,7 @@ EXTSYM CNetType
 EXTSYM KeySlowDown
 EXTSYM chaton
 EXTSYM genfulladdtab
-EXTSYM KeyFRateDown,KeyFRateUp,KeyVolUp,KeyVolDown,FPSOn
+EXTSYM KeyFRateDown,KeyFRateUp,KeyVolUp,KeyVolDown,KeyDisplayFPS,FPSOn
 EXTSYM bg1ptr,bg2ptr,bg3ptr,bg4ptr,cachebg1,resolutn
 EXTSYM curypos,oamram,objhipr,objptr,objptrn,objsize1,objsize2
 EXTSYM spritetablea,sprleftpr,sprlefttot,vcache4b
@@ -686,6 +686,14 @@ NEWSYM cachevideo
     mov eax,[MsgCount]
     mov [MessageOn],eax
 .nofrdown
+    mov eax,[KeyDisplayFPS]
+    test byte[pressed+eax],1
+    je .nodisplayfps
+    mov byte[pressed+eax],2
+    cmp byte[frameskip],0
+    jne .nodisplayfps
+    xor byte[FPSOn],1
+.nodisplayfps
     ; do state selects
     stateselcomp KeyStateSlc0,'0','T'
     stateselcomp KeyStateSlc1,'1','1'