--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/10/08 21:57:54 1.87
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/08/28 01:23:47 1.119
@@ -8,6 +8,7 @@
use CFPlus;
use CFPlus::OpenGL;
use CFPlus::UI;
+use CFPlus::Macro;
our @ISA = CFPlus::UI::Base::;
@@ -21,25 +22,19 @@
my $self = $class->SUPER::new (
z => -1,
can_focus => 1,
- list => glGenList,
-
- smooth_matrix => [
- 0.05, 0.13, 0.05,
- 0.13, 0.30, 0.13,
- 0.05, 0.13, 0.05,
- ],
-
+ tilesize => 32,
@_
);
- $self->{completer} = new CFPlus::MapWidget::Command::
- command => $self->{command},
- tooltip => "#completer_help",
- ;
-
$self
}
+sub set_tilesize {
+ my ($self, $tilesize) = @_;
+
+ $self->{tilesize} = $tilesize;
+}
+
sub add_command {
my ($self, $command, $tooltip, $widget, $cb) = @_;
@@ -49,16 +44,16 @@
$tooltip = "$data\n\n$tooltip";
$tooltip =~ s/\s+$//;
- $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
+ $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
}
sub clr_commands {
my ($self) = @_;
- %{$self->{completer}{command}} = ();
+ %{$::COMPLETER->{command}} = ();
- $self->{completer}->hide
- if $self->{completer};
+ $::COMPLETER->hide
+ if $::COMPLETER;
}
sub server_login {
@@ -69,36 +64,12 @@
::start_game ();
}
-sub check_lwp($) {
- my ($res) = @_;
-
- $res->is_error
- and die $res->status_line;
-
- $res
-}
-
sub editor_invoke {
my $editsup = $::CONN && $::CONN->{editor_support}
or return;
- my ($pid, $fh);
- unless ($pid = open $fh, "-|:utf8", "-") {
- $SIG{__DIE__} = sub {
- my $msg = $_[0];
- $msg =~ s/\n+/\n/;
- warn "FATAL: $msg";
- CFPlus::_exit 99;
- };
-
- open STDERR, ">&STDOUT";
- binmode STDOUT, ":utf8";
- binmode STDERR, ":utf8";
- close $fh;
-
- $| = 1;
+ CFPlus::background {
print "preparing editor startup...\n";
- CFPlus::set_proxy;
my $server = $editsup->{gameserver} || "default";
$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
@@ -109,19 +80,12 @@
print "map directory is $mapdir\n";
print "lib directory is $libdir\n";
- require LWP::UserAgent;
-
- my $ua = LWP::UserAgent->new (
- agent => "cfplus $CFPlus::VERSION",
- keep_alive => 1,
- env_proxy => 1,
- timeout => 30,
- );
+ my $ua = CFPlus::lwp_useragent;
for my $file (qw(archetypes crossfire.0)) {
my $url = "$editsup->{lib_root}$file";
print "mirroring $url...\n";
- check_lwp $ua->mirror ($url, "$libdir/$file");
+ CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
printf "%s size %d octets\n", $file, -s "$libdir/$file";
}
@@ -136,14 +100,14 @@
# try to get the most recent head revision, what a hack,
# this should have been returned while downloading *sigh*
- my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
+ my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
if ($log =~ /\?rev=(\d+\.\d+)"/) {
my $rev = $1;
print "downloading revision $rev...\n";
- my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+ my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
my $meta = {
%$editsup,
@@ -199,24 +163,7 @@
die "viewvc parse error, unable to detect revision\n";
}
}
-
- CFPlus::_exit;
}
-
- my $buffer;
-
- Event->io (fd => $fh, poll => 'r', cb => sub {
- unless (sysread $fh, $buffer, 4096, length $buffer) {
- $_[0]->w->cancel;
- $buffer .= "done\n";
- }
-
- while ($buffer =~ s/^(.*)\n//) {
- ::message ({
- markup => "editor($pid): " . CFPlus::asxml $1,
- });
- }
- });
}
sub invoke_button_down {
@@ -226,14 +173,15 @@
$self->grab_focus;
return unless $::CONN;
- my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
- my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+ my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
+ my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
- $x -= int 0.5 * $self->{sw};
- $y -= int 0.5 * $self->{sh};
+ $x -= CFPlus::floor $::MAP->w * 0.5;
+ $y -= CFPlus::floor $::MAP->h * 0.5;
- $::CONN->lookat ($x, $y)
- if $::CONN;
+ if ($::CONN) {
+ $::CONN->lookat ($x, $y)
+ }
} elsif ($ev->{button} == 2) {
$self->grab_focus;
@@ -329,9 +277,11 @@
}
sub size_request {
+ my ($self) = @_;
+
(
- 32 * CFPlus::ceil $::WIDTH / 32,
- 32 * CFPlus::ceil $::HEIGHT / 32,
+ $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
+ $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
)
}
@@ -343,19 +293,24 @@
}
my %DIR = (
- CFPlus::SDLK_KP8, [1, "north"],
- CFPlus::SDLK_KP9, [2, "northeast"],
- CFPlus::SDLK_KP6, [3, "east"],
- CFPlus::SDLK_KP3, [4, "southeast"],
- CFPlus::SDLK_KP2, [5, "south"],
- CFPlus::SDLK_KP1, [6, "southwest"],
- CFPlus::SDLK_KP4, [7, "west"],
- CFPlus::SDLK_KP7, [8, "northwest"],
-
- CFPlus::SDLK_UP, [1, "north"],
- CFPlus::SDLK_RIGHT, [3, "east"],
- CFPlus::SDLK_DOWN, [5, "south"],
- CFPlus::SDLK_LEFT, [7, "west"],
+ ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
+ ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
+ ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
+ ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
+ ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
+ ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
+ ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
+ ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
+ ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
+
+ ( "," . CFPlus::SDLK_UP ), [1, "north"],
+ ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
+ ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
+ ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
+ ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
+ ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
+ ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
+ ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
);
sub invoke_key_down {
@@ -367,80 +322,24 @@
$mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
- if ($uni == ord "\t") {
- $::PL_WINDOW->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
- $::HELP_WINDOW->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
- ::toggle_player_page ($::STATS_PAGE);
- } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
- ::toggle_player_page ($::SKILL_PAGE);
- } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
- ::toggle_player_page ($::SPELL_PAGE);
- } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
- ::toggle_player_page ($::INVENTORY_PAGE);
- } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
- $::SETUP_DIALOG->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
- $::BIND_EDITOR->set_binding (undef, undef, [],
- sub {
- my ($mod, $sym, $cmds) = @_;
- $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
- });
- $::BIND_EDITOR->start;
- $::BIND_EDITOR->show;
-#TODO: elmex, what was this supposed to do? it currently crashes the client.
-# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
-# $::BIND_EDITOR->stop;
-# $::BIND_EDITOR->ask_for_bind_and_commit;
-# $::BIND_EDITOR->hide;
- } elsif (!$::CONN) {
- return 0; # bindings further down need a valid connection
-
- } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
- $::CONN->user_send ("stay fire");
- } elsif ($uni == ord ",") {
- $::CONN->user_send ("take");
- } elsif ($uni == ord " ") {
- $::CONN->user_send ("apply");
- } elsif ($uni == 13) {
- $::CONN->user_send ("examine");
- } elsif ($uni == ord ".") {
- $::CONN->user_send ($self->{completer}{last_command})
- if exists $self->{completer}{last_command};
- } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
- $::CONN->user_send ($_) for @$bind_cmd;
- } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
- $::CONN->user_send ("rotateshoottype +");
- } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
- $::CONN->user_send ("rotateshoottype -");
- } elsif ($uni == ord '"') {
- $self->{completer}->set_prefix ("$::CFG->{say_command} ");
- $self->{completer}->show;
- } elsif ($uni == ord "'") {
- $self->{completer}->set_prefix ("");
- $self->{completer}->show;
- } elsif (exists $DIR{$sym}) {
+ if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
if ($mod & CFPlus::KMOD_SHIFT) {
$self->{shft}++;
- if ($DIR{$sym}[0] != $self->{fire_dir}) {
- $::CONN->user_send ("fire $DIR{$sym}[0]");
+ if ($dir->[0] != $self->{fire_dir}) {
+ $::CONN->user_send ("fire $dir->[0]");
}
$self->{fire_dir} = $DIR{$sym}[0];
} elsif ($mod & CFPlus::KMOD_CTRL) {
$self->{ctrl}++;
- $::CONN->user_send ("run $DIR{$sym}[0]");
+ $::CONN->user_send ("run $dir->[0]");
} else {
- $::CONN->user_send ("$DIR{$sym}[1]");
+ $::CONN->user_send ("$dir->[1]");
}
- } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
- $self->{completer}->inject_key_down ($ev);
- $self->{completer}->show;
- } else {
- return 0;
+
+ return 1;
}
- 1
+ 0
}
sub invoke_key_up {
@@ -476,101 +375,112 @@
$res
}
+sub invoke_visibility_change {
+ my ($self) = @_;
+
+ $self->refresh_hook;
+
+ 0
+}
+
sub set_magicmap {
my ($self, $w, $h, $x, $y, $data) = @_;
- $x -= $::MAP->ox + int 0.5 * $::MAP->w;
- $y -= $::MAP->oy + int 0.5 * $::MAP->h;
+ $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
+ $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
$self->{magicmap} = [$x, $y, $w, $h, $data];
$self->update;
}
-sub draw {
+sub refresh_hook {
my ($self) = @_;
- return unless $::MAP;
-
- my $focused = $CFPlus::UI::FOCUS == $self
- || $CFPlus::UI::FOCUS == $self->{completer}{entry};
-
- return
- unless $focused || !$::FAST;
-
- if (delete $self->{need_update}) {
- my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+ if ($::MAP && $::CONN) {
+ if (delete $self->{need_update}) {
+ my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
+
+ my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
+ my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+
+ my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
+ my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+
+ my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
+ my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
+
+ my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
+ my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
+
+ if ($::CFG->{fow_enable}) {
+ my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
+
+ $self->{fow_texture} = new CFPlus::Texture
+ w => $w,
+ h => $h,
+ data => $data,
+ internalformat => GL_ALPHA,
+ format => GL_ALPHA;
+ } else {
+ delete $self->{fow_texture};
+ }
- my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
- my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+ glNewList ($self->{list} ||= glGenList);
- my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
- my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
+ glPushMatrix;
+ glTranslate $sx0, $sy0;
+ glScale $::CFG->{map_scale}, $::CFG->{map_scale};
- my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
- my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
-
- if ($::CFG->{fow_enable}) {
- my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
-
- if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
- glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
- glConvolutionFilter2D (
- GL_CONVOLUTION_2D,
- GL_ALPHA,
- 3, 3,
- GL_ALPHA, GL_FLOAT,
- (pack "f*", @{ $self->{smooth_matrix} }),
- );
- glEnable GL_CONVOLUTION_2D;
- }
+ $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
- $self->{fow_texture} = new CFPlus::Texture
- w => $w,
- h => $h,
- data => $data,
- internalformat => GL_ALPHA,
- format => GL_ALPHA;
+ glScale $self->{tilesize}, $self->{tilesize};
- glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
- } else {
- delete $self->{fow_texture};
- }
+ if (my $tex = $self->{fow_texture}) {
+ glPushMatrix;
+ glScale 1/3, 1/3;
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
- glNewList $self->{list};
+ glColor +($::CFG->{fow_intensity}) x 3, 0.9;
+ $self->{fow_texture}->draw_quad_alpha (0, 0);
- glPushMatrix;
- glTranslate $sx0, $sy0;
- glScale $::CFG->{map_scale}, $::CFG->{map_scale};
-
- $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
+ glDisable GL_TEXTURE_2D;
+ glPopMatrix;
+ }
- glScale 32, 32;
+ if ($self->{magicmap}) {
+ my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
- if (my $tex = $self->{fow_texture}) {
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+ $x += $::MAP->ox + $self->{dx};
+ $y += $::MAP->oy + $self->{dy};
- glColor +($::CFG->{fow_intensity}) x 3, 0.9;
- $self->{fow_texture}->draw_quad_alpha (0, 0);
+ glTranslate - $x - 1, - $y - 1;
+ glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+ $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+ }
- glDisable GL_TEXTURE_2D;
+ glPopMatrix;
+ glEndList;
}
+ } else {
+ glDeleteList delete $self->{list}
+ if $self->{list};
+ }
+}
- if ($self->{magicmap}) {
- my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
+sub draw {
+ my ($self) = @_;
- $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
- $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+ $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
- glTranslate - $x - 1, - $y - 1;
- glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
- $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
- }
+ return unless $self->{list};
- glPopMatrix;
- glEndList;
- }
+ my $focused = $CFPlus::UI::FOCUS == $self
+ || $CFPlus::UI::FOCUS == $::COMPLETER{entry};
+
+ return
+ unless $focused || !$::FAST;
glCallList $self->{list};
@@ -599,13 +509,61 @@
package CFPlus::MapWidget::MapMap;
+use strict;
+use utf8;
+
our @ISA = CFPlus::UI::Base::;
use Time::HiRes qw(time);
use CFPlus::OpenGL;
sub size_request {
- ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
+ ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
+}
+
+sub refresh_hook {
+ my ($self) = @_;
+
+ if ($::MAP && $self->{texture_atime} < time) {
+ my ($w, $h) = @$self{qw(w h)};
+
+ my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+ my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+
+ my $ox = 0.5 * ($w - $sw);
+ my $oy = 0.5 * ($h - $sh);
+
+ my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+ my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
+
+ #TODO: map scale is completely borked
+
+ my $x0 = int $ox - $sx + 0.5;
+ my $y0 = int $oy - $sy + 0.5;
+
+ $self->{sw} = $sw;
+ $self->{sh} = $sh;
+
+ $self->{x0} = $x0;
+ $self->{y0} = $y0;
+
+ $self->{texture_atime} = time + 1/3;
+
+ $self->{texture} =
+ new CFPlus::Texture
+ w => $w,
+ h => $h,
+ data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
+ type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+ }
+}
+
+sub invoke_visibility_change {
+ my ($self) = @_;
+
+ $self->refresh_hook;
+
+ 0
}
sub invoke_size_allocate {
@@ -626,52 +584,27 @@
sub _draw {
my ($self) = @_;
- $::MAP or return;
-
- my ($w, $h) = @$self{qw(w h)};
-
- my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
- my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
-
- my $sx = int $::CFG->{map_shift_x} / 32;
- my $sy = int $::CFG->{map_shift_y} / 32;
+ $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
- my $ox = 0.5 * ($w - $sw);
- my $oy = 0.5 * ($h - $sh);
+ $self->{texture} or return;
glEnable GL_BLEND;
glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- if ($self->{texture_atime} < time) {
- $self->{texture_atime} = time + 1/3;
-
- $self->{texture} =
- new CFPlus::Texture
- w => $w,
- h => $h,
- data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
- type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
- }
-
$self->{texture}->draw_quad (0, 0);
glDisable GL_TEXTURE_2D;
glTranslate 0.375, 0.375;
- #TODO: map scale is completely borked
-
- my $x0 = int $ox - $sx + 0.5;
- my $y0 = int $oy - $sy + 0.5;
-
glColor 1, 1, 0, 1;
glBegin GL_LINE_LOOP;
- glVertex $x0 , $y0 ;
- glVertex $x0 , $y0 + $sh;
- glVertex $x0 + $sw, $y0 + $sh;
- glVertex $x0 + $sw, $y0 ;
+ glVertex $self->{x0} , $self->{y0} ;
+ glVertex $self->{x0} , $self->{y0} + $self->{sh};
+ glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
+ glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
glEnd;
glDisable GL_BLEND;
@@ -717,7 +650,7 @@
(new CFPlus::UI::Menu
items => [
["bind " . (CFPlus::asxml $self->{select}) . " to a key"
- => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
+ => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
],
)->popup ($ev);
return 1;