diff options
author | markt <markt> | 2007-06-16 22:45:25 (GMT) |
---|---|---|
committer | markt <markt> | 2007-06-16 22:45:25 (GMT) |
commit | 2edf6a574137a6c42abd71522c1fb398556e5b19 (patch) | |
tree | c10034c03e10c6c043a7590f1e0972c289631026 /src/Window.cc | |
parent | 5704ad99d3e07fa1dc0a7b9cebd6135380df5e65 (diff) | |
download | fluxbox-2edf6a574137a6c42abd71522c1fb398556e5b19.zip fluxbox-2edf6a574137a6c42abd71522c1fb398556e5b19.tar.bz2 |
moved function so fluxbox compiles with --disable-remember
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/Window.cc b/src/Window.cc index 44fd4c9..8b92999 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -396,7 +396,7 @@ void FluxboxWindow::init() { | |||
396 | m_blackbox_attrib.premax_w = m_blackbox_attrib.premax_h = 0; | 396 | m_blackbox_attrib.premax_w = m_blackbox_attrib.premax_h = 0; |
397 | 397 | ||
398 | // set default decorations but don't apply them | 398 | // set default decorations but don't apply them |
399 | setDecorationMask(Remember::getDecoFromString(screen().defaultDeco()), false); | 399 | setDecorationMask(getDecoMaskFromString(screen().defaultDeco()), false); |
400 | 400 | ||
401 | functions.resize = functions.move = functions.iconify = functions.maximize | 401 | functions.resize = functions.move = functions.iconify = functions.maximize |
402 | = functions.close = functions.tabable = true; | 402 | = functions.close = functions.tabable = true; |
@@ -4254,3 +4254,29 @@ void FluxboxWindow::associateClient(WinClient &client) { | |||
4254 | evm.add(*this, client.window()); | 4254 | evm.add(*this, client.window()); |
4255 | client.setFluxboxWindow(this); | 4255 | client.setFluxboxWindow(this); |
4256 | } | 4256 | } |
4257 | |||
4258 | int FluxboxWindow::getDecoMaskFromString(const string &str_label) { | ||
4259 | if (strcasecmp(str_label.c_str(), "NONE") == 0) | ||
4260 | return 0; | ||
4261 | if (strcasecmp(str_label.c_str(), "NORMAL") == 0) | ||
4262 | return FluxboxWindow::DECORM_LAST - 1; | ||
4263 | if (strcasecmp(str_label.c_str(), "TINY") == 0) | ||
4264 | return FluxboxWindow::DECORM_TITLEBAR | ||
4265 | | FluxboxWindow::DECORM_ICONIFY | ||
4266 | | FluxboxWindow::DECORM_MENU | ||
4267 | | FluxboxWindow::DECORM_TAB; | ||
4268 | if (strcasecmp(str_label.c_str(), "TOOL") == 0) | ||
4269 | return FluxboxWindow::DECORM_TITLEBAR | ||
4270 | | FluxboxWindow::DECORM_MENU; | ||
4271 | if (strcasecmp(str_label.c_str(), "BORDER") == 0) | ||
4272 | return FluxboxWindow::DECORM_BORDER | ||
4273 | | FluxboxWindow::DECORM_MENU; | ||
4274 | if (strcasecmp(str_label.c_str(), "TAB") == 0) | ||
4275 | return FluxboxWindow::DECORM_BORDER | ||
4276 | | FluxboxWindow::DECORM_MENU | ||
4277 | | FluxboxWindow::DECORM_TAB; | ||
4278 | unsigned int mask = atoi(str_label.c_str()); | ||
4279 | if (mask) | ||
4280 | return mask; | ||
4281 | return -1; | ||
4282 | } | ||