Various fixes to deal with where we install things on Solaris:

- Only run hacks from the hacks dir, not $PATH

- Find helper programs even though they are not in $PATH

- Show author names when reading RSS feeds from sites like blogs.sun.com

- Show Solaris package names in demo app when hacks are not installed

- Use gnome-help to display man pages nicely, without requiring internet

access (which some customers at secure sites won't have configured),

Nevada that supports "man:xscreensaver" style URL's to display man pages.

When backporting to older releases you will probably want to uncomment the

lines shown for GNOME 2.4/2.6.

Also, you'll need to fix the package names shown when the hacks are not

+*loadURL: gnome-help '%s'

+*manualCommand: gnome-help 'man:%s'

! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)

!

-@GNOME24@*loadURL: @WITH_BROWSER@ '%s'

-@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \

-@GNOME24@ --command '/bin/sh -c "man %s; read foo"'

+!*loadURL: gnome-terminal --title 'xscreensaver manual' \

+! --command '/bin/ksh -c "man xscreensaver; read foo"'

+!*manualCommand: gnome-terminal --title '%s manual' \

+! --command '/bin/ksh -c "man %s; read foo"'

!

! Gnome 2.2:

!

diff --git xscreensaver-5.12/driver/demo-Gtk.c xscreensaver-5.12/driver/demo-Gtk.c

--- xscreensaver-5.12/driver/demo-Gtk.c

+++ xscreensaver-5.12/driver/demo-Gtk.c

@@ -990,7 +990,7 @@ restart_menu_cb (GtkWidget *widget, gpointer user_data)

flush_dialog_changes_and_save (s);

xscreensaver_command (GDK_DISPLAY(), XA_EXIT, 0, False, NULL);

sleep (1);

- if (system ("xscreensaver -nosplash &") < 0)

+ if (system (BINDIR "/xscreensaver -nosplash &") < 0)

fprintf (stderr, "%s: fork error\n", blurb());

await_xscreensaver (s);

@@ -4933,7 +4933,7 @@ main (int argc, char **argv)

if (init_results == 1)

{

- system ("xscreensaver -nosplash &");

+ system (BINDIR "/xscreensaver -nosplash &");

return 0;

}

diff --git xscreensaver-5.12/driver/subprocs.c xscreensaver-5.12/driver/subprocs.c

--- xscreensaver-5.12/driver/subprocs.c

+++ xscreensaver-5.12/driver/subprocs.c

@@ -14,6 +14,7 @@

# include "config.h"

#endif

+#include <sys/stat.h>

#include <ctype.h>

#include <stdio.h>

#include <string.h>

@@ -791,6 +792,8 @@ print_path_error (const char *program)

free (cmd);

perror (buf);

+/* mali - security issue do not want to display user's path */

+#ifdef EXPOSE_USER_PATH

if (errno == ENOENT &&

(token = getenv("PATH")))

{

@@ -821,6 +824,7 @@ print_path_error (const char *program)

}

fprintf (stderr, "\n");

}

+#endif

}

@@ -877,12 +881,42 @@ fork_and_exec (saver_screen_info *ssi, const char *command)

return forked;

}

+static Bool

+check_if_hacks_dir_exists(Bool verbose_p)

+{

+ const char hackdir[] = HACK_PATH;

+

+ int status;

+ struct stat st;

+

+ status = stat (hackdir, &st);

+

+ if (status == 0 && S_ISDIR(st.st_mode))

+ {

+ return True;

+ }

+ else

+ {

+ if (verbose_p)

+ {

+ fprintf(stderr,

+ "%s: Warning: dir: %s missing. Will not run hacks\n",

+ blurb(), hackdir);

+ }

+ return False;

+ }

+}

void

spawn_screenhack (saver_screen_info *ssi)

{

saver_info *si = ssi->global;

saver_preferences *p = &si->prefs;

+ char* complete_hack_command;

+

+ if (si->prefs.verbose_p)

+ fprintf(stderr, "--> spawn_screenhack()\n");

+

XFlush (si->dpy);

if (!monitor_powered_on_p (si))

@@ -962,6 +996,12 @@ spawn_screenhack (saver_screen_info *ssi)

;

}

+ if ((new_hack >= 0) &&

+ (check_if_hacks_dir_exists(p->verbose_p) == False))

+ {

+ new_hack = -1;

+ }

+

if (new_hack < 0) /* don't run a hack */

{

ssi->current_hack = -1;

@@ -1009,7 +1049,17 @@ spawn_screenhack (saver_screen_info *ssi)

if (si->selection_mode < 0)

si->selection_mode = 0;

- forked = fork_and_exec (ssi, hack->command);

+ /* We need complete path to hack command else any executable

+ complete_hack_command = malloc (10 + strlen(hack->command) +

+ strlen (HACK_PATH));

+ sprintf(complete_hack_command, HACK_PATH"/%s", hack->command);

+

+

+ forked = fork_and_exec (ssi, complete_hack_command);

+ free (complete_hack_command);

+

switch ((int) forked)

{

case -1: /* fork failed */

@@ -1186,7 +1236,7 @@ get_best_gl_visual (saver_info *si, Screen *screen)

char *av[10];

int ac = 0;

- av[ac++] = "xscreensaver-gl-helper";

+ av[ac++] = HELPER_PATH "/xscreensaver-gl-helper";

av[ac] = 0;

if (pipe (fds))

diff --git xscreensaver-5.12/driver/xscreensaver-demo.glade2 xscreensaver-5.12/driver/xscreensaver-demo.glade2

--- xscreensaver-5.12/driver/xscreensaver-demo.glade2

+++ xscreensaver-5.12/driver/xscreensaver-demo.glade2

@@ -927,10 +927,12 @@ Installed</property>

<property name="visible">True</property>

<property name="label" translatable="yes">Very few (or no) screen savers appear to be available.

-This probably means that the &quot;xscreensaver-extras&quot; and

-&quot;xscreensaver-gl-extras&quot; packages are not installed.</property>

+This probably means that the “&lt;a href="file:/usr/lib/xscreensaver/config/xscreensaver-hacks.p5i"&gt;desktop/xscreensaver/hacks&lt;/a&gt;,”

+“&lt;a href="file:/usr/lib/xscreensaver/config/xscreensaver-hacks-gl.p5i"&gt;desktop/xscreensaver/hacks/hacks-gl&lt;/a&gt;,” and

+“&lt;a href="file:/usr/lib/xscreensaver/config/rss-glx.p5i"&gt;desktop/xscreensaver/hacks/rss-glx&lt;/a&gt;” packages

+are not installed.</property>

<property name="use_underline">False</property>

- <property name="use_markup">False</property>

+ <property name="use_markup">True</property>

<property name="justify">GTK_JUSTIFY_CENTER</property>

<property name="wrap">False</property>

<property name="selectable">False</property>

diff --git xscreensaver-5.12/driver/xscreensaver-text xscreensaver-5.12/driver/xscreensaver-text

--- xscreensaver-5.12/driver/xscreensaver-text

+++ xscreensaver-5.12/driver/xscreensaver-text

@@ -695,12 +695,15 @@ sub reformat_rss($) {

$i++;

my ($title, $body1, $body2, $body3);

+ my $author;

$title = $3 if (m@<((TITLE) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi);

$body1 = $3 if (m@<((DESCRIPTION) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi);

$body2 = $3 if (m@<((CONTENT) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi);

$body3 = $3 if (m@<((SUMMARY) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi);

+ $author = $3 if (m@<((DC:CREATOR) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi);

+

# If there are both <description> and <content> or <content:encoded>,

# use whichever one contains more text.

#

@@ -724,10 +727,11 @@ sub reformat_rss($) {

$title = rss_field_to_html ($title || '');

$body1 = rss_field_to_html ($body1 || '');

+ $author = rss_field_to_html ($author || '');

$title = '' if ($body1 eq $title); # Identical in Twitter's atom feed.