diff options
| -rwxr-xr-x | dwim | 30 | ||||
| -rw-r--r-- | dwim.1 | 6 | ||||
| -rw-r--r-- | xchord.c | 2 |
3 files changed, 23 insertions, 15 deletions
@@ -7,7 +7,21 @@ use warnings; use strict; use subs qw/cd dir dirname env fail handle path run/; -my @OPENER = ('xtopen'); +my ($cwd, $handler, $phrase); +my ($DEBUG, $OPENER); + +while ($_ = shift @ARGV) { + if (/^-/) { + $DEBUG = 1 if /d/; + $OPENER = 1 if /o/; + die "usage: $0 [-d] [phrase]\n" if not /[do]/ + } else { + $phrase = $_; + last; + } +} + +my @OPENER = $OPENER ? ('xtopen') : (); my @EDITOR = (@OPENER, 'vi'); my @PDF_VIEWER = ('xpdf'); my @MAN_VIEWER = (@OPENER, 'man'); @@ -17,18 +31,6 @@ my @FILE_BROWSER = ('rox'); my @MAILDIR_VIEWER = (@OPENER, 'mutt -f'); my $MAILROOT = env MAILROOT => '/home/john/mail/'; -my ($DEBUG, $cwd, $handler, $phrase); - -while ($_ = shift @ARGV) { - if (/^-d$/) { - $DEBUG = 1; - } elsif (/^-/) { - die "usage: $0 [-d] [phrase]\n"; - } else { - $phrase = $_; - } -} - $phrase = `xsel -o` if not defined $phrase; for ($phrase) { @@ -202,7 +204,7 @@ sub run { s/(\s)/\\$1/g for @argv; # escape whitespace print STDERR "@argv\n"; } - if (fork == 0) { + if (!$OPENER or fork == 0) { exec @_; die "could not exec: $1\n"; } @@ -8,6 +8,7 @@ .Sh SYNOPSIS .Nm dwim .Op Fl d +.Op Fl o .Op Ar phrase . .Sh DESCRIPTION @@ -98,6 +99,11 @@ or equivalent) .It MAILDIR_VIEWER .Li OPENER mutt -f .El +.Pp +.Li OPENER +is only used if the +.Fl o +flag is specified. .Sh AUTHORS .An -nosplit .An John Ankarström Aq Mt "john (at) ankarstrom.se" @@ -82,7 +82,7 @@ main(int argc, char *argv[]) /* 1 pressed + 3 pressed + 3 released (third step) */ if(p == 2 && rev->detail == 3){ p = 3; - system("dwim"); + system("dwim -o"); } /* 1 released (reset) */ if((p == 1 || p == 3) && rev->detail == 1) p = 0; |