Cosmetics.

SVN revision: 9351

src/borders.c

@@ -29,14 +29,6 @@ static void         DetermineEwinArea(EWin * ewin);
 EWin               *Adopt(Window win);
 EWin               *AdoptInternal(Window win, Border * border, int type);
 
-#if 0
-#define DELETE_EWIN_REFERENCE(ew, ew_ref) \
-	({ if (ew_ref == ew) { printf("Stale ewin ref (" #ew_ref ")\n"); ew_ref = NULL; } })
-#else
-#define DELETE_EWIN_REFERENCE(ew, ew_ref) \
-	({ if (ew_ref == ew) { ew_ref = NULL; } })
-#endif
-
 void
 KillEwin(EWin * ewin, int nogroup)
 {
@@ -1215,9 +1207,8 @@ AdoptInternal(Window win, Border * border, int type)
    ewin->type = type;
    switch (type)
      {
-#if 0
      case EWIN_TYPE_DIALOG:
-#endif
+	break;
      case EWIN_TYPE_MENU:
 	ewin->layer = 99;
 	ewin->skiptask = 1;
@@ -1381,8 +1372,8 @@ FreeEwin(EWin * ewin)
    if (ewin->ibox)
       IconboxDestroy(ewin->ibox);
 
-   /* May be an overkill but cannot hurt... */
-   DELETE_EWIN_REFERENCE(ewin, mode.mouse_over_win);
+   if (ewin == mode.mouse_over_win)
+      mode.mouse_over_win = NULL;
 
    HintsDelWindowHints(ewin);
 

src/config.c

@@ -908,8 +908,7 @@ Config_Control(FILE * ConfigFile)
 	     sscanf(s, "%*s %d %d ", &conf.dock.startx, &conf.dock.starty);
 	     break;
 	  case CONTROL_KDESUPPORT:
-#if 0
-	     /* Ignore */
+#if 0				/* Ignore */
 #endif
 	     break;
 	  case CONTROL_SHOWROOTTOOLTIP:

src/desktops.c

@@ -547,7 +547,7 @@ SetBackgroundTo(Window win, Background * dsk, char setbg)
    if (conf.backgrounds.hiquality)
      {
 	imlib_context_set_dither(1);
-#if 0
+#if 0				/* ??? */
 	imlib_context_set_anti_alias(1);
 #endif
      }

src/ewmh.c

@@ -237,7 +237,7 @@ EWMH_Init(Window win_wm_check)
    _ATOM_INIT(_NET_WM_STATE_SKIP_TASKBAR);
    _ATOM_INIT(_NET_WM_STATE_SKIP_PAGER);
    _ATOM_INIT(_NET_WM_STATE_HIDDEN);
-#if 0
+#if 0				/* Not implemented */
    _ATOM_INIT(_NET_WM_STATE_FULLSCREEN);
 #endif
    _ATOM_INIT(_NET_WM_STATE_ABOVE);
@@ -667,7 +667,7 @@ EWMH_GetWindowType(EWin * ewin)
 	ewin->skipfocus = 1;
 	ewin->never_use_area = 1;
      }
-#if 0
+#if 0				/* Not used by E (yet?) */
    else if (atom == _NET_WM_WINDOW_TYPE_TOOLBAR)
      {
      }

src/focus.c

@@ -347,7 +347,7 @@ FocusNewDeskBegin(void)
 
 	     if (ewin->pager)
 	       {
-#if 0
+#if 0				/* ??? */
 		  XSelectInput(disp, ewin->client.win,
 			       PropertyChangeMask | FocusChangeMask |
 			       ResizeRedirectMask | StructureNotifyMask |
@@ -476,9 +476,6 @@ FocusNewDesk(void)
 void
 FocusHandleEnter(XEvent * ev)
 {
-#if 0
-   Window              win = ev->xcrossing.window;
-#endif
    EWin               *ewin;
 
    EDBUG(5, "FocusHandleEnter");
@@ -519,7 +516,7 @@ FocusHandleLeave(XEvent * ev)
       FocusToEWin(NULL, FOCUS_SET);
 }
 
-#if 0
+#if 0				/* Remove old code */
 void
 FocusHandleEnter(XEvent * ev)
 {

src/icccm.c

@@ -78,14 +78,6 @@ ICCCM_ProcessClientMessage(XClientMessageEvent * event)
 	     if (!(ewin->iconified))
 		IconifyEwin(ewin);
 	  }
-#if 0
-	else if (event->data.l[0] == NormalState)
-	  {
-	     if (ewin->iconified)
-		DeIconifyEwin(ewin);
-	  }
-	HintsSetWindowState(ewin);
-#endif
      }
 }
 

src/iclass.c

@@ -42,7 +42,7 @@ TransparencyMakeColorModifier(void)
    if (icm == NULL)
       icm = imlib_create_color_modifier();
    imlib_context_set_color_modifier(icm);
-#if 0
+#if 0				/* Useful in this context? */
    imlib_modify_color_modifier_gamma(0.5);
    imlib_modify_color_modifier_brightness(0.5);
    imlib_modify_color_modifier_contrast(0.5);
@@ -464,7 +464,7 @@ ImageStateMakePmapMask(ImageState * is, Drawable win, PmapMask * pmm,
 	     imlib_context_set_blend(0);
 #ifdef ENABLE_THEME_TRANSPARENCY
 	     imlib_context_set_color_modifier(NULL);
-#if 0
+#if 0				/* Do we ever need to free it? */
 	     imlib_free_color_modifier();
 #endif
 #endif

src/iconify.c

@@ -1182,7 +1182,7 @@ SelectIconboxForEwin(EWin * ewin)
 	  }
 	Efree(ib);
      }
-#if 0
+#if 0				/* Do not autocreate iconboxes */
    else
      {
 	/* If there are no iconboxes, create one. */

src/ipc.c

@@ -4567,7 +4567,7 @@ HandleIPC(char *params, Client * c)
    return 0;
 }
 
-#if 0
+#if 0				/* Not implemented */
 /* The External function designed for attaching to a dialog box
  * to return a message back to an external app telling you what
  * button was depressed

src/menus.c

@@ -221,7 +221,7 @@ MenuShow(Menu * m, char noshow)
 	  {
 	     ButtonDrawWithState(mode.button, STATE_NORMAL);
 	  }
-#if 0
+#if 0				/* ??? */
 	RaiseEwin(ewin);
 	ShowEwin(ewin);
 	EDBUG_RETURN_;
@@ -1869,7 +1869,7 @@ MenuCreateFromDesktops(char *name, MenuStyle * ms)
    EDBUG_RETURN(m);
 }
 
-#if 0
+#if 0				/* Not finished */
 Menu               *
 MenuCreateMoveToDesktop(char *name, MenuStyle * ms)
 {

src/settings.c

@@ -2379,7 +2379,7 @@ SettingsSpecialFX(void)
    DialogItemSetFill(di, 1, 0);
    DialogItemSetColSpan(di, 4);
    DialogItemTextSetText(di, _("Effects"));
-#if 0
+#if 0				/* Disabled */
    di = DialogAddItem(table, DITEM_CHECKBUTTON);
    DialogItemSetPadding(di, 2, 2, 2, 2);
    DialogItemSetFill(di, 1, 0);

src/snaps.c

@@ -509,7 +509,7 @@ SnapshotEwinDialog(EWin * ewin)
    DialogItemCheckButtonSetState(di, tmp_snap_skiplists);
    DialogItemCheckButtonSetPtr(di, &tmp_snap_skiplists);
 
-#if 0
+#if 0				/* Disabled (why?) */
    di = DialogAddItem(table, DITEM_CHECKBUTTON);
    DialogItemSetColSpan(di, 2);
    DialogItemSetPadding(di, 2, 2, 2, 2);

src/theme.c

@@ -361,7 +361,7 @@ ThemeCleanup(void)
       return;
 
    /* We don't ever get here because mustdel is never set */
-#if 0
+#if 0				/* Don't do recursive theme removal (risky?) */
    rmrf(themepath);
 #endif
 }

src/ttfont.c

@@ -944,7 +944,7 @@ EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
 /*  XUngrabServer(disp); */
 /*  XFlush(disp); */
 
-#if 0
+#if 0				/* ??? */
    if (xatt.depth == 16)
      {
 	XVisualInfo         xvi, *xvir;

src/warp.c

@@ -60,7 +60,7 @@ WarpFocusHandleEvent(XEvent * ev)
    if (ev->type != KeyPress && ev->type != KeyRelease)
       EDBUG_RETURN(0);
 
-#if 0
+#if 0				/* Debug */
    printf("WarpFocusHandleEvent win=%#x key=%#x(%#x) %d\n",
 	  (unsigned)ev->xkey.window, ev->xkey.keycode,
 	  warpFocusKey, warpFocusTitleShowing);

src/x.c

@@ -562,7 +562,7 @@ EGetGeometry(Display * d, Window win, Window * root_return, int *x, int *y,
      {
 	ok = XGetGeometry(d, win, root_return, x, y, w, h, bw, depth);
      }
-#if 0
+#if 0				/* Debug */
    if (!ok)
       printf("EGetGeometry win=%#x, error %d\n", (unsigned)win, ok);
 #endif

src/zoom.c

@@ -252,7 +252,7 @@ Zoom(EWin * ewin)
 	FocusToEWin(ewin, FOCUS_SET);
 	XWarpPointer(disp, None, ewin->client.win, 0, 0, 0, 0,
 		     ewin->client.w / 2, ewin->client.h / 2);
-#if 0
+#if 0				/* Doesn't work as intended */
 	XGrabPointer(disp, ewin->client.win, True,
 		     ButtonPressMask | ButtonReleaseMask |
 		     PointerMotionMask | ButtonMotionMask |