move getDecoMaskFromString to FbWinFrame
Mark Tiefenbruck mark@fluxbox.org
5 files changed,
24 insertions(+),
24 deletions(-)
M
src/FbWinFrame.cc
→
src/FbWinFrame.cc
@@ -1407,6 +1407,26 @@ btn->reconfigTheme();
} } +int FbWinFrame::getDecoMaskFromString(const string &str_label) { + if (strcasecmp(str_label.c_str(), "NONE") == 0) + return DECOR_NONE; + if (strcasecmp(str_label.c_str(), "NORMAL") == 0) + return DECOR_NORMAL; + if (strcasecmp(str_label.c_str(), "TINY") == 0) + return DECOR_TINY; + if (strcasecmp(str_label.c_str(), "TOOL") == 0) + return DECOR_TOOL; + if (strcasecmp(str_label.c_str(), "BORDER") == 0) + return DECOR_BORDER; + if (strcasecmp(str_label.c_str(), "TAB") == 0) + return DECOR_TAB; + int mask = -1; + if (str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x' || + str_label.size() > 0 && isdigit(str_label[0])) + mask = strtol(str_label.c_str(), NULL, 0); + return mask; +} + void FbWinFrame::applyDecorations() { int grav_x=0, grav_y=0; // negate gravity
M
src/FbWinFrame.hh
→
src/FbWinFrame.hh
@@ -228,6 +228,7 @@ void applySizeHints(unsigned int &width, unsigned int &height,
bool maximizing = false) const; void displaySize(unsigned int width, unsigned int height) const; + static int getDecoMaskFromString(const std::string &str); void setDecorationMask(unsigned int mask) { m_state.deco_mask = mask; } void applyDecorations();
M
src/Remember.cc
→
src/Remember.cc
@@ -513,7 +513,7 @@ } else if (str_key == "hidden") {
app.rememberIconHiddenstate((strcasecmp(str_label.c_str(), "yes") == 0)); app.rememberFocusHiddenstate((strcasecmp(str_label.c_str(), "yes") == 0)); } else if (str_key == "deco") { - int deco = FluxboxWindow::getDecoMaskFromString(str_label); + int deco = FbWinFrame::getDecoMaskFromString(str_label); if (deco == -1) had_error = 1; else
M
src/Window.cc
→
src/Window.cc
@@ -427,7 +427,8 @@ m_blackbox_attrib.premax_x = m_blackbox_attrib.premax_y = 0;
m_blackbox_attrib.premax_w = m_blackbox_attrib.premax_h = 0; // set default decorations but don't apply them - setDecorationMask(getDecoMaskFromString(screen().defaultDeco()), false); + setDecorationMask(FbWinFrame::getDecoMaskFromString(screen().defaultDeco()), + false); functions.resize = functions.move = functions.iconify = functions.maximize = functions.close = functions.tabable = true;@@ -4033,26 +4034,6 @@ evm.add(*this, btn->window()); // we take care of button events for this
evm.add(*this, client.window()); client.setFluxboxWindow(this); client.titleSig().attach(this); -} - -int FluxboxWindow::getDecoMaskFromString(const string &str_label) { - if (strcasecmp(str_label.c_str(), "NONE") == 0) - return FbWinFrame::DECOR_NONE; - if (strcasecmp(str_label.c_str(), "NORMAL") == 0) - return FbWinFrame::DECOR_NORMAL; - if (strcasecmp(str_label.c_str(), "TINY") == 0) - return FbWinFrame::DECOR_TINY; - if (strcasecmp(str_label.c_str(), "TOOL") == 0) - return FbWinFrame::DECOR_TOOL; - if (strcasecmp(str_label.c_str(), "BORDER") == 0) - return FbWinFrame::DECOR_BORDER; - if (strcasecmp(str_label.c_str(), "TAB") == 0) - return FbWinFrame::DECOR_TAB; - int mask = -1; - if (str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x' || - str_label.size() > 0 && isdigit(str_label[0])) - mask = strtol(str_label.c_str(), NULL, 0); - return mask; } int FluxboxWindow::getOnHead() const {
M
src/Window.hh
→
src/Window.hh
@@ -465,8 +465,6 @@
int layerNum() const { return m_layernum; } void setLayerNum(int layernum); - static int getDecoMaskFromString(const std::string &str); - unsigned int titlebarHeight() const; int initialState() const;