Merge branch 'master' into to_push

1 files changed, 22 insertions, 36 deletions

diff --git a/src/Remember.cc b/src/Remember.cc
index 8e133b8..f76fe9b 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -120,7 +120,7 @@ public:
 
     void click(int button, int time, unsigned int mods) {
         // reconfigure only does stuff if the apps file has changed
-        Remember::instance().reconfigure();
+        Remember::instance().checkReload();
         if (WindowCmd<void>::window() != 0) {
             if (isSelected()) {
                 Remember::instance().forgetAttrib(WindowCmd<void>::window()->winClient(), m_attrib);
@@ -281,14 +281,14 @@ void Application::reset() {
 Remember *Remember::s_instance = 0;
 
 Remember::Remember():
-    m_pats(new Patterns()),
-    m_last_timestamp(0)
-{
+    m_pats(new Patterns()) {
     if (s_instance != 0)
         throw string("Can not create more than one instance of Remember");
 
     s_instance = this;
     enableUpdate();
+
+    m_reloader.setReloadCmd(FbTk::RefCount<FbTk::Command<void> >(new FbTk::SimpleCommand<Remember>(*this, &Remember::reload)));
     reconfigure();
 }
 
@@ -411,24 +411,8 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
                 else
                     had_error = true;
             } else if (strcasecmp(str_key.c_str(), "Layer") == 0) {
-                unsigned int l;
-                if (strcasecmp(str_label.c_str(), "DESKTOP") == 0) {
-                    l = Layer::DESKTOP;
-                } else if (strcasecmp(str_label.c_str(), "BOTTOM") == 0) {
-                    l = Layer::BOTTOM;
-                } else if (strcasecmp(str_label.c_str(), "NORMAL") == 0) {
-                    l = Layer::NORMAL;
-                } else if (strcasecmp(str_label.c_str(), "TOP") == 0) {
-                    l = Layer::TOP;
-                } else if (strcasecmp(str_label.c_str(), "DOCK") == 0) {
-                    l = Layer::DOCK;
-                } else if (strcasecmp(str_label.c_str(), "ABOVEDOCK") == 0) {
-                    l = Layer::ABOVE_DOCK;
-                } else if (strcasecmp(str_label.c_str(), "MENU") == 0) {
-                    l = Layer::MENU;
-                } else if (!getuint(str_label.c_str(), l)) {
-                    had_error = true;
-                }
+                int l = Layer::getNumFromString(str_label);
+                had_error = (l == -1);
                 if (!had_error)
                     app.rememberLayer(l);
             } else if (strcasecmp(str_key.c_str(), "Dimensions") == 0) {
@@ -579,11 +563,15 @@ Application *Remember::findMatchingPatterns(ClientPattern *pat, Patterns *patlis
 
 
 void Remember::reconfigure() {
-    string apps_string = FbTk::StringUtil::expandFilename(Fluxbox::instance()->getAppsFilename());
+    m_reloader.setMainFile(Fluxbox::instance()->getAppsFilename());
+}
 
-    time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp(apps_string.c_str());
-    if (m_last_timestamp > 0 && m_last_timestamp == timestamp)
-        return;
+void Remember::checkReload() {
+    m_reloader.checkReload();
+}
+
+void Remember::reload() {
+    string apps_string = FbTk::StringUtil::expandFilename(Fluxbox::instance()->getAppsFilename());
 
 #ifdef DEBUG
     cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl;
@@ -598,7 +586,6 @@ void Remember::reconfigure() {
     m_startups.clear();
 
     if (!apps_file.fail()) {
-        m_last_timestamp = timestamp;
         if (!apps_file.eof()) {
             string line;
             int row = 0;
@@ -687,7 +674,7 @@ void Remember::reconfigure() {
 #endif
         }
     } else {
-        cerr << "apps file failure" << endl;
+        cerr << "failed to open apps file" << endl;
     }
 
     // Clean up old state
@@ -895,11 +882,8 @@ void Remember::save() {
         apps_file << "[end]" << endl;
     }
     apps_file.close();
-
-    time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp(apps_string.c_str());
-    if (timestamp > 0)
-        m_last_timestamp = timestamp;
-
+    // update timestamp to avoid unnecessary reload
+    m_reloader.addFile(Fluxbox::instance()->getAppsFilename());
 }
 
 bool Remember::isRemembered(WinClient &winclient, Attribute attrib) {
@@ -978,8 +962,7 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
         app->rememberHead(win->screen().getHead(win->fbWindow()));
         break;
     case REM_DIMENSIONS:
-        //!! Note: This is odd, why dont we need to substract border width on win->width() ?
-        app->rememberDimensions(win->normalWidth(), win->normalHeight() - 2 * win->fbWindow().borderWidth());
+        app->rememberDimensions(win->normalWidth(), win->normalHeight());
         break;
     case REM_POSITION: {
         int head = win->screen().getHead(win->fbWindow());
@@ -1216,6 +1199,9 @@ void Remember::setupClient(WinClient &winclient) {
     if (winclient.screen().isRestart())
         return;
 
+    // check if apps file has changed
+    checkReload();
+
     Application *app = find(winclient);
     if (app == 0)
         return; // nothing to do
@@ -1249,7 +1235,7 @@ FluxboxWindow *Remember::findGroup(Application *app, BScreen &screen) {
 }
 
 void Remember::updateClientClose(WinClient &winclient) {
-    reconfigure(); // reload if it's changed
+    checkReload(); // reload if it's changed
     Application *app = find(winclient);
 
     if (app && (app->save_on_close_remember && app->save_on_close)) {