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

Added ability to reload the current ROM listing in the ROM launcher to the 'Control-r' key combo (similar to the same key which reloads the ROM while in emulation mode). 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1555 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2008-11-30 17:28:03 +00:00
parent f9d4bf5873
commit f1441f5f1b
6 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stella/src/common/FrameBufferGL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferGL.cxx,v 1.107 2008-11-24 18:02:19 stephena Exp $
// $Id: FrameBufferGL.cxx,v 1.108 2008-11-30 17:28:03 stephena Exp $
//============================================================================
#ifdef DISPLAY_OPENGL
@ -431,12 +431,14 @@ void FrameBufferGL::drawMediaSource()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBufferGL::postFrameUpdate()
{
static int FCOUNT = 0;
if(myDirtyFlag)
{
cerr << " SWAP buffers\n";
// Now show all changes made to the texture
SDL_GL_SwapBuffers();
myDirtyFlag = false;
cerr << FCOUNT++ << " : SWAP buffers" << endl;
}
}

4
stella/src/debugger/Debugger.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Debugger.hxx,v 1.95 2008-05-30 19:07:55 stephena Exp $
// $Id: Debugger.hxx,v 1.96 2008-11-30 17:28:03 stephena Exp $
//============================================================================
#ifndef DEBUGGER_HXX
@ -70,7 +70,7 @@ typedef uInt16 (Debugger::*DEBUGGER_WORD_METHOD)();
for all debugging operations in Stella (parser, 6502 debugger, etc).
@author Stephen Anthony
@version $Id: Debugger.hxx,v 1.95 2008-05-30 19:07:55 stephena Exp $
@version $Id: Debugger.hxx,v 1.96 2008-11-30 17:28:03 stephena Exp $
*/
class Debugger : public DialogContainer
{

4
stella/src/debugger/gui/DebuggerDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: DebuggerDialog.cxx,v 1.25 2008-06-13 13:14:50 stephena Exp $
// $Id: DebuggerDialog.cxx,v 1.26 2008-11-30 17:28:03 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -88,7 +88,7 @@ void DebuggerDialog::handleKeyDown(int ascii, int keycode, int modifiers)
bool handled = instance().eventHandler().kbdAlt(modifiers);
if(handled)
{
switch(ascii)
switch(keycode)
{
case 's':
doStep();

19
stella/src/gui/LauncherDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: LauncherDialog.cxx,v 1.88 2008-06-13 13:14:51 stephena Exp $
// $Id: LauncherDialog.cxx,v 1.89 2008-11-30 17:28:03 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -216,7 +216,7 @@ void LauncherDialog::enableButtons(bool enable)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void LauncherDialog::updateListing(bool fullReload)
void LauncherDialog::updateListing()
{
// Start with empty list
myGameList->clear();
@ -323,6 +323,17 @@ void LauncherDialog::loadRomInfo()
myRomInfoWidget->clearProperties();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void LauncherDialog::handleKeyDown(int ascii, int keycode, int modifiers)
{
// Grab the key before passing it to the actual dialog and check for
// Control-R (reload ROM listing)
if(instance().eventHandler().kbdControl(modifiers) && keycode == 'r')
updateListing();
Dialog::handleKeyDown(ascii, keycode, modifiers);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
int data, int id)
@ -370,7 +381,7 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
case kPrevDirCmd:
myCurrentNode = myCurrentNode.getParent();
updateListing(false);
updateListing();
break;
case kListSelectionChangedCmd:
@ -392,7 +403,7 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
break;
case kReloadRomDirCmd:
updateListing(true);
updateListing();
break;
case kResizeCmd:

5
stella/src/gui/LauncherDialog.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: LauncherDialog.hxx,v 1.34 2008-03-14 19:34:56 stephena Exp $
// $Id: LauncherDialog.hxx,v 1.35 2008-11-30 17:28:03 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -62,10 +62,11 @@ class LauncherDialog : public Dialog
string selectedRomMD5();
protected:
virtual void handleKeyDown(int ascii, int keycode, int modifiers);
virtual void handleCommand(CommandSender* sender, int cmd, int data, int id);
void updateListing(bool fullReload = false);
void loadConfig();
void updateListing();
protected:
ButtonWidget* myStartButton;

3
stella/src/win32/SettingsWin32.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: SettingsWin32.cxx,v 1.29 2008-05-04 17:16:39 stephena Exp $
// $Id: SettingsWin32.cxx,v 1.30 2008-11-30 17:28:03 stephena Exp $
//============================================================================
#include "bspf.hxx"
@ -28,7 +28,6 @@ SettingsWin32::SettingsWin32(OSystem* osystem)
// Anything less than this usually causes sound skipping
setInternal("fragsize", "2048");
// Most Windows systems work better without this
setInternal("dirtyrects", "false");
setInternal("romdir", "c:\\");
}