aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index fe4cf4a..ff005c3 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -284,8 +284,7 @@ public:
284 explicit SetClientCmd(WinClient &client):m_client(client) { 284 explicit SetClientCmd(WinClient &client):m_client(client) {
285 } 285 }
286 void execute() { 286 void execute() {
287 if (m_client.fbwindow() != 0) 287 m_client.focus();
288 m_client.fbwindow()->setCurrentClient(m_client);
289 } 288 }
290private: 289private:
291 WinClient &m_client; 290 WinClient &m_client;
@@ -440,8 +439,6 @@ void FluxboxWindow::init() {
440 439
441 frame().resize(m_client->width(), m_client->height()); 440 frame().resize(m_client->width(), m_client->height());
442 441
443 m_last_focus_time.tv_sec = m_last_focus_time.tv_usec = 0;
444
445 m_blackbox_attrib.workspace = m_workspace_number = m_screen.currentWorkspaceID(); 442 m_blackbox_attrib.workspace = m_workspace_number = m_screen.currentWorkspaceID();
446 443
447 m_blackbox_attrib.flags = m_blackbox_attrib.attrib = m_blackbox_attrib.stack = 0; 444 m_blackbox_attrib.flags = m_blackbox_attrib.attrib = m_blackbox_attrib.stack = 0;
@@ -1453,7 +1450,7 @@ bool FluxboxWindow::setInputFocus() {
1453 cerr<<__FUNCTION__<<": transient 0x"<<(*it)<<endl; 1450 cerr<<__FUNCTION__<<": transient 0x"<<(*it)<<endl;
1454#endif // DEBUG 1451#endif // DEBUG
1455 if ((*it)->isModal()) 1452 if ((*it)->isModal())
1456 return (*it)->fbwindow()->setCurrentClient(**it, true); 1453 return (*it)->focus();
1457 } 1454 }
1458 } 1455 }
1459 1456
@@ -2129,7 +2126,6 @@ void FluxboxWindow::setFocusFlag(bool focus) {
2129#endif // DEBUG 2126#endif // DEBUG
2130 // Record focus timestamp for window cycling enhancements 2127 // Record focus timestamp for window cycling enhancements
2131 if (focused) { 2128 if (focused) {
2132 gettimeofday(&m_last_focus_time, 0);
2133 screen().focusControl().setScreenFocusedWindow(*m_client); 2129 screen().focusControl().setScreenFocusedWindow(*m_client);
2134 } 2130 }
2135 2131