e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Wed Sep 22 15:41:28 PDT 1999 

(Raster)

some more multihead fixes...


SVN revision: 372
This commit is contained in:
Carsten Haitzler 1999-09-22 22:07:20 +00:00
parent 15bfad6edd
commit f1bae17ab0
5 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -2204,3 +2204,10 @@ Wed Sep 22 15:37:25 PDT 1999
fixed a bug in kde support that caused E to potentially crash on property
events upon deletion by a window.
-------------------------------------------------------------------------------
Wed Sep 22 15:41:28 PDT 1999
(Raster)
some more multihead fixes...

11
src/menus.c
View File

@ -1500,10 +1500,13 @@ FillFlatFileMenu(Menu * m, MenuStyle * ms, char *name, char *file, Menu * parent
Esnprintf(wd, sizeof(wd), "__FM.%s.%i", name, count);
count++;
mm = CreateMenuFromFlatFile(wd, ms, params, parent);
mm->parent = m;
AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
mi = CreateMenuItem(txt, icc, 0, NULL, mm);
AddItemToMenu(m, mi);
if (mm)
{
mm->parent = m;
AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
mi = CreateMenuItem(txt, icc, 0, NULL, mm);
AddItemToMenu(m, mi);
}
if (txt)
Efree(txt);
}

2
src/misc.c
View File

@ -83,7 +83,7 @@ EExit(void *code)
system(sss);
}
for (i = 0; i < child_count; i++)
kill(e_children[i], SIGCONT);
kill(e_children[i], SIGINT);
}
SaveSnapInfo();

55
src/session.c
View File

@ -390,26 +390,36 @@ autosave(void)
{
if (mode.startup)
return;
if (master_pid == getpid())
if (mode.autosave)
{
if (mode.autosave)
{
char s[4096];
char s[4096];
SaveSnapInfo();
Etmp(s);
SaveUserControlConfig(fopen(s, "w"));
rm(GetGenericSMFile());
mv(s, GetGenericSMFile());
if (!isfile(GetGenericSMFile()))
Alert("There was an error saving your autosave data - filing\n"
"system problems.\n"
);
}
else
{
rm(GetGenericSMFile());
}
SaveSnapInfo();
Etmp(s);
SaveUserControlConfig(fopen(s, "w"));
rm(GetGenericSMFile());
mv(s, GetGenericSMFile());
if (!isfile(GetGenericSMFile()))
Alert("There was an error saving your autosave data - filing\n"
"system problems.\n"
);
/*
* if (strcmp(GetSMFile(), GetGenericSMFile()))
* {
* if (exists(GetGenericSMFile()))
* rm(GetGenericSMFile());
* symlink(GetSMFile(), GetGenericSMFile());
* }
*/
}
else
{
/* char buf[1024];
*
* * Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*", GetSMFile());
* *
* * system(buf); */
rm(GetGenericSMFile());
}
}
@ -511,7 +521,7 @@ doSMExit(void *params)
w = MakeExtInitWin();
XCloseDisplay(disp);
disp = NULL;
CommsBroadcastToSlaveWMs("exit quit");
if (themepath[0] != 0)
{
Esnprintf(sss, sizeof(sss),
@ -545,17 +555,13 @@ doSMExit(void *params)
sscanf(params, "%*s %1000s", s);
Esnprintf(sss, sizeof(sss),
"exec %s -ext_init_win %i -theme %s", command, w, s);
CommsBroadcastToSlaveWMs("exit quit");
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
else
{
sscanf(params, "%*s %1000s", s);
Esnprintf(sss, sizeof(sss),
"restart_theme %s", s);
if (sound_fd >= 0)
close(sound_fd);
CommsSendToMasterWM(sss);
CommsSendToMasterWM("restart_theme");
do_master_kill = 0;
}
}
@ -572,7 +578,6 @@ doSMExit(void *params)
strncpy(s, atword(params, 2), 1000);
real_exec = (char *)Emalloc(strlen(s) + 6);
sprintf(real_exec, "exec %s", s);
CommsBroadcastToSlaveWMs("exit quit");
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", "exec",
real_exec, NULL);
}

2
src/setup.c
View File

@ -226,7 +226,7 @@ SetupX()
}
else
{
pause();
kill(getpid(), SIGSTOP);
/* Find the point to concatenate the screen onto */
dispstr = strchr(subdisplay, ':');
if (NULL != dispstr)