summaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-05-12 00:22:40 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-05-12 00:22:40 (GMT)
commit93b0c5322a7482d83e38657b36e9814f8415e47b (patch)
tree0e7bfe2e975e0b9bd88334975c691e98513c1c14 /src/FbTk
parent72a45fae3c39323206e7d19913bb3ab17a691691 (diff)
downloadfluxbox_lack-93b0c5322a7482d83e38657b36e9814f8415e47b.zip
fluxbox_lack-93b0c5322a7482d83e38657b36e9814f8415e47b.tar.bz2
refactor menu reloading, added FbTk::AutoReloadHelper
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/AutoReloadHelper.cc66
-rw-r--r--src/FbTk/AutoReloadHelper.hh54
-rw-r--r--src/FbTk/Makefile.am1
3 files changed, 121 insertions, 0 deletions
diff --git a/src/FbTk/AutoReloadHelper.cc b/src/FbTk/AutoReloadHelper.cc
new file mode 100644
index 0000000..e3c1d59
--- /dev/null
+++ b/src/FbTk/AutoReloadHelper.cc
@@ -0,0 +1,66 @@
1// AutoReloadHelper.cc
2// Copyright (c) 2008 Fluxbox Team (fluxgen at fluxbox dot org)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22#include "AutoReloadHelper.hh"
23
24#include "FileUtil.hh"
25#include "StringUtil.hh"
26
27namespace FbTk {
28
29void AutoReloadHelper::checkReload() {
30 if (!m_reload_cmd.get())
31 return;
32 TimestampMap::const_iterator it = m_timestamps.begin();
33 TimestampMap::const_iterator it_end = m_timestamps.end();
34 for (; it != it_end; ++it) {
35 if (FileUtil::getLastStatusChangeTimestamp(it->first.c_str()) !=
36 it->second) {
37 reload();
38 return;
39 }
40 }
41}
42
43void AutoReloadHelper::setMainFile(std::string file) {
44 file = StringUtil::expandFilename(file);
45 if (file == m_main_file)
46 return;
47 m_main_file = file;
48 reload();
49}
50
51void AutoReloadHelper::addFile(std::string file) {
52 if (file.empty())
53 return;
54 file = StringUtil::expandFilename(file);
55 m_timestamps[file] = FileUtil::getLastStatusChangeTimestamp(file.c_str());
56}
57
58void AutoReloadHelper::reload() {
59 if (!m_reload_cmd.get())
60 return;
61 m_timestamps.clear();
62 addFile(m_main_file);
63 m_reload_cmd->execute();
64}
65
66} // end namespace FbTk
diff --git a/src/FbTk/AutoReloadHelper.hh b/src/FbTk/AutoReloadHelper.hh
new file mode 100644
index 0000000..36be8f1
--- /dev/null
+++ b/src/FbTk/AutoReloadHelper.hh
@@ -0,0 +1,54 @@
1// AutoReloadHelper.hh
2// Copyright (c) 2008 Fluxbox Team (fluxgen at fluxbox dot org)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22#ifndef AUTORELOADHELPER_HH
23#define AUTORELOADHELPER_HH
24
25#include <map>
26#include <string>
27#include <sys/types.h>
28
29#include "Command.hh"
30#include "RefCount.hh"
31
32namespace FbTk {
33
34class AutoReloadHelper {
35public:
36
37 void setMainFile(std::string filename);
38 void addFile(std::string filename);
39 void setReloadCmd(RefCount<Command<void> > cmd) { m_reload_cmd = cmd; }
40
41 void checkReload();
42 void reload();
43
44private:
45 RefCount<Command<void> > m_reload_cmd;
46 std::string m_main_file;
47
48 typedef std::map<std::string, time_t> TimestampMap;
49 TimestampMap m_timestamps;
50};
51
52} // end namespace FbTk
53
54#endif // AUTORELOADHELPER_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index fcf0304..f830e4a 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -45,6 +45,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
45 RegExp.hh RegExp.cc \ 45 RegExp.hh RegExp.cc \
46 FbString.hh FbString.cc \ 46 FbString.hh FbString.cc \
47 Subject.hh Subject.cc Observer.hh Observer.cc SimpleObserver.hh \ 47 Subject.hh Subject.cc Observer.hh Observer.cc SimpleObserver.hh \
48 AutoReloadHelper.hh AutoReloadHelper.cc \
48 Transparent.hh Transparent.cc \ 49 Transparent.hh Transparent.cc \
49 FbPixmap.hh FbPixmap.cc \ 50 FbPixmap.hh FbPixmap.cc \
50 FbDrawable.hh FbDrawable.cc \ 51 FbDrawable.hh FbDrawable.cc \