--- rxvt-unicode/src/urxvt.pm	2006/01/08 00:07:18	1.49
+++ rxvt-unicode/src/urxvt.pm	2006/01/08 01:59:29	1.54
@@ -39,7 +39,7 @@
 
 =over 4
 
-=item selection
+=item selection (enabled by default)
 
 Intelligent selection. This extension tries to be more intelligent when
 the user extends selections (double-click). Right now, it tries to select
@@ -58,6 +58,11 @@
 
 =back
 
+=item option-popup (enabled by default)
+
+Binds a popup menu to Ctrl-Button3 that lets you toggle (some) options at
+runtime.
+
 =item digital-clock
 
 Displays a digital clock using the built-in overlay.
@@ -483,20 +488,25 @@
    if ($htype == 0) { # INIT
       my @dirs = ((split /:/, $TERM->resource ("perl_lib")), "$LIBDIR/perl");
       
-      my @ext = (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2);
+      my %want_ext;
 
-      while (@ext) {
-         my $ext = shift @ext;
-         if ($ext eq "default") {
-            unshift @ext, qw(selection);
+      for (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
+         if ($_ eq "default") {
+            $want_ext{$_}++ for qw(selection option-popup);
+         } elsif (/^-(.*)$/) {
+            delete $want_ext{$1};
          } else {
-            my @files = grep -f $_, map "$_/$ext", @dirs;
+            $want_ext{$_}++;
+         }
+      }
+
+      for my $ext (keys %want_ext) {
+         my @files = grep -f $_, map "$_/$ext", @dirs;
 
-            if (@files) {
-               register_package extension_package $files[0];
-            } else {
-               warn "perl extension '$ext' not found in perl library search path\n";
-            }
+         if (@files) {
+            register_package extension_package $files[0];
+         } else {
+            warn "perl extension '$ext' not found in perl library search path\n";
          }
       }
    }
@@ -1022,15 +1032,42 @@
 sub add_item {
    my ($self, $item) = @_;
 
+   $item->{rend}{normal} = "\x1b[0;30;47m" unless exists $item->{rend}{normal};
+   $item->{rend}{hover}  = "\x1b[0;30;46m" unless exists $item->{rend}{hover};
+   $item->{rend}{active} = "\x1b[m"        unless exists $item->{rend}{active};
+
+   $item->{render} ||= sub { $_[0]{text} };
+
    push @{ $self->{item} }, $item;
 }
 
+sub add_separator {
+   my ($self, $sep) = @_;
+
+   $sep ||= "═";
+
+   $self->add_item ({
+      rend => { normal => "\x1b[0;30;47m", hover => "\x1b[0;30;47m", active => "\x1b[0;30;47m" },
+      text => "",
+      render => sub { $sep x $urxvt::TERM->ncol },
+      activate => sub { },
+   });
+}
+
+sub add_title {
+   my ($self, $title) = @_;
+
+   $self->add_item ({
+      rend => { normal => "\x1b[38;5;11;44m", hover => "\x1b[38;5;11;44m", active => "\x1b[38;5;11;44m" },
+      text => $title,
+      activate => sub { },
+   });
+}
+
 sub add_button {
    my ($self, $text, $cb) = @_;
 
-   $self->add_item ({ type => "button", text => "[ $text ]", activate => $cb,
-      render => sub { $_[0]{text} },
-   });
+   $self->add_item ({ type => "button", text => "[ $text ]", activate => $cb});
 }
 
 sub add_toggle {
@@ -1040,7 +1077,7 @@
       type => "button",
       text => "  $text",
       value => $value,
-      render => sub { ($item->{value} ? "✔" : " ") . $text },
+      render => sub { ($item->{value} ? "* " : "  ") . $text },
       activate => sub { $cb->($item->{value} = !$item->{value}); },
    };