diff engine/core/gui/console/console.cpp @ 697:ecaa4d98f05f tip

Abstracted the GUI code and refactored the GUIChan-specific code into its own module. * Most of the GUIChan code has been refactored into its own gui/guichan module. However, references to the GuiFont class still persist in the Engine and GuiManager code and these will need further refactoring. * GuiManager is now an abstract base class which specific implementations (e.g. GUIChan) should subclass. * The GUIChan GUI code is now a concrete implementation of GuiManager, most of which is in the new GuiChanGuiManager class. * The GUI code in the Console class has been refactored out of the Console and into the GUIChan module as its own GuiChanConsoleWidget class. The rest of the Console class related to executing commands was left largely unchanged. * Existing client code may need to downcast the GuiManager pointer received from FIFE::Engine::getGuiManager() to GuiChanGuiManager, since not all functionality is represented in the GuiManager abstract base class. Python client code can use the new GuiChanGuiManager.castTo static method for this purpose.
author M. George Hansen <technopolitica@gmail.com>
date Sat, 18 Jun 2011 00:28:40 -1000
parents e201abd8c807
children
line wrap: on
line diff
--- a/engine/core/gui/console/console.cpp	Fri Jun 10 23:37:46 2011 -1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,309 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2008 by the FIFE team                              *
- *   http://www.fifengine.de                                               *
- *   This file is part of FIFE.                                            *
- *                                                                         *
- *   FIFE is free software; you can redistribute it and/or                 *
- *   modify it under the terms of the GNU Lesser General Public            *
- *   License as published by the Free Software Foundation; either          *
- *   version 2.1 of the License, or (at your option) any later version.    *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
-
-// Standard C++ library includes
-#include <cassert>
-
-// 3rd party library includes
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/regex.hpp>
-#include <boost/tokenizer.hpp>
-
-// FIFE includes
-// These includes are split up in two parts, separated by one empty line
-// First block: files included from the FIFE root src directory
-// Second block: files included from the same folder
-#include "video/renderbackend.h"
-#include "util/time/timemanager.h"
-#include "util/log/logger.h"
-#include "util/base/exception.h"
-#include "gui/guimanager.h"
-#include "gui/base/gui_font.h"
-#include "gui/widgets/utf8textbox.h"
-
-#include "commandline.h"
-#include "console.h"
-
-namespace FIFE {
-	const unsigned  Console::m_maxOutputRows = 50;
-	static Logger _log(LM_CONSOLE);
-
-	Console::Console()
-		: gcn::Container(),
-		m_consoleexec(0),
-		m_input(new CommandLine()),
-		m_output(new gcn::UTF8TextBox()),
-		m_outputscrollarea(new gcn::ScrollArea(m_output)),
-		m_status(new gcn::Label()),
-		m_toolsbutton(new gcn::Button("Tools"))
-		{
-		reLayout();
-
-		add(m_outputscrollarea);
-		add(m_input);
-		add(m_status);
-		add(m_toolsbutton);
-
-		setOpaque(true);
-
-		m_input->setCallback( std::bind1st( std::mem_fun(&Console::execute), this) );
-		m_prompt = "-- ";
-
-		m_isAttached = false;
-
-		m_fpsTimer.setInterval(500);
-		m_fpsTimer.setCallback( boost::bind(&Console::updateCaption, this) );
-
-		m_hiding = true;
-
-		m_animationTimer.setInterval(20);
-		m_animationTimer.setCallback( boost::bind(&Console::updateAnimation, this) );
-
-		m_toolsbutton->addActionListener(this);
-		m_toolsbutton->setFocusable(false);
-		m_input->addFocusListener(this);
-
-		GuiFont* font = GUIManager::instance()->createFont();
-		font->setColor(255,255,255);
-		setIOFont(font);
-	}
-
-	void Console::reLayout() {
-		Image* screen = RenderBackend::instance()->getScreenImage();
-		assert(screen);
-
-		int w, h, b, input_h, bbar_h, button_w;
-		w = screen->getWidth() * 4/5;
-		h = screen->getHeight() * 4/5;
-		b = 0;
-		input_h = getFont()->getHeight();
-		bbar_h = input_h;
-		button_w = 80;
-
-		gcn::Color black(0x00,0,0,0xff);
-		gcn::Color white(0xff,0xff,0xff,0xff);
-		gcn::Color dark(50,60,50,0xff);
-
-		setSize(w, h);
-		setPosition((screen->getWidth() - w) / 2,-h);
-		setFrameSize(0);
-
-		setForegroundColor(white);
-		setBackgroundColor(black);
-		setBaseColor(dark);
-
-		setSize(w, h);
-
-		m_outputscrollarea->setSize(w - 2*b, h - input_h - 3*b - bbar_h);
-		m_outputscrollarea->setPosition(b,0);
-
-		m_input->setPosition(b, h - input_h - b - bbar_h);
-		m_input->setSize(w - 2*b, input_h);
-
-		m_status->setPosition(b, h - b - bbar_h);
-		m_status->setSize(w - 2*b, bbar_h);
-
-		m_toolsbutton->setPosition(w - button_w, h - b - bbar_h);
-		m_toolsbutton->setSize(button_w, bbar_h);
-
-		m_output->setBackgroundColor(black);
-		m_output->setFocusable(false);
-
-		m_outputscrollarea->setBackgroundColor(black);
-		m_outputscrollarea->setBaseColor(dark);
-
-		m_input->setForegroundColor(white);
-		m_input->setBackgroundColor(black);
-
-		m_status->setForegroundColor(white);
-		m_status->setBackgroundColor(black);
-
-		m_toolsbutton->setForegroundColor(white);
-		m_toolsbutton->setBackgroundColor(black);
-		m_toolsbutton->setBaseColor(dark);
-
-		m_hiddenPos = -h;
-		m_animationDelta = h/6;
-	}
-
-	Console::~Console() {
-		doHide();
-
-		remove(m_input);
-		remove(m_outputscrollarea);
-		remove(m_status);
-
-		delete m_output;
-		delete m_input;
-		delete m_outputscrollarea;
-		delete m_status;
-		delete m_toolsbutton;
-	}
-
-	void Console::updateCaption() {
-		std::string caption = "FIFE Console - FPS: ";
-		float fps = 1e3/double(TimeManager::instance()->getAverageFrameTime());
-		caption += boost::lexical_cast<std::string>(fps);
-		m_status->setCaption( caption );
-	}
-
-	void Console::updateAnimation() {
-	    if (m_hiding){
-		setPosition(getX(), getY() - m_animationDelta);
-		if (getY() <= m_hiddenPos){
-		    doHide();
-			m_animationTimer.stop();
-		}
-	    }else{
-		setPosition(getX(), getY() + m_animationDelta);
-		if (getY() >= 0){
-		    setPosition(getX(), 0);
-			m_animationTimer.stop();
-		}
-	}
-	}
-
-	void Console::clear() {
-		m_output->setText("");
-	}
-
-	void Console::doShow() {
-		if (m_isAttached)
-			return;
-		m_isAttached = true;
-		GUIManager::instance()->add(this);
-		GUIManager::instance()->getTopContainer()->moveToTop(this);
-		// Assure the input field is focused when shown.
-		m_input->requestFocus();
-
-		m_fpsTimer.start();
-	}
-
-	void Console::doHide() {
-		if (!m_isAttached)
-			return;
-		m_isAttached = false;
-		GUIManager::instance()->remove(this);
-		m_fpsTimer.stop();
-	}
-
-	void Console::show() {
-		if(m_hiding) {
-			m_hiding = false;
-			doShow();
-			m_animationTimer.start();
-		}
-	}
-
-	void Console::hide() {
-		if(!m_hiding) {
-			m_hiding = true;
-			m_animationTimer.start();
-		}
-	}
-
-	void Console::toggleShowHide() {
-		m_hiding = !m_hiding;
-		if(!m_hiding)
-			doShow();
-		m_animationTimer.start();
-	}
-
-	void Console::execute(std::string cmd) {
- 		FL_DBG(_log, LMsg("in execute with command ") << cmd);
-		if (cmd.empty())
-			return;
-
-		// copy input to output
-		println(m_prompt + cmd);
-
-		// run the command
-		try {
-			if (m_consoleexec) {
-				std::string resp = m_consoleexec->onConsoleCommand(cmd);
-				println(resp);
-			} else {
-				FL_WARN(_log, LMsg("ConsoleExecuter not bind, but command received: ") << cmd.c_str());
-			}
-		}
-		catch (const FIFE::Exception & e) {
-			FL_WARN(_log, LMsg("Console caught exception: ") << e.what());
-			println(e.what());
-		}
-	}
-
-	void Console::println(const std::string & s) {
-		assert(m_output);
-
-		// Add the text in rows
-		boost::char_separator<char> separator("\n");
-		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-		tokenizer tokens(s,separator);
-		for(tokenizer::iterator i = tokens.begin(); i != tokens.end(); ++i) {
-			m_output->addRow(*i);
-		}
-
-		// Assure the maximum number of rows
-		if( m_output->getNumberOfRows() > m_maxOutputRows ) {
-			unsigned rows = m_output->getNumberOfRows();
-			int delta_rows = rows - m_maxOutputRows;
-			std::vector<std::string> rows_text;
-			for(size_t i=delta_rows; i != rows; ++i) {
-				rows_text.push_back(m_output->getTextRow(i));
-			}
-			m_output->setText("");
-			for(size_t i=0; i != rows_text.size(); ++i) {
-				m_output->addRow(rows_text[i]);
-			}
-		}
-
-		// Assure the new text is visible
-		gcn::Rectangle rect(0,m_output->getHeight(),0,0);
-		m_outputscrollarea->showWidgetPart(m_output,rect);
-	}
-
-	void Console::action(const gcn::ActionEvent & event) {
-		if (m_consoleexec) {
-			m_consoleexec->onToolsClick();
-		} else {
-			FL_WARN(_log, "ConsoleExecuter not bind, but tools button clicked");
-		}
-	}
-
-	void Console::setConsoleExecuter(ConsoleExecuter* const consoleexec) {
-		m_consoleexec = consoleexec;
-	}
-
-	void Console::removeConsoleExecuter() {
-		m_consoleexec = NULL;
-	}
-
-	void Console::setIOFont(GuiFont* font) {
-		m_input->setFont(font);
-		m_output->setFont(font);
-	}
-
-	void Console::focusLost(const gcn::Event& ) {
-		hide();
-	}
-}
-/* vim: set noexpandtab: set shiftwidth=2: set tabstop=2: */