*** empty log message ***

diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html
index 21995151f579bc8291a709cc981cd6c5bb5d0b84..6cab21ce3418b0865f83be62fbc505770f651677 100644 (file)
--- a/doc/rxvt.1.html
+++ b/doc/rxvt.1.html
@@ -48,7 +48,7 @@
 </p>
 <hr />
 <h1><a name="description">DESCRIPTION</a></h1>
-<p><strong>rxvt-unicode</strong>, version <strong>6.2</strong>, is a colour vt102 terminal
+<p><strong>rxvt-unicode</strong>, version <strong>6.3</strong>, is a colour vt102 terminal
 emulator intended as an <em>xterm</em>(1) replacement for users who do not
 require features such as Tektronix 4014 emulation and toolkit-style
 configurability. As a result, <strong>rxvt-unicode</strong> uses much less swap space --
@@ -632,7 +632,8 @@ longer example is in <em>doc/pty-fd</em>):</p>
 <dt><strong><a name="item__2dpe_string"><strong>-pe</strong> <em>string</em></a></strong><br />
 </dt>
 <dd>
-Colon-separated list of perl extension scripts to use in this terminal instance. See resource <strong>perl-ext</strong>.
+Colon-separated list of perl extension scripts to use in this terminal
+instance. See resource <strong>perl-ext</strong>.
 </dd>
 <p></p></dl>
 <p>
@@ -1427,14 +1428,18 @@ info):</p>
   URxvt.keysym.M-C-4: command:\033[8;48;110t</pre>
 </dd>
 <p></p>
+<dt><strong><a name="item_perl_2dext_2dcommon_3a_string"><strong>perl-ext-common</strong>: <em>string</em></a></strong><br />
+</dt>
 <dt><strong><a name="item_perl_2dext_3a_string"><strong>perl-ext</strong>: <em>string</em></a></strong><br />
 </dt>
 <dd>
-Colon-separated list of perl extension scripts to use in this terminal
+Colon-separated <code>list(s)</code> of perl extension scripts to use in this terminal
 instance. Each extension is looked up in the library directories, loaded
-if necessary, and bound to the current terminal instance. If this resource
-is empty or missing, then the perl interpreter will not be initialized;
-option <strong>-pe</strong>.
+if necessary, and bound to the current terminal instance. If this
+resource is empty or missing, then the perl interpreter will not be
+initialized. The idea behind two options is that <strong>perl-ext-common</strong> will
+be used for extensions that should be available to all instances, while
+<strong>perl-ext</strong> is used for specific instances; option <strong>-pe</strong>.
 </dd>
 <p></p>
 <dt><strong><a name="item_perl_2deval_3a_string"><strong>perl-eval</strong>: <em>string</em></a></strong><br />

diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in
index 1b17fbbdc7b05d65268a12e2807581e8233556a8..ca41bb9c9d13d00bef446bca56d65e53e5d0060f 100644 (file)
--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 1"
-.TH rxvt 1 "2006-01-04" "6.2" "RXVT-UNICODE"
+.TH rxvt 1 "2006-01-04" "6.3" "RXVT-UNICODE"
 .SH "NAME"
 rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system)
 .SH "SYNOPSIS"
@@ -537,7 +537,8 @@ longer example is in \fIdoc/pty\-fd\fR):
 .Ve
 .IP "\fB\-pe\fR \fIstring\fR" 4
 .IX Item "-pe string"
