X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverView.m;h=404cfc1c42bc5c163592278cf5e8c90d5b282544;hp=d8eea00acf345349232962cfc4edc5210808b557;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hpb=1d7308dd9032b39a92fda86e8c2db04218b45fbf

diff --git a/OSX/XScreenSaverView.m b/OSX/XScreenSaverView.m
index d8eea00a..404cfc1c 100644
--- a/OSX/XScreenSaverView.m
+++ b/OSX/XScreenSaverView.m
@@ -134,6 +134,7 @@ add_default_options (const XrmOptionDescRec *opts,
     { "-text-literal",           ".textLiteral",       XrmoptionSepArg, 0 },
     { "-text-file",              ".textFile",          XrmoptionSepArg, 0 },
     { "-text-url",               ".textURL",           XrmoptionSepArg, 0 },
+    { "-text-program",           ".textProgram",       XrmoptionSepArg, 0 },
     { "-grab-desktop",           ".grabDesktopImages", XrmoptionNoArg, "True" },
     { "-no-grab-desktop",        ".grabDesktopImages", XrmoptionNoArg, "False"},
     { "-choose-random-images",   ".chooseRandomImages",XrmoptionNoArg, "True" },
@@ -150,7 +151,8 @@ add_default_options (const XrmOptionDescRec *opts,
     ".textMode:           date",
  // ".textLiteral:        ",
  // ".textFile:           ",
- // ".textURL:            ",
+    ".textURL:            http://twitter.com/statuses/public_timeline.atom",
+ // ".textProgram:        ",
     ".grabDesktopImages:  yes",
     ".chooseRandomImages: no",
     ".imageDirectory:     ~/Pictures",
@@ -315,7 +317,7 @@ add_default_options (const XrmOptionDescRec *opts,
 static void
 screenhack_do_fps (Display *dpy, Window w, fps_state *fpst, void *closure)
 {
-  fps_compute (fpst, 0);
+  fps_compute (fpst, 0, -1);
   fps_draw (fpst);
 }
 
@@ -539,6 +541,12 @@ screenhack_do_fps (Display *dpy, Window w, fps_state *fpst, void *closure)
 }
 
 
+- (NSUserDefaultsController *) userDefaultsController
+{
+  return [prefsReader userDefaultsController];
+}
+
+
 /* Announce our willingness to accept keyboard input.
 */
 - (BOOL)acceptsFirstResponder