xwinwm-0.0.4

3 files changed, 26 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 726a1f5..22a8f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-10  Kensuke Matsuzaki  <zakki@peppermint.jp>
+
+	* src/Window.cc: ifdef out debug message
+
 2004-04-09  Kensuke Matsuzaki  <zakki@peppermint.jp>
 
 	* src/Window.cc: Fix restacking and moving window problem.
diff --git a/TODO b/TODO
index 611e29d..e6befda 100644
--- a/TODO
+++ b/TODO
@@ -15,6 +15,7 @@
 -- KNOWN BUG
 * Resizing and moving window is unstable.
 * Sometimes window order changing never stop.
+* Problem with handling clients which start before XWinWM
 
 
 -- TODO for Blackbox - an X11 Window manager
diff --git a/src/Window.cc b/src/Window.cc
index 5d4bcf4..3073119 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2187,13 +2187,17 @@ void BlackboxWindow::configureRequestEvent(const XConfigureRequestEvent *cr) {
         
       case Above:
       case TopIf:
+#if defined(DEBUG)
         fprintf(stderr, "configureRequestEvent CWStackMode %d Above TopIf\n",
                 cr->detail);
+#endif
         screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
         break;
       default:
+#if defined(DEBUG)
         fprintf(stderr, "configureRequestEvent CWStackMode %d default\n",
                 cr->detail);
+#endif
         screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
         break;
       }
@@ -2216,12 +2220,16 @@ void BlackboxWindow::configureNotifyEvent(const XConfigureEvent *ce) {
   if (ce->window != client.window)
     return;
 #if 1
+#if defined(DEBUG)
   fprintf(stderr, "BlackboxWindow::configureNotifyEvent\n");
+#endif
   HWND hWnd = (HWND)getHWnd(client.window);
   if (hWnd && blackbox_attrib.premax_w != 0 && blackbox_attrib.premax_h != 0) {
+#if defined(DEBUG)
     fprintf(stderr, "\t%d %d %d %d\n",
             blackbox_attrib.premax_x, blackbox_attrib.premax_y,
             blackbox_attrib.premax_w, blackbox_attrib.premax_h);
+#endif
     WINDOWPLACEMENT wndpl = {sizeof(WINDOWPLACEMENT)};
     if (GetWindowPlacement(hWnd, &wndpl)) {
       SetRect (&wndpl.rcNormalPosition,
@@ -2419,14 +2427,14 @@ void BlackboxWindow::shapeEvent(XShapeEvent *) {
 
 
 void BlackboxWindow::windowsWMControllerEvent(XWindowsWMNotifyEvent *windows_wm_event) {
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
   fprintf (stderr, "\tBlackboxWindow::windowsWMControllerEvent %d %d %s\n",
            blackbox->hasWindowsWMExtensions(), windows_wm_event->arg,
            client.title.c_str());
 #endif
   if (windows_wm_event->window == client.window)
     {
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
       fprintf (stderr, "\tclient window\n");
 #endif
       if (blackbox->hasWindowsWMExtensions()) {
@@ -2435,7 +2443,7 @@ void BlackboxWindow::windowsWMControllerEvent(XWindowsWMNotifyEvent *windows_wm_
           //printf ("maximize 0x%08x\n", (int)c);
           //raise_win(c);
           //show();
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMMaximizeWindow\n");
 #endif
           if (!flags.maximized) maximize(1);
@@ -2443,14 +2451,14 @@ void BlackboxWindow::windowsWMControllerEvent(XWindowsWMNotifyEvent *windows_wm_
         case WindowsWMMinimizeWindow:
           //printf ("minimize 0x%08x\n", (int)c);
           iconify();//FIXME: This window become hide. Configure this behavior by ext?
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr,"\tWindowsWMMinimizeWindow\n");
 #endif
           //FIXME:
           //screen->getWorkspace(blackbox_attrib.workspace)->lowerWindow(this);
           break;
         case WindowsWMRestoreWindow:
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMRestoreWindow\n");
 #endif
           //assert(0);
@@ -2458,13 +2466,13 @@ void BlackboxWindow::windowsWMControllerEvent(XWindowsWMNotifyEvent *windows_wm_
           if (flags.maximized) maximize(1);
           break;
         case WindowsWMCloseWindow:
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMCloseWindow\n");
 #endif
           close();
           break;
         case WindowsWMActivateWindow:
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMActivateWindow\n");
 #endif
           //show();
@@ -2479,38 +2487,38 @@ void BlackboxWindow::windowsWMControllerEvent(XWindowsWMNotifyEvent *windows_wm_
 
   if (windows_wm_event->window == window_in_taskbar)
     {
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
   fprintf (stderr, "\ttaskbar\n");
 #endif
       if (blackbox->hasWindowsWMExtensions()) {
         switch (windows_wm_event->arg) {
         case WindowsWMMaximizeWindow:
           //show();
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMMaximizeWindow\n");
 #endif
           break;
         case WindowsWMMinimizeWindow:
           //iconify();
           assert(0);
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr,"\tWindowsWMMinimizeWindow\n");
 #endif
           break;
         case WindowsWMRestoreWindow:
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMRestoreWindow %d\n", flags.iconic);
 #endif
           show();
           break;
         case WindowsWMCloseWindow:
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMCloseWindow\n");
 #endif
           close();
           break;
         case WindowsWMActivateWindow:
-#if defined(DEBUG) || 1
+#if defined(DEBUG)
           fprintf (stderr, "\tWindowsWMActivateWindow\n");
 #endif
           //show();