Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h config.c ewins.c main.c setup.c startup.c
Log Message:
Keep startup windows raised.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -3 -r1.336 -r1.337
--- E.h 31 Dec 2004 13:07:02 -0000 1.336
+++ E.h 31 Dec 2004 13:49:07 -0000 1.337
@@ -2209,7 +2209,8 @@
#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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- config.c 28 Dec 2004 23:46:43 -0000 1.121
+++ config.c 31 Dec 2004 13:49:07 -0000 1.122
@@ -533,7 +533,7 @@
if (!Mode.wm.restart)
{
if (i == 2)
- CreateStartupDisplay(1);
+ StartupWindowsCreate(1);
if ((i > 1) && (!p))
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewins.c 28 Dec 2004 23:46:45 -0000 1.2
+++ ewins.c 31 Dec 2004 13:49:08 -0000 1.3
@@ -964,6 +964,9 @@
EwinBorderDraw(ewin, 1, 1);
EwinDetermineArea(ewin);
+
+ StartupWindowsRaise();
+
ecore_x_ungrab();
EDBUG_RETURN(ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- main.c 28 Dec 2004 23:46:46 -0000 1.103
+++ main.c 31 Dec 2004 13:49:08 -0000 1.104
@@ -270,7 +270,7 @@
MapUnmap(1);
if (!Mode.wm.restart)
- CreateStartupDisplay(0);
+ StartupWindowsCreate(0);
/* sync just to make sure */
ecore_x_sync();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- setup.c 28 Dec 2004 23:46:47 -0000 1.142
+++ setup.c 31 Dec 2004 13:49:08 -0000 1.143
@@ -82,16 +82,12 @@
{
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
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- startup.c 28 Dec 2004 23:46:47 -0000 1.46
+++ startup.c 31 Dec 2004 13:49:08 -0000 1.47
@@ -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 @@
}
EDBUG_RETURN_;
}
+
+/* FIXME - should be handled via object stack */
+void
+StartupWindowsRaise(void)
+{
+ if (init_win1)
+ {
+ XRaiseWindow(disp, init_win1);
+ XRaiseWindow(disp, init_win2);
+ }
+}
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
