Ticket #8388: scaleableGui-v1.patch

graphics/font.cpp

@@ -20 +20 @@
 
 #include "common/stdafx.h"
 #include "graphics/font.h"
+#include "gui/newgui.h"
 
 namespace Graphics {
 
@@ -38 +39 @@
 
 void NewFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color) const {
         assert(dst != 0);
+        const int scaleFactorWidth = g_gui.getScaleFactorWidth(), scaleFactorHeight = g_gui.getScaleFactorHeight();
+        tx *= scaleFactorWidth; ty *= scaleFactorHeight;
+
         byte *ptr = (byte *)dst->getBasePtr(tx, ty);
 
         assert(desc.bits != 0 && desc.maxwidth <= 16);
@@ -54 +58 @@
         chr -= desc.firstchar;
         const bitmap_t *tmp = desc.bits + (desc.offset ? desc.offset[chr] : (chr * desc.height));
 
-        for (int y = 0; y < desc.height; y++, ptr += dst->pitch) {
-                const bitmap_t buffer = *tmp++;
+        for (int y = 0; y < desc.height * scaleFactorHeight; y++, ptr += dst->pitch) {
+                const bitmap_t *buffer = 0;
+                if(scaleFactorHeight != 1) {
+                        if(!(y % 2))
+                                buffer = tmp++;
+                        else
+                                buffer = tmp;
+                } else
+                        buffer = tmp++;
                 bitmap_t mask = 0x8000;
                 if (ty + y < 0 || ty + y >= dst->h)
                         continue;
-                
-                for (int x = 0; x < w; x++, mask >>= 1) {
+
+                for (int x = 0; x < w * scaleFactorWidth; x++) {
+                        if(scaleFactorWidth != 1) {
+                                if(!(x % 2) && x != 0)
+                                        mask >>= 1;
+                        } else if(x != 0)
+                                mask >>= 1;
+
                         if (tx + x < 0 || tx + x >= dst->w)
                                 continue;
-                        if ((buffer & mask) != 0) {
+                        if ((*buffer & mask) != 0) {
                                 if (dst->bytesPerPixel == 1)
                                         ptr[x] = color;
                                 else if (dst->bytesPerPixel == 2)
@@ -91 +108 @@
         uint i;
         int width = getStringWidth(s);
         Common::String str;
-        
+
         if (useEllipsis && width > w) {
                 // String is too wide. So we shorten it "intellegently", by replacing
                 // parts of it by an ellipsis ("..."). There are three possibilities
@@ -100 +117 @@
                 // make this configurable, replacing the middle probably is a good
                 // compromise.
                 const int ellipsisWidth = getStringWidth("...");
-                
+
                 // SLOW algorithm to remove enough of the middle. But it is good enough
                 // for now.
                 const int halfWidth = (w - ellipsisWidth) / 2;
                 int w2 = 0;
-                
+
                 for (i = 0; i < s.size(); ++i) {
                         int charWidth = getCharWidth(s[i]);
                         if (w2 + charWidth > halfWidth)
@@ -116 +133 @@
                 // At this point we know that the first 'i' chars are together 'w2'
                 // pixels wide. We took the first i-1, and add "..." to them.
                 str += "...";
-                
+
                 // The original string is width wide. Of those we already skipped past
                 // w2 pixels, which means (width - w2) remain.
                 // The new str is (w2+ellipsisWidth) wide, so we can accomodate about

graphics/scummfont.cpp

@@ -20 +20 @@
 
 #include "stdafx.h"
 #include "graphics/font.h"
+#include "gui/newgui.h"
 
 namespace Graphics {
 
@@ -64 +65 @@
 //void ScummFont::drawChar(byte chr, int xx, int yy, OverlayColor color) {
 void ScummFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color) const {
         assert(dst != 0);
+        const int scaleFactorWidth = g_gui.getScaleFactorWidth(), scaleFactorHeight = g_gui.getScaleFactorHeight();
+        tx *= scaleFactorWidth; ty *= scaleFactorHeight;
+
         byte *ptr = (byte *)dst->getBasePtr(tx, ty);
 
         const byte *tmp = guifont + 6 + guifont[4] + chr * 8;
         uint buffer = 0;
         uint mask = 0;
 
-        for (int y = 0; y < 8; y++) {
+        for (int y = 0; y < 8 * scaleFactorHeight; y++) {
                 if (ty + y < 0 || ty + y >= dst->h)
                         continue;
-                for (int x = 0; x < 8; x++) {
+                for (int x = 0; x < 8 * scaleFactorWidth; x++) {
                         if (tx + x < 0 || tx + x >= dst->w)
                                 continue;
                         unsigned char c;
-                        mask >>= 1;
+                        if(scaleFactorWidth != 1 && !(x % 2))
+                                mask >>= 1;
+                        else if(scaleFactorWidth == 1)
+                                mask >>= 1;
+
                         if (mask == 0) {
-                                buffer = *tmp++;
+                                if(scaleFactorHeight != 1 && !(y % 2))
+                                        buffer = *tmp++;
+                                else if(scaleFactorHeight == 1)
+                                        buffer = *tmp++;
+
                                 mask = 0x80;
                         }
                         c = ((buffer & mask) != 0);

gui/dialog.cpp

@@ -29 +29 @@
 
 /*
  * TODO list
- * - add some sense of the window being "active" (i.e. in front) or not. If it 
+ * - add some sense of the window being "active" (i.e. in front) or not. If it
  *   was inactive and just became active, reset certain vars (like who is focused).
  *   Maybe we should just add lostFocus and receivedFocus methods to Dialog, just
  *   like we have for class Widget?
@@ -98 +98 @@
 }
 
 void Dialog::drawDialog() {
-        
+
         if (!isVisible())
                 return;
 
@@ -117 +117 @@
 }
 
 void Dialog::handleMouseDown(int x, int y, int button, int clickCount) {
+        x /= g_gui.getScaleFactorWidth(); y /= g_gui.getScaleFactorHeight();
+
         Widget *w;
+
         w = findWidget(x, y);
-        
+
         _dragWidget = w;
 
         // If the click occured inside a widget which is not the currently
@@ -141 +144 @@
 }
 
 void Dialog::handleMouseUp(int x, int y, int button, int clickCount) {
+        x /= g_gui.getScaleFactorWidth(); y /= g_gui.getScaleFactorHeight();
+
         Widget *w;
 
         if (_focusedWidget) {
                 //w = _focusedWidget;
-                
+
                 // Lose focus on mouseup unless the widget requested to retain the focus
                 if (! (_focusedWidget->getFlags() & WIDGET_RETAIN_FOCUS )) {
                         releaseFocus();
@@ -161 +166 @@
 }
 
 void Dialog::handleMouseWheel(int x, int y, int direction) {
+        x /= g_gui.getScaleFactorWidth(); y /= g_gui.getScaleFactorHeight();
+
         Widget *w;
 
         // This may look a bit backwards, but I think it makes more sense for
@@ -212 +219 @@
 }
 
 void Dialog::handleMouseMoved(int x, int y, int button) {
+        x /= g_gui.getScaleFactorWidth(); y /= g_gui.getScaleFactorHeight();
+
         Widget *w;
-        
+
         //if (!button)
         //      _dragWidget = 0;
-        
+
         if (_focusedWidget && !_dragWidget) {
                 w = _focusedWidget;
                 int wx = w->getAbsX() - _x;
                 int wy = w->getAbsY() - _y;
-                
+
                 // We still send mouseEntered/Left messages to the focused item
                 // (but to no other items).
                 bool mouseInFocusedWidget = (x >= wx && x < wx + w->_w && y >= wy && y < wy + w->_h);
@@ -237 +246 @@
 
                 w->handleMouseMoved(x - wx, y - wy, button);
         }
-        
+
         // While a "drag" is in process (i.e. mouse is moved while a button is pressed),
         // only deal with the widget in which the click originated.
         if (_dragWidget)
@@ -251 +260 @@
                 if (w)
                         w->handleMouseEntered(button);
                 _mouseWidget = w;
-        } 
+        }
 
         if (w && (w->getFlags() & WIDGET_TRACK_MOUSE)) {
                 w->handleMouseMoved(x - (w->getAbsX() - _x), y - (w->getAbsY() - _y), button);

gui/newgui.cpp

@@ -41 +41 @@
  * - allow multi line (l/c/r aligned) text via StaticTextWidget ?
  * - add "close" widget to all dialogs (with a flag to turn it off) ?
  * - make dialogs "moveable" ?
- * - come up with a new look & feel / theme for the GUI 
+ * - come up with a new look & feel / theme for the GUI
  * - ...
  */
 
@@ -56 +56 @@
 // Constructor
 NewGui::NewGui() : _needRedraw(false),
         _stateIsSaved(false), _cursorAnimateCounter(0), _cursorAnimateTimer(0) {
-        
+
         _system = OSystem::instance();
 
         // Clear the cursor
@@ -64 +64 @@
 
         // Reset key repeat
         _currentKeyDown.keycode = 0;
+
+        // updates the scaling factor
+        updateScaleFactor();
 }
 
 void NewGui::updateColors() {
@@ -75 +78 @@
         _textcolorhi = _system->RGBToColor(0, 255, 0);
 }
 
+void NewGui::updateScaleFactor() {
+        const int16 stdGuiWidth = 320;
+        const int16 stdGuiHeight = 200;
+
+        _scaleFactorWidth = _system->getWidth() / stdGuiWidth;
+        _scaleFactorHeight = _system->getHeight() / stdGuiHeight;
+}
+
 void NewGui::runLoop() {
         Dialog *activeDialog = _dialogStack.top();
         bool didSaveState = false;
 
         if (activeDialog == 0)
                 return;
-        
+
         // Setup some default GUI colors. Normally this will be done whenever an
         // EVENT_SCREEN_CHANGED is received. However, not yet all backends support
         // that event, so we also do it "manually" whenever a run loop is entered.
         updateColors();
+        updateScaleFactor();
 
         if (!_stateIsSaved) {
                 saveState();
@@ -106 +118 @@
                 }
 
                 animateCursor();
-                _system->updateScreen();                
+                _system->updateScreen();
 
                 OSystem::Event event;
                 uint32 time = _system->getMillis();
@@ -131 +143 @@
                                         _currentKeyDown.keycode = 0;
                                 break;
                         case OSystem::EVENT_MOUSEMOVE:
-                                activeDialog->handleMouseMoved(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 0);
+                                activeDialog->handleMouseMoved(event.mouse.x - (activeDialog->_x * _scaleFactorWidth), event.mouse.y - (activeDialog->_y * _scaleFactorHeight), 0);
                                 break;
                         // We don't distinguish between mousebuttons (for now at least)
                         case OSystem::EVENT_LBUTTONDOWN:
@@ -146 +158 @@
                                         _lastClick.count = 1;
                                 }
                                 _lastClick.time = time;
-                                activeDialog->handleMouseDown(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 1, _lastClick.count);
+                                activeDialog->handleMouseDown(event.mouse.x - (activeDialog->_x * _scaleFactorWidth), event.mouse.y - (activeDialog->_y * _scaleFactorHeight), 1, _lastClick.count);
                                 break;
                         case OSystem::EVENT_LBUTTONUP:
                         case OSystem::EVENT_RBUTTONUP:
-                                activeDialog->handleMouseUp(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 1, _lastClick.count);
+                                activeDialog->handleMouseUp(event.mouse.x - (activeDialog->_x * _scaleFactorWidth), event.mouse.y - (activeDialog->_y * _scaleFactorHeight), 1, _lastClick.count);
                                 break;
                         case OSystem::EVENT_WHEELUP:
-                                activeDialog->handleMouseWheel(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, -1);
+                                activeDialog->handleMouseWheel(event.mouse.x - (activeDialog->_x * _scaleFactorWidth), event.mouse.y - (activeDialog->_y * _scaleFactorHeight), -1);
                                 break;
                         case OSystem::EVENT_WHEELDOWN:
-                                activeDialog->handleMouseWheel(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 1);
+                                activeDialog->handleMouseWheel(event.mouse.x - (activeDialog->_x * _scaleFactorWidth), event.mouse.y - (activeDialog->_y * _scaleFactorHeight), 1);
                                 break;
                         case OSystem::EVENT_QUIT:
                                 _system->quit();
                                 return;
                         case OSystem::EVENT_SCREEN_CHANGED:
                                 updateColors();
+                                updateScaleFactor();
                                 activeDialog->handleScreenChanged();
                                 break;
                         }
@@ -180 +193 @@
                 // Delay for a moment
                 _system->delayMillis(10);
         }
-        
+
         if (didSaveState)
                 restoreState();
 }
@@ -224 +237 @@
         }
 
         _system->updateScreen();
-        
+
         _stateIsSaved = false;
 }
 
@@ -270 +283 @@
 }
 
 void NewGui::hLine(int x, int y, int x2, OverlayColor color) {
-        _screen.hLine(x, y, x2, color);
+        _screen.hLine(x * _scaleFactorWidth, y * _scaleFactorHeight, x2 * _scaleFactorWidth, color);
 }
 
 void NewGui::vLine(int x, int y, int y2, OverlayColor color) {
-        _screen.vLine(x, y, y2, color);
+        _screen.vLine(x * _scaleFactorWidth, y * _scaleFactorHeight, y2 * _scaleFactorHeight, color);
 }
 
 void NewGui::blendRect(int x, int y, int w, int h, OverlayColor color, int level) {
 #ifdef NEWGUI_256
         fillRect(x, y, w, h, color);
 #else
-        Common::Rect rect(x, y, x + w, y + h);
+        Common::Rect rect(x * _scaleFactorWidth, y * _scaleFactorHeight, (x + w) * _scaleFactorWidth, (y + h) * _scaleFactorHeight);
         rect.clip(_screen.w, _screen.h);
-        
+
         if (!rect.isValidRect())
                 return;
 
@@ -311 +324 @@
 }
 
 void NewGui::fillRect(int x, int y, int w, int h, OverlayColor color) {
-        _screen.fillRect(Common::Rect(x, y, x+w, y+h), color);
+        _screen.fillRect(Common::Rect(x * _scaleFactorWidth, y * _scaleFactorHeight, (x+w) * _scaleFactorWidth, (y+h) * _scaleFactorHeight), color);
 }
 
 void NewGui::frameRect(int x, int y, int w, int h, OverlayColor color) {
-        _screen.frameRect(Common::Rect(x, y, x+w, y+h), color);
+        _screen.frameRect(Common::Rect(x * _scaleFactorWidth, y * _scaleFactorHeight, (x+w) * _scaleFactorWidth, (y+h) * _scaleFactorHeight), color);
 }
 
 void NewGui::addDirtyRect(int x, int y, int w, int h) {
-        Common::Rect rect(x, y, x + w, y + h);
+        Common::Rect rect(x * _scaleFactorWidth, y * _scaleFactorHeight, (x + w) * _scaleFactorWidth, (y + h) * _scaleFactorHeight);
         rect.clip(_screen.w, _screen.h);
-        
+
         if (!rect.isValidRect())
                 return;
 
@@ -339 +352 @@
 }
 
 int NewGui::getStringWidth(const String &str) {
-        return getFont().getStringWidth(str);
+        return getFont().getStringWidth(str) * _scaleFactorWidth;
 }
 
 int NewGui::getCharWidth(byte c) {
-        return getFont().getCharWidth(c);
+        return getFont().getCharWidth(c) * _scaleFactorWidth;
 }
 
 void NewGui::drawString(const String &s, int x, int y, int w, OverlayColor color, TextAlignment align, int deltax, bool useEllipsis) {
@@ -354 +367 @@
 // Draw an 8x8 bitmap at location (x,y)
 //
 void NewGui::drawBitmap(uint32 *bitmap, int tx, int ty, OverlayColor color, int h) {
+        tx *= _scaleFactorWidth; ty *= _scaleFactorHeight;
+        h *= _scaleFactorHeight;
         OverlayColor *ptr = getBasePtr(tx, ty);
 
         for (int y = 0; y < h; y++, ptr += _screenPitch) {
                 uint32 mask = 0xF0000000;
                 if (ty + y < 0 || ty + y >= _screen.h)
                         continue;
-                for (int x = 0; x < 8; x++, mask >>= 4) {
+                for (int x = 0; x < 8 * _scaleFactorWidth; x++) {
+                        if(!(x % 2) && _scaleFactorWidth != 1 && x != 0)
+                                mask >>= 4;
+                        else if(_scaleFactorWidth == 1 && x != 0)
+                                mask >>= 4;
+
                         if (tx + x < 0 || tx + x >= _screen.w)
                                 continue;
-                        if (bitmap[y] & mask)
-                                ptr[x] = color;
+                        if (bitmap[y / _scaleFactorHeight] & mask)
+                                        ptr[x] = color;
                 }
         }
 }
@@ -374 +394 @@
 // We could plug in a different cursor here if we like to.
 //
 void NewGui::animateCursor() {
-        int time = _system->getMillis(); 
+        int time = _system->getMillis();
         if (time > _cursorAnimateTimer + kCursorAnimateDelay) {
                 const byte colors[4] = { 15, 15, 7, 8 };
                 const byte color = colors[_cursorAnimateCounter];
                 int i;
-                
+
                 for (i = 0; i < 15; i++) {
                         if ((i < 6) || (i > 8)) {
                                 _cursor[16 * 7 + i] = color;
                                 _cursor[16 * i + 7] = color;
                         }
                 }
-        
+
                 _system->setMouseCursor(_cursor, 16, 16, 7, 7);
 
                 _cursorAnimateTimer = time;

gui/newgui.h

@@ -52 +52 @@
 
 /**
  * GUI manager singleton.
- */ 
+ */
 class NewGui : public Common::Singleton<NewGui> {
         typedef Common::String String;
         friend class Dialog;
@@ -66 +66 @@
 
         bool isActive() { return ! _dialogStack.empty(); }
 
+        int getScaleFactorWidth() { return _scaleFactorWidth; }
+        int getScaleFactorHeight() { return _scaleFactorHeight; }
+
 protected:
-        OSystem         *_system;
-        Graphics::Surface               _screen;
+        OSystem                 *_system;
+        Graphics::Surface       _screen;
         int                     _screenPitch;
-        
+
+        int                     _scaleFactorWidth;
+        int                     _scaleFactorHeight;
+
         bool            _needRedraw;
         DialogStack     _dialogStack;
-        
+
         bool            _stateIsSaved;
-        
+
         // for continuous events (keyDown)
         struct {
                 uint16 ascii;
@@ -83 +89 @@
                 int keycode;
         } _currentKeyDown;
         uint32          _keyRepeatTime;
-        
+
         // position and time of last mouse click (used to detect double clicks)
         struct {
                 int16 x, y;     // Position of mouse when the click occured
                 uint32 time;    // Time
                 int count;      // How often was it already pressed?
         } _lastClick;
-        
+
         // mouse cursor state
         bool            _oldCursorMode;
-        int                     _cursorAnimateCounter;
-        int                     _cursorAnimateTimer;
+        int             _cursorAnimateCounter;
+        int             _cursorAnimateTimer;
         byte            _cursor[2048];
 
         void saveState();
         void restoreState();
-        
+
         void openDialog(Dialog *dialog);
         void closeTopDialog();
-        
+
         void loop();
 
         void animateCursor();
         void updateColors();
+        void updateScaleFactor();
 
         OverlayColor *getBasePtr(int x, int y);
 
@@ -116 +123 @@
         OverlayColor _bgcolor;
         OverlayColor _textcolor;
         OverlayColor _textcolorhi;
-        
+
         // Font
         const Graphics::Font &getFont() const;