3 files changed, 11 insertions, 4 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index d9deea7..27a0b68 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -179,7 +179,8 @@ int handleXErrors(Display *d, XErrorEvent *e) {
 //static singleton var
 Fluxbox *Fluxbox::s_singleton=0;
 
-Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfilename)
+Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name,
+                 const char *rcfilename, bool xsync)
     : FbTk::App(dpy_name),
       m_fbatoms(new FbAtoms()),
       m_resourcemanager(rcfilename, true),
@@ -263,7 +264,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
     m_reconfig_timer.setCommand(reconfig_cmd);
     m_reconfig_timer.fireOnce(true);
 
-    // XSynchronize(disp, True);
+    if (xsync)
+        XSynchronize(disp, True);
 
     s_singleton = this;
     m_have_shape = false;
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index e761eda..a6c0b2f 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -77,7 +77,7 @@ class Fluxbox : public FbTk::App,
                 public FbTk::Observer {
 public:
     Fluxbox(int argc, char **argv, const char * dpy_name= 0,
-            const char *rcfilename = 0);
+            const char *rcfilename = 0, bool xsync = false);
     virtual ~Fluxbox();
 
     static Fluxbox *instance() { return s_singleton; }
diff --git a/src/main.cc b/src/main.cc
index fb47bc7..d69ce2d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -183,6 +183,7 @@ int main(int argc, char **argv) {
     string session_display("");
     string rc_file;
     string log_filename;
+    bool xsync = false;
 
     FbTk::NLSInit("fluxbox.cat");
     _FB_USES_NLS;
@@ -229,6 +230,8 @@ int main(int argc, char **argv) {
                 exit(EXIT_FAILURE);
             }
             log_filename = argv[i];
+        } else if (arg == "-sync") {
+             xsync = true;
         } else if (arg == "-help" || arg == "-h") {
             // print program usage and command line options
             printf(_FB_CONSOLETEXT(main, Usage,
@@ -240,6 +243,7 @@ int main(int argc, char **argv) {
                            "-version\t\t\tdisplay version and exit.\n"
                            "-info\t\t\t\tdisplay some useful information.\n"
                            "-list-commands\t\t\tlist all valid key commands.\n"
+                           "-sync\t\t\t\tsynchronize with X server for debugging.\n"
                            "-log <filename>\t\t\tlog output to file.\n"
                            "-help\t\t\t\tdisplay this help text and exit.\n\n",
 
@@ -286,7 +290,8 @@ int main(int argc, char **argv) {
 
     try {
 
-        fluxbox.reset(new Fluxbox(argc, argv, session_display.c_str(), rc_file.c_str()));
+        fluxbox.reset(new Fluxbox(argc, argv, session_display.c_str(),
+                                  rc_file.c_str(), xsync));
         fluxbox->eventLoop();
 
         exitcode = EXIT_SUCCESS;