mirror of https://github.com/stella-emu/stella.git
Fixed long-standing GUI drawing bug whereby items were being redrawn
before a certain state was entered. For example, launching a game and bypassing the ROM launcher would attempt to draw elements from the debugger, with coordinates that were usually larger than the current screen. Made system-wide location of stella.pro/stellarc files configurable at build-time. They're now stored in DATADIR/stella, where DATADIR can be changed with "--datadir=..." during configure. This is only enabled for UNIX for now. Added missing 'cheat' and 'break' to commandline description. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@964 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena
parent
d75868d33d
commit
0ffc5863a7
|
|
@ -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: Makefile,v 1.15 2006-01-08 02:28:01 stephena Exp $
|
||||
## $Id: Makefile,v 1.16 2006-01-15 20:46:19 stephena Exp $
|
||||
##
|
||||
## Based on code from ScummVM - Scumm Interpreter
|
||||
## Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -168,7 +168,7 @@ install: all
|
|||
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons"
|
||||
$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons"
|
||||
$(INSTALL) -d "$(DESTDIR)/etc"
|
||||
$(INSTALL) -c -m 644 "$(srcdir)/src/emucore/stella.pro" "$(DESTDIR)/etc"
|
||||
$(INSTALL) -c -m 644 "$(srcdir)/src/emucore/stella.pro" "$(DESTDIR)$(PROPDIR)"
|
||||
|
||||
install-strip: install
|
||||
strip stella$(EXEEXT)
|
||||
|
|
|
|||
|
|
@ -591,7 +591,7 @@ else
|
|||
;;
|
||||
os2*)
|
||||
DEFINES="$DEFINES -DUNIX -DOS2"
|
||||
LIBS="$LIBS -lpng -lz"
|
||||
LIBS="$LIBS -lpng -lz"
|
||||
_host_os=unix
|
||||
;;
|
||||
# given this is a shell script assume some type of unix
|
||||
|
|
@ -780,6 +780,9 @@ case $_host_os in
|
|||
if test "$_build_gl" = yes ; then
|
||||
DEFINES="$DEFINES -DDISPLAY_OPENGL"
|
||||
fi
|
||||
# Add properties directory
|
||||
PROPDIR="$_datadir/stella"
|
||||
DEFINES="$DEFINES -DPROPDIR=\"\\\"$PROPDIR\\\"\""
|
||||
;;
|
||||
win32)
|
||||
DEFINES="$DEFINES -DBSPF_WIN32 -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
|
||||
|
|
|
|||
|
|
@ -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.52 2006-01-15 16:31:00 stephena Exp $
|
||||
// $Id: FrameBufferGL.cxx,v 1.53 2006-01-15 20:46:19 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#ifdef DISPLAY_OPENGL
|
||||
|
|
@ -573,7 +573,10 @@ void FrameBufferGL::cls()
|
|||
bool FrameBufferGL::createTextures()
|
||||
{
|
||||
if(myTexture)
|
||||
{
|
||||
SDL_FreeSurface(myTexture);
|
||||
myTexture = NULL;
|
||||
}
|
||||
|
||||
p_glDeleteTextures(1, &myTextureID);
|
||||
|
||||
|
|
|
|||
|
|
@ -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: ContextMenu.cxx,v 1.4 2005-10-06 17:28:55 stephena Exp $
|
||||
// $Id: ContextMenu.cxx,v 1.5 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -187,7 +187,6 @@ void ContextMenu::drawDialog()
|
|||
// by the ScummVM guys, so I'm not going to mess with it.
|
||||
if(_dirty)
|
||||
{
|
||||
// cerr << "ContextMenu::drawDialog()" << endl;
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
|
||||
fb.fillRect(_x+1, _y+1, _w-2, _h-2, kBGColor);
|
||||
|
|
|
|||
|
|
@ -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: DataGridOpsWidget.cxx,v 1.1 2005-08-30 17:51:26 stephena Exp $
|
||||
// $Id: DataGridOpsWidget.cxx,v 1.2 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -71,6 +71,16 @@ DataGridOpsWidget::DataGridOpsWidget(GuiObject* boss, int x, int y)
|
|||
// Calculate real dimensions
|
||||
_w = xpos + bwidth;
|
||||
_h = ypos + bheight;
|
||||
|
||||
// We don't enable the buttons until the DataGridWidget is attached
|
||||
// Don't call setEnabled(false), since that does an immediate redraw
|
||||
_zeroButton->clearFlags(WIDGET_ENABLED);
|
||||
_invButton->clearFlags(WIDGET_ENABLED);
|
||||
_negButton->clearFlags(WIDGET_ENABLED);
|
||||
_incButton->clearFlags(WIDGET_ENABLED);
|
||||
_decButton->clearFlags(WIDGET_ENABLED);
|
||||
_shiftLeftButton->clearFlags(WIDGET_ENABLED);
|
||||
_shiftRightButton->clearFlags(WIDGET_ENABLED);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
|||
|
|
@ -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: DataGridWidget.cxx,v 1.4 2005-12-18 18:37:02 stephena Exp $
|
||||
// $Id: DataGridWidget.cxx,v 1.5 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -480,6 +480,7 @@ void DataGridWidget::handleCommand(CommandSender* sender, int cmd,
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void DataGridWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "DataGridWidget::drawWidget\n";
|
||||
FrameBuffer& fb = _boss->instance()->frameBuffer();
|
||||
int row, col, deltax;
|
||||
string buffer;
|
||||
|
|
|
|||
|
|
@ -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.10 2005-12-20 19:05:15 stephena Exp $
|
||||
// $Id: DebuggerDialog.cxx,v 1.11 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -225,7 +225,6 @@ void DebuggerDialog::addRomArea()
|
|||
|
||||
xpos = r.left + 10 + myCpu->getWidth() + 20;
|
||||
DataGridOpsWidget* ops = new DataGridOpsWidget(this, xpos, 20);
|
||||
ops->setEnabled(false);
|
||||
|
||||
int buttonX = r.right - kButtonWidth - 5, buttonY = r.top + 5;
|
||||
addButton(buttonX, buttonY, "Step", kDDStepCmd, 0);
|
||||
|
|
|
|||
|
|
@ -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: PromptWidget.cxx,v 1.5 2005-10-15 16:38:17 urchlay Exp $
|
||||
// $Id: PromptWidget.cxx,v 1.6 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -822,6 +822,7 @@ void PromptWidget::print(const string& str)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void PromptWidget::drawCaret()
|
||||
{
|
||||
//cerr << "PromptWidget::drawCaret()\n";
|
||||
FrameBuffer& fb = _boss->instance()->frameBuffer();
|
||||
|
||||
int line = _currentPos / _lineWidth;
|
||||
|
|
|
|||
|
|
@ -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: TiaOutputWidget.cxx,v 1.7 2005-10-11 19:38:10 stephena Exp $
|
||||
// $Id: TiaOutputWidget.cxx,v 1.8 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -49,7 +49,6 @@ TiaOutputWidget::TiaOutputWidget(GuiObject* boss, int x, int y, int w, int h)
|
|||
l.push_back("Set zoom position");
|
||||
|
||||
myMenu->setList(l);
|
||||
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
|||
|
|
@ -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: ToggleBitWidget.cxx,v 1.1 2005-08-30 17:51:26 stephena Exp $
|
||||
// $Id: ToggleBitWidget.cxx,v 1.2 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -73,6 +73,7 @@ void ToggleBitWidget::setState(const BoolArray& state, const BoolArray& changed)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void ToggleBitWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "ToggleBitWidget::drawWidget\n";
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
int row, col;
|
||||
string buffer;
|
||||
|
|
|
|||
|
|
@ -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: TogglePixelWidget.cxx,v 1.1 2005-08-30 17:51:26 stephena Exp $
|
||||
// $Id: TogglePixelWidget.cxx,v 1.2 2006-01-15 20:46:19 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -112,6 +112,7 @@ int TogglePixelWidget::getIntState()
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void TogglePixelWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "TogglePixelWidget::drawWidget\n";
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
int row, col;
|
||||
|
||||
|
|
|
|||
|
|
@ -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: Settings.cxx,v 1.75 2006-01-14 21:36:29 stephena Exp $
|
||||
// $Id: Settings.cxx,v 1.76 2006-01-15 20:46:19 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <cassert>
|
||||
|
|
@ -308,6 +308,7 @@ void Settings::usage()
|
|||
<< " -clipvol <1|0> Enable volume clipping (eliminates popping)\n"
|
||||
<< endl
|
||||
#endif
|
||||
<< " -cheat <code> Use the specified cheatcode (see manual for description)\n"
|
||||
<< " -showinfo <1|0> Shows some game info\n"
|
||||
<< " -paddle <0|1|2|3> Indicates which paddle the mouse should emulate\n"
|
||||
<< " -sa1 <left|right> Stelladaptor 1 emulates specified joystick port\n"
|
||||
|
|
@ -333,6 +334,7 @@ void Settings::usage()
|
|||
<< " The following options are meant for developers\n"
|
||||
<< " Arguments are more fully explained in the manual\n"
|
||||
<< endl
|
||||
<< " -break <address> Set a breakpoint at 'address'\n"
|
||||
<< " -debugheight <number> Set height of debugger in lines of text (NOT pixels)\n"
|
||||
<< " -debug Start in debugger mode\n"
|
||||
<< " -holdreset Start the emulator with the Game Reset switch held down\n"
|
||||
|
|
|
|||
|
|
@ -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: EditTextWidget.cxx,v 1.12 2005-10-04 22:46:52 stephena Exp $
|
||||
// $Id: EditTextWidget.cxx,v 1.13 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -34,8 +34,6 @@ EditTextWidget::EditTextWidget(GuiObject* boss, int x, int y, int w, int h,
|
|||
_type = kEditTextWidget;
|
||||
|
||||
_editable = true;
|
||||
|
||||
setEditString(text);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
@ -72,6 +70,7 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EditTextWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "EditTextWidget::drawWidget\n";
|
||||
FrameBuffer& fb = _boss->instance()->frameBuffer();
|
||||
|
||||
// Draw a thin frame around us.
|
||||
|
|
|
|||
|
|
@ -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: EditableWidget.cxx,v 1.14 2005-10-09 20:41:56 stephena Exp $
|
||||
// $Id: EditableWidget.cxx,v 1.15 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -162,6 +162,7 @@ int EditableWidget::getCaretOffset() const
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EditableWidget::drawCaret()
|
||||
{
|
||||
//cerr << "EditableWidget::drawCaret()\n";
|
||||
// Only draw if item is visible
|
||||
if (!_editable || !isVisible() || !_boss->isVisible() || !_hasFocus)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -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: EventMappingWidget.cxx,v 1.9 2006-01-09 19:30:04 stephena Exp $
|
||||
// $Id: EventMappingWidget.cxx,v 1.10 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -34,7 +34,8 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, int x, int y, int w, int
|
|||
: Widget(boss, x, y, w, h),
|
||||
CommandSender(boss),
|
||||
myActionSelected(-1),
|
||||
myRemapStatus(false)
|
||||
myRemapStatus(false),
|
||||
myFirstTime(true)
|
||||
{
|
||||
const GUI::Font& font = instance()->font();
|
||||
const int fontHeight = font.getFontHeight(),
|
||||
|
|
@ -81,7 +82,6 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, int x, int y, int w, int
|
|||
l.push_back(EventHandler::ourActionList[i].action);
|
||||
|
||||
myActionsList->setList(l);
|
||||
myActionsList->setSelected(0);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
@ -92,6 +92,13 @@ EventMappingWidget::~EventMappingWidget()
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EventMappingWidget::loadConfig()
|
||||
{
|
||||
//cerr << "EventMappingWidget::loadConfig()\n";
|
||||
if(myFirstTime)
|
||||
{
|
||||
myActionsList->setSelected(0);
|
||||
myFirstTime = false;
|
||||
}
|
||||
|
||||
// Make sure remapping is turned off, just in case the user didn't properly
|
||||
// exit last time
|
||||
stopRemapping();
|
||||
|
|
|
|||
|
|
@ -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: EventMappingWidget.hxx,v 1.5 2006-01-09 19:30:04 stephena Exp $
|
||||
// $Id: EventMappingWidget.hxx,v 1.6 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -83,6 +83,8 @@ class EventMappingWidget : public Widget, public CommandSender
|
|||
// Indicates if we're currently in remap mode
|
||||
// In this mode, the next event received is remapped to some action
|
||||
bool myRemapStatus;
|
||||
|
||||
bool myFirstTime;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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: GuiObject.hxx,v 1.17 2006-01-04 01:24:17 stephena Exp $
|
||||
// $Id: GuiObject.hxx,v 1.18 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -47,7 +47,7 @@ enum {
|
|||
This is the base class for all GUI objects/widgets.
|
||||
|
||||
@author Stephen Anthony
|
||||
@version $Id: GuiObject.hxx,v 1.17 2006-01-04 01:24:17 stephena Exp $
|
||||
@version $Id: GuiObject.hxx,v 1.18 2006-01-15 20:46:20 stephena Exp $
|
||||
*/
|
||||
class GuiObject : public CommandReceiver
|
||||
{
|
||||
|
|
@ -62,7 +62,7 @@ class GuiObject : public CommandReceiver
|
|||
_y(y),
|
||||
_w(w),
|
||||
_h(h),
|
||||
_dirty(true),
|
||||
_dirty(false),
|
||||
_font((GUI::Font*)&(osystem->font())),
|
||||
_firstWidget(0) {}
|
||||
|
||||
|
|
|
|||
|
|
@ -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: InputDialog.cxx,v 1.9 2006-01-09 19:30:04 stephena Exp $
|
||||
// $Id: InputDialog.cxx,v 1.10 2006-01-15 20:46:20 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include "OSystem.hxx"
|
||||
|
|
@ -35,9 +35,8 @@ enum {
|
|||
};
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
InputDialog::InputDialog(
|
||||
OSystem* osystem, DialogContainer* parent,
|
||||
int x, int y, int w, int h)
|
||||
InputDialog::InputDialog(OSystem* osystem, DialogContainer* parent,
|
||||
int x, int y, int w, int h)
|
||||
: Dialog(osystem, parent, x, y, w, h)
|
||||
{
|
||||
const int vBorder = 4;
|
||||
|
|
@ -180,6 +179,8 @@ void InputDialog::addVDeviceTab()
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void InputDialog::loadConfig()
|
||||
{
|
||||
myEventMapper->loadConfig();
|
||||
|
||||
// Left & right ports
|
||||
const string& sa1 = instance()->settings().getString("sa1");
|
||||
int lport = sa1 == "right" ? 2 : 1;
|
||||
|
|
|
|||
|
|
@ -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: ListWidget.cxx,v 1.38 2006-01-04 01:24:17 stephena Exp $
|
||||
// $Id: ListWidget.cxx,v 1.39 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -117,7 +117,7 @@ void ListWidget::scrollTo(int item)
|
|||
if (item < 0)
|
||||
item = 0;
|
||||
|
||||
if (_currentPos != item)
|
||||
if(_currentPos != item)
|
||||
{
|
||||
_currentPos = item;
|
||||
scrollBarRecalc();
|
||||
|
|
@ -138,18 +138,16 @@ void ListWidget::recalc()
|
|||
_selectedItem = 0;
|
||||
|
||||
_editMode = false;
|
||||
scrollBarRecalc();
|
||||
|
||||
_scrollBar->_numEntries = _list.size();
|
||||
_scrollBar->_entriesPerPage = _rows;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void ListWidget::scrollBarRecalc()
|
||||
{
|
||||
_scrollBar->_numEntries = _list.size();
|
||||
_scrollBar->_entriesPerPage = _rows;
|
||||
_scrollBar->_currentPos = _currentPos;
|
||||
_scrollBar->_currentPos = _currentPos;
|
||||
_scrollBar->recalc();
|
||||
|
||||
setDirty(); draw();
|
||||
sendCommand(kListScrolledCmd, _currentPos, _id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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: PopUpWidget.cxx,v 1.22 2005-10-02 22:09:12 stephena Exp $
|
||||
// $Id: PopUpWidget.cxx,v 1.23 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -68,6 +68,7 @@ void PopUpDialog::drawDialog()
|
|||
{
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
|
||||
//cerr << "PopUpDialog::drawDialog()\n";
|
||||
// Draw the menu border
|
||||
fb.hLine(_x, _y, _x + _w - 1, kColor);
|
||||
fb.hLine(_x, _y + _h - 1, _x + _w - 1, kShadowColor);
|
||||
|
|
@ -161,6 +162,7 @@ void PopUpDialog::handleKeyDown(int ascii, int keycode, int modifiers)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void PopUpDialog::drawMenuEntry(int entry, bool hilite)
|
||||
{
|
||||
//cerr << "PopUpDialog::drawMenuEntry\n";
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
|
||||
// Draw one entry of the popup menu, including selection
|
||||
|
|
@ -466,6 +468,7 @@ void PopUpWidget::setSelectedTag(int tag)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void PopUpWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "PopUpWidget::drawWidget\n";
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
|
||||
int x = _x + _labelWidth;
|
||||
|
|
|
|||
|
|
@ -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: ScrollBarWidget.cxx,v 1.11 2005-08-10 12:23:42 stephena Exp $
|
||||
// $Id: ScrollBarWidget.cxx,v 1.12 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -223,6 +223,7 @@ void ScrollBarWidget::handleMouseLeft(int button)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void ScrollBarWidget::recalc()
|
||||
{
|
||||
//cerr << "ScrollBarWidget::recalc()\n";
|
||||
if(_numEntries > _entriesPerPage)
|
||||
{
|
||||
_sliderHeight = (_h - 2 * UP_DOWN_BOX_HEIGHT) * _entriesPerPage / _numEntries;
|
||||
|
|
|
|||
|
|
@ -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: StringListWidget.cxx,v 1.3 2006-01-04 01:24:17 stephena Exp $
|
||||
// $Id: StringListWidget.cxx,v 1.4 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -47,6 +47,7 @@ void StringListWidget::setList(const StringList& list)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void StringListWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "StringListWidget::drawWidget\n";
|
||||
FrameBuffer& fb = _boss->instance()->frameBuffer();
|
||||
int i, pos, len = _list.size();
|
||||
string buffer;
|
||||
|
|
|
|||
|
|
@ -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: TabWidget.cxx,v 1.19 2005-12-21 01:50:16 stephena Exp $
|
||||
// $Id: TabWidget.cxx,v 1.20 2006-01-15 20:46:20 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -217,6 +217,7 @@ void TabWidget::loadConfig()
|
|||
void TabWidget::box(int x, int y, int width, int height,
|
||||
OverlayColor colorA, OverlayColor colorB, bool omitBottom)
|
||||
{
|
||||
//cerr << "TabWidget::box\n";
|
||||
FrameBuffer& fb = _boss->instance()->frameBuffer();
|
||||
|
||||
fb.hLine(x + 1, y, x + width - 2, colorA);
|
||||
|
|
@ -236,6 +237,7 @@ void TabWidget::box(int x, int y, int width, int height,
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void TabWidget::drawWidget(bool hilite)
|
||||
{
|
||||
//cerr << "TabWidget::drawWidget\n";
|
||||
// The tab widget is strange in that it acts as both a widget (obviously)
|
||||
// and a dialog (it contains other widgets). Because of the latter,
|
||||
// it must assume responsibility for refreshing all its children.
|
||||
|
|
|
|||
|
|
@ -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: OSystemUNIX.cxx,v 1.14 2006-01-08 02:28:04 stephena Exp $
|
||||
// $Id: OSystemUNIX.cxx,v 1.15 2006-01-15 20:46:20 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <SDL.h>
|
||||
|
|
@ -46,10 +46,6 @@
|
|||
setConfigFiles()
|
||||
setCacheFile()
|
||||
|
||||
And for initializing the following variables:
|
||||
|
||||
myDriverList (a StringList)
|
||||
|
||||
See OSystem.hxx for a further explanation
|
||||
*/
|
||||
|
||||
|
|
@ -63,16 +59,15 @@ OSystemUNIX::OSystemUNIX()
|
|||
string statedir = basedir + "/state";
|
||||
setStateDir(statedir);
|
||||
|
||||
setPropertiesDir(basedir, "/etc");
|
||||
string propdir = PROPDIR; // Hopefully this is defined
|
||||
setPropertiesDir(basedir, propdir);
|
||||
|
||||
string userConfigFile = basedir + "/stellarc";
|
||||
string systemConfigFile = "/etc/stellarc";
|
||||
string systemConfigFile = propdir + "/stellarc";
|
||||
setConfigFiles(userConfigFile, systemConfigFile);
|
||||
|
||||
string cacheFile = basedir + "/stella.cache";
|
||||
setCacheFile(cacheFile);
|
||||
|
||||
// No drivers are specified for Unix
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
|||
Loading…
Reference in New Issue