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

[xscreensaver] / driver / prefs.c

diff --git a/driver/prefs.c b/driver/prefs.c
index c8e4ae14868c671fb66371901667dade718413e2..1df877287d621930caa45930428a48f05825dae8 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-2008 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",
@@ -301,6 +302,7 @@ static const char * const prefs[] = {
   "xidleExtension",
   "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;
 
@@ -852,6 +855,7 @@ write_init_file (Display *dpy,
       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("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;
@@ -1122,6 +1126,10 @@ load_init_file (Display *dpy, saver_preferences *p)
   p->use_sgi_saver_extension = get_boolean_resource (dpy,
                                                      "sgiSaverExtension",
                                                     "Boolean");
+
+  p->use_xinput_extension = get_boolean_resource (dpy, "xinputExtensionDev",
+                                                  "Boolean");
+
   p->use_proc_interrupts = get_boolean_resource (dpy,
                                                  "procInterrupts", "Boolean");