summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 2b18447..4a4141e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.243 2003/12/04 00:08:05 fluxgen Exp $ 25// $Id: Screen.cc,v 1.244 2003/12/04 21:31:02 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -279,7 +279,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
279 SubstructureRedirectMask | KeyPressMask | KeyReleaseMask | 279 SubstructureRedirectMask | KeyPressMask | KeyReleaseMask |
280 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask); 280 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask);
281 281
282 XSync(disp, False); 282 FbTk::App::instance()->sync(false);
283 283
284 XSetErrorHandler((XErrorHandler) old); 284 XSetErrorHandler((XErrorHandler) old);
285 285
@@ -810,7 +810,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
810 id == m_current_workspace->workspaceID()) 810 id == m_current_workspace->workspaceID())
811 return; 811 return;
812 812
813 XSync(FbTk::App::instance()->display(), true); 813 FbTk::App::instance()->sync(true);
814 814
815 WinClient *focused_client = Fluxbox::instance()->getFocusedWindow(); 815 WinClient *focused_client = Fluxbox::instance()->getFocusedWindow();
816 FluxboxWindow *focused = 0; 816 FluxboxWindow *focused = 0;
@@ -877,7 +877,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
877 } 877 }
878 878
879 879
880 XSync(FbTk::App::instance()->display(), True); 880 FbTk::App::instance()->sync(true);
881 881
882 if (win && &win->screen() == this && 882 if (win && &win->screen() == this &&
883 (! win->isStuck())) { 883 (! win->isStuck())) {
@@ -1012,7 +1012,7 @@ void BScreen::updateNetizenConfigNotify(XEvent &e) {
1012} 1012}
1013 1013
1014FluxboxWindow *BScreen::createWindow(Window client) { 1014FluxboxWindow *BScreen::createWindow(Window client) {
1015 XSync(FbTk::App::instance()->display(), false); 1015 FbTk::App::instance()->sync(false);
1016 1016
1017#ifdef SLIT 1017#ifdef SLIT
1018#ifdef KDE 1018#ifdef KDE
@@ -1121,7 +1121,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1121 win->show(); 1121 win->show();
1122 } 1122 }
1123 1123
1124 XSync(FbTk::App::instance()->display(), False); 1124 FbTk::App::instance()->sync(false);
1125 return win; 1125 return win;
1126} 1126}
1127 1127
@@ -2005,9 +2005,8 @@ void BScreen::createStyleMenu(FbTk::Menu &menu,
2005} 2005}
2006 2006
2007void BScreen::shutdown() { 2007void BScreen::shutdown() {
2008 Display *disp = FbTk::App::instance()->display();
2009 rootWindow().setEventMask(NoEventMask); 2008 rootWindow().setEventMask(NoEventMask);
2010 XSync(disp, False); 2009 FbTk::App::instance()->sync(false);
2011 m_shutdown = true; 2010 m_shutdown = true;
2012 for_each(m_workspaces_list.begin(), 2011 for_each(m_workspaces_list.begin(),
2013 m_workspaces_list.end(), 2012 m_workspaces_list.end(),