diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index ede9a5a..dcc947a 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -200,7 +200,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
200 | "session.colorsPerChannel", "Session.ColorsPerChannel"), | 200 | "session.colorsPerChannel", "Session.ColorsPerChannel"), |
201 | m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), | 201 | m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), |
202 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), | 202 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), |
203 | m_rc_update_delay_time(m_resourcemanager, 0, "session.updateDelayTime", "Session.UpdateDelayTime"), | ||
204 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), | 203 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), |
205 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), | 204 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), |
206 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), | 205 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), |
@@ -278,7 +277,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
278 | m_reconfig_timer.setTimeout(to); | 277 | m_reconfig_timer.setTimeout(to); |
279 | m_reconfig_timer.setCommand(reconfig_cmd); | 278 | m_reconfig_timer.setCommand(reconfig_cmd); |
280 | m_reconfig_timer.fireOnce(true); | 279 | m_reconfig_timer.fireOnce(true); |
281 | //XSynchronize(disp, True); | 280 | // XSynchronize(disp, True); |
282 | 281 | ||
283 | s_singleton = this; | 282 | s_singleton = this; |
284 | m_have_shape = false; | 283 | m_have_shape = false; |
@@ -377,8 +376,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
377 | // setup theme manager to have our style file ready to be scanned | 376 | // setup theme manager to have our style file ready to be scanned |
378 | FbTk::ThemeManager::instance().load(FbTk::StringUtil::expandFilename(getStyleFilename())); | 377 | FbTk::ThemeManager::instance().load(FbTk::StringUtil::expandFilename(getStyleFilename())); |
379 | 378 | ||
380 | XSynchronize(disp, False); | 379 | //XSynchronize(disp, False); |
381 | //XSynchronize(disp, True); | ||
382 | sync(false); | 380 | sync(false); |
383 | 381 | ||
384 | m_reconfigure_wait = m_reread_menu_wait = false; | 382 | m_reconfigure_wait = m_reread_menu_wait = false; |
@@ -1854,7 +1852,6 @@ void Fluxbox::setFocusedWindow(WinClient *client) { | |||
1854 | m_focused_window = 0; | 1852 | m_focused_window = 0; |
1855 | 1853 | ||
1856 | 1854 | ||
1857 | |||
1858 | if (screen != 0) { | 1855 | if (screen != 0) { |
1859 | screen->updateNetizenWindowFocus(); | 1856 | screen->updateNetizenWindowFocus(); |
1860 | for (AtomHandlerContainerIt it= m_atomhandler.begin(); | 1857 | for (AtomHandlerContainerIt it= m_atomhandler.begin(); |
@@ -1871,7 +1868,6 @@ void Fluxbox::setFocusedWindow(WinClient *client) { | |||
1871 | it != m_atomhandler.end(); it++) | 1868 | it != m_atomhandler.end(); it++) |
1872 | (*it).first->updateFocusedWindow(*old_screen, 0); | 1869 | (*it).first->updateFocusedWindow(*old_screen, 0); |
1873 | } | 1870 | } |
1874 | |||
1875 | } | 1871 | } |
1876 | 1872 | ||
1877 | /** | 1873 | /** |