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

Reverted the previous changes, since it looks like I'll have to revert back 

to a TabWidget and PromptWidget, and it's going to take some time.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@478 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-06-09 20:09:23 +00:00
parent 7e7d0b57f5
commit c988604949
4 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stella/src/gui/DebuggerDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: DebuggerDialog.cxx,v 1.5 2005-06-09 19:04:59 stephena Exp $ // $Id: DebuggerDialog.cxx,v 1.6 2005-06-09 20:09:22 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -47,7 +47,7 @@ DebuggerDialog::DebuggerDialog(OSystem* osystem, DialogContainer* parent,
const int space = 5; const int space = 5;
const int width = 40; const int width = 40;
int xpos = border; int xpos = border;
/*
// Add a row of buttons for the various debugger operations // Add a row of buttons for the various debugger operations
new ButtonWidget(this, xpos, border, width, 16, "Prompt", kPromptCmd, 0); new ButtonWidget(this, xpos, border, width, 16, "Prompt", kPromptCmd, 0);
xpos += space + width; xpos += space + width;
@ -61,14 +61,12 @@ DebuggerDialog::DebuggerDialog(OSystem* osystem, DialogContainer* parent,
xpos += space + width; xpos += space + width;
new ButtonWidget(this, xpos, border, width, 16, "Code", kCodeCmd, 0); new ButtonWidget(this, xpos, border, width, 16, "Code", kCodeCmd, 0);
xpos += space + width; xpos += space + width;
*/
const int xoff = border; const int xoff = border;
const int yoff = border + 16 + 2; const int yoff = border + 16 + 2;
// Create the debugger dialog boxes // Create the debugger dialog boxes
// myPromptDialog = new PromptDialog(this, osystem, parent, x, y, w, h); myPromptDialog = new PromptDialog(osystem, parent, x + xoff, y + yoff,
myPromptDialog = new PromptDialog(this, osystem, parent, x + xoff, y + yoff,
w - xoff - 2, h - yoff - 3); w - xoff - 2, h - yoff - 3);
} }

4
stella/src/gui/ListWidget.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: ListWidget.cxx,v 1.12 2005-06-08 18:45:09 stephena Exp $ // $Id: ListWidget.cxx,v 1.13 2005-06-09 20:09:23 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -190,7 +190,7 @@ bool ListWidget::handleKeyDown(int ascii, int keycode, int modifiers)
{ {
// Ignore all mod keys // Ignore all mod keys
if(instance()->eventHandler().kbdControl(modifiers) || if(instance()->eventHandler().kbdControl(modifiers) ||
instance()->eventHandler().kbdControl(modifiers)) instance()->eventHandler().kbdAlt(modifiers))
return true; return true;
bool handled = true; bool handled = true;

27
stella/src/gui/PromptDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: PromptDialog.cxx,v 1.8 2005-06-09 19:04:59 stephena Exp $ // $Id: PromptDialog.cxx,v 1.9 2005-06-09 20:09:23 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -39,29 +39,10 @@
*/ */
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PromptDialog::PromptDialog(DebuggerDialog* dbg, OSystem* osystem, PromptDialog::PromptDialog(OSystem* osystem, DialogContainer* parent,
DialogContainer* parent,
int x, int y, int w, int h) int x, int y, int w, int h)
: Dialog(osystem, parent, x, y, w, h), : Dialog(osystem, parent, x, y, w, h)
myDebuggerDialog(dbg)
{ {
// Add the buttons common to all DebuggerDialog children
// myDebuggerDialog->addButtons(this);
/*
const int border = 5;
const int space = 5;
const int width = 40;
int xpos = border;
// Add a row of buttons for the various debugger operations
new ButtonWidget(this, xpos, border, width, 16, "Prompt", 0, 0);
*/
new ButtonWidget(this, 10, 10, 50, 20, "Prompt", 0);
_kConsoleCharWidth = instance()->consoleFont().getMaxCharWidth(); _kConsoleCharWidth = instance()->consoleFont().getMaxCharWidth();
_kConsoleLineHeight = instance()->consoleFont().getFontHeight() + 2; _kConsoleLineHeight = instance()->consoleFont().getFontHeight() + 2;
@ -111,7 +92,7 @@ void PromptDialog::loadConfig()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PromptDialog::drawDialog1() void PromptDialog::drawDialog()
{ {
FrameBuffer& fb = instance()->frameBuffer(); FrameBuffer& fb = instance()->frameBuffer();

10
stella/src/gui/PromptDialog.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: PromptDialog.hxx,v 1.6 2005-06-09 19:04:59 stephena Exp $ // $Id: PromptDialog.hxx,v 1.7 2005-06-09 20:09:23 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -25,7 +25,6 @@
class CommandSender; class CommandSender;
class DialogContainer; class DialogContainer;
class ScrollBarWidget; class ScrollBarWidget;
class DebuggerDialog;
#include <stdarg.h> #include <stdarg.h>
#include "Dialog.hxx" #include "Dialog.hxx"
@ -40,7 +39,7 @@ enum {
class PromptDialog : public Dialog class PromptDialog : public Dialog
{ {
public: public:
PromptDialog(DebuggerDialog* dbg, OSystem* osystem, DialogContainer* parent, PromptDialog(OSystem* osystem, DialogContainer* parent,
int x, int y, int w, int h); int x, int y, int w, int h);
virtual ~PromptDialog(); virtual ~PromptDialog();
@ -53,7 +52,7 @@ class PromptDialog : public Dialog
protected: protected:
inline char &buffer(int idx) { return _buffer[idx % kBufferSize]; } inline char &buffer(int idx) { return _buffer[idx % kBufferSize]; }
void drawDialog1(); void drawDialog();
void drawCaret(); void drawCaret();
void putcharIntern(int c); void putcharIntern(int c);
void insertIntoPrompt(const char *str); void insertIntoPrompt(const char *str);
@ -101,9 +100,6 @@ class PromptDialog : public Dialog
int _historyLine; int _historyLine;
int _kConsoleCharWidth, _kConsoleLineHeight; int _kConsoleCharWidth, _kConsoleLineHeight;
private:
DebuggerDialog* myDebuggerDialog;
}; };
#endif #endif