Keep startup windows raised.

SVN revision: 12671

src/E.h

@@ -2209,7 +2209,8 @@ EWin               *EwinListStackGetTop(void);
 #define EwinListFocusLower(ewin) EobjListFocusLower(&(ewin->o))
 
 /* startup.c */
-void                CreateStartupDisplay(char start);
+void                StartupWindowsCreate(int start);
+void                StartupWindowsRaise(void);
 
 /* tclass.c */
 int                 TextclassConfigLoad(FILE * fs);

src/config.c

@@ -533,7 +533,7 @@ ThemeConfigLoad(void)
 	if (!Mode.wm.restart)
 	  {
 	     if (i == 2)
-		CreateStartupDisplay(1);
+		StartupWindowsCreate(1);
 
 	     if ((i > 1) && (!p))
 	       {

src/ewins.c

@@ -964,6 +964,9 @@ AddInternalToFamily(Window win, const char *bname, int type, void *ptr,
    EwinBorderDraw(ewin, 1, 1);
 
    EwinDetermineArea(ewin);
+
+   StartupWindowsRaise();
+
    ecore_x_ungrab();
 
    EDBUG_RETURN(ewin);

src/main.c

@@ -270,7 +270,7 @@ main(int argc, char **argv)
    MapUnmap(1);
 
    if (!Mode.wm.restart)
-      CreateStartupDisplay(0);
+      StartupWindowsCreate(0);
 
    /* sync just to make sure */
    ecore_x_sync();

src/setup.c

@@ -82,16 +82,12 @@ MapUnmap(int start)
 			 {
 			    if (attr.override_redirect)
 			      {
-				 if (init_win1)
-				   {
-				      XRaiseWindow(disp, init_win1);
-				      XRaiseWindow(disp, init_win2);
-				   }
 #ifdef USE_EXT_INIT_WIN
 				 if (init_win_ext)
 				    XRaiseWindow(disp, init_win_ext);
-				 ProgressbarsRaise();
 #endif
+				 StartupWindowsRaise();
+				 ProgressbarsRaise();
 				 EMapWindow(disp, wlist[i]);
 			      }
 			    else

src/startup.c

@@ -23,11 +23,11 @@
 #include "E.h"
 #include <time.h>
 
-Window              init_win1 = 0;
-Window              init_win2 = 0;
+Window              init_win1 = None;
+Window              init_win2 = None;
 
 void
-CreateStartupDisplay(char start)
+StartupWindowsCreate(int start)
 {
    static Window       w1, w2, win1, win2, b1, b2;
    static Background  *bg = NULL;
@@ -142,3 +142,14 @@ CreateStartupDisplay(char start)
      }
    EDBUG_RETURN_;
 }
+
+/* FIXME - should be handled via object stack */
+void
+StartupWindowsRaise(void)
+{
+   if (init_win1)
+     {
+	XRaiseWindow(disp, init_win1);
+	XRaiseWindow(disp, init_win2);
+     }
+}