-/* xscreensaver, Copyright (c) 2006-2008 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2010 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
opts++;
}
+#if 0
// make sure there's no resource mentioned in defaults and not options.
NSEnumerator *enumerator = [defsdict keyEnumerator];
NSString *key;
while ((key = [enumerator nextObject])) {
-#if 0
if (! [optsdict objectForKey:key])
if (! ([key isEqualToString:@"foreground"] || // don't warn about these
[key isEqualToString:@"background"] ||
[key isEqualToString:@"TVTint"]
))
NSLog (@"warning: \"%@\" is in defaults but not options", key);
-#endif /* 0 */
}
+#endif /* 0 */
}
strcpy (result, result+1);
}
+ // Kludge: assume that any string that begins with "~" and has a "/"
+ // anywhere in it should be expanded as if it is a pathname.
+ if (result[0] == '~' && strchr (result, '/')) {
+ os = [NSString stringWithCString:result encoding:NSUTF8StringEncoding];
+ free (result);
+ result = strdup ([[os stringByExpandingTildeInPath]
+ cStringUsingEncoding:NSUTF8StringEncoding]);
+ }
+
return result;
}