aboutsummaryrefslogtreecommitdiff
path: root/src/CurrentWindowCmd.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/CurrentWindowCmd.cc')
-rw-r--r--src/CurrentWindowCmd.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index d78ed99..7bc7977 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -29,10 +29,12 @@
29#include "Screen.hh" 29#include "Screen.hh"
30#include "WinClient.hh" 30#include "WinClient.hh"
31 31
32#include "FocusControl.hh"
33
32CurrentWindowCmd::CurrentWindowCmd(Action act):m_action(act) { } 34CurrentWindowCmd::CurrentWindowCmd(Action act):m_action(act) { }
33 35
34void CurrentWindowCmd::execute() { 36void CurrentWindowCmd::execute() {
35 WinClient *client = Fluxbox::instance()->getFocusedWindow(); 37 WinClient *client = FocusControl::focusedWindow();
36 if (client && client->fbwindow()) 38 if (client && client->fbwindow())
37 (client->fbwindow()->*m_action)(); 39 (client->fbwindow()->*m_action)();
38} 40}
@@ -95,19 +97,19 @@ void GoToTabCmd::real_execute() {
95} 97}
96 98
97void WindowHelperCmd::execute() { 99void WindowHelperCmd::execute() {
98 WinClient *client = Fluxbox::instance()->getFocusedWindow(); 100 WinClient *client = FocusControl::focusedWindow();
99 if (client && client->fbwindow()) // guarantee that fbwindow() exists too 101 if (client && client->fbwindow()) // guarantee that fbwindow() exists too
100 real_execute(); 102 real_execute();
101} 103}
102 104
103WinClient &WindowHelperCmd::winclient() { 105WinClient &WindowHelperCmd::winclient() {
104 // will exist from execute above 106 // will exist from execute above
105 return *Fluxbox::instance()->getFocusedWindow(); 107 return *FocusControl::focusedWindow();
106} 108}
107 109
108FluxboxWindow &WindowHelperCmd::fbwindow() { 110FluxboxWindow &WindowHelperCmd::fbwindow() {
109 // will exist from execute above 111 // will exist from execute above
110 return *Fluxbox::instance()->getFocusedWindow()->fbwindow(); 112 return *FocusControl::focusedWindow()->fbwindow();
111} 113}
112 114
113MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) : 115MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) :