nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replacing some instances of focusedWindow()->fbwindow() with focusedFbWindow()

Browse source
This commit is contained in:
markt 2006-07-12 00:08:57 +00:00
parent e1fdf51f4e
commit c929da4054
4 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/CommandDialog.cc
View file

@ -90,9 +90,8 @@ void CommandDialog::hide() {
FbTk::FbWindow::hide(); FbTk::FbWindow::hide();
// return focus to fluxbox window // return focus to fluxbox window
if (FocusControl::focusedWindow() && if (FocusControl::focusedFbWindow())
FocusControl::focusedWindow()->fbwindow()) FocusControl::focusedFbWindow()->setInputFocus();
FocusControl::focusedWindow()->fbwindow()->setInputFocus();
} }

11
src/CurrentWindowCmd.cc
View file

@ -34,9 +34,9 @@
CurrentWindowCmd::CurrentWindowCmd(Action act):m_action(act) { } CurrentWindowCmd::CurrentWindowCmd(Action act):m_action(act) { }
void CurrentWindowCmd::execute() { void CurrentWindowCmd::execute() {
WinClient *client = FocusControl::focusedWindow(); FluxboxWindow *win = FocusControl::focusedFbWindow();
if (client && client->fbwindow()) if (win)
(client->fbwindow()->*m_action)(); (win->*m_action)();
} }
@ -97,8 +97,7 @@ void GoToTabCmd::real_execute() {
} }
void WindowHelperCmd::execute() { void WindowHelperCmd::execute() {
WinClient *client = FocusControl::focusedWindow(); if (FocusControl::focusedFbWindow()) // guarantee that fbwindow() exists too
if (client && client->fbwindow()) // guarantee that fbwindow() exists too
real_execute(); real_execute();
} }
@ -109,7 +108,7 @@ WinClient &WindowHelperCmd::winclient() {
FluxboxWindow &WindowHelperCmd::fbwindow() { FluxboxWindow &WindowHelperCmd::fbwindow() {
// will exist from execute above // will exist from execute above
return *FocusControl::focusedWindow()->fbwindow(); return *FocusControl::focusedFbWindow();
} }
MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) : MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) :

15
src/Screen.cc
View file

@ -1057,11 +1057,8 @@ void BScreen::changeWorkspaceID(unsigned int id) {
FbTk::App::instance()->sync(false); FbTk::App::instance()->sync(false);
WinClient *focused_client = FocusControl::focusedWindow(); FluxboxWindow *focused = FocusControl::focusedFbWindow();
FluxboxWindow *focused = 0;
if (focused_client)
focused = focused_client->fbwindow();
if (focused && focused->isMoving()) { if (focused && focused->isMoving()) {
if (doOpaqueMove()) if (doOpaqueMove())
reassociateWindow(focused, id, true); reassociateWindow(focused, id, true);
@ -1113,12 +1110,8 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
if (! m_current_workspace || id >= m_workspaces_list.size()) if (! m_current_workspace || id >= m_workspaces_list.size())
return; return;
if (!win) { if (!win)
WinClient *client = FocusControl::focusedWindow(); win = FocusControl::focusedFbWindow();
if (client)
win = client->fbwindow();
}
FbTk::App::instance()->sync(false); FbTk::App::instance()->sync(false);

8
src/WorkspaceCmd.cc
View file

@ -91,11 +91,9 @@ void DirFocusCmd::execute() {
if (screen == 0) if (screen == 0)
return; return;
WinClient *client = FocusControl::focusedWindow(); FluxboxWindow *win = FocusControl::focusedFbWindow();
if (client == 0 || client->fbwindow() == 0) if (win)
return; screen->focusControl().dirFocus(*win, m_dir);
screen->focusControl().dirFocus(*client->fbwindow(), m_dir);
} }
void NextWorkspaceCmd::execute() { void NextWorkspaceCmd::execute() {