http://www.jwz.org/xscreensaver/xscreensaver-5.13.tar.gz

[xscreensaver] / driver / prefs.c

diff --git a/driver/prefs.c b/driver/prefs.c
index c8e4ae14868c671fb66371901667dade718413e2..857139350ae4e2687d87d7e4c27a479cb87f6db8 100644 (file)
--- a/driver/prefs.c
+++ b/driver/prefs.c
@@ -1,5 +1,5 @@
 /* dotfile.c --- management of the ~/.xscreensaver file.
- * xscreensaver, Copyright (c) 1998-2006 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1998-2011 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -272,6 +272,7 @@ static const char * const prefs[] = {
   "fadeTicks",
   "captureStderr",
   "captureStdout",             /* not saved -- obsolete */
+  "logFile",                   /* not saved */
   "ignoreUninstalledPrograms",
   "font",
   "dpmsEnabled",
@@ -296,11 +297,12 @@ static const char * const prefs[] = {
   "pointerHysteresis",
   "windowCreationTimeout",
   "initialDelay",
-  "sgiSaverExtension",
+  "sgiSaverExtension",         /* not saved -- obsolete */
   "mitSaverExtension",         /* not saved -- obsolete */
-  "xidleExtension",
+  "xidleExtension",            /* not saved -- obsolete */
   "GetViewPortIsFullOfLies",
   "procInterrupts",
+  "xinputExtensionDev",
   "overlayStderr",
   "overlayTextBackground",     /* not saved -- X resources only */
   "overlayTextForeground",     /* not saved -- X resources only */
@@ -808,6 +810,7 @@ write_init_file (Display *dpy,
       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("logFile")         continue;  /* don't save */
       CHECK("ignoreUninstalledPrograms")
                                 type = pref_bool, b = p->ignore_uninstalled_p;
 
@@ -848,16 +851,17 @@ write_init_file (Display *dpy,
       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("sgiSaverExtension") continue;  /* don't save */
       CHECK("mitSaverExtension") continue;  /* don't save */
-      CHECK("xidleExtension")  type = pref_bool, b = p->use_xidle_extension;
+      CHECK("xidleExtension")   continue;  /* don't save */
       CHECK("procInterrupts")  type = pref_bool, b = p->use_proc_interrupts;
+      CHECK("xinputExtensionDev") type = pref_bool, b = p->use_xinput_extension;
       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 */
-      CHECK("bourneShell")     continue;
+      CHECK("bourneShell")          continue;  /* don't save */
       else                     abort();
 # undef CHECK
 
@@ -1114,14 +1118,21 @@ load_init_file (Display *dpy, saver_preferences *p)
   }
 
   p->use_xidle_extension = get_boolean_resource (dpy, "xidleExtension","Boolean");
-#if 0 /* ignore this, it is evil. */
+#if 0 /* obsolete. */
+  p->use_sgi_saver_extension = get_boolean_resource (dpy,
+                                                     "sgiSaverExtension",
+                                                    "Boolean");
+#endif
+#if 0 /* obsolete. */
+  p->use_xinput_extension = get_boolean_resource (dpy, "xinputExtensionDev",
+                                                  "Boolean");
+#endif
+#if 0 /* broken and evil. */
   p->use_mit_saver_extension = get_boolean_resource (dpy, 
                                                      "mitSaverExtension",
                                                     "Boolean");
 #endif
-  p->use_sgi_saver_extension = get_boolean_resource (dpy,
-                                                     "sgiSaverExtension",
-                                                    "Boolean");
+
   p->use_proc_interrupts = get_boolean_resource (dpy,
                                                  "procInterrupts", "Boolean");