aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-24 11:19:45 (GMT)
committerfluxgen <fluxgen>2003-08-24 11:19:45 (GMT)
commitd509be7ac9a01ad5e2de4e4de510788ada3c8a60 (patch)
treee7e2317571a916a318ace7da21888f3653911cbf /src/fluxbox.cc
parente405a967e2c17d8947fc80a31f211314499d5927 (diff)
downloadfluxbox_pavel-d509be7ac9a01ad5e2de4e4de510788ada3c8a60.zip
fluxbox_pavel-d509be7ac9a01ad5e2de4e4de510788ada3c8a60.tar.bz2
cleaning
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc33
1 files changed, 8 insertions, 25 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 370bc1d..c28a53c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.186 2003/08/22 21:38:58 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.187 2003/08/24 11:19:45 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1332,17 +1332,11 @@ void Fluxbox::attachSignals(WinClient &winclient) {
1332} 1332}
1333 1333
1334BScreen *Fluxbox::searchScreen(Window window) { 1334BScreen *Fluxbox::searchScreen(Window window) {
1335 BScreen *screen = 0;
1336 ScreenList::iterator it = m_screen_list.begin(); 1335 ScreenList::iterator it = m_screen_list.begin();
1337 ScreenList::iterator it_end = m_screen_list.end(); 1336 ScreenList::iterator it_end = m_screen_list.end();
1338
1339 for (; it != it_end; ++it) { 1337 for (; it != it_end; ++it) {
1340 if (*it) { 1338 if (*it && (*it)->rootWindow() == window)
1341 if ((*it)->rootWindow() == window) { 1339 return (*it);
1342 screen = (*it);
1343 return screen;
1344 }
1345 }
1346 } 1340 }
1347 1341
1348 return 0; 1342 return 0;
@@ -1431,12 +1425,8 @@ void Fluxbox::shutdown() {
1431 XSetInputFocus(FbTk::App::instance()->display(), PointerRoot, None, CurrentTime); 1425 XSetInputFocus(FbTk::App::instance()->display(), PointerRoot, None, CurrentTime);
1432 1426
1433 //send shutdown to all screens 1427 //send shutdown to all screens
1434 ScreenList::iterator it = m_screen_list.begin(); 1428 for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::shutdown));
1435 ScreenList::iterator it_end = m_screen_list.end(); 1429
1436 for (; it != it_end; ++it) {
1437 if(*it)
1438 (*it)->shutdown();
1439 }
1440 m_shutdown = true; 1430 m_shutdown = true;
1441 XSync(FbTk::App::instance()->display(), False); 1431 XSync(FbTk::App::instance()->display(), False);
1442 1432
@@ -1791,10 +1781,8 @@ void Fluxbox::real_reconfigure() {
1791 if (old_blackboxrc) 1781 if (old_blackboxrc)
1792 XrmDestroyDatabase(old_blackboxrc); 1782 XrmDestroyDatabase(old_blackboxrc);
1793 1783
1794 ScreenList::iterator sit = m_screen_list.begin(); 1784 // reconfigure all screens
1795 ScreenList::iterator sit_end = m_screen_list.end(); 1785 for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::reconfigure));
1796 for (; sit != sit_end; ++sit)
1797 (*sit)->reconfigure();
1798 1786
1799 //reconfigure keys 1787 //reconfigure keys
1800 m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str()); 1788 m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str());
@@ -1841,12 +1829,7 @@ void Fluxbox::real_rereadMenu() {
1841 delete *it; 1829 delete *it;
1842 1830
1843 m_menu_timestamps.erase(m_menu_timestamps.begin(), m_menu_timestamps.end()); 1831 m_menu_timestamps.erase(m_menu_timestamps.begin(), m_menu_timestamps.end());
1844 1832 for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::rereadMenu));
1845 ScreenList::iterator sit = m_screen_list.begin();
1846 ScreenList::iterator sit_end = m_screen_list.end();
1847 for (; sit != sit_end; ++sit) {
1848 (*sit)->rereadMenu();
1849 }
1850} 1833}
1851 1834
1852void Fluxbox::saveMenuFilename(const char *filename) { 1835void Fluxbox::saveMenuFilename(const char *filename) {