aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fluxbox.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 10ddc09..a3a1b6e 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.75 2002/09/08 19:31:27 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.76 2002/10/11 10:23:54 fluxgen Exp $
26 26
27 27
28#include "fluxbox.hh" 28#include "fluxbox.hh"
@@ -41,7 +41,7 @@
41#include "XrmDatabaseHelper.hh" 41#include "XrmDatabaseHelper.hh"
42#include "AtomHandler.hh" 42#include "AtomHandler.hh"
43#include "Gnome.hh" 43#include "Gnome.hh"
44//#include "Ewmh.hh" 44#include "Ewmh.hh"
45 45
46#ifdef SLIT 46#ifdef SLIT
47#include "Slit.hh" 47#include "Slit.hh"
@@ -1646,7 +1646,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1646 BScreen &screen = subj->screen(); 1646 BScreen &screen = subj->screen();
1647 if ((&(screen.workspaceCountSig())) == changedsub) { 1647 if ((&(screen.workspaceCountSig())) == changedsub) {
1648#ifdef DEBUG 1648#ifdef DEBUG
1649 cerr<<__FILE__<<"("<<__LINE__<<"): workspace count signal"<<endl; 1649 cerr<<__FILE__<<"("<<__LINE__<<"): SCREEN workspace count signal"<<endl;
1650#endif // DEBUG 1650#endif // DEBUG
1651 for (size_t i=0; i<m_atomhandler.size(); ++i) { 1651 for (size_t i=0; i<m_atomhandler.size(); ++i) {
1652 if (m_atomhandler[i]->update()) 1652 if (m_atomhandler[i]->update())
@@ -1654,7 +1654,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1654 } 1654 }
1655 } else if ((&(screen.workspaceNamesSig())) == changedsub) { 1655 } else if ((&(screen.workspaceNamesSig())) == changedsub) {
1656#ifdef DEBUG 1656#ifdef DEBUG
1657 cerr<<__FILE__<<"("<<__LINE__<<"): workspace names signal"<<endl; 1657 cerr<<__FILE__<<"("<<__LINE__<<"): SCREEN workspace names signal"<<endl;
1658#endif // DEBUG 1658#endif // DEBUG
1659 for (size_t i=0; i<m_atomhandler.size(); ++i) { 1659 for (size_t i=0; i<m_atomhandler.size(); ++i) {
1660 if (m_atomhandler[i]->update()) 1660 if (m_atomhandler[i]->update())
@@ -1662,7 +1662,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1662 } 1662 }
1663 } else if ((&(screen.currentWorkspaceSig())) == changedsub) { 1663 } else if ((&(screen.currentWorkspaceSig())) == changedsub) {
1664#ifdef DEBUG 1664#ifdef DEBUG
1665 cerr<<__FILE__<<"("<<__LINE__<<"): current workspace signal"<<endl; 1665 cerr<<__FILE__<<"("<<__LINE__<<"): SCREEN current workspace signal"<<endl;
1666#endif // DEBUG 1666#endif // DEBUG
1667 for (size_t i=0; i<m_atomhandler.size(); ++i) { 1667 for (size_t i=0; i<m_atomhandler.size(); ++i) {
1668 if (m_atomhandler[i]->update()) 1668 if (m_atomhandler[i]->update())
@@ -1670,7 +1670,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1670 } 1670 }
1671 } else if ((&(screen.clientListSig())) == changedsub) { 1671 } else if ((&(screen.clientListSig())) == changedsub) {
1672#ifdef DEBUG 1672#ifdef DEBUG
1673 cerr<<__FILE__<<"("<<__LINE__<<"): client list signal"<<endl; 1673 cerr<<__FILE__<<"("<<__LINE__<<"): SCREEN client list signal"<<endl;
1674#endif // DEBUG 1674#endif // DEBUG
1675 for (size_t i=0; i<m_atomhandler.size(); ++i) { 1675 for (size_t i=0; i<m_atomhandler.size(); ++i) {
1676 if (m_atomhandler[i]->update()) 1676 if (m_atomhandler[i]->update())
@@ -2558,9 +2558,9 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2558 ScreenList::iterator winscreen = 2558 ScreenList::iterator winscreen =
2559 std::find(screenList.begin(), screenList.end(), 2559 std::find(screenList.begin(), screenList.end(),
2560 win->getScreen()); 2560 win->getScreen());
2561 if (winscreen == screenList.end()) 2561 if (winscreen == screenList.end()) {
2562 focused_window = 0; // the window pointer wasn't valid, mark no window focused 2562 focused_window = 0; // the window pointer wasn't valid, mark no window focused
2563 else { 2563 } else {
2564 screen = *winscreen; 2564 screen = *winscreen;
2565 tbar = screen->getToolbar(); 2565 tbar = screen->getToolbar();
2566 wkspc = screen->getWorkspace(win->getWorkspaceNumber()); 2566 wkspc = screen->getWorkspace(win->getWorkspaceNumber());