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

minor cleaning

Browse source
This commit is contained in:
fluxgen 2003-12-30 18:16:51 +00:00
parent 35e2057fb7
commit 5febf6c902
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Workspace.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Workspace.cc,v 1.88 2003/12/18 18:03:22 fluxgen Exp $ // $Id: Workspace.cc,v 1.89 2003/12/30 18:16:51 fluxgen Exp $
#include "Workspace.hh" #include "Workspace.hh"
@ -32,8 +32,8 @@
#include "Window.hh" #include "Window.hh"
#include "WinClient.hh" #include "WinClient.hh"
#include "FbWinFrame.hh" #include "FbWinFrame.hh"
#include "MenuItem.hh"
#include "FbTk/MenuItem.hh"
#include "FbTk/StringUtil.hh" #include "FbTk/StringUtil.hh"
// use GNU extensions // use GNU extensions
@ -143,8 +143,7 @@ void Workspace::setLastFocusedWindow(FluxboxWindow *win) {
void Workspace::addWindow(FluxboxWindow &w, bool place) { void Workspace::addWindow(FluxboxWindow &w, bool place) {
// we don't need to add a window that already exist in our list // we don't need to add a window that already exist in our list
if (find(m_windowlist.begin(), m_windowlist.end(), &w) != if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
m_windowlist.end())
return; return;
w.setWorkspace(m_id); w.setWorkspace(m_id);

7
src/WorkspaceCmd.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: WorkspaceCmd.cc,v 1.8 2003/12/03 17:55:13 fluxgen Exp $ // $Id: WorkspaceCmd.cc,v 1.9 2003/12/30 18:15:55 fluxgen Exp $
#include "WorkspaceCmd.hh" #include "WorkspaceCmd.hh"
@ -34,6 +34,7 @@
#include <cmath> #include <cmath>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <iostream>
void NextWindowCmd::execute() { void NextWindowCmd::execute() {
@ -42,7 +43,7 @@ void NextWindowCmd::execute() {
Fluxbox *fb = Fluxbox::instance(); Fluxbox *fb = Fluxbox::instance();
// special case for commands from key events // special case for commands from key events
if (fb->lastEvent().type == KeyPress) { if (fb->lastEvent().type == KeyPress) {
unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state); unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state);
if (mods == 0) // can't stacked cycle unless there is a mod to grab if (mods == 0) // can't stacked cycle unless there is a mod to grab
screen->nextFocus(m_option | BScreen::CYCLELINEAR); screen->nextFocus(m_option | BScreen::CYCLELINEAR);
else { else {
@ -63,7 +64,7 @@ void PrevWindowCmd::execute() {
Fluxbox *fb = Fluxbox::instance(); Fluxbox *fb = Fluxbox::instance();
// special case for commands from key events // special case for commands from key events
if (fb->lastEvent().type == KeyPress) { if (fb->lastEvent().type == KeyPress) {
unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state); unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state);
if (mods == 0) // can't stacked cycle unless there is a mod to grab if (mods == 0) // can't stacked cycle unless there is a mod to grab
screen->prevFocus(m_option | BScreen::CYCLELINEAR); screen->prevFocus(m_option | BScreen::CYCLELINEAR);
else { else {