Shuffled around some startup/debug stuff.

SVN revision: 9306

src/E.h

@@ -238,7 +238,6 @@ if (__xim) XDestroyImage(__xim);}
 
 #ifdef DEBUG
 extern int          call_level;
-extern int          debug_level;
 extern char        *call_stack[1024];
 
 #endif
@@ -1262,6 +1261,7 @@ EConf;
 /* State parameters */
 typedef struct
 {
+   int                 debug;
    int                 mode;
    char                place;
    char                flipp;

src/globals.c

@@ -69,6 +69,5 @@ char               *e_machine_name = NULL;
 
 #ifdef DEBUG
 int                 call_level;
-int                 debug_level;
 char               *call_stack[1024];
 #endif

src/main.c

@@ -60,6 +60,11 @@ main(int argc, char **argv)
     * proceeds into the primary event loop at the end.
     */
 
+   /* Init state variable struct */
+   memset(&mode, 0, sizeof(EMode));
+   mode.mode = MODE_NONE;
+   mode.startup = 1;
+
    single_screen_mode = 0;
 /*  unsetenv("LD_PRELOAD"); */
 
@@ -73,11 +78,10 @@ main(int argc, char **argv)
 
 #ifdef DEBUG
    call_level = 0;
-   debug_level = 0;
+#endif
    str = getenv("EDBUG");
    if (str)
-      debug_level = atoi(str);
-#endif
+      mode.debug = atoi(str);
    str = getenv("EDBUG_FLAGS");
    if (str)
       EventDebugInit(str);

src/setup.c

@@ -346,11 +346,6 @@ SetupX()
 	 XFreeModifiermap(mod);
    }
 
-   /* Init state variable struct */
-   memset(&mode, 0, sizeof(EMode));
-   mode.mode = MODE_NONE;
-   mode.startup = 1;
-
    /* Now we're going to set a bunch of default settings in E - in case we
     * don't ever get to load a config file for some odd reason. */
    memset(&conf, 0, sizeof(EConf));