aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-13 06:45:29 (GMT)
committermarkt <markt>2006-07-13 06:45:29 (GMT)
commitd32a7af7e6540221edbf43cee7b89a36e0755a66 (patch)
treec1681b79fda33ec5fc213cabac77856e2183c83b
parente44da5f926c5e61818a130071ecaa5a41d900fc2 (diff)
downloadfluxbox-d32a7af7e6540221edbf43cee7b89a36e0755a66.zip
fluxbox-d32a7af7e6540221edbf43cee7b89a36e0755a66.tar.bz2
remove lock from RootTheme and redundant loadTheme from fluxbox
-rw-r--r--ChangeLog2
-rw-r--r--src/RootTheme.cc4
-rw-r--r--src/RootTheme.hh3
-rw-r--r--src/Screen.cc2
-rw-r--r--src/fluxbox.cc2
5 files changed, 2 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index cac729e..9ed16b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/13: 3*06/07/13:
4 * Remove some redundant code for loading styles (Mark)
5 fluxbox.cc Screen.cc RootTheme.cc/hh
4 * Fix background: random (Mark) 6 * Fix background: random (Mark)
5 RootTheme.cc 7 RootTheme.cc
6*06/07/10: 8*06/07/10:
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 19e8c8d..61c7b65 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -109,7 +109,6 @@ RootTheme::RootTheme(const std::string &root_command,
109 m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), 109 m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())),
110 m_root_command(root_command), 110 m_root_command(root_command),
111 m_image_ctrl(image_control), 111 m_image_ctrl(image_control),
112 m_lock(false),
113 m_background_loaded(true) { 112 m_background_loaded(true) {
114 113
115 Display *disp = FbTk::App::instance()->display(); 114 Display *disp = FbTk::App::instance()->display();
@@ -138,9 +137,6 @@ bool RootTheme::fallback(FbTk::ThemeItem_base &item) {
138void RootTheme::reconfigTheme() { 137void RootTheme::reconfigTheme() {
139 _FB_USES_NLS; 138 _FB_USES_NLS;
140 139
141 if (m_lock)
142 return;
143
144 // if user specified background in the config then use it 140 // if user specified background in the config then use it
145 // instead of style background 141 // instead of style background
146 if (!m_root_command.empty()) { 142 if (!m_root_command.empty()) {
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 7136ea0..8bd2841 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -61,14 +61,11 @@ public:
61 m_opgc.setLineAttributes(width, line_style, cap_style, join_style); 61 m_opgc.setLineAttributes(width, line_style, cap_style, join_style);
62 } 62 }
63 63
64 //!! TODO we should need this later
65 void lock(bool value) { m_lock = value; }
66private: 64private:
67 BackgroundItem *m_background;///< background image/texture 65 BackgroundItem *m_background;///< background image/texture
68 FbTk::GContext m_opgc; 66 FbTk::GContext m_opgc;
69 const std::string &m_root_command; 67 const std::string &m_root_command;
70 FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture 68 FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture
71 bool m_lock; ///< reconfigure lock
72 bool m_background_loaded; ///< whether or not the background is present in the style file 69 bool m_background_loaded; ///< whether or not the background is present in the style file
73 70
74}; 71};
diff --git a/src/Screen.cc b/src/Screen.cc
index c54338d..20fc755 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -442,11 +442,9 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
442 // else the focus label doesn't get updated 442 // else the focus label doesn't get updated
443 // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme 443 // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme
444 // This must be fixed in the future. 444 // This must be fixed in the future.
445 m_root_theme->lock(true);
446 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), 445 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
447 fluxbox->getStyleOverlayFilename(), 446 fluxbox->getStyleOverlayFilename(),
448 m_root_theme->screenNum()); 447 m_root_theme->screenNum());
449 m_root_theme->lock(false);
450 m_root_theme->setLineAttributes(*resource.gc_line_width, 448 m_root_theme->setLineAttributes(*resource.gc_line_width,
451 *resource.gc_line_style, 449 *resource.gc_line_style,
452 *resource.gc_cap_style, 450 *resource.gc_cap_style,
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 737eda2..ccc7f8d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -291,8 +291,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
291#endif // HAVE_RANDR 291#endif // HAVE_RANDR
292 292
293 load_rc(); 293 load_rc();
294 // setup theme manager to have our style file ready to be scanned
295 FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());
296 294
297 // setup atom handlers before we create any windows 295 // setup atom handlers before we create any windows
298#ifdef REMEMBER 296#ifdef REMEMBER