From ce45fa24363d2b4ec7f2a9320a917ddb09b2c7c9 Mon Sep 17 00:00:00 2001 From: ipher <> Date: Thu, 9 Feb 2006 02:14:41 +0000 Subject: [PATCH] Added "Pause Emu in Background" to the options manu --- zsnes/src/gui/gui.asm | 6 +++--- zsnes/src/gui/guikeys.inc | 1 + zsnes/src/gui/guimouse.inc | 3 ++- zsnes/src/gui/guiwindp.inc | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 1548d5d1..dbca86f2 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -142,7 +142,7 @@ EXTSYM BilinearFilter,lastcursres,OldVolume,prevloadl,prevloadfname,OldWinPos EXTSYM GUIwinposy2,GUIwinposx2,AllowMultipleInst,Surround,SoundBufEn,SPCDisable EXTSYM GUIEnableTransp,FilteredGUI,MouseWheel,TrapMouseCursor,AlwaysOnTop EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch -EXTSYM KeyDisplayBatt +EXTSYM KeyDisplayBatt,PauseFocusChange %ifdef __UNIXSDL__ EXTSYM numlockptr @@ -303,9 +303,9 @@ ViewBuffer resb 50*32 SECTION .data ; Window sizes and positions ; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO CHIP PATH SAVE SPED -GUIwinposxo dd 0,6 ,65 ,33 ,44 ,38 ,34 ,6 ,64 ,8 ,8 ,33 ,56 ,64 ,56 ,38 ,3 ,48 ,48 ,6 ,28 ,53 +GUIwinposxo dd 0,6 ,65 ,33 ,42 ,38 ,34 ,6 ,64 ,8 ,8 ,33 ,56 ,64 ,56 ,38 ,3 ,48 ,48 ,6 ,28 ,53 GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,35 ,19 ,60 ,60 ,20 ,30 ,25 -GUIwinsizex dd 0,244 ,126 ,189 ,167 ,180 ,188 ,244 ,8*16,240 ,240 ,190 ,9*16,8*16,9*16,180 ,250 ,160 ,160 ,244 ,200 ,150 +GUIwinsizex dd 0,244 ,126 ,189 ,172 ,180 ,188 ,244 ,8*16,240 ,240 ,190 ,9*16,8*16,9*16,180 ,250 ,160 ,160 ,244 ,200 ,150 GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,160 ,190 ,100 ,100 ,190 ,160 ,180 GUIwinptr db 0 diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 2e0c97dd..71896d04 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -781,6 +781,7 @@ GUIOptionKeys: GUIKeyCheckbox AutoPatch,'P' GUIKeyCheckbox RomInfo,'T' GUIKeyCheckbox AllowUDLR,'A' + GUIKeyCheckbox PauseFocusChange,'B' %ifdef __WIN32__ GUIKeyCheckbox DisableScreenSaver,'I' %endif diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 0fbe5598..6235bd06 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2350,8 +2350,9 @@ DisplayGUIOptionClick: GUIClickCButton 11,130,byte[AutoPatch] GUIClickCButton 11,140,byte[RomInfo] GUIClickCButton 11,150,byte[AllowUDLR] + GUIClickCButton 11,160,byte[PauseFocusChange] %ifdef __WIN32__ - GUIClickCButtonW 11,160,byte[DisableScreenSaver] + GUIClickCButtonW 11,170,byte[DisableScreenSaver] %endif ret diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index a0f166d0..0ac2da69 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1369,8 +1369,9 @@ DisplayGUIOption: ; Frame Rate/Auto Frame Rate/Max Frame Skip/New Gfx Engi GUIDisplayCheckboxu 4,11,130,AutoPatch,GUIOptionTextD,12 GUIDisplayCheckboxu 4,11,140,RomInfo,GUIOptionTextE,15 GUIDisplayCheckboxu 4,11,150,AllowUDLR,GUIOptionTextF,0 + GUIDisplayCheckboxu 4,11,160,PauseFocusChange,GUIOptionTextG,13 %ifdef __WIN32__ - GUIDisplayCheckboxu 4,11,160,DisableScreenSaver,GUIOptionTextW,1 + GUIDisplayCheckboxu 4,11,170,DisableScreenSaver,GUIOptionTextW,1 %endif ret @@ -1390,6 +1391,7 @@ GUIOptionTextC db 'USE SMALL MESSAGE TEXT',0 GUIOptionTextD db 'ENABLE AUTO-PATCH',0 GUIOptionTextE db 'ENABLE ROMINFO.TXT',0 GUIOptionTextF db 'ALLOW U+D/L+R',0 +GUIOptionTextG db 'PAUSE EMU IN BACKGROUND',0 GUIOptionTextW db 'DISABLE SCREENSAVER',0 ; Try to keep as last option, since its Win Only. GUIOptionTextX db '-',0 GUIOptionTextY db '+',0