From 66b565c9c2db447b3080d781ca60c12f78348dbf Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 18 Jul 2009 22:17:56 +0000
Subject: Fix crash in tab completion if one command is a prefix of another.
svn-id: r42597
---
gui/debugger.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gui')
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 181403484b..6b55681a25 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -307,7 +307,8 @@ bool Debugger::tabComplete(const char *input, Common::String &completion) const
} else {
// take common prefix of previous match and this command
for (uint j = 0; j < completion.size(); j++) {
- if (completion[j] != i->_key[inputlen + j]) {
+ if (inputlen + j >= i->_key.size() ||
+ completion[j] != i->_key[inputlen + j]) {
completion = Common::String(completion.begin(), completion.begin() + j);
// If there is no unambiguous completion, abort
if (completion.empty())
--
cgit v1.2.3
From 00af395ab6a07250c7f3e7b8870cf328c72cde47 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 19 Jul 2009 21:06:25 +0000
Subject: Fix compilation with USE_CONSOLE = 0
svn-id: r42623
---
gui/debugger.cpp | 9 ++++++++-
gui/debugger.h | 4 +++-
2 files changed, 11 insertions(+), 2 deletions(-)
(limited to 'gui')
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 6b55681a25..dd292a3a8a 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -39,9 +39,11 @@ Debugger::Debugger() {
_isAttached = false;
_errStr = NULL;
_firstTime = true;
+#if USE_CONSOLE
_debuggerDialog = new GUI::ConsoleDialog(1.0f, 0.67f);
_debuggerDialog->setInputCallback(debuggerInputCallback, this);
_debuggerDialog->setCompletionCallback(debuggerCompletionCallback, this);
+#endif
//DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit));
DCmd_Register("exit", WRAP_METHOD(Debugger, Cmd_Exit));
@@ -55,7 +57,9 @@ Debugger::Debugger() {
}
Debugger::~Debugger() {
+#if USE_CONSOLE
delete _debuggerDialog;
+#endif
}
@@ -357,8 +361,11 @@ bool Debugger::Cmd_Exit(int argc, const char **argv) {
// Print a list of all registered commands (and variables, if any),
// nicely word-wrapped.
bool Debugger::Cmd_Help(int argc, const char **argv) {
-
+#if USE_CONSOLE
const int charsPerLine = _debuggerDialog->getCharsPerLine();
+#else
+ const int charsPerLine = 80;
+#endif
int width, size;
uint i;
diff --git a/gui/debugger.h b/gui/debugger.h
index e84da594be..1baf99faeb 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -35,7 +35,7 @@ namespace GUI {
// Choose between text console or ScummConsole
#define USE_CONSOLE 1
-#ifdef USE_CONSOLE
+#if USE_CONSOLE
class ConsoleDialog;
#endif
@@ -86,7 +86,9 @@ private:
bool _isAttached;
char *_errStr;
bool _firstTime;
+#if USE_CONSOLE
GUI::ConsoleDialog *_debuggerDialog;
+#endif
protected:
// Hook for subclasses: Called just before enter() is run
--
cgit v1.2.3
From 4e71153249c5f2337fced281ccf47f2f7f6463b4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 22 Jul 2009 20:37:48 +0000
Subject: Fix bug #2825252: "GUI: Low Res Bugs"
svn-id: r42668
---
gui/ThemeEngine.h | 2 +-
gui/themes/default.inc | 1894 ++++++++++----------
gui/themes/scummclassic.zip | Bin 53307 -> 53286 bytes
gui/themes/scummclassic/THEMERC | 2 +-
gui/themes/scummclassic/classic_layout_lowres.stx | 12 +-
gui/themes/scummmodern.zip | Bin 157995 -> 157974 bytes
gui/themes/scummmodern/THEMERC | 2 +-
.../scummmodern/scummmodern_layout_lowres.stx | 12 +-
8 files changed, 962 insertions(+), 962 deletions(-)
(limited to 'gui')
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 75f42618a6..c2b6db7119 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -32,7 +32,7 @@
#include "graphics/surface.h"
#include "graphics/fontman.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.5"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.6"
namespace Graphics {
struct DrawStep;
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 0331c90fbb..de9ae3a37c 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,403 +1,470 @@
""
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
-" "
+" "
+" "
+" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
+" "
+" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
-" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
-" "
-" "
-" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
+" "
-" "
+" "
+" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
-" "
-" "
+" "
+" "
+" "
-" "
-" "
-" "
+" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
+" "
" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
+" "
" "
" "
" "
-" "
-" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
+" "
" "
" "
+" "
+" "
+" "
" "
" "
" "
" "
" "
" "
" "
" "
" "
-" "
-" "
+" "
+" "
+" "
" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
+" "
" "
" "
" "
-" "
-" "
-" "
-" "
+" "
+" "
+" "
+" "
+" "
+" "
" "
" "
-" "
-" "
-" "
" "
" "
" "
" "
" "
" "
" "
" "
" "
-"