[Scummvm-cvs-logs] SF.net SVN: scummvm:[53979] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Oct 31 18:11:43 CET 2010
Revision: 53979
http://scummvm.svn.sourceforge.net/scummvm/?rev=53979&view=rev
Author: fingolfin
Date: 2010-10-31 17:11:43 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
WINCE: Code formatting
Modified Paths:
--------------
scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
scummvm/trunk/backends/platform/wince/CEActionsPocket.h
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h
scummvm/trunk/backends/platform/wince/CEDevice.h
scummvm/trunk/backends/platform/wince/CEScaler.cpp
scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp
scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h
scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp
scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h
scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp
scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h
scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp
scummvm/trunk/backends/platform/wince/CEgui/Panel.h
scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp
scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h
scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp
scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h
scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp
scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h
scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp
scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h
scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp
scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h
scummvm/trunk/gui/Actions.cpp
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -85,8 +85,7 @@
}
CEActionsPocket::CEActionsPocket(const Common::String &gameid) :
-GUI::Actions()
-{
+GUI::Actions() {
int i;
_right_click_needed = false;
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -61,32 +61,32 @@
class OSystem_WINCE3;
class CEActionsPocket : public GUI::Actions {
- public:
- // Actions
- bool perform(GUI::ActionType action, bool pushed = true);
- Common::String actionName(GUI::ActionType action);
- int size();
+public:
+ // Actions
+ bool perform(GUI::ActionType action, bool pushed = true);
+ Common::String actionName(GUI::ActionType action);
+ int size();
- static void init();
- void initInstanceMain(OSystem *mainSystem);
- void initInstanceGame();
+ static void init();
+ void initInstanceMain(OSystem *mainSystem);
+ void initInstanceGame();
- // Action domain
- Common::String domain();
- int version();
+ // Action domain
+ Common::String domain();
+ int version();
- // Utility
- bool needsRightClickMapping();
- bool needsHideToolbarMapping();
- bool needsZoomMapping();
+ // Utility
+ bool needsRightClickMapping();
+ bool needsHideToolbarMapping();
+ bool needsZoomMapping();
- ~CEActionsPocket();
- private:
- CEActionsPocket(const Common::String &gameid);
- bool _right_click_needed;
- bool _hide_toolbar_needed;
- bool _zoom_needed;
- OSystem_WINCE3 *_CESystem;
- };
+ ~CEActionsPocket();
+private:
+ CEActionsPocket(const Common::String &gameid);
+ bool _right_click_needed;
+ bool _hide_toolbar_needed;
+ bool _zoom_needed;
+ OSystem_WINCE3 *_CESystem;
+};
#endif
Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -55,24 +55,24 @@
class CEActionsSmartphone : public GUI::Actions {
- public:
- // Actions
- bool perform(GUI::ActionType action, bool pushed = true);
- Common::String actionName(GUI::ActionType action);
- int size();
- static void init();
- void initInstanceMain(OSystem *mainSystem);
- void initInstanceGame();
+public:
+ // Actions
+ bool perform(GUI::ActionType action, bool pushed = true);
+ Common::String actionName(GUI::ActionType action);
+ int size();
+ static void init();
+ void initInstanceMain(OSystem *mainSystem);
+ void initInstanceGame();
- // Action domain
- Common::String domain();
- int version();
+ // Action domain
+ Common::String domain();
+ int version();
- ~CEActionsSmartphone();
- private:
- CEActionsSmartphone();
- bool _right_click_needed;
- OSystem_WINCE3 *_CESystem;
- };
+ ~CEActionsSmartphone();
+private:
+ CEActionsSmartphone();
+ bool _right_click_needed;
+ OSystem_WINCE3 *_CESystem;
+};
#endif
Modified: scummvm/trunk/backends/platform/wince/CEDevice.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEDevice.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEDevice.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -31,20 +31,20 @@
#include "common/str.h"
class CEDevice {
- public:
- static void init();
- static void end();
- static void wakeUp();
- static bool hasPocketPCResolution();
- static bool hasSquareQVGAResolution();
- static bool hasDesktopResolution();
- static bool hasWideResolution();
- static bool hasSmartphoneResolution();
- static bool isSmartphone();
+public:
+ static void init();
+ static void end();
+ static void wakeUp();
+ static bool hasPocketPCResolution();
+ static bool hasSquareQVGAResolution();
+ static bool hasDesktopResolution();
+ static bool hasWideResolution();
+ static bool hasSmartphoneResolution();
+ static bool isSmartphone();
- private:
- static DWORD reg_access(TCHAR *key, TCHAR *val, DWORD data);
- static void backlight_xchg();
+private:
+ static DWORD reg_access(TCHAR *key, TCHAR *val, DWORD data);
+ static void backlight_xchg();
};
#endif
Modified: scummvm/trunk/backends/platform/wince/CEScaler.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEScaler.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEScaler.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -22,6 +22,7 @@
* $Id$
*
*/
+
#include "graphics/scaler/intern.h"
#include "CEScaler.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -34,98 +34,97 @@
namespace CEGUI {
- GUIElement::GUIElement(int x, int y, int width, int height) :
- _background(0), _drawn(false), _visible(true), _x(x), _y(y), _width(width), _height(height)
- {
- }
+GUIElement::GUIElement(int x, int y, int width, int height) :
+_background(0), _drawn(false), _visible(true), _x(x), _y(y), _width(width), _height(height) {
+}
- bool GUIElement::setBackground(WORD backgroundReference) {
- _background = new SDL_ImageResource();
- if (!_background->load(backgroundReference)) {
- delete _background;
- _background = NULL;
- return false;
- }
- if (!_height && !_width) {
- _height = _background->height();
- _width = _background->width();
- }
- else
- if (_background->height() != _height || _background->width() != _width) {
- delete _background;
- _background = NULL;
- return false;
- }
- return true;
+bool GUIElement::setBackground(WORD backgroundReference) {
+ _background = new SDL_ImageResource();
+ if (!_background->load(backgroundReference)) {
+ delete _background;
+ _background = NULL;
+ return false;
}
-
- void GUIElement::move(int x, int y) {
- _x = x;
- _y = y;
+ if (!_height && !_width) {
+ _height = _background->height();
+ _width = _background->width();
}
+ else
+ if (_background->height() != _height || _background->width() != _width) {
+ delete _background;
+ _background = NULL;
+ return false;
+ }
+ return true;
+}
- bool GUIElement::draw(SDL_Surface *surface) {
- if (_background && !_drawn && _visible) {
- SDL_Rect rect;
+void GUIElement::move(int x, int y) {
+ _x = x;
+ _y = y;
+}
- rect.x = _x;
- rect.y = _y;
- rect.w = _width;
- rect.h = _height;
+bool GUIElement::draw(SDL_Surface *surface) {
+ if (_background && !_drawn && _visible) {
+ SDL_Rect rect;
- SDL_BlitSurface(_background->get(), NULL, surface, &rect);
+ rect.x = _x;
+ rect.y = _y;
+ rect.w = _width;
+ rect.h = _height;
- _drawn = true;
+ SDL_BlitSurface(_background->get(), NULL, surface, &rect);
- return true;
- }
- else
- return false;
- }
+ _drawn = true;
- bool GUIElement::checkInside(int x, int y) {
- if (x >= _x && x <= _x + _width && y >= _y && y <= _y + _height)
- return true;
- else
- return false;
+ return true;
}
+ else
+ return false;
+}
- void GUIElement::setVisible(bool visibility) {
- if (visibility && !_visible)
- _drawn = false;
- _visible = visibility;
- }
+bool GUIElement::checkInside(int x, int y) {
+ if (x >= _x && x <= _x + _width && y >= _y && y <= _y + _height)
+ return true;
+ else
+ return false;
+}
- bool GUIElement::visible() {
- return _visible;
- }
-
- void GUIElement::forceRedraw() {
+void GUIElement::setVisible(bool visibility) {
+ if (visibility && !_visible)
_drawn = false;
- }
+ _visible = visibility;
+}
- bool GUIElement::drawn() {
- return _drawn;
- }
+bool GUIElement::visible() {
+ return _visible;
+}
- int GUIElement::x() {
- return _x;
- }
+void GUIElement::forceRedraw() {
+ _drawn = false;
+}
- int GUIElement::y() {
- return _y;
- }
+bool GUIElement::drawn() {
+ return _drawn;
+}
- int GUIElement::width() {
- return _width;
- }
+int GUIElement::x() {
+ return _x;
+}
- int GUIElement::height() {
- return _height;
- }
+int GUIElement::y() {
+ return _y;
+}
- GUIElement::~GUIElement() {
- delete _background;
- }
+int GUIElement::width() {
+ return _width;
+}
+int GUIElement::height() {
+ return _height;
}
+
+GUIElement::~GUIElement() {
+ delete _background;
+}
+
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -33,35 +33,36 @@
namespace CEGUI {
- class SDL_ImageResource;
+class SDL_ImageResource;
- class GUIElement {
- public:
- bool setBackground(WORD backgroundReference);
- void setVisible(bool visibility);
- virtual void forceRedraw();
- virtual bool draw(SDL_Surface *surface);
- virtual ~GUIElement();
- void move(int x, int y);
- int width();
- int height();
- int x();
- int y();
- virtual bool action(int x, int y, bool pushed) = 0;
- bool visible();
- bool drawn();
- protected:
- GUIElement(int x = 0, int y = 0, int width = 0, int height = 0);
- bool checkInside(int x, int y);
- bool _visible;
- SDL_ImageResource *_background;
- int _x;
- int _y;
- bool _drawn;
- private:
- int _width;
- int _height;
- };
-}
+class GUIElement {
+public:
+ bool setBackground(WORD backgroundReference);
+ void setVisible(bool visibility);
+ virtual void forceRedraw();
+ virtual bool draw(SDL_Surface *surface);
+ virtual ~GUIElement();
+ void move(int x, int y);
+ int width();
+ int height();
+ int x();
+ int y();
+ virtual bool action(int x, int y, bool pushed) = 0;
+ bool visible();
+ bool drawn();
+protected:
+ GUIElement(int x = 0, int y = 0, int width = 0, int height = 0);
+ bool checkInside(int x, int y);
+ bool _visible;
+ SDL_ImageResource *_background;
+ int _x;
+ int _y;
+ bool _drawn;
+private:
+ int _width;
+ int _height;
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -27,25 +27,25 @@
namespace CEGUI {
- ItemAction::ItemAction(WORD reference, GUI::ActionType action) :
- PanelItem(reference) {
- _action = action;
- if (!GUI::Actions::Instance()->isEnabled(_action))
- _visible = false;
- }
+ItemAction::ItemAction(WORD reference, GUI::ActionType action) :
+PanelItem(reference) {
+ _action = action;
+ if (!GUI::Actions::Instance()->isEnabled(_action))
+ _visible = false;
+}
- ItemAction::~ItemAction() {
- }
+ItemAction::~ItemAction() {
+}
- bool ItemAction::action(int x, int y, bool pushed) {
+bool ItemAction::action(int x, int y, bool pushed) {
- if (checkInside(x, y) && _visible && pushed) {
- GUI::Actions::Instance()->perform(_action, true);
- GUI::Actions::Instance()->perform(_action, false);
- return true;
- }
- else
- return false;
- }
+ if (checkInside(x, y) && _visible && pushed) {
+ GUI::Actions::Instance()->perform(_action, true);
+ GUI::Actions::Instance()->perform(_action, false);
+ return true;
+ } else
+ return false;
}
+
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -31,16 +31,18 @@
#include "gui/Actions.h"
#include "CEgui/PanelItem.h"
+
namespace CEGUI {
- class ItemAction : public PanelItem {
- public:
- ItemAction(WORD reference, GUI::ActionType action);
- virtual ~ItemAction();
- virtual bool action(int x, int y, bool pushed);
- private:
- GUI::ActionType _action;
- };
-}
+class ItemAction : public PanelItem {
+public:
+ ItemAction(WORD reference, GUI::ActionType action);
+ virtual ~ItemAction();
+ virtual bool action(int x, int y, bool pushed);
+private:
+ GUI::ActionType _action;
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -28,68 +28,69 @@
namespace CEGUI {
- void ItemSwitch::init(WORD referenceTrue, WORD referenceFalse) {
- _backgroundTrue = _background;
- _backgroundFalse = new SDL_ImageResource();
- if (!_backgroundFalse->load(referenceFalse)) {
- delete _backgroundFalse;
- delete _background;
- _background = NULL;
- _backgroundFalse = NULL;
- }
+void ItemSwitch::init(WORD referenceTrue, WORD referenceFalse) {
+ _backgroundTrue = _background;
+ _backgroundFalse = new SDL_ImageResource();
+ if (!_backgroundFalse->load(referenceFalse)) {
+ delete _backgroundFalse;
+ delete _background;
+ _background = NULL;
+ _backgroundFalse = NULL;
}
+}
- ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item) :
- PanelItem(referenceTrue) {
- init(referenceTrue, referenceFalse);
- _item = item;
- _itemmax = -1;
- if (!*_item)
- _background = _backgroundFalse;
- }
+ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item) :
+PanelItem(referenceTrue) {
+ init(referenceTrue, referenceFalse);
+ _item = item;
+ _itemmax = -1;
+ if (!*_item)
+ _background = _backgroundFalse;
+}
- ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max) :
- PanelItem(referenceTrue) {
- init(referenceTrue, referenceFalse);
- _itemmultiple = item;
- _itemmax = max;
- if (!*item)
- _background = _backgroundFalse;
- }
+ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max) :
+PanelItem(referenceTrue) {
+ init(referenceTrue, referenceFalse);
+ _itemmultiple = item;
+ _itemmax = max;
+ if (!*item)
+ _background = _backgroundFalse;
+}
- ItemSwitch::~ItemSwitch() {
- delete _backgroundFalse;
- }
+ItemSwitch::~ItemSwitch() {
+ delete _backgroundFalse;
+}
- bool ItemSwitch::action(int x, int y, bool pushed) {
+bool ItemSwitch::action(int x, int y, bool pushed) {
- if (checkInside(x, y) && _visible && pushed) {
- if (_itemmax <= 0) {
- *_item = !*_item;
- if (*_item)
- _background = _backgroundTrue;
- else
- _background = _backgroundFalse;
+ if (checkInside(x, y) && _visible && pushed) {
+ if (_itemmax <= 0) {
+ *_item = !*_item;
+ if (*_item)
+ _background = _backgroundTrue;
+ else
+ _background = _backgroundFalse;
- if (_panel)
- _panel->forceRedraw();
+ if (_panel)
+ _panel->forceRedraw();
- return true;
- } else {
- *_itemmultiple = *_itemmultiple + 1;
- if (*_itemmultiple > _itemmax)
- *_itemmultiple = 0;
- if (*_itemmultiple)
- _background = _backgroundTrue;
- else
- _background = _backgroundFalse;
+ return true;
+ } else {
+ *_itemmultiple = *_itemmultiple + 1;
+ if (*_itemmultiple > _itemmax)
+ *_itemmultiple = 0;
+ if (*_itemmultiple)
+ _background = _backgroundTrue;
+ else
+ _background = _backgroundFalse;
- if (_panel)
- _panel->forceRedraw();
+ if (_panel)
+ _panel->forceRedraw();
- return true;
- }
- } else
- return false;
- }
+ return true;
+ }
+ } else
+ return false;
}
+
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -35,22 +35,24 @@
using GUI::Key;
namespace CEGUI {
- class SDL_ImageResource;
- class ItemSwitch : public PanelItem {
- public:
- ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item);
- ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max);
- virtual ~ItemSwitch();
- virtual bool action(int x, int y, bool pushed);
- private:
- void init(WORD referenceTrue, WORD referenceFalse);
- bool *_item;
- static bool _itemdummy;
- int *_itemmultiple, _itemmax;
- SDL_ImageResource *_backgroundTrue;
- SDL_ImageResource *_backgroundFalse;
- };
-}
+class SDL_ImageResource;
+class ItemSwitch : public PanelItem {
+public:
+ ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item);
+ ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max);
+ virtual ~ItemSwitch();
+ virtual bool action(int x, int y, bool pushed);
+private:
+ void init(WORD referenceTrue, WORD referenceFalse);
+ bool *_item;
+ static bool _itemdummy;
+ int *_itemmultiple, _itemmax;
+ SDL_ImageResource *_backgroundTrue;
+ SDL_ImageResource *_backgroundFalse;
+};
+
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -27,59 +27,58 @@
namespace CEGUI {
- Panel::Panel(int interleave_first, int interleave) : Toolbar()
- {
- _interleave = interleave;
- _currentItem = interleave_first;
- }
+Panel::Panel(int interleave_first, int interleave) : Toolbar() {
+ _interleave = interleave;
+ _currentItem = interleave_first;
+}
- bool Panel::add(const String &name, const PanelItem *item) {
- _itemsMap[name] = (PanelItem*)item;
- _itemsMap[name]->move(_currentItem, _y + 10);
- _itemsMap[name]->setPanel(this);
- _currentItem += _interleave;
+bool Panel::add(const String &name, const PanelItem *item) {
+ _itemsMap[name] = (PanelItem*)item;
+ _itemsMap[name]->move(_currentItem, _y + 10);
+ _itemsMap[name]->setPanel(this);
+ _currentItem += _interleave;
- return true;
- }
+ return true;
+}
- bool Panel::draw(SDL_Surface *surface) {
- ItemMap::const_iterator iterator;
- if (!_drawn && _visible) {
- GUIElement::draw(surface);
- for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator) {
- ((GUIElement*)(iterator->_value))->draw(surface);
- }
- return true;
+bool Panel::draw(SDL_Surface *surface) {
+ ItemMap::const_iterator iterator;
+ if (!_drawn && _visible) {
+ GUIElement::draw(surface);
+ for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator) {
+ ((GUIElement*)(iterator->_value))->draw(surface);
}
- else
- return false;
+ return true;
}
+ else
+ return false;
+}
- void Panel::forceRedraw() {
- ItemMap::const_iterator iterator;
- GUIElement::forceRedraw();
- for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator)
- ((GUIElement*)(iterator->_value))->forceRedraw();
- }
+void Panel::forceRedraw() {
+ ItemMap::const_iterator iterator;
+ GUIElement::forceRedraw();
+ for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator)
+ ((GUIElement*)(iterator->_value))->forceRedraw();
+}
- bool Panel::action(int x, int y, bool pushed) {
- ItemMap::const_iterator iterator;
- bool result = false;
- if (!_visible || !checkInside(x, y))
- return false;
+bool Panel::action(int x, int y, bool pushed) {
+ ItemMap::const_iterator iterator;
+ bool result = false;
+ if (!_visible || !checkInside(x, y))
+ return false;
- for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
- result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
- return result;
- }
+ for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
+ result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
+ return result;
+}
- void Panel::clear() {
- _itemsMap.clear();
- }
+void Panel::clear() {
+ _itemsMap.clear();
+}
- Panel::~Panel() {
- _itemsMap.clear();
- }
+Panel::~Panel() {
+ _itemsMap.clear();
}
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/Panel.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Panel.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/Panel.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -40,23 +40,24 @@
namespace CEGUI {
- class Panel : public Toolbar {
- public:
- Panel(int interleave_first, int interleave);
- virtual bool draw(SDL_Surface *surface);
- virtual ~Panel();
- bool add(const String &name, const PanelItem *item);
- void clear();
- virtual void forceRedraw();
- virtual bool action(int x, int y, bool pushed);
- private:
+class Panel : public Toolbar {
+public:
+ Panel(int interleave_first, int interleave);
+ virtual bool draw(SDL_Surface *surface);
+ virtual ~Panel();
+ bool add(const String &name, const PanelItem *item);
+ void clear();
+ virtual void forceRedraw();
+ virtual bool action(int x, int y, bool pushed);
+private:
- typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
+ typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
- ItemMap _itemsMap;
- int _interleave;
- int _currentItem;
- };
-}
+ ItemMap _itemsMap;
+ int _interleave;
+ int _currentItem;
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -27,21 +27,21 @@
namespace CEGUI {
- PanelItem::PanelItem(WORD reference) : GUIElement() {
- setBackground(reference);
- _panel = NULL;
- }
+PanelItem::PanelItem(WORD reference) : GUIElement() {
+ setBackground(reference);
+ _panel = NULL;
+}
- PanelItem::~PanelItem() {
- }
+PanelItem::~PanelItem() {
+}
- bool PanelItem::action(int x, int y, bool pushed) {
- return false;
- }
+bool PanelItem::action(int x, int y, bool pushed) {
+ return false;
+}
- void PanelItem::setPanel(Panel *panel) {
- _panel = panel;
- }
+void PanelItem::setPanel(Panel *panel) {
+ _panel = panel;
}
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -33,18 +33,19 @@
namespace CEGUI {
- class Panel;
+class Panel;
- class PanelItem : public GUIElement {
- friend class Panel;
- public:
- PanelItem(WORD reference);
- virtual ~PanelItem();
- virtual bool action(int x, int y, bool pushed);
- protected:
- void setPanel(Panel *panel);
- Panel *_panel;
- };
-}
+class PanelItem : public GUIElement {
+friend class Panel;
+public:
+ PanelItem(WORD reference);
+ virtual ~PanelItem();
+ virtual bool action(int x, int y, bool pushed);
+protected:
+ void setPanel(Panel *panel);
+ Panel *_panel;
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -32,73 +32,72 @@
namespace CEGUI {
- const char KEYBOARD_MAPPING_ALPHA[][14] = { {"abcdefghijklm"}, {"nopqrstuvwxyz"} };
- const char KEYBOARD_MAPPING_NUMERIC[][6] = { {"12345"}, {"67890"} };
- const int KEYBOARD_MAPPING_SPECIAL[][3][2] = { { {1,SDLK_ESCAPE}, {224,SDLK_UP}, {32,SDLK_SPACE} },
- { {224,SDLK_LEFT}, {224,SDLK_DOWN}, {224,SDLK_RIGHT} } };
+const char KEYBOARD_MAPPING_ALPHA[][14] = { {"abcdefghijklm"}, {"nopqrstuvwxyz"} };
+const char KEYBOARD_MAPPING_NUMERIC[][6] = { {"12345"}, {"67890"} };
+const int KEYBOARD_MAPPING_SPECIAL[][3][2] = { { {1,SDLK_ESCAPE}, {224,SDLK_UP}, {32,SDLK_SPACE} },
+ { {224,SDLK_LEFT}, {224,SDLK_DOWN}, {224,SDLK_RIGHT} } };
- PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
- setBackground(reference);
- _state = false;
- _lastKey.setKey(0);
- }
+PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
+ setBackground(reference);
+ _state = false;
+ _lastKey.setKey(0);
+}
- PanelKeyboard::~PanelKeyboard() {
- }
+PanelKeyboard::~PanelKeyboard() {
+}
- bool PanelKeyboard::action(int x, int y, bool pushed) {
- Key key;
+bool PanelKeyboard::action(int x, int y, bool pushed) {
+ Key key;
- if (checkInside(x, y)) {
- int keyAscii = 0;
- int keyCode = 0;
- if (x < 185) {
- // Alpha selection
- keyCode = keyAscii = KEYBOARD_MAPPING_ALPHA[y >= _y+20][((x + 10) / 14) - 1];
- } else if (x >= 186 && x <= 255) {
- // Numeric selection
- keyCode = keyAscii = KEYBOARD_MAPPING_NUMERIC[y >= _y+20][((x - 187 + 10) / 14) - 1];
- } else if (x >= 258 && x <= 300) {
- // Special keys
- keyAscii = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][0];
- keyCode = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][1];
- } else if (x >= 302 && x <= 316) {
- if (y < _y +20) {
- // Backspace
- keyAscii = VK_BACK; keyCode = keyAscii;
- } else {
- // Enter
- keyAscii = 13; keyCode = 13;
- }
+ if (checkInside(x, y)) {
+ int keyAscii = 0;
+ int keyCode = 0;
+ if (x < 185) {
+ // Alpha selection
+ keyCode = keyAscii = KEYBOARD_MAPPING_ALPHA[y >= _y+20][((x + 10) / 14) - 1];
+ } else if (x >= 186 && x <= 255) {
+ // Numeric selection
+ keyCode = keyAscii = KEYBOARD_MAPPING_NUMERIC[y >= _y+20][((x - 187 + 10) / 14) - 1];
+ } else if (x >= 258 && x <= 300) {
+ // Special keys
+ keyAscii = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][0];
+ keyCode = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][1];
+ } else if (x >= 302 && x <= 316) {
+ if (y < _y +20) {
+ // Backspace
+ keyAscii = VK_BACK; keyCode = keyAscii;
+ } else {
+ // Enter
+ keyAscii = 13; keyCode = 13;
}
+ }
- if (keyAscii != 0) {
- if (_state && pushed && keyCode != _lastKey.keycode()) // if cursor is still down and off the current key
- return false;
- else if (_state && !pushed && keyCode != _lastKey.keycode()) { // cursor is up but off the current key
- keyAscii = _lastKey.ascii();
- keyCode = _lastKey.keycode();
- }
- _state = pushed;
- _lastKey.setKey(keyAscii, tolower(keyCode));
-
- key.setKey(keyAscii, tolower(keyCode));
- return EventsBuffer::simulateKey(&key, pushed);
- }
- else if (_state && !pushed) { // cursor is in some forbidden region and is up
- _state = false;
- key = _lastKey;
- return EventsBuffer::simulateKey(&key, false);
- } else
+ if (keyAscii != 0) {
+ if (_state && pushed && keyCode != _lastKey.keycode()) // if cursor is still down and off the current key
return false;
- }
- else if (_state && !pushed) { // cursor left the keyboard area and is up
+ else if (_state && !pushed && keyCode != _lastKey.keycode()) { // cursor is up but off the current key
+ keyAscii = _lastKey.ascii();
+ keyCode = _lastKey.keycode();
+ }
+ _state = pushed;
+ _lastKey.setKey(keyAscii, tolower(keyCode));
+
+ key.setKey(keyAscii, tolower(keyCode));
+ return EventsBuffer::simulateKey(&key, pushed);
+ } else if (_state && !pushed) { // cursor is in some forbidden region and is up
_state = false;
key = _lastKey;
return EventsBuffer::simulateKey(&key, false);
} else
return false;
- }
+ } else if (_state && !pushed) { // cursor left the keyboard area and is up
+ _state = false;
+ key = _lastKey;
+ return EventsBuffer::simulateKey(&key, false);
+ } else
+ return false;
}
+} // End of namespace CEGUI
+
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -37,15 +37,16 @@
namespace CEGUI {
- class PanelKeyboard : public Toolbar {
- public:
- PanelKeyboard(WORD reference);
- virtual ~PanelKeyboard();
- virtual bool action(int x, int y, bool pushed);
- private:
- bool _state;
- Key _lastKey;
- };
-}
+class PanelKeyboard : public Toolbar {
+public:
+ PanelKeyboard(WORD reference);
+ virtual ~PanelKeyboard();
+ virtual bool action(int x, int y, bool pushed);
+private:
+ bool _state;
+ Key _lastKey;
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -31,59 +31,59 @@
namespace CEGUI {
- SDL_ImageResource::SDL_ImageResource() :
- _surface(0)
- {
- }
+SDL_ImageResource::SDL_ImageResource() :
+ _surface(0) {
+}
- SDL_Surface* SDL_ImageResource::load(WORD resourceID) {
- HRSRC resource;
- HGLOBAL resourceGlobal;
- LPVOID resourcePointer;
- DWORD resourceSize;
- SDL_RWops *surfaceData;
- HMODULE moduleHandle;
+SDL_Surface* SDL_ImageResource::load(WORD resourceID) {
+ HRSRC resource;
+ HGLOBAL resourceGlobal;
+ LPVOID resourcePointer;
+ DWORD resourceSize;
+ SDL_RWops *surfaceData;
+ HMODULE moduleHandle;
- moduleHandle = GetModuleHandle(NULL);
- resource = FindResource(moduleHandle, MAKEINTRESOURCE(resourceID), TEXT("BINARY"));
- if (!resource)
- return NULL;
- resourceSize = SizeofResource(moduleHandle, resource);
- if (!resourceSize)
- return NULL;
- resourceGlobal = LoadResource(moduleHandle, resource);
- if (!resourceGlobal)
- return NULL;
- resourcePointer = LockResource(resourceGlobal);
- if (!resourcePointer)
- return NULL;
+ moduleHandle = GetModuleHandle(NULL);
+ resource = FindResource(moduleHandle, MAKEINTRESOURCE(resourceID), TEXT("BINARY"));
+ if (!resource)
+ return NULL;
+ resourceSize = SizeofResource(moduleHandle, resource);
+ if (!resourceSize)
+ return NULL;
+ resourceGlobal = LoadResource(moduleHandle, resource);
+ if (!resourceGlobal)
+ return NULL;
+ resourcePointer = LockResource(resourceGlobal);
+ if (!resourcePointer)
+ return NULL;
- surfaceData = SDL_RWFromMem(resourcePointer, resourceSize);
- if (!surfaceData)
- return NULL;
- _surface = SDL_LoadBMP_RW(surfaceData, 1);
+ surfaceData = SDL_RWFromMem(resourcePointer, resourceSize);
+ if (!surfaceData)
+ return NULL;
+ _surface = SDL_LoadBMP_RW(surfaceData, 1);
- return _surface;
- }
+ return _surface;
+}
- SDL_Surface* SDL_ImageResource::get() {
- return _surface;
- }
+SDL_Surface* SDL_ImageResource::get() {
+ return _surface;
+}
- int SDL_ImageResource::height() {
- if (_surface)
- return _surface->h;
- return 0;
- }
+int SDL_ImageResource::height() {
+ if (_surface)
+ return _surface->h;
+ return 0;
+}
- int SDL_ImageResource::width() {
- if (_surface)
- return _surface->w;
- return 0;
- }
+int SDL_ImageResource::width() {
+ if (_surface)
+ return _surface->w;
+ return 0;
+}
- SDL_ImageResource::~SDL_ImageResource() {
- if (_surface)
- SDL_FreeSurface(_surface);
- }
+SDL_ImageResource::~SDL_ImageResource() {
+ if (_surface)
+ SDL_FreeSurface(_surface);
}
+
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -32,17 +32,19 @@
struct SDL_Surface;
namespace CEGUI {
- class SDL_ImageResource {
- public:
- SDL_ImageResource();
- SDL_Surface* load(WORD resourceID);
- SDL_Surface* get();
- int height();
- int width();
- virtual ~SDL_ImageResource();
- private:
- SDL_Surface *_surface;
- };
-}
+class SDL_ImageResource {
+public:
+ SDL_ImageResource();
+ SDL_Surface* load(WORD resourceID);
+ SDL_Surface* get();
+ int height();
+ int width();
+ virtual ~SDL_ImageResource();
+private:
+ SDL_Surface *_surface;
+};
+
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -27,12 +27,12 @@
namespace CEGUI {
- // Not to be drawn on game screen !
- Toolbar::Toolbar() : GUIElement(0, 0, 320, 40)
- {
- }
+// Not to be drawn on game screen !
+Toolbar::Toolbar() : GUIElement(0, 0, 320, 40) {
+}
- Toolbar::~Toolbar() {
- }
+Toolbar::~Toolbar() {
}
+
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -30,18 +30,17 @@
#include "GUIElement.h"
-
-
namespace CEGUI {
- class Toolbar : public GUIElement {
- public:
- virtual ~Toolbar();
- virtual bool action(int x, int y, bool pushed) = 0;
- protected:
- Toolbar();
+class Toolbar : public GUIElement {
+public:
+ virtual ~Toolbar();
+ virtual bool action(int x, int y, bool pushed) = 0;
+protected:
+ Toolbar();
- };
-}
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -32,102 +32,102 @@
namespace CEGUI {
- ToolbarHandler::ToolbarHandler():
- _current(""), _active(NULL) {
- }
+ToolbarHandler::ToolbarHandler():
+_current(""), _active(NULL) {
+}
- bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) {
- _toolbarMap[name] = (Toolbar*)&toolbar;
+bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) {
+ _toolbarMap[name] = (Toolbar*)&toolbar;
- if (!_active) {
- _active = &((Toolbar&)toolbar);
- _current = name;
- }
-
- return true;
+ if (!_active) {
+ _active = &((Toolbar&)toolbar);
+ _current = name;
}
- String ToolbarHandler::activeName() {
- return _current;
- }
+ return true;
+}
- bool ToolbarHandler::setActive(const String &name) {
- if (!_toolbarMap.contains(name))
- return false;
- if (_current == name)
- return true;
- _active->action(0, 0, false); // make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel)
- _current = name;
- _active = _toolbarMap[name];
- _active->forceRedraw();
+String ToolbarHandler::activeName() {
+ return _current;
+}
+
+bool ToolbarHandler::setActive(const String &name) {
+ if (!_toolbarMap.contains(name))
+ return false;
+ if (_current == name)
return true;
- }
+ _active->action(0, 0, false); // make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel)
+ _current = name;
+ _active = _toolbarMap[name];
+ _active->forceRedraw();
+ return true;
+}
- bool ToolbarHandler::action(int x, int y, bool pushed) {
- if (_active && _active->visible()) {
- // FIXME !
- if (_offset > 240)
- return _active->action(x / 2, (y - _offset) / 2, pushed);
- else
- return _active->action(x, y - _offset, pushed);
- }
+bool ToolbarHandler::action(int x, int y, bool pushed) {
+ if (_active && _active->visible()) {
+ // FIXME !
+ if (_offset > 240)
+ return _active->action(x / 2, (y - _offset) / 2, pushed);
else
- return false;
+ return _active->action(x, y - _offset, pushed);
}
+ else
+ return false;
+}
- void ToolbarHandler::setVisible(bool visible) {
- if (_active)
- _active->setVisible(visible);
- }
+void ToolbarHandler::setVisible(bool visible) {
+ if (_active)
+ _active->setVisible(visible);
+}
- bool ToolbarHandler::visible() {
- if (_active)
- return _active->visible();
- else
- return false;
- }
+bool ToolbarHandler::visible() {
+ if (_active)
+ return _active->visible();
+ else
+ return false;
+}
- void ToolbarHandler::forceRedraw() {
- if (_active)
- _active->forceRedraw();
- }
+void ToolbarHandler::forceRedraw() {
+ if (_active)
+ _active->forceRedraw();
+}
- bool ToolbarHandler::drawn() {
- if (_active)
- return _active->drawn();
- else
- return false;
- }
+bool ToolbarHandler::drawn() {
+ if (_active)
+ return _active->drawn();
+ else
+ return false;
+}
- bool ToolbarHandler::draw(SDL_Surface *surface, SDL_Rect *rect) {
- if (_active) {
- bool result = _active->draw(surface);
- if (result) {
- rect->x = _active->x();
- rect->y = _active->y();
- rect->w = _active->width();
- rect->h = _active->height();
- }
- return result;
+bool ToolbarHandler::draw(SDL_Surface *surface, SDL_Rect *rect) {
+ if (_active) {
+ bool result = _active->draw(surface);
+ if (result) {
+ rect->x = _active->x();
+ rect->y = _active->y();
+ rect->w = _active->width();
+ rect->h = _active->height();
}
- else
- return false;
- }
+ return result;
+ } else
+ return false;
+}
- void ToolbarHandler::setOffset(int offset) {
- _offset = offset;
- }
+void ToolbarHandler::setOffset(int offset) {
+ _offset = offset;
+}
- int ToolbarHandler::getOffset() {
- return _offset;
- }
+int ToolbarHandler::getOffset() {
+ return _offset;
+}
- Toolbar* ToolbarHandler::active() {
- return _active;
- }
+Toolbar* ToolbarHandler::active() {
+ return _active;
+}
- ToolbarHandler::~ToolbarHandler() {
- _toolbarMap.clear();
- }
+ToolbarHandler::~ToolbarHandler() {
+ _toolbarMap.clear();
}
+
+} // End of namespace CEGUI
Modified: scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h 2010-10-31 17:11:43 UTC (rev 53979)
@@ -39,29 +39,30 @@
namespace CEGUI {
- class ToolbarHandler {
- public:
- ToolbarHandler();
- bool add(const String &name, const Toolbar &toolbar);
- bool setActive(const String &name);
- bool action(int x, int y, bool pushed);
- void setVisible(bool visible);
- bool visible();
- String activeName();
- void forceRedraw();
- void setOffset(int offset);
- int getOffset();
- bool draw(SDL_Surface *surface, SDL_Rect *rect);
- bool drawn();
- Toolbar *active();
- virtual ~ToolbarHandler();
- private:
+class ToolbarHandler {
+public:
+ ToolbarHandler();
+ bool add(const String &name, const Toolbar &toolbar);
+ bool setActive(const String &name);
+ bool action(int x, int y, bool pushed);
+ void setVisible(bool visible);
+ bool visible();
+ String activeName();
+ void forceRedraw();
+ void setOffset(int offset);
+ int getOffset();
+ bool draw(SDL_Surface *surface, SDL_Rect *rect);
+ bool drawn();
+ Toolbar *active();
+ virtual ~ToolbarHandler();
+private:
- HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
- String _current;
- Toolbar *_active;
- int _offset;
- };
-}
+ HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
+ String _current;
+ Toolbar *_active;
+ int _offset;
+};
+} // End of namespace CEGUI
+
#endif
Modified: scummvm/trunk/gui/Actions.cpp
===================================================================
--- scummvm/trunk/gui/Actions.cpp 2010-10-31 17:10:45 UTC (rev 53978)
+++ scummvm/trunk/gui/Actions.cpp 2010-10-31 17:11:43 UTC (rev 53979)
@@ -42,8 +42,7 @@
}
Actions::Actions() :
- _mapping_active(false), _initialized(false)
-{
+ _mapping_active(false), _initialized(false) {
}
@@ -95,7 +94,7 @@
bool Actions::performMapped(unsigned int keyCode, bool pushed) {
int i;
- for (i=0; i<size(); i++) {
+ for (i = 0; i < size(); ++i) {
if (_action_mapping[i] == keyCode && _action_enabled[i])
return perform((ActionType)i, pushed);
}
@@ -112,7 +111,7 @@
return false;
tempo = ConfMan.get("action_mapping", domain()).c_str();
if (tempo && strlen(tempo)) {
- for (i=0; i<size(); i++) {
+ for (i = 0; i < size(); ++i) {
char x[7];
int j;
memset(x, 0, sizeof(x));
@@ -121,8 +120,7 @@
_action_mapping[i] = j;
}
return true;
- }
- else
+ } else
return false;
}
@@ -131,7 +129,7 @@
int i;
tempo[0] = '\0';
ConfMan.setInt("action_mapping_version", version(), domain());
- for (i=0; i<size(); i++) {
+ for (i = 0; i < size(); ++i) {
char x[10];
sprintf(x, "%.4x ", _action_mapping[i]);
strcat(tempo, x);
@@ -149,7 +147,7 @@
void Actions::setMapping(ActionType action, unsigned int keyCode) {
int i;
- for (i=0; i<size(); i++) {
+ for (i = 0; i < size(); ++i) {
if (_action_mapping[i] == keyCode)
_action_mapping[i] = 0;
}
@@ -157,8 +155,7 @@
_action_mapping[action] = keyCode;
}
-Key& Actions::getKeyAction(ActionType action)
-{
+Key& Actions::getKeyAction(ActionType action) {
return _key_action[action];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list