- Fixed all // comments

- Final cleanups

src/dock.c

@@ -338,10 +338,10 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
     Bool collapsed = clipIcon->dock->collapsed;
 #endif
 
-    //if (!clipIcon->dock->collapsed)
-    //    color = scr->clip_title_color[CLIP_NORMAL];
-    //else
-    //    color = scr->clip_title_color[CLIP_COLLAPSED];
+    /*if (!clipIcon->dock->collapsed)
+        color = scr->clip_title_color[CLIP_NORMAL];
+    else
+        color = scr->clip_title_color[CLIP_COLLAPSED];*/
     color = scr->clip_title_color[CLIP_NORMAL];
 
     XSetForeground(dpy, gc, WMColorPixel(color));

src/window.c

@@ -894,7 +894,7 @@ wManageWindow(WScreen *scr, Window window)
 
 #define ADEQUATE(x) ((x)!=None && (x)!=wwin->client_win && (x)!=fPtr->leader)
 
-        // only enter here if PropGetWMClass() succeds
+        /* // only enter here if PropGetWMClass() succeds */
         PropGetWMClass(wwin->main_window, &class, &instance);
         buffer = StrConcatDot(instance, class);
 

src/wmspec.c

@@ -944,7 +944,7 @@ getWindowLayer(WWindow * wwin)
                 layer = WMFullscreenLevel;
             }
         }
-        //layer = WMPopUpLevel;
+        /* //layer = WMPopUpLevel; // this seems a bad idea -Dan */
     } else if (wwin->type == net_wm_window_type_normal) {
     }
 
@@ -1157,8 +1157,10 @@ handleWindowType(WWindow * wwin, Atom type, int *layer)
         wwin->client_flags.no_appicon = 1;
         wwin->flags.net_skip_pager = 1;
     } else if (type == net_wm_window_type_dialog) {
+        /* These also seem a bad idea in our context -Dan
         // wwin->client_flags.skip_window_list = 1;
         // wwin->client_flags.no_appicon = 1;
+        */
     } else if (type == net_wm_window_type_normal) {
     } else {
         ret = False;

src/xinerama.c

@@ -236,43 +236,43 @@ wGetHeadForWindow(WWindow *wwin)
 
 
 /*
- int
- wGetHeadForPoint(WScreen *scr, WMPoint point, int *flags)
- {
- int i;
+int
+wGetHeadForPoint(WScreen *scr, WMPoint point, int *flags)
+{
+    int i;
 
- // paranoia
- if (flags == NULL) {
- static int tmp;
- flags = &tmp;
- }
- *flags = XFLAG_NONE;
+    // paranoia
+    if (flags == NULL) {
+        static int tmp;
+        flags = &tmp;
+    }
+    *flags = XFLAG_NONE;
 
- for (i = 0; i < scr->xine_info.count; i++) {
- #if 0
- int yy, xx;
+    for (i = 0; i < scr->xine_info.count; i++) {
+#if 0
+        int yy, xx;
 
- xx = scr->xine_info.screens[i].pos.x + scr->xine_info.screens[i].size.width;
- yy = scr->xine_info.screens[i].pos.y + scr->xine_info.screens[i].size.height;
- if (point.x >= scr->xine_info.screens[i].pos.x &&
- point.y >= scr->xine_info.screens[i].pos.y &&
- point.x < xx && point.y < yy) {
- return i;
- }
- #else
- XineramaScreenInfo *xsi = &scr->xine_info.screens[i];
+        xx = scr->xine_info.screens[i].pos.x + scr->xine_info.screens[i].size.width;
+        yy = scr->xine_info.screens[i].pos.y + scr->xine_info.screens[i].size.height;
+        if (point.x >= scr->xine_info.screens[i].pos.x &&
+            point.y >= scr->xine_info.screens[i].pos.y &&
+            point.x < xx && point.y < yy) {
+            return i;
+        }
+#else
+        XineramaScreenInfo *xsi = &scr->xine_info.screens[i];
 
- if ((unsigned)(point.x - xsi->x_org) < xsi->width &&
- (unsigned)(point.y - xsi->y_org) < xsi->height)
- return i;
- #endif
- }
+        if ((unsigned)(point.x - xsi->x_org) < xsi->width &&
+            (unsigned)(point.y - xsi->y_org) < xsi->height)
+            return i;
+#endif
+    }
 
- *flags |= XFLAG_DEAD;
+    *flags |= XFLAG_DEAD;
 
- return scr->xine_primary_head;
- }
- */
+    return scr->xine_primary_head;
+}
+*/