ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32 - TraceLogger - Fix bug where user can't scroll log text while auto-updating

This commit is contained in:
adelikat 2009-03-12 13:09:51 +00:00
parent 8607e516ec
commit 0bb0d643ce
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,4 +1,5 @@
---version 2.0.4 yet to be released--- ---version 2.0.4 yet to be released---
12-mar-2009 - adelikat - Win32 - Trace Logger - fixed bug where user can't scroll the log window while it is auto-updating
11-mar-2009 - adelikat - Win32 - Trace Logger - changed message about F2 pause (left over from FCEUXDSP) to display the current hotkey mapping 11-mar-2009 - adelikat - Win32 - Trace Logger - changed message about F2 pause (left over from FCEUXDSP) to display the current hotkey mapping
11-mar-2009 - adelikat - Added frame counter to savestates 11-mar-2009 - adelikat - Added frame counter to savestates
08-mar-2009 - adelikat - Lua - added input.get() function 08-mar-2009 - adelikat - Lua - added input.get() function

6
src/drivers/win/debugger.cpp
View File

@ -1243,6 +1243,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
FCEUI_Debugger().step = true; FCEUI_Debugger().step = true;
FCEUI_SetEmulationPaused(0); FCEUI_SetEmulationPaused(0);
UpdateDebugger(); UpdateDebugger();
UpdateLogWindow();
break; break;
case IDC_DEBUGGER_RUN_LINE: case IDC_DEBUGGER_RUN_LINE:
if (FCEUI_EmulationPaused()) { if (FCEUI_EmulationPaused()) {
@ -1257,6 +1258,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
} }
FCEUI_SetEmulationPaused(0); FCEUI_SetEmulationPaused(0);
UpdateDebugger(); UpdateDebugger();
UpdateLogWindow();
break; break;
case IDC_DEBUGGER_RUN_FRAME2: case IDC_DEBUGGER_RUN_FRAME2:
if (FCEUI_EmulationPaused()) { if (FCEUI_EmulationPaused()) {
@ -1271,6 +1273,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
} }
FCEUI_SetEmulationPaused(0); FCEUI_SetEmulationPaused(0);
UpdateDebugger(); UpdateDebugger();
UpdateLogWindow();
break; break;
case IDC_DEBUGGER_STEP_OUT: case IDC_DEBUGGER_STEP_OUT:
//mbg merge 7/18/06 changed pausing check and set //mbg merge 7/18/06 changed pausing check and set
@ -1285,7 +1288,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
//UpdateDebugger(); //UpdateDebugger();
} }
break; break;
case IDC_DEBUGGER_STEP_OVER: case IDC_DEBUGGER_STEP_OVER:
//mbg merge 7/18/06 changed pausing check and set //mbg merge 7/18/06 changed pausing check and set
if (FCEUI_EmulationPaused()) { if (FCEUI_EmulationPaused()) {
UpdateRegs(hwndDlg); UpdateRegs(hwndDlg);
@ -1296,6 +1299,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
} }
else FCEUI_Debugger().step = true; else FCEUI_Debugger().step = true;
FCEUI_SetEmulationPaused(0); FCEUI_SetEmulationPaused(0);
UpdateLogWindow();
} }
break; break;
case IDC_DEBUGGER_SEEK_PC: case IDC_DEBUGGER_SEEK_PC:

2
src/drivers/win/main.cpp
View File

@ -761,7 +761,7 @@ void _updateWindow()
PPUViewDoBlit(); PPUViewDoBlit();
UpdateMemoryView(0); UpdateMemoryView(0);
UpdateCDLogger(); UpdateCDLogger();
UpdateLogWindow(); //UpdateLogWindow();
UpdateMemWatch(); UpdateMemWatch();
NTViewDoBlit(0); NTViewDoBlit(0);
UpdateTasEdit(); UpdateTasEdit();

3
src/fceu.cpp
View File

@ -63,6 +63,7 @@
#include "drivers/win/cheat.h" #include "drivers/win/cheat.h"
#include "drivers/win/texthook.h" #include "drivers/win/texthook.h"
#include "drivers/win/memwatch.h" #include "drivers/win/memwatch.h"
#include "drivers/win/tracer.h"
#else #else
#include "drivers/sdl/sdl.h" #include "drivers/sdl/sdl.h"
#endif #endif
@ -602,9 +603,11 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
if (skip != 2) ssize=FlushEmulateSound(); //If skip = 2 we are skipping sound processing if (skip != 2) ssize=FlushEmulateSound(); //If skip = 2 we are skipping sound processing
#ifdef WIN32 #ifdef WIN32
//These Windows only dialogs need to be updated only once per frame so they are included here
UpdateCheatList(); UpdateCheatList();
UpdateTextHooker(); UpdateTextHooker();
RamChange(); RamChange();
UpdateLogWindow();
//FCEUI_AviVideoUpdate(XBuf); //FCEUI_AviVideoUpdate(XBuf);
#endif #endif