Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c config.c main.c session.c setup.c
Log Message:
Enable continuing startup when there are errors in ...e_session-XXXXXX.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- actions.c 13 Jun 2004 16:05:24 -0000 1.168
+++ actions.c 19 Jun 2004 21:31:39 -0000 1.169
@@ -1792,19 +1792,15 @@
{
EDBUG(6, "doMoveModeSet");
if (params)
- {
- Conf.movemode = atoi((char *)params);
- }
+ Conf.movemode = atoi((char *)params);
else
- {
- Conf.movemode++;
- if (Conf.movemode > 5)
- Conf.movemode = 0;
- }
+ Conf.movemode++;
#if !USE_IMLIB2
if ((prImlib_Context) && (Conf.movemode == 5))
Conf.movemode = 3;
#endif
+ if (Conf.movemode < 0 || Conf.movemode > 5)
+ Conf.movemode = 0;
autosave();
EDBUG_RETURN(0);
edummy = NULL;
@@ -1815,17 +1811,11 @@
{
EDBUG(6, "doResizeModeSet");
if (params)
- {
- Conf.resizemode = atoi((char *)params);
- }
+ Conf.resizemode = atoi((char *)params);
else
- {
- Conf.resizemode++;
- if (Conf.resizemode > 4)
- Conf.resizemode = 0;
- }
- if (Conf.resizemode == 5)
- Conf.resizemode = 3;
+ Conf.resizemode++;
+ if (Conf.resizemode < 0 || Conf.resizemode > 4)
+ Conf.resizemode = 0;
autosave();
EDBUG_RETURN(0);
edummy = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- config.c 14 Jun 2004 17:02:29 -0000 1.104
+++ config.c 19 Jun 2004 21:31:39 -0000 1.105
@@ -692,9 +692,13 @@
break;
case CONTROL_MOVEMODE:
Conf.movemode = i2;
+ if (Conf.movemode < 0 || Conf.movemode > 5)
+ Conf.movemode = 0;
break;
case CONTROL_RESIZEMODE:
Conf.resizemode = i2;
+ if (Conf.resizemode < 0 || Conf.resizemode > 4)
+ Conf.resizemode = 0;
break;
case CONTROL_GEOMINFOMODE:
Conf.geominfomode = i2;
@@ -4244,23 +4248,25 @@
static void
RecoverUserConfig(void)
{
+ int save;
+
if (is_autosave)
{
+ /* Don't save settings if we restart or quit */
+ save = Conf.autosave;
+ Conf.autosave = 0;
+
AlertX(_("Recover system config?"), _("Yes, Attempt recovery"),
_("Restart and try again"), _("Quit and give up"),
+ _
("Enlightenment has encountered parsing errors in your autosaved\n"
"configuration.\n" "\n"
"This may be due to filing system errors, Minor bugs or "
"unforeseen\n" "system shutdowns.\n" "\n"
"Do you wish Enlightenment to recover its original system\n"
"configuration and try again?\n"));
- Conf.autosave = 0;
- MapUnmap(1);
- if (Mode.wm.master && init_win_ext)
- {
- XKillClient(disp, init_win_ext);
- init_win_ext = 0;
- }
- SessionExit("restart");
+
+ /* Allow settings to be saved if we continue */
+ Conf.autosave = save;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- main.c 31 May 2004 20:14:50 -0000 1.96
+++ main.c 19 Jun 2004 21:31:40 -0000 1.97
@@ -232,14 +232,15 @@
GotoDesktop(0);
CommsSetup();
CommsFindCommsWindow();
- GrabX();
LoadGroups();
LoadSnapInfo();
+
+ GrabX();
MapUnmap(0);
+ UngrabX();
/* make all of our fallback classes */
SetupFallbackClasses();
- UngrabX();
desks.desk[0].viewable = 0;
/* now we're going to load the configuration/theme */
@@ -296,10 +297,6 @@
XSync(disp, False);
Mode.queue_up = DRAW_QUEUE_ENABLE;
- /* hello! we don't have a resizemode of 5! */
- if (Conf.resizemode == 5)
- Conf.resizemode = 0;
-
/* of course, we have to set the cursors */
ec = FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_ECURSOR);
if (ec)
@@ -371,6 +368,10 @@
BackgroundsInit(); /* Start the background accounting */
+ /* Update pagers */
+ for (i = 0; i < Conf.desks.num; i++)
+ RedrawPagersForDesktop(i, 0);
+
/* The primary event loop */
for (;;)
WaitEvent();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- session.c 18 Jun 2004 20:12:10 -0000 1.72
+++ session.c 19 Jun 2004 21:31:40 -0000 1.73
@@ -448,15 +448,8 @@
if (!isfile(GetGenericSMFile()))
Alert(_("There was an error saving your autosave data - filing\n"
"system problems.\n"));
-/*
- * if (strcmp(GetSMFile(), GetGenericSMFile()))
- * {
- * if (exists(GetGenericSMFile()))
- * E_rm(GetGenericSMFile());
- * symlink(GetSMFile(), GetGenericSMFile());
- * }
- */
}
+#if 0 /* Why nuke it? */
else
{
/* char buf[1024];
@@ -468,6 +461,7 @@
Eprintf("autosave: kill %s\n", GetGenericSMFile());
E_rm(GetGenericSMFile());
}
+#endif
}
#ifdef HAVE_X11_SM_SMLIB_H
@@ -996,9 +990,16 @@
SaveSession(1);
ICCCM_SetEInfoOnAll();
EwinsSetFree();
+ if (Mode.wm.startup && Mode.wm.exiting)
+ MapUnmap(1);
if (disp)
- XSelectInput(disp, VRoot.win, 0);
+ {
+ XSelectInput(disp, VRoot.win, 0);
+
+ if (Mode.wm.master && init_win_ext)
+ XKillClient(disp, init_win_ext);
+ }
if ((!params) || (!strcmp((char *)s, "exit")))
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- setup.c 18 Jun 2004 22:21:35 -0000 1.130
+++ setup.c 19 Jun 2004 21:31:40 -0000 1.131
@@ -93,12 +93,16 @@
}
else
{
- AddToFamily(wlist[i]);
+ if (Mode.wm.exiting)
+ EMapWindow(disp, wlist[i]);
+ else
+ AddToFamily(wlist[i]);
}
}
}
}
XFree(wlist);
+ wlist = NULL;
}
break;
default:
-------------------------------------------------------
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
