X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fprefs.c;h=d34d2935083470d59a65e78b99ce3c1a178ff819;hb=3f438031d610c7e15fd33876a879b97e290e05fb;hp=7dcb768adecd4ecfde82ccd677ba7e757f47e918;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver diff --git a/driver/prefs.c b/driver/prefs.c index 7dcb768a..d34d2935 100644 --- a/driver/prefs.c +++ b/driver/prefs.c @@ -1,5 +1,5 @@ /* dotfile.c --- management of the ~/.xscreensaver file. - * xscreensaver, Copyright (c) 1998 Jamie Zawinski + * xscreensaver, Copyright (c) 1998-2005 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -77,6 +77,8 @@ static void get_screenhacks (saver_preferences *p); static char *format_command (const char *cmd, Bool wrap_p); static void merge_system_screenhacks (saver_preferences *p, screenhack **system_list, int count); +static void stop_the_insanity (saver_preferences *p); + static char * chase_symlinks (const char *file) @@ -88,7 +90,7 @@ chase_symlinks (const char *file) if (realpath (file, buf)) return strdup (buf); - sprintf (buf, "%s: realpath", blurb()); + sprintf (buf, "%.100s: realpath %.200s", blurb(), file); perror(buf); } # endif /* HAVE_REALPATH */ @@ -216,6 +218,7 @@ get_byte_resource (char *name, char *class) LOSE: fprintf (stderr, "%s: %s must be a number of bytes, not \"%s\".\n", progname, name, s); + free (s); return 0; } s2++; @@ -223,6 +226,7 @@ get_byte_resource (char *name, char *class) while (isspace(*s2)) s2++; if (*s2) goto LOSE; + free (s); return n; } @@ -231,7 +235,7 @@ static const char * const prefs[] = { "timeout", "cycle", "lock", - "lockVTs", + "lockVTs", /* not saved */ "lockTimeout", "passwdTimeout", "visualID", @@ -240,10 +244,13 @@ static const char * const prefs[] = { "timestamp", "splash", "splashDuration", + "quad", "demoCommand", "prefsCommand", - "helpURL", - "loadURL", + "newLoginCommand", + "helpURL", /* not saved */ + "loadURL", /* not saved */ + "newLoginCommand", /* not saved */ "nice", "memoryLimit", "fade", @@ -252,6 +259,7 @@ static const char * const prefs[] = { "fadeTicks", "captureStderr", "captureStdout", /* not saved -- obsolete */ + "ignoreUninstalledPrograms", "font", "dpmsEnabled", "dpmsStandby", @@ -263,15 +271,22 @@ static const char * const prefs[] = { "imageDirectory", "mode", "selected", + "textMode", + "textLiteral", + "textFile", + "textProgram", + "textURL", "", "programs", "", "pointerPollTime", + "pointerHysteresis", "windowCreationTimeout", "initialDelay", "sgiSaverExtension", - "mitSaverExtension", + "mitSaverExtension", /* not saved -- obsolete */ "xidleExtension", + "GetViewPortIsFullOfLies", "procInterrupts", "overlayStderr", "overlayTextBackground", /* not saved -- X resources only */ @@ -632,6 +647,11 @@ write_init_file (saver_preferences *p, const char *version_string, if (n2) name = n2; + /* Throttle the various timeouts to reasonable values before writing + the file to disk. */ + stop_the_insanity (p); + + if (verbose_p) fprintf (stderr, "%s: writing \"%s\".\n", blurb(), name); @@ -701,6 +721,7 @@ write_init_file (saver_preferences *p, const char *version_string, *ss++ = '\n'; *ss = 0; } + free (hack_strings); } { @@ -756,10 +777,15 @@ write_init_file (saver_preferences *p, const char *version_string, CHECK("timestamp") type = pref_bool, b = p->timestamp_p; CHECK("splash") type = pref_bool, b = p->splash_p; CHECK("splashDuration") type = pref_time, t = p->splash_duration; + CHECK("quad") type = pref_bool, b = p->quad_p; CHECK("demoCommand") type = pref_str, s = p->demo_command; CHECK("prefsCommand") type = pref_str, s = p->prefs_command; - CHECK("helpURL") type = pref_str, s = p->help_url; - CHECK("loadURL") type = pref_str, s = p->load_url_command; +/* CHECK("helpURL") type = pref_str, s = p->help_url; */ + CHECK("helpURL") continue; /* don't save */ +/* CHECK("loadURL") type = pref_str, s = p->load_url_command; */ + CHECK("loadURL") continue; /* don't save */ +/* CHECK("newLoginCommand") type = pref_str, s = p->new_login_command; */ + CHECK("newLoginCommand") continue; /* don't save */ CHECK("nice") type = pref_int, i = p->nice_inferior; CHECK("memoryLimit") type = pref_byte, i = p->inferior_memory_limit; CHECK("fade") type = pref_bool, b = p->fade_p; @@ -768,6 +794,9 @@ write_init_file (saver_preferences *p, const char *version_string, CHECK("fadeTicks") type = pref_int, i = p->fade_ticks; CHECK("captureStderr") type = pref_bool, b = p->capture_stderr_p; CHECK("captureStdout") continue; /* don't save */ + CHECK("ignoreUninstalledPrograms") + type = pref_bool, b = p->ignore_uninstalled_p; + CHECK("font") type = pref_str, s = stderr_font; CHECK("dpmsEnabled") type = pref_bool, b = p->dpms_enabled_p; @@ -784,17 +813,33 @@ write_init_file (saver_preferences *p, const char *version_string, s = (p->mode == ONE_HACK ? "one" : p->mode == BLANK_ONLY ? "blank" : p->mode == DONT_BLANK ? "off" : - "random"); + p->mode == RANDOM_HACKS_SAME + ? "random-same" + : "random"); CHECK("selected") type = pref_int, i = p->selected_hack; + CHECK("textMode") type = pref_str, + s = (p->tmode == TEXT_URL ? "url" : + p->tmode == TEXT_LITERAL ? "literal" : + p->tmode == TEXT_FILE ? "file" : + p->tmode == TEXT_PROGRAM ? "program" : + "date"); + CHECK("textLiteral") type = pref_str, s = p->text_literal; + CHECK("textFile") type = pref_str, s = p->text_file; + CHECK("textProgram") type = pref_str, s = p->text_program; + CHECK("textURL") type = pref_str, s = p->text_url; + CHECK("programs") type = pref_str, s = programs; CHECK("pointerPollTime") type = pref_time, t = p->pointer_timeout; + CHECK("pointerHysteresis")type = pref_int, i = p->pointer_hysteresis; CHECK("windowCreationTimeout")type=pref_time,t= p->notice_events_timeout; CHECK("initialDelay") type = pref_time, t = p->initial_delay; CHECK("sgiSaverExtension")type = pref_bool, b=p->use_sgi_saver_extension; - CHECK("mitSaverExtension")type = pref_bool, b=p->use_mit_saver_extension; + CHECK("mitSaverExtension") continue; /* don't save */ CHECK("xidleExtension") type = pref_bool, b = p->use_xidle_extension; CHECK("procInterrupts") type = pref_bool, b = p->use_proc_interrupts; + CHECK("GetViewPortIsFullOfLies") type = pref_bool, + b = p->getviewport_full_of_lies_p; CHECK("overlayStderr") type = pref_bool, b = overlay_stderr_p; CHECK("overlayTextBackground") continue; /* don't save */ CHECK("overlayTextForeground") continue; /* don't save */ @@ -848,7 +893,8 @@ write_init_file (saver_preferences *p, const char *version_string, break; } - if (pr && !strcmp(pr, "mode")) fprintf(out, "\n"); + if (pr && (!strcmp(pr, "mode") || !strcmp(pr, "textMode"))) + fprintf(out, "\n"); write_entry (out, pr, s); } @@ -939,6 +985,7 @@ free_screenhack_list (screenhack **list, int count) } + /* Populate `saver_preferences' with the contents of the resource database. Note that this may be called multiple times -- it is re-run each time the ~/.xscreensaver file is reloaded. @@ -987,7 +1034,10 @@ load_init_file (saver_preferences *p) p->nice_inferior = get_integer_resource ("nice", "Nice"); p->inferior_memory_limit = get_byte_resource ("memoryLimit", "MemoryLimit"); p->splash_p = get_boolean_resource ("splash", "Boolean"); + p->quad_p = get_boolean_resource ("quad", "Boolean"); p->capture_stderr_p = get_boolean_resource ("captureStderr", "Boolean"); + p->ignore_uninstalled_p = get_boolean_resource ("ignoreUninstalledPrograms", + "Boolean"); p->initial_delay = 1000 * get_seconds_resource ("initialDelay", "Time"); p->splash_duration = 1000 * get_seconds_resource ("splashDuration", "Time"); @@ -996,6 +1046,7 @@ load_init_file (saver_preferences *p) p->cycle = 1000 * get_minutes_resource ("cycle", "Time"); p->passwd_timeout = 1000 * get_seconds_resource ("passwdTimeout", "Time"); p->pointer_timeout = 1000 * get_seconds_resource ("pointerPollTime", "Time"); + p->pointer_hysteresis = get_integer_resource ("pointerHysteresis","Integer"); p->notice_events_timeout = 1000*get_seconds_resource("windowCreationTimeout", "Time"); @@ -1010,13 +1061,19 @@ load_init_file (saver_preferences *p) p->image_directory = get_string_resource ("imageDirectory", "ImageDirectory"); + p->text_literal = get_string_resource ("textLiteral", "TextLiteral"); + p->text_file = get_string_resource ("textFile", "TextFile"); + p->text_program = get_string_resource ("textProgram", "TextProgram"); + p->text_url = get_string_resource ("textURL", "TextURL"); + p->shell = get_string_resource ("bourneShell", "BourneShell"); p->demo_command = get_string_resource("demoCommand", "URL"); p->prefs_command = get_string_resource("prefsCommand", "URL"); p->help_url = get_string_resource("helpURL", "URL"); p->load_url_command = get_string_resource("loadURL", "LoadURL"); - + p->new_login_command = get_string_resource("newLoginCommand", + "NewLoginCommand"); /* If "*splash" is unset, default to true. */ { @@ -1037,60 +1094,48 @@ load_init_file (saver_preferences *p) } p->use_xidle_extension = get_boolean_resource ("xidleExtension","Boolean"); +#if 0 /* ignore this, it is evil. */ p->use_mit_saver_extension = get_boolean_resource ("mitSaverExtension", "Boolean"); +#endif p->use_sgi_saver_extension = get_boolean_resource ("sgiSaverExtension", "Boolean"); p->use_proc_interrupts = get_boolean_resource ("procInterrupts", "Boolean"); - /* Throttle the various timeouts to reasonable values. - */ - if (p->passwd_timeout <= 0) p->passwd_timeout = 30000; /* 30 secs */ - if (p->timeout < 10000) p->timeout = 10000; /* 10 secs */ - if (p->cycle != 0 && p->cycle < 2000) p->cycle = 2000; /* 2 secs */ - if (p->pointer_timeout <= 0) p->pointer_timeout = 5000; /* 5 secs */ - if (p->notice_events_timeout <= 0) - p->notice_events_timeout = 10000; /* 10 secs */ - if (p->fade_seconds <= 0 || p->fade_ticks <= 0) - p->fade_p = False; - if (! p->fade_p) p->unfade_p = False; - - /* The DPMS settings may have the value 0. - But if they are negative, or are a range less than 10 seconds, - reset them to sensible defaults. (Since that must be a mistake.) - */ - if (p->dpms_standby != 0 && - p->dpms_standby < 10 * 1000) - p->dpms_standby = 2 * 60 * 60 * 1000; /* 2 hours */ - if (p->dpms_suspend != 0 && - p->dpms_suspend < 10 * 1000) - p->dpms_suspend = 2 * 60 * 60 * 1000; /* 2 hours */ - if (p->dpms_off != 0 && - p->dpms_off < 10 * 1000) - p->dpms_off = 4 * 60 * 60 * 1000; /* 4 hours */ - - if (p->dpms_standby == 0 && /* if *all* are 0, then DPMS is disabled */ - p->dpms_suspend == 0 && - p->dpms_off == 0) - p->dpms_enabled_p = False; - - - p->watchdog_timeout = p->cycle * 0.6; - if (p->watchdog_timeout < 30000) p->watchdog_timeout = 30000; /* 30 secs */ - if (p->watchdog_timeout > 3600000) p->watchdog_timeout = 3600000; /* 1 hr */ + p->getviewport_full_of_lies_p = + get_boolean_resource ("GetViewPortIsFullOfLies", "Boolean"); - get_screenhacks (p); + get_screenhacks (p); /* Parse the "programs" resource. */ - p->selected_hack = get_integer_resource ("selected", "Integer"); - if (p->selected_hack < 0 || p->selected_hack >= p->screenhacks_count) - p->selected_hack = -1; + { + char *s = get_string_resource ("selected", "Integer"); + if (!s || !*s) + p->selected_hack = -1; + else + p->selected_hack = get_integer_resource ("selected", "Integer"); + if (s) free (s); + if (p->selected_hack < 0 || p->selected_hack >= p->screenhacks_count) + p->selected_hack = -1; + } { char *s = get_string_resource ("mode", "Mode"); - if (s && !strcasecmp (s, "one")) p->mode = ONE_HACK; - else if (s && !strcasecmp (s, "blank")) p->mode = BLANK_ONLY; - else if (s && !strcasecmp (s, "off")) p->mode = DONT_BLANK; - else p->mode = RANDOM_HACKS; + if (s && !strcasecmp (s, "one")) p->mode = ONE_HACK; + else if (s && !strcasecmp (s, "blank")) p->mode = BLANK_ONLY; + else if (s && !strcasecmp (s, "off")) p->mode = DONT_BLANK; + else if (s && !strcasecmp (s, "random-same")) p->mode = RANDOM_HACKS_SAME; + else p->mode = RANDOM_HACKS; + if (s) free (s); + } + + { + char *s = get_string_resource ("textMode", "TextMode"); + if (s && !strcasecmp (s, "url")) p->tmode = TEXT_URL; + else if (s && !strcasecmp (s, "literal")) p->tmode = TEXT_LITERAL; + else if (s && !strcasecmp (s, "file")) p->tmode = TEXT_FILE; + else if (s && !strcasecmp (s, "program")) p->tmode = TEXT_PROGRAM; + else p->tmode = TEXT_DATE; + if (s) free (s); } if (system_default_screenhack_count) /* note: first_time is also true */ @@ -1110,6 +1155,10 @@ load_init_file (saver_preferences *p) p->timestamp_p = True; p->initial_delay = 0; } + + /* Throttle the various timeouts to reasonable values after reading the + disk file. */ + stop_the_insanity (p); } @@ -1319,7 +1368,10 @@ make_hack_name (const char *shell_command) sprintf (res_name, "hacks.%s.name", s); /* resource? */ s2 = get_string_resource (res_name, res_name); if (s2) - return s2; + { + free (s); + return s2; + } for (s2 = s; *s2; s2++) /* if it has any capitals, return it */ if (*s2 >= 'A' && *s2 <= 'Z') @@ -1329,6 +1381,10 @@ make_hack_name (const char *shell_command) s[0] -= 'a'-'A'; if (s[0] == 'X' && s[1] >= 'a' && s[1] <= 'z') /* (magic leading X) */ s[1] -= 'a'-'A'; + if (s[0] == 'G' && s[1] == 'l' && + s[2] >= 'a' && s[2] <= 'z') /* (magic leading GL) */ + s[1] -= 'a'-'A', + s[2] -= 'a'-'A'; return s; } @@ -1337,15 +1393,28 @@ char * format_hack (screenhack *hack, Bool wrap_p) { int tab = 32; - int size = (2 * (strlen(hack->command) + - (hack->visual ? strlen(hack->visual) : 0) + - (hack->name ? strlen(hack->name) : 0) + - tab)); - char *h2 = (char *) malloc (size); - char *out = h2; - char *s; + int size; + char *h2, *out, *s; int col = 0; + char *def_name = make_hack_name (hack->command); + + /* Don't ever write out a name for a hack if it's the same as the default. + */ + if (hack->name && !strcmp (hack->name, def_name)) + { + free (hack->name); + hack->name = 0; + } + free (def_name); + + size = (2 * (strlen(hack->command) + + (hack->visual ? strlen(hack->visual) : 0) + + (hack->name ? strlen(hack->name) : 0) + + tab)); + h2 = (char *) malloc (size); + out = h2; + if (!hack->enabled_p) *out++ = '-'; /* write disabled flag */ if (hack->visual && *hack->visual) /* write visual name */ @@ -1468,9 +1537,62 @@ get_screenhacks (saver_preferences *p) start = end+1; } + free (d); + if (p->screenhacks_count == 0) { free (p->screenhacks); p->screenhacks = 0; } } + + +/* Make sure all the values in the preferences struct are sane. + */ +static void +stop_the_insanity (saver_preferences *p) +{ + if (p->passwd_timeout <= 0) p->passwd_timeout = 30000; /* 30 secs */ + if (p->timeout < 15000) p->timeout = 15000; /* 15 secs */ + if (p->cycle != 0 && p->cycle < 2000) p->cycle = 2000; /* 2 secs */ + if (p->pointer_timeout <= 0) p->pointer_timeout = 5000; /* 5 secs */ + if (p->notice_events_timeout <= 0) + p->notice_events_timeout = 10000; /* 10 secs */ + if (p->fade_seconds <= 0 || p->fade_ticks <= 0) + p->fade_p = False; + if (! p->fade_p) p->unfade_p = False; + + /* The DPMS settings may have the value 0. + But if they are negative, or are a range less than 10 seconds, + reset them to sensible defaults. (Since that must be a mistake.) + */ + if (p->dpms_standby != 0 && + p->dpms_standby < 10 * 1000) + p->dpms_standby = 2 * 60 * 60 * 1000; /* 2 hours */ + if (p->dpms_suspend != 0 && + p->dpms_suspend < 10 * 1000) + p->dpms_suspend = 2 * 60 * 60 * 1000; /* 2 hours */ + if (p->dpms_off != 0 && + p->dpms_off < 10 * 1000) + p->dpms_off = 4 * 60 * 60 * 1000; /* 4 hours */ + + /* standby may not be greater than suspend. + suspend may not be greater than off. + */ + if (p->dpms_standby > p->dpms_suspend) p->dpms_standby = p->dpms_suspend; + if (p->dpms_suspend > p->dpms_off) p->dpms_suspend = p->dpms_off; + + + if (p->dpms_standby == 0 && /* if *all* are 0, then DPMS is disabled */ + p->dpms_suspend == 0 && + p->dpms_off == 0) + p->dpms_enabled_p = False; + + + p->watchdog_timeout = p->cycle * 0.6; + if (p->watchdog_timeout < 27000) p->watchdog_timeout = 27000; /* 27 secs */ + if (p->watchdog_timeout > 57000) p->watchdog_timeout = 57000; /* 57 secs */ + + if (p->pointer_hysteresis < 0) p->pointer_hysteresis = 0; + if (p->pointer_hysteresis > 100) p->pointer_hysteresis = 100; +}