-Colon-separated list of perl extension scripts to use in this terminal instance. See resource \fBperl-ext\fR.
+Colon-separated list of perl extension scripts to use in this terminal
+instance. See resource \fBperl-ext\fR.
 .SH "RESOURCES (available also as long\-options)"
 .IX Header "RESOURCES (available also as long-options)"
 Note: `@@RXVT_NAME@@ \-\-help' gives a list of all resources (long
@@ -1090,13 +1091,19 @@ info):
 \&  URxvt.keysym.M-C-3: command:\e033[8;25;80t
 \&  URxvt.keysym.M-C-4: command:\e033[8;48;110t
 .Ve
+.IP "\fBperl-ext-common\fR: \fIstring\fR" 4
+.IX Item "perl-ext-common: string"
+.PD 0
 .IP "\fBperl-ext\fR: \fIstring\fR" 4
 .IX Item "perl-ext: string"
-Colon-separated list of perl extension scripts to use in this terminal
+.PD
+Colon-separated list(s) of perl extension scripts to use in this terminal
 instance. Each extension is looked up in the library directories, loaded
-if necessary, and bound to the current terminal instance. If this resource
-is empty or missing, then the perl interpreter will not be initialized;
-option \fB\-pe\fR.
+if necessary, and bound to the current terminal instance. If this
+resource is empty or missing, then the perl interpreter will not be
+initialized. The idea behind two options is that \fBperl-ext-common\fR will
+be used for extensions that should be available to all instances, while
+\&\fBperl-ext\fR is used for specific instances; option \fB\-pe\fR.
 .IP "\fBperl-eval\fR: \fIstring\fR" 4
 .IX Item "perl-eval: string"
 Perl code to be evaluated when all extensions have been registered. See the

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 10c916620c95ab1bc8ffb52dcb9712f77f2a60da..46b1c498e7f7951b768dd9b0561cc8d9458ddd27 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -458,7 +458,8 @@ longer example is in F<doc/pty-fd>):
 
 =item B<-pe> I<string>
 
-Colon-separated list of perl extension scripts to use in this terminal instance. See resource B<perl-ext>.
+Colon-separated list of perl extension scripts to use in this terminal
+instance. See resource B<perl-ext>.
 
 =back
 
@@ -1064,13 +1065,17 @@ info):
   URxvt.keysym.M-C-3: command:\033[8;25;80t
   URxvt.keysym.M-C-4: command:\033[8;48;110t
 
+=item B<perl-ext-common>: I<string>
+
 =item B<perl-ext>: I<string>
 
-Colon-separated list of perl extension scripts to use in this terminal
+Colon-separated list(s) of perl extension scripts to use in this terminal
 instance. Each extension is looked up in the library directories, loaded
-if necessary, and bound to the current terminal instance. If this resource
-is empty or missing, then the perl interpreter will not be initialized;
-option B<-pe>.
+if necessary, and bound to the current terminal instance. If this
+resource is empty or missing, then the perl interpreter will not be
+initialized. The idea behind two options is that B<perl-ext-common> will
+be used for extensions that should be available to all instances, while
+B<perl-ext> is used for specific instances; option B<-pe>.
 
 =item B<perl-eval>: I<string>
 

diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt
index 38b1b3ae49c657567efba539e8fc35cd8b7cdd3a..f9703e1ea02eeefcf60aca005f68a37863c7bc38 100644 (file)
--- a/doc/rxvt.1.txt
+++ b/doc/rxvt.1.txt
@@ -6,7 +6,7 @@ SYNOPSIS
     rxvt [options] [-e command [ args ]]
 
 DESCRIPTION
-    rxvt-unicode, version 6.2, is a colour vt102 terminal emulator intended
+    rxvt-unicode, version 6.3, is a colour vt102 terminal emulator intended
     as an *xterm*(1) replacement for users who do not require features such
     as Tektronix 4014 emulation and toolkit-style configurability. As a
     result, rxvt-unicode uses much less swap space -- a significant
@@ -926,12 +926,16 @@ RESOURCES (available also as long-options)
           URxvt.keysym.M-C-3: command:\033[8;25;80t
           URxvt.keysym.M-C-4: command:\033[8;48;110t
 
+    perl-ext-common: *string*
     perl-ext: *string*
-        Colon-separated list of perl extension scripts to use in this
+        Colon-separated list(s) of perl extension scripts to use in this
         terminal instance. Each extension is looked up in the library
         directories, loaded if necessary, and bound to the current terminal
         instance. If this resource is empty or missing, then the perl
-        interpreter will not be initialized; option -pe.
+        interpreter will not be initialized. The idea behind two options is
+        that perl-ext-common will be used for extensions that should be
+        available to all instances, while perl-ext is used for specific
+        instances; option -pe.
 
     perl-eval: *string*
         Perl code to be evaluated when all extensions have been registered.

diff --git a/doc/rxvtperl.3.html b/doc/rxvtperl.3.html
index d9998d912cd9224e95e1e8eed577c446a7b6b899..04d1386cb9a1edb80763ccc3d37684b5baa0b6dd 100644 (file)
--- a/doc/rxvtperl.3.html
+++ b/doc/rxvtperl.3.html
@@ -418,7 +418,7 @@ list:</p>
   display_name embed ext_bwidth fade font geometry hold iconName
   imFont imLocale inputMethod insecure int_bwidth intensityStyles
   italicFont jumpScroll lineSpace loginShell mapAlert menu meta8 modifier
-  mouseWheelScrollPage name pastableTabs path perl_eval perl_ext
+  mouseWheelScrollPage name pastableTabs path perl_eval perl_ext_1 perl_ext_2
   perl_lib pointerBlank pointerBlankDelay preeditType print_pipe pty_fd
   reverseVideo saveLines scrollBar scrollBar_align scrollBar_floating
   scrollBar_right scrollBar_thickness scrollTtyKeypress scrollTtyOutput

diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in
index 4510220fe0ad8279a4fbb550ff8a227982e0b474..cda1e05fcb4877760cf2e9938ef21c2bfa898a50 100644 (file)
--- a/doc/rxvtperl.3.man.in
+++ b/doc/rxvtperl.3.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 3"
-.TH rxvt 3 "2006-01-04" "6.2" "RXVT-UNICODE"
+.TH rxvt 3 "2006-01-04" "6.3" "RXVT-UNICODE"
 .SH "NAME"
 @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter
 .SH "SYNOPSIS"
@@ -437,7 +437,7 @@ list:
 \&  display_name embed ext_bwidth fade font geometry hold iconName
 \&  imFont imLocale inputMethod insecure int_bwidth intensityStyles
 \&  italicFont jumpScroll lineSpace loginShell mapAlert menu meta8 modifier
-\&  mouseWheelScrollPage name pastableTabs path perl_eval perl_ext
+\&  mouseWheelScrollPage name pastableTabs path perl_eval perl_ext_1 perl_ext_2
 \&  perl_lib pointerBlank pointerBlankDelay preeditType print_pipe pty_fd
 \&  reverseVideo saveLines scrollBar scrollBar_align scrollBar_floating
 \&  scrollBar_right scrollBar_thickness scrollTtyKeypress scrollTtyOutput

diff --git a/doc/rxvtperl.3.txt b/doc/rxvtperl.3.txt
index 5f81ead428c64ac3050499ebaf28a8e1cffc2869..0300df3f62e4d79853eb6479381a36a07f217ded 100644 (file)
--- a/doc/rxvtperl.3.txt
+++ b/doc/rxvtperl.3.txt
@@ -259,7 +259,7 @@ DESCRIPTION
           display_name embed ext_bwidth fade font geometry hold iconName
           imFont imLocale inputMethod insecure int_bwidth intensityStyles
           italicFont jumpScroll lineSpace loginShell mapAlert menu meta8 modifier
-          mouseWheelScrollPage name pastableTabs path perl_eval perl_ext
+          mouseWheelScrollPage name pastableTabs path perl_eval perl_ext_1 perl_ext_2
           perl_lib pointerBlank pointerBlankDelay preeditType print_pipe pty_fd
           reverseVideo saveLines scrollBar scrollBar_align scrollBar_floating
           scrollBar_right scrollBar_thickness scrollTtyKeypress scrollTtyOutput

diff --git a/src/main.C b/src/main.C
index bf935345f33cc86221d7f5aec520860ab4f73eae..c6cd10fed6882e045e2e22525a04c6a3b4586156 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -489,7 +489,9 @@ rxvt_term::init (int argc, const char *const *argv)
 #endif
 
 #if ENABLE_PERL
-  if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
+  if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
+      || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
+      || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
     {
       rxvt_perl.init ();
       PERL_INVOKE ((this, HOOK_INIT, DT_END));

diff --git a/src/rsinc.h b/src/rsinc.h
index 6b1de3f122bcbff5b7e60e18e616214ca7d132f2..8f8c52663cff4357bc6ffaa9841033e499af31c0 100644 (file)
--- a/src/rsinc.h
+++ b/src/rsinc.h
@@ -105,6 +105,7 @@
 #endif
 #if ENABLE_PERL
   def (perl_eval)
-  def (perl_ext)
+  def (perl_ext_1)
+  def (perl_ext_2)
   def (perl_lib)
 #endif

diff --git a/src/urxvt.pm b/src/urxvt.pm
index 7b6ea94f4f54406fe8769ace3c923b25e7f72d2d..516df3b8e4cf76000e0e4e6410df5c126b064945 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -376,7 +376,7 @@ sub invoke {
    if ($htype == 0) { # INIT
       my @dirs = ((split /:/, $TERM->resource ("perl_lib")), "$LIBDIR/perl");
 
-      for my $ext (split /:/, $TERM->resource ("perl_ext")) {
+      for my $ext (map { split /:/, $TERM->resource ("perl_ext_$_") } 1, 2) {
          my @files = grep -f $_, map "$_/$ext", @dirs;
 
          if (@files) {
@@ -463,7 +463,7 @@ list:
   display_name embed ext_bwidth fade font geometry hold iconName
   imFont imLocale inputMethod insecure int_bwidth intensityStyles
   italicFont jumpScroll lineSpace loginShell mapAlert menu meta8 modifier
-  mouseWheelScrollPage name pastableTabs path perl_eval perl_ext
+  mouseWheelScrollPage name pastableTabs path perl_eval perl_ext_1 perl_ext_2
   perl_lib pointerBlank pointerBlankDelay preeditType print_pipe pty_fd
   reverseVideo saveLines scrollBar scrollBar_align scrollBar_floating
   scrollBar_right scrollBar_thickness scrollTtyKeypress scrollTtyOutput

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 5bdd6aa568146f11582145169211e1d6d94ace38..7869b831b7d8cd5bcbe286f750a046612f4d73f3 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -261,9 +261,10 @@ optList[] = {
               BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
 #endif
 #if ENABLE_PERL
-              RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),
-              RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),
-              STRG (Rs_perl_ext, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable"),
+              RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
+              RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
+              RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
+              STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
 #endif
 #if 0 && TODO
 #if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)