diff options
author | fluxgen <fluxgen> | 2003-12-16 23:36:06 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-16 23:36:06 (GMT) |
commit | 90ff80f89b990fcdf98d8c28b4d85a4420a8e213 (patch) | |
tree | 0761fc0b38fd787e988ea673f48f0740075c9b2e /src/fluxbox.cc | |
parent | 72b878f78c0df0a54cf8e9f04bb2e22dd6715658 (diff) | |
download | fluxbox-90ff80f89b990fcdf98d8c28b4d85a4420a8e213.zip fluxbox-90ff80f89b990fcdf98d8c28b4d85a4420a8e213.tar.bz2 |
cleaning
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 5290cf1..26bf782 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.206 2003/12/09 12:28:24 rathnor Exp $ | 25 | // $Id: fluxbox.cc,v 1.207 2003/12/16 23:36:06 fluxgen Exp $ |
26 | 26 | ||
27 | #include "fluxbox.hh" | 27 | #include "fluxbox.hh" |
28 | 28 | ||
@@ -368,7 +368,7 @@ void copyFile(const std::string &from, const std::string &to) { | |||
368 | } | 368 | } |
369 | } | 369 | } |
370 | 370 | ||
371 | }; | 371 | } // end anonymous |
372 | 372 | ||
373 | static int handleXErrors(Display *d, XErrorEvent *e) { | 373 | static int handleXErrors(Display *d, XErrorEvent *e) { |
374 | #ifdef DEBUG | 374 | #ifdef DEBUG |
@@ -1983,7 +1983,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) { | |||
1983 | #endif // DEBUG | 1983 | #endif // DEBUG |
1984 | BScreen *old_screen = 0, *screen = 0; | 1984 | BScreen *old_screen = 0, *screen = 0; |
1985 | WinClient *old_client = 0; | 1985 | WinClient *old_client = 0; |
1986 | Workspace *old_wkspc = 0, *wkspc = 0; | 1986 | Workspace *old_wkspc = 0; |
1987 | 1987 | ||
1988 | if (m_focused_window != 0) { | 1988 | if (m_focused_window != 0) { |
1989 | // check if m_focused_window is valid | 1989 | // check if m_focused_window is valid |
@@ -2024,7 +2024,6 @@ void Fluxbox::setFocusedWindow(WinClient *client) { | |||
2024 | m_focused_window = 0; // the window pointer wasn't valid, mark no window focused | 2024 | m_focused_window = 0; // the window pointer wasn't valid, mark no window focused |
2025 | } else { | 2025 | } else { |
2026 | screen = *winscreen; | 2026 | screen = *winscreen; |
2027 | wkspc = screen->getWorkspace(win->workspaceNumber()); | ||
2028 | m_focused_window = client; // update focused window | 2027 | m_focused_window = client; // update focused window |
2029 | win->setCurrentClient(*client, false); // don't setinputfocus | 2028 | win->setCurrentClient(*client, false); // don't setinputfocus |
2030 | win->setFocusFlag(true); // set focus flag | 2029 | win->setFocusFlag(true); // set focus flag |