diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 8b605e7..9e340f8 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "FbTk/IntMenuItem.hh" | 39 | #include "FbTk/IntMenuItem.hh" |
40 | #include "FbTk/MenuSeparator.hh" | 40 | #include "FbTk/MenuSeparator.hh" |
41 | #include "FocusModelMenuItem.hh" | 41 | #include "FocusModelMenuItem.hh" |
42 | #include "RadioMenuItem.hh" | 42 | #include "FbTk/RadioMenuItem.hh" |
43 | 43 | ||
44 | // menus | 44 | // menus |
45 | #include "FbMenu.hh" | 45 | #include "FbMenu.hh" |
@@ -1098,6 +1098,9 @@ void BScreen::changeWorkspaceID(unsigned int id, bool revert) { | |||
1098 | id == m_current_workspace->workspaceID()) | 1098 | id == m_current_workspace->workspaceID()) |
1099 | return; | 1099 | return; |
1100 | 1100 | ||
1101 | /* Ignore all EnterNotify events until the pointer actually moves */ | ||
1102 | this->focusControl().ignoreAtPointer(); | ||
1103 | |||
1101 | FbTk::App::instance()->sync(false); | 1104 | FbTk::App::instance()->sync(false); |
1102 | 1105 | ||
1103 | FluxboxWindow *focused = FocusControl::focusedFbWindow(); | 1106 | FluxboxWindow *focused = FocusControl::focusedFbWindow(); |
@@ -1228,10 +1231,8 @@ bool BScreen::isKdeDockapp(Window client) const { | |||
1228 | bool BScreen::addKdeDockapp(Window client) { | 1231 | bool BScreen::addKdeDockapp(Window client) { |
1229 | 1232 | ||
1230 | XSelectInput(FbTk::App::instance()->display(), client, StructureNotifyMask); | 1233 | XSelectInput(FbTk::App::instance()->display(), client, StructureNotifyMask); |
1231 | char intbuff[16]; | ||
1232 | sprintf(intbuff, "%d", screenNumber()); | ||
1233 | string atom_name("_NET_SYSTEM_TRAY_S"); | 1234 | string atom_name("_NET_SYSTEM_TRAY_S"); |
1234 | atom_name += intbuff; // append number | 1235 | atom_name += FbTk::StringUtil::number2String(screenNumber()); |
1235 | // find the right atomhandler that has the name: _NET_SYSTEM_TRAY_S<num> | 1236 | // find the right atomhandler that has the name: _NET_SYSTEM_TRAY_S<num> |
1236 | AtomHandler *handler = Fluxbox::instance()->getAtomHandler(atom_name); | 1237 | AtomHandler *handler = Fluxbox::instance()->getAtomHandler(atom_name); |
1237 | FbTk::EventHandler *evh = 0; | 1238 | FbTk::EventHandler *evh = 0; |