libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-11 05:36:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WAGE: Implemented text console callback

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-04-19 11:14:48 +02:00
parent c9d3b7210e
commit 6f03947bc9
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/wage/gui.cpp
View File

@ -143,6 +143,9 @@ static void cursorTimerHandler(void *refCon) {
gui->_cursorDirty = true;
}
static void sceneWindowCallback(WindowClick click, Common::Event &event, void *gui);
static void consoleWindowCallback(WindowClick click, Common::Event &event, void *gui);
Gui::Gui(WageEngine *engine) {
_engine = engine;
_scene = NULL;
@ -190,7 +193,10 @@ Gui::Gui(WageEngine *engine) {
_menu = new Menu(this);
_sceneWindow = _wm.add(false);
_sceneWindow->setCallback(sceneWindowCallback, this);
_consoleWindow = _wm.add(true);
_consoleWindow->setCallback(consoleWindowCallback, this);
}
Gui::~Gui() {
@ -303,6 +309,9 @@ void Gui::drawScene() {
_consoleTextArea.setHeight(_scene->_textBounds->height() - 2 * kBorderWidth);
}
static void sceneWindowCallback(WindowClick click, Common::Event &event, void *gui) {
}
// Render console
void Gui::drawConsole() {
if (!_consoleDirty && !_consoleFullRedraw && !_bordersDirty && !_sceneDirty)
@ -314,6 +323,22 @@ void Gui::drawConsole() {
_consoleWindow->setDirty(true);
}
static void consoleWindowCallback(WindowClick click, Common::Event &event, void *g) {
Gui *gui = (Gui *)g;
if (click == kBorderScrollUp || click == kBorderScrollDown) {
int textFullSize = gui->getLinesSize() * gui->getConsoleLineHeight() + gui->getConsoleTextAreaHeight();
float scrollPos = (float)gui->getScrollPos() / textFullSize;
float scrollSize = (float)gui->getConsoleTextAreaHeight() / textFullSize;
gui->_consoleWindow->setScroll(scrollPos, scrollSize);
warning("pos: %f size: %f", scrollPos, scrollSize);
return;
}
}
void Gui::drawBox(Graphics::ManagedSurface *g, int x, int y, int w, int h) {
Common::Rect r(x, y, x + w + 1, y + h + 1);

10
engines/wage/gui.h
View File

@ -114,6 +114,11 @@ public:
bool builtInFonts() { return _builtInFonts; }
uint getScrollPos() { return _scrollPos; }
uint getLinesSize() { return _lines.size(); }
int getConsoleLineHeight() { return _consoleLineHeight; }
int getConsoleTextAreaHeight() { return _consoleTextArea.height(); }
private:
void drawScene();
void drawConsole();
@ -150,6 +155,9 @@ public:
bool _menuDirty;
MacWindow *_sceneWindow;
MacWindow *_consoleWindow;
private:
Graphics::ManagedSurface _console;
Menu *_menu;
@ -181,8 +189,6 @@ private:
int _inputTextLineNum;
MacWindowManager _wm;
MacWindow *_sceneWindow;
MacWindow *_consoleWindow;
};
} // End of namespace Wage

2
engines/wage/macwindow.cpp
View File

@ -294,6 +294,7 @@ bool MacWindow::processEvent(Common::Event &event) {
}
void MacWindow::mouseDown(Common::Event &event) {
_innerDims.debugPrint();
if (_innerDims.contains(event.mouse.x, event.mouse.y)) {
if (!_callback)
return;
@ -303,6 +304,7 @@ void MacWindow::mouseDown(Common::Event &event) {
}
WindowClick click = isInBorder(_innerDims, event.mouse.x, event.mouse.y);
warning("click: %d", click);
if (click == kBorderNone)
return;

2
engines/wage/macwindow.h
View File

@ -82,7 +82,7 @@ public:
Graphics::ManagedSurface *getSurface() { return &_surface; }
void setTitle(Common::String &title) { _title = title; }
void setHighlight(WindowClick highlightedPart) { _highlightedPart = highlightedPart; }
void setScroll(float scrollPos, float scrollSize) { _scrollPos = scrollPos; _scrollSize = scrollSize; }
void setScroll(float scrollPos, float scrollSize) { _scrollPos = scrollPos; _scrollSize = scrollSize; _borderIsDirty = true; }
void setDirty(bool dirty) { _contentIsDirty = dirty; }
int getId() { return _id; }
bool processEvent(Common::Event &event);