[Scummvm-cvs-logs] SF.net SVN: scummvm: [21544] scummvm/trunk/gui
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Apr 1 16:57:02 CEST 2006
Revision: 21544
Author: lordhoto
Date: 2006-04-01 16:56:21 -0800 (Sat, 01 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21544&view=rev
Log Message:
-----------
- moves some code in ThemeNew.cpp (calcGradient and calcAlpha to the bottom)
- added possibility to use a shading effect on inactive dialogs (luminance and dim are builtin, and special ablility to specifiy a own expression, evaluated via the evaluator)
- adds also a color cache (atm it's generated on startup)
- uses luminance effect by default
- bumps theme config version to 7
Modified Paths:
--------------
scummvm/trunk/gui/ThemeClassic.cpp
scummvm/trunk/gui/ThemeNew.cpp
scummvm/trunk/gui/newgui.cpp
scummvm/trunk/gui/theme.h
scummvm/trunk/gui/themes/default-theme.ini
Modified: scummvm/trunk/gui/ThemeClassic.cpp
===================================================================
--- scummvm/trunk/gui/ThemeClassic.cpp 2006-04-02 00:18:33 UTC (rev 21543)
+++ scummvm/trunk/gui/ThemeClassic.cpp 2006-04-02 00:56:21 UTC (rev 21544)
@@ -92,7 +92,7 @@
_system->hideOverlay();
}
-void ThemeClassic::openDialog() {
+void ThemeClassic::openDialog(bool topDialog) {
#ifdef OLDGUI_TRANSPARENCY
if (!_dialog) {
_dialog = new DialogState;
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp 2006-04-02 00:18:33 UTC (rev 21543)
+++ scummvm/trunk/gui/ThemeNew.cpp 2006-04-02 00:56:21 UTC (rev 21544)
@@ -22,6 +22,7 @@
#ifndef DISABLE_FANCY_THEMES
#include "gui/theme.h"
+#include "gui/eval.h"
#include "graphics/imageman.h"
#include "graphics/imagedec.h"
@@ -36,7 +37,7 @@
#define kShadowTr3 64
#define kShadowTr4 128
-#define THEME_VERSION 6
+#define THEME_VERSION 7
using Graphics::Surface;
@@ -112,6 +113,11 @@
};
};
+OverlayColor getColorAlpha(OverlayColor col1, OverlayColor col2, int alpha);
+OverlayColor calcGradient(OverlayColor start, OverlayColor end, int pos, int max, uint factor);
+
+#pragma mark -
+
ThemeNew::ThemeNew(OSystem *system, Common::String stylefile) : Theme(), _system(system), _screen(), _initOk(false),
_lastUsedBitMask(0), _forceRedraw(false), _font(0), _imageHandles(0), _images(0), _colors(), _gradientFactors() {
_initOk = false;
@@ -234,9 +240,6 @@
_configFile.getKey("theme_logo", "pixmaps", imageHandlesTable[kThemeLogo]);
- // load the colors from the config file
- setupColors();
-
// load the gradient factors from the config file
getFactorFromConfig(_configFile, "main_dialog", _gradientFactors[kMainDialogFactor]);
getFactorFromConfig(_configFile, "dialog", _gradientFactors[kDialogFactor]);
@@ -260,7 +263,71 @@
getExtraValueFromConfig(_configFile, "shadow_right_width", _shadowRightWidth, 4);
getExtraValueFromConfig(_configFile, "shadow_top_height", _shadowTopHeight, 2);
getExtraValueFromConfig(_configFile, "shadow_bottom_height", _shadowBottomHeight, 4);
+
+ // inactive dialog shading stuff
+ _numCacheColors = 0;
+ _colorCacheTable = 0;
+ _dialogShadingCallback = 0;
+ _shadingEpxressionR = _shadingEpxressionG = _shadingEpxressionB = "";
+ _shadingEffect = kShadingEffectNothing;
+
+ if (_configFile.hasKey("inactive_dialog_shading", "extra")) {
+ _configFile.getKey("inactive_dialog_shading", "extra", temp);
+ bool createCacheTable = false;
+
+ if (temp == "no_effect") {
+ // nothing
+ } else if (temp == "luminance") {
+ _dialogShadingCallback = &ThemeNew::calcLuminance;
+ _shadingEffect = kShadingEffectLuminance;
+ // don't cache colors for the luminance effect
+ //createCacheTable = true;
+ } else if (temp == "dim") {
+ if (!_configFile.hasKey("shading_dim_percent", "extra")) {
+ warning("no 'shading_dim_percent' specified");
+ } else {
+ getValueFromConfig(_configFile, "extra", "shading_dim_percent", _dimPercentValue, -1);
+
+ if (_dimPercentValue < 0) {
+ _dimPercentValue = 0;
+ } else if (_dimPercentValue > 100) {
+ _dimPercentValue = 100;
+ }
+
+ if (_dimPercentValue != 0) {
+ _dimPercentValue = 100 - _dimPercentValue;
+ _dialogShadingCallback = &ThemeNew::calcDimColor;
+ createCacheTable = true;
+ _shadingEffect = kShadingEffectDim;
+ }
+ }
+ } else if (temp == "custom") {
+ if (_configFile.hasKey("shading_custom_r", "extra") && _configFile.hasKey("shading_custom_g", "extra")
+ && _configFile.hasKey("shading_custom_b", "extra")) {
+ _configFile.getKey("shading_custom_r", "extra", _shadingEpxressionR);
+ _configFile.getKey("shading_custom_g", "extra", _shadingEpxressionG);
+ _configFile.getKey("shading_custom_b", "extra", _shadingEpxressionB);
+ _dialogShadingCallback = &ThemeNew::calcCustomColor;
+ createCacheTable = true;
+ _shadingEffect = kShadingEffectCustom;
+ } else {
+ warning("not all custom shading expressions are defined, please check for 'shading_custom_r', 'shading_custom_g' and 'shading_custom_b'");
+ }
+ } else {
+ warning("no valid 'inactive_dialog_shading' specified");
+ }
+
+ if (createCacheTable) {
+ _numCacheColors = 65536;
+ _colorCacheTable = new OverlayColor[_numCacheColors];
+ assert(_colorCacheTable);
+ }
+ }
+
+ // load the colors from the config file
+ setupColors();
+
_imageHandles = imageHandlesTable;
_images = new const Graphics::Surface*[ARRAYSIZE(imageHandlesTable)];
@@ -340,14 +407,41 @@
_system->hideOverlay();
}
-void ThemeNew::openDialog() {
+void ThemeNew::openDialog(bool topDialog) {
if (!_dialog) {
_dialog = new DialogState;
assert(_dialog);
// first dialog
_dialog->screen.create(_screen.w, _screen.h, sizeof(OverlayColor));
}
+
+ if (_colorCacheTable && topDialog) {
+ OverlayColor *col = (OverlayColor*)_screen.pixels;
+ uint8 r, g, b;
+ for (int y = 0; y < _screen.h; ++y) {
+ for (int x = 0; x < _screen.w; ++x) {
+ _system->colorToRGB(col[x], r, g, b);
+ r = (r >> 3) & 0x1F;
+ g = (g >> 2) & 0x3F;
+ b = (b >> 3) & 0x1F;
+ col[x] = _colorCacheTable[(r << 11) | (g << 5) | b];
+ }
+ col += _screen.w;
+ }
+ } else if (_dialogShadingCallback && topDialog) {
+ OverlayColor *col = (OverlayColor*)_screen.pixels;
+ for (int y = 0; y < _screen.h; ++y) {
+ for (int x = 0; x < _screen.w; ++x) {
+ col[x] = (this->*(_dialogShadingCallback))(col[x], false);
+ }
+ col += _screen.w;
+ }
+ }
+
memcpy(_dialog->screen.pixels, _screen.pixels, _screen.pitch*_screen.h);
+
+ if ((_colorCacheTable || _dialogShadingCallback) && topDialog)
+ addDirtyRect(Common::Rect(0, 0, _screen.w, _screen.h), false, false);
}
void ThemeNew::closeDialog() {
@@ -610,8 +704,6 @@
addDirtyRect(r);
}
-OverlayColor calcGradient(OverlayColor start, OverlayColor end, int pos, int max, uint factor);
-
void ThemeNew::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, const Common::Array<Common::String> &tabs, int active, uint16 hints, kState state) {
if (!_initOk)
return;
@@ -825,33 +917,6 @@
return true;
}
-template<class T>
-inline OverlayColor calcGradient(OverlayColor start, OverlayColor end, int pos, int max) {
- OverlayColor output = 0;
- output |= ((start & T::kRedMask) + (((((end & T::kRedMask) - (start & T::kRedMask))) * pos / max) & T::kRedMask)) & T::kRedMask;
- output |= ((start & T::kGreenMask) + (((((end & T::kGreenMask) - (start & T::kGreenMask))) * pos / max) & T::kGreenMask)) & T::kGreenMask;
- output |= ((start & T::kBlueMask) + (((((end & T::kBlueMask) - (start & T::kBlueMask))) * pos / max) & T::kBlueMask)) & T::kBlueMask;
- return output;
-}
-
-OverlayColor calcGradient(OverlayColor start, OverlayColor end, int pos, int max, uint factor = 1) {
- max /= factor;
- pos *= factor;
- if (pos > max) {
- return end;
- } else if (!pos) {
- return start;
- } else if (start == end) {
- return end;
- }
-
- if (gBitFormat == 565) {
- return calcGradient<ColorMasks<565> >(start, end, pos, max);
- } else {
- return calcGradient<ColorMasks<555> >(start, end, pos, max);
- }
-}
-
void ThemeNew::colorFade(const Common::Rect &r, OverlayColor start, OverlayColor end, uint factor) {
OverlayColor *ptr = (OverlayColor*)_screen.getBasePtr(r.left, r.top);
int h = r.height();
@@ -1116,24 +1181,6 @@
drawSurfaceMasked(r, surf, upDown, leftRight, alpha, _system->RGBToColor(255, 255, 255), _system->RGBToColor(255, 255, 255));
}
-template<class T>
-inline OverlayColor getColorAlphaImpl(OverlayColor col1, OverlayColor col2, int alpha) {
- OverlayColor output = 0;
- output |= ((alpha * ((col1 & T::kRBMask) - (col2 & T::kRBMask)) >> 8) + (col2 & T::kRBMask)) & T::kRBMask;
- output |= ((alpha * ((col1 & T::kGreenMask) - (col2 & T::kGreenMask)) >> 8) + (col2 & T::kGreenMask)) & T::kGreenMask;
- return output;
-}
-
-OverlayColor getColorAlpha(OverlayColor col1, OverlayColor col2, int alpha) {
- if (alpha >= 256)
- return col1;
- if (gBitFormat == 565) {
- return getColorAlphaImpl<ColorMasks<565> >(col1, col2, alpha);
- } else {
- return getColorAlphaImpl<ColorMasks<555> >(col1, col2, alpha);
- }
-}
-
void ThemeNew::drawSurfaceMasked(const Common::Rect &r, const Graphics::Surface *surf, bool upDown, bool leftRight,
int alpha, OverlayColor start, OverlayColor end, uint factor) {
OverlayColor *dst = (OverlayColor*)_screen.getBasePtr(r.left, r.top);
@@ -1316,7 +1363,126 @@
getColorFromConfig(_configFile, "scrollbar_slider_highlight_end", _colors[kScrollbarSliderHighlightEnd]);
getColorFromConfig(_configFile, "caret_color", _colors[kCaretColor]);
+
+ setupColorCache();
}
+
+void ThemeNew::setupColorCache() {
+ // TODO: use file caches + show process bar
+
+ // inactive dialog cache
+ if (_colorCacheTable && _dialogShadingCallback) {
+ memset(_colorCacheTable, 0, sizeof(OverlayColor)*_numCacheColors);
+ for (uint i = 0; i < _numCacheColors; ++i) {
+ _colorCacheTable[i] = (this->*(_dialogShadingCallback))(i, true);
+ }
+ }
+}
+
+#pragma mark -
+
+OverlayColor ThemeNew::calcLuminance(OverlayColor col, bool cache) {
+ uint8 r, g, b;
+ if (cache) {
+ r = ((col & 0xF800) >> 11) << 3;
+ g = ((col & 0x07E0) >> 5) << 2;
+ b = (col & 0x001F) << 3;
+ } else {
+ _system->colorToRGB(col, r, g, b);
+ }
+
+ //uint lum = (76 * r / 0xFF);
+ //lum += (151 * g / 0xFF);
+ //lum += (28 * b / 0xFF);
+ uint lum = (r >> 2) + (g >> 1) + (b >> 3);
+
+ return _system->RGBToColor(lum, lum, lum);
+}
+
+OverlayColor ThemeNew::calcDimColor(OverlayColor col, bool cache) {
+ uint8 r, g, b;
+ if (cache) {
+ r = ((col & 0xF800) >> 11) << 3;
+ g = ((col & 0x07E0) >> 5) << 2;
+ b = (col & 0x001F) << 3;
+ } else {
+ _system->colorToRGB(col, r, g, b);
+ }
+
+ r = r * _dimPercentValue / 100;
+ g = g * _dimPercentValue / 100;
+ b = b * _dimPercentValue / 100;
+
+ return _system->RGBToColor(r, g, b);
+}
+
+OverlayColor ThemeNew::calcCustomColor(OverlayColor col, bool cache) {
+ uint8 r, g, b;
+ if (cache) {
+ r = ((col & 0xF800) >> 11) << 3;
+ g = ((col & 0x07E0) >> 5) << 2;
+ b = (col & 0x001F) << 3;
+ } else {
+ _system->colorToRGB(col, r, g, b);
+ }
+
+ _evaluator->setVar("r", r);
+ _evaluator->setVar("g", g);
+ _evaluator->setVar("b", b);
+
+ r = _evaluator->eval(_shadingEpxressionR, "extra", "shading_custom_r", 0);
+ g = _evaluator->eval(_shadingEpxressionG, "extra", "shading_custom_g", 0);
+ b = _evaluator->eval(_shadingEpxressionB, "extra", "shading_custom_b", 0);
+
+ return _system->RGBToColor(r, g, b);
+}
+
+#pragma mark -
+
+template<class T>
+inline OverlayColor getColorAlphaImpl(OverlayColor col1, OverlayColor col2, int alpha) {
+ OverlayColor output = 0;
+ output |= ((alpha * ((col1 & T::kRBMask) - (col2 & T::kRBMask)) >> 8) + (col2 & T::kRBMask)) & T::kRBMask;
+ output |= ((alpha * ((col1 & T::kGreenMask) - (col2 & T::kGreenMask)) >> 8) + (col2 & T::kGreenMask)) & T::kGreenMask;
+ return output;
+}
+
+OverlayColor getColorAlpha(OverlayColor col1, OverlayColor col2, int alpha) {
+ if (alpha >= 256)
+ return col1;
+ if (gBitFormat == 565) {
+ return getColorAlphaImpl<ColorMasks<565> >(col1, col2, alpha);
+ } else {
+ return getColorAlphaImpl<ColorMasks<555> >(col1, col2, alpha);
+ }
+}
+
+template<class T>
+inline OverlayColor calcGradient(OverlayColor start, OverlayColor end, int pos, int max) {
+ OverlayColor output = 0;
+ output |= ((start & T::kRedMask) + (((((end & T::kRedMask) - (start & T::kRedMask))) * pos / max) & T::kRedMask)) & T::kRedMask;
+ output |= ((start & T::kGreenMask) + (((((end & T::kGreenMask) - (start & T::kGreenMask))) * pos / max) & T::kGreenMask)) & T::kGreenMask;
+ output |= ((start & T::kBlueMask) + (((((end & T::kBlueMask) - (start & T::kBlueMask))) * pos / max) & T::kBlueMask)) & T::kBlueMask;
+ return output;
+}
+
+OverlayColor calcGradient(OverlayColor start, OverlayColor end, int pos, int max, uint factor = 1) {
+ max /= factor;
+ pos *= factor;
+ if (pos > max) {
+ return end;
+ } else if (!pos) {
+ return start;
+ } else if (start == end) {
+ return end;
+ }
+
+ if (gBitFormat == 565) {
+ return calcGradient<ColorMasks<565> >(start, end, pos, max);
+ } else {
+ return calcGradient<ColorMasks<555> >(start, end, pos, max);
+ }
+}
} // end of namespace GUI
#endif
Modified: scummvm/trunk/gui/newgui.cpp
===================================================================
--- scummvm/trunk/gui/newgui.cpp 2006-04-02 00:18:33 UTC (rev 21543)
+++ scummvm/trunk/gui/newgui.cpp 2006-04-02 00:56:21 UTC (rev 21544)
@@ -135,8 +135,19 @@
didSaveState = true;
}
- _theme->openDialog();
+ // small 'HACK': complete gui redraw (needed for new theme inactive dialog color change possibilities)
+ _theme->clearAll();
+ int i;
+
+ for (i = 0; i < _dialogStack.size() - 1; ++i) {
+ _theme->closeDialog();
+ }
+ for (i = 0; i < _dialogStack.size() - 1; i++) {
+ _theme->openDialog(false);
+ }
+ _theme->openDialog(true);
+
while (!_dialogStack.empty() && activeDialog == _dialogStack.top()) {
activeDialog->handleTickle();
@@ -145,13 +156,11 @@
// This is necessary to get the blending right.
_theme->clearAll();
- int i;
-
for (i = 0; i < _dialogStack.size(); ++i) {
_theme->closeDialog();
}
for (i = 0; i < _dialogStack.size(); i++) {
- _theme->openDialog();
+ _theme->openDialog(i == (_dialogStack.size() - 1));
_dialogStack[i]->drawDialog();
}
_needRedraw = false;
Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h 2006-04-02 00:18:33 UTC (rev 21543)
+++ scummvm/trunk/gui/theme.h 2006-04-02 00:56:21 UTC (rev 21544)
@@ -101,7 +101,7 @@
virtual void enable() = 0;
virtual void disable() = 0;
- virtual void openDialog() = 0;
+ virtual void openDialog(bool topDialog) = 0;
virtual void closeDialog() = 0;
virtual void clearAll() = 0;
@@ -199,7 +199,7 @@
void enable();
void disable();
- void openDialog();
+ void openDialog(bool topDialog);
void closeDialog();
void clearAll();
@@ -272,8 +272,8 @@
void enable();
void disable();
-
- void openDialog();
+
+ void openDialog(bool topDialog);
void closeDialog();
void clearAll();
@@ -411,6 +411,34 @@
};
private:
+ // inactive dialog effects
+ enum kShadingEffects {
+ kShadingEffectNothing = 0,
+ kShadingEffectLuminance = 1,
+ kShadingEffectDim = 2,
+ kShadingEffectCustom = 3
+ };
+
+ // used for the (yet) unimplemented cache file
+ int _shadingEffect;
+
+ int _dimPercentValue;
+ Common::String _shadingEpxressionR, _shadingEpxressionG, _shadingEpxressionB;
+
+ uint _numCacheColors;
+ OverlayColor *_colorCacheTable;
+ void setupColorCache();
+
+ typedef OverlayColor (ThemeNew::*InactiveDialogCallback)(OverlayColor col, bool cache);
+
+ InactiveDialogCallback _dialogShadingCallback;
+
+ // cache means input is 16 bpp mode
+ OverlayColor calcLuminance(OverlayColor col, bool cache);
+ OverlayColor calcDimColor(OverlayColor col, bool cache);
+ OverlayColor calcCustomColor(OverlayColor col, bool cache);
+
+private:
const String *_imageHandles;
const Graphics::Surface **_images;
Modified: scummvm/trunk/gui/themes/default-theme.ini
===================================================================
--- scummvm/trunk/gui/themes/default-theme.ini 2006-04-02 00:18:33 UTC (rev 21543)
+++ scummvm/trunk/gui/themes/default-theme.ini 2006-04-02 00:56:21 UTC (rev 21544)
@@ -1,7 +1,7 @@
# $URL$
# $Id$
[theme]
-version=6
+version=7
[pixmaps]
dialog_corner=dialog_bkgd_corner.bmp
@@ -130,7 +130,8 @@
shadow_left_width=2
shadow_right_width=4
shadow_top_height=2
-pshadow_bottom_height=4
+shadow_bottom_height=4
+inactive_dialog_shading=luminance
[640xY]
def_widgetSize=kBigWidgetSize
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