diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-10-10 01:57:28 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-10-10 01:57:28 +0000 |
| commit | dd442788e7efd6489ad1baa12cadc57ae180fa40 (patch) | |
| tree | 3a08a649a2fb52595959a43bdd53e2022aea038e /net/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm | |
| parent | Update to 3.1.1. (diff) | |
New port AmphetaDesk version 0.93.1: News, weblog, and RSS aggregator
with a brain
Notes
Notes:
svn path=/head/; revision=144741
Diffstat (limited to 'net/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm')
| -rw-r--r-- | net/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/net/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm b/net/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm new file mode 100644 index 000000000000..101b5d137522 --- /dev/null +++ b/net/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm @@ -0,0 +1,61 @@ +--- lib/AmphetaDesk/OS/Linux.pm.orig Sun Oct 9 22:39:00 2005 ++++ lib/AmphetaDesk/OS/Linux.pm Sun Oct 9 22:39:05 2005 +@@ -15,11 +15,25 @@ + use strict; + use AmphetaDesk::Settings; + use AmphetaDesk::Utilities; ++use POSIX ":sys_wait_h"; + require Exporter; + use vars qw( @ISA @EXPORT ); + @ISA = qw( Exporter ); + @EXPORT = qw( gui_init gui_listen gui_note open_url ); + ++# taken from perlipc man page ++sub sigchild { ++ my $child; ++ ++ # If a second child dies while in the signal handler caused by the ++ # first death, we won't get another signal. So must loop here else ++ # we will leave the unreaped child as a zombie. And the next time ++ # two children die we get another zombie. And so on. ++ while (($child = waitpid(-1,WNOHANG)) > 0) {} ++ ++ $SIG{CHLD} = \&sigchild; ++} ++ + ############################################################################### + # gui_init - start the gui and display the window. # + ############################################################################### +@@ -105,8 +119,32 @@ + # construct our url. + my $url = "http://127.0.0.1:" . get_setting("urls_port") . "/index.html"; + ++ # default browser ++ my $browser; ++ + # we spit out our suggestion just to catch all instances. + note("If your browser doesn't load, go to <$url>.", 1); ++ ++ # what browser? ++ if ($ENV{'BROWSER'}) { ++ $browser = $ENV{'BROWSER'}; ++ } else { ++ if (get_setting("user_browser_path")) { ++ $browser = get_setting("user_browser_path"); ++ } ++ } ++ ++ if ($browser) { ++ note("Your environment states that $browser is your default program."); ++ ++ $SIG{CHLD} = \&sigchild; ++ ++ if (fork() == 0) { ++ my @args = ("$browser", "$url"); ++ exec(@args) == 0 ++ or note("The browser <$browser> does not exist. Please select another."); ++ } ++ } + + return 1; + |