diff options
Diffstat (limited to 'src/Remember.cc')
-rw-r--r-- | src/Remember.cc | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/Remember.cc b/src/Remember.cc index 55816c4..cb1114c 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -290,32 +290,6 @@ Remember::~Remember() { | |||
290 | s_instance = 0; | 290 | s_instance = 0; |
291 | } | 291 | } |
292 | 292 | ||
293 | int Remember::getDecoFromString(const string &str_label) { | ||
294 | if (strcasecmp(str_label.c_str(), "NONE") == 0) | ||
295 | return 0; | ||
296 | if (strcasecmp(str_label.c_str(), "NORMAL") == 0) | ||
297 | return FluxboxWindow::DECORM_LAST - 1; | ||
298 | if (strcasecmp(str_label.c_str(), "TINY") == 0) | ||
299 | return FluxboxWindow::DECORM_TITLEBAR | ||
300 | | FluxboxWindow::DECORM_ICONIFY | ||
301 | | FluxboxWindow::DECORM_MENU | ||
302 | | FluxboxWindow::DECORM_TAB; | ||
303 | if (strcasecmp(str_label.c_str(), "TOOL") == 0) | ||
304 | return FluxboxWindow::DECORM_TITLEBAR | ||
305 | | FluxboxWindow::DECORM_MENU; | ||
306 | if (strcasecmp(str_label.c_str(), "BORDER") == 0) | ||
307 | return FluxboxWindow::DECORM_BORDER | ||
308 | | FluxboxWindow::DECORM_MENU; | ||
309 | if (strcasecmp(str_label.c_str(), "TAB") == 0) | ||
310 | return FluxboxWindow::DECORM_BORDER | ||
311 | | FluxboxWindow::DECORM_MENU | ||
312 | | FluxboxWindow::DECORM_TAB; | ||
313 | unsigned int mask; | ||
314 | if (getuint(str_label.c_str(), mask)) | ||
315 | return mask; | ||
316 | return -1; | ||
317 | } | ||
318 | |||
319 | Application* Remember::find(WinClient &winclient) { | 293 | Application* Remember::find(WinClient &winclient) { |
320 | // if it is already associated with a application, return that one | 294 | // if it is already associated with a application, return that one |
321 | // otherwise, check it against every pattern that we've got | 295 | // otherwise, check it against every pattern that we've got |
@@ -474,7 +448,7 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) { | |||
474 | app.rememberIconHiddenstate((strcasecmp(str_label.c_str(), "yes") == 0)); | 448 | app.rememberIconHiddenstate((strcasecmp(str_label.c_str(), "yes") == 0)); |
475 | app.rememberFocusHiddenstate((strcasecmp(str_label.c_str(), "yes") == 0)); | 449 | app.rememberFocusHiddenstate((strcasecmp(str_label.c_str(), "yes") == 0)); |
476 | } else if (strcasecmp(str_key.c_str(), "Deco") == 0) { | 450 | } else if (strcasecmp(str_key.c_str(), "Deco") == 0) { |
477 | int deco = getDecoFromString(str_label); | 451 | int deco = FluxboxWindow::getDecoMaskFromString(str_label); |
478 | if (deco == -1) | 452 | if (deco == -1) |
479 | had_error = 1; | 453 | had_error = 1; |
480 | else | 454 | else |