1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00

- Fixed a bug that crashed wmaker when selecting the "Start alternate window

manager" option in the crashing dialog panel.
- Window Maker will now use the WINDOWMAKER_ALT_WM environment variable (if
  it is defined) to overwrite the default hardcoded fallback window manager.
This commit is contained in:
dan
2002-02-01 01:20:15 +00:00
parent 06f1bf91a9
commit f37b4cf5d0
4 changed files with 26 additions and 9 deletions

View File

@@ -582,7 +582,7 @@ int
main(int argc, char **argv)
{
int i, restart=0;
char *str;
char *str, *alt;
int d, s;
#ifdef DEBUG
Bool doSync = False;
@@ -610,9 +610,21 @@ main(int argc, char **argv)
restart = 0;
memset(&wPreferences, 0, sizeof(WPreferences));
wPreferences.fallbackWMs = WMCreateArray(8);
alt = getenv("WINDOWMAKER_ALT_WM");
if (alt != NULL)
WMAddToArray(wPreferences.fallbackWMs, wstrdup(alt));
WMAddToArray(wPreferences.fallbackWMs, wstrdup(FALLBACK_WINDOWMANAGER));
WMAddToArray(wPreferences.fallbackWMs, wstrdup("fvwm"));
WMAddToArray(wPreferences.fallbackWMs, wstrdup("twm"));
WMAddToArray(wPreferences.fallbackWMs, NULL);
WMAddToArray(wPreferences.fallbackWMs, wstrdup("rxvt"));
WMAddToArray(wPreferences.fallbackWMs, wstrdup("xterm"));
if (argc>1) {
for (i=1; i<argc; i++) {
#ifdef USECPP