--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/24 13:04:31 1.16
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/10/18 12:53:46 1.89
@@ -1,39 +1,213 @@
-package CFClient::MapWidget;
+package CFPlus::MapWidget;
use strict;
use utf8;
use List::Util qw(min max);
-use CFClient::OpenGL;
-
-our @ISA = CFClient::UI::Base::;
+use CFPlus;
+use CFPlus::OpenGL;
+use CFPlus::UI;
+
+our @ISA = CFPlus::UI::Base::;
+
+my $magicmap_tex =
+ new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
+ mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
sub new {
my $class = shift;
- $class->SUPER::new (
+ 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,
+ ],
+
@_
- )
+ );
+
+ $self->{completer} = new CFPlus::MapWidget::Command::
+ command => $self->{command},
+ tooltip => "#completer_help",
+ ;
+
+ $self
}
-sub DESTROY {
- my $self = shift;
+sub add_command {
+ my ($self, $command, $tooltip, $widget, $cb) = @_;
- glDeleteList $self->{list};
+ (my $data = $command) =~ s/\\//g;
- $self->SUPER::DESTROY;
+ $tooltip =~ s/^\s+//;
+ $tooltip = "$data\n\n$tooltip";
+ $tooltip =~ s/\s+$//;
+
+ $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
}
-sub button_down {
- my ($self, $ev, $x, $y) = @_;
+sub clr_commands {
+ my ($self) = @_;
+
+ %{$self->{completer}{command}} = ();
+
+ $self->{completer}->hide
+ if $self->{completer};
+}
+
+sub server_login {
+ my ($server) = @_;
+
+ ::stop_game ();
+ local $::PROFILE->{host} = $server;
+ ::start_game ();
+}
+
+sub check_lwp($) {
+ my ($res) = @_;
+
+ $res->is_error
+ and die $res->status_line;
+
+ $res
+}
- $self->focus_in;
+sub editor_invoke {
+ my $editsup = $::CONN && $::CONN->{editor_support}
+ or return;
- if ($ev->{button} == 2) {
+ 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;
+
+ local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
+ local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
+
+ 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,
+ );
+
+ for my $file (qw(archetypes crossfire.0)) {
+ my $url = "$editsup->{lib_root}$file";
+ print "mirroring $url...\n";
+ check_lwp $ua->mirror ($url, "$libdir/$file");
+ printf "%s size %d octets\n", $file, -s "$libdir/$file";
+ }
+
+ if (1) { # upload a map
+ my $mapname = $::CONN->{map_info}[0];
+
+ my $mappath = "$mapdir/$mapname";
+
+ -e $mappath and die "$mappath already exists\n";
+
+ print "getting map revision for $mapname...\n";
+
+ # 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;
+
+ 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 $meta = {
+ %$editsup,
+ path => $mapname,
+ revision => $rev,
+ cf_login => $::PROFILE->{user},
+ };
+
+ require File::Basename;
+ require File::Path;
+
+ File::Path::mkpath (File::Basename::dirname ($mappath));
+ open my $fh, ">:raw:perlio", "$mappath.meta"
+ or die "$mappath.meta: $!\n";
+ print $fh CFPlus::to_json $meta;
+ close $fh;
+ open my $fh, ">:raw:perlio:utf8", $mappath
+ or die "$mappath: $!\n";
+ print $fh $map;
+ close $fh;
+
+ print "saved as $mappath\n";
+
+ print "invoking editor...\n";
+ exec "/root/s2/gce $mappath";#d#
+
+ # now upload it
+# require HTTP::Request::Common;
+#
+# my $res = $ua->post (
+# $ENV{CFPLUS_UPLOAD},
+# Content_Type => 'multipart/form-data',
+# Content => [
+# path => $mapname,
+# mapdir => $ENV{CROSSFIRE_MAPDIR},
+# map => $map,
+# revision => $rev,
+# cf_login => $ENV{CFPLUS_LOGIN},
+# cf_password => $ENV{CFPLUS_PASSWORD},
+# comment => "",
+# ]
+# );
+#
+# if ($res->is_error) {
+# # fatal condition
+# warn $res->status_line;
+# } else {
+# # script replies are marked as {{..}}
+# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
+# warn map "$_\n", @msgs;
+# }
+ } else {
+ die "viewvc parse error, unable to detect revision\n";
+ }
+ }
+ }
+}
+
+sub invoke_button_down {
+ my ($self, $ev, $x, $y) = @_;
+
+ if ($ev->{button} == 1) {
+ $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};
+
+ $x -= int 0.5 * $self->{sw};
+ $y -= int 0.5 * $self->{sh};
+
+ $::CONN->lookat ($x, $y)
+ if $::CONN;
+
+ } elsif ($ev->{button} == 2) {
+ $self->grab_focus;
+ return unless $::CONN;
+
my ($ox, $oy) = ($ev->{x}, $ev->{y});
my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
@@ -47,25 +221,86 @@
$self->update;
};
+ } elsif ($ev->{button} == 3) {
+ my @items = (
+ ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
+ ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
+ ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
+ ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
+ ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
+ ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
+ ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
+ [
+ $::PICKUP_ENABLE->{state}
+ ? "Disable automatic pickup"
+ : "Enable automatic pickup",
+ sub { $::PICKUP_ENABLE->toggle }
+ ],
+ );
+
+ if ($::CONN && $::CONN->{editor_support} && 0) {
+ push @items, [
+ "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")",
+ \&editor_invoke,
+ ];
+
+ for my $type (qw(test name)) {
+ $::CONN->{editor_support}{type} ne $type
+ or next;
+ my $server = $::CONN->{editor_support}{"${type}server"}
+ or next;
+
+ push @items, [
+ "Login on $type server (" . (CFPlus::asxml $server) . ")",
+ sub { server_login $server },
+ ];
+ }
+ }
+
+ push @items,
+ ["Quit",
+ sub {
+ if ($::CONN) {
+ &::open_quit_dialog;
+ } else {
+ exit;
+ }
+ }
+ ],
+ ;
+
+ (new CFPlus::UI::Menu
+ items => \@items,
+ )->popup ($ev);
}
+
+ 1
}
-sub button_up {
+sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
delete $self->{motion};
+
+ 1
}
-sub mouse_motion {
+sub invoke_mouse_motion {
my ($self, $ev, $x, $y) = @_;
- $self->{motion}->($ev, $x, $y) if $self->{motion};
+ if ($self->{motion}) {
+ $self->{motion}->($ev, $x, $y);
+ } else {
+ return 0;
+ }
+
+ 1
}
sub size_request {
(
- 1 + 32 * int $::WIDTH / 32,
- 1 + 32 * int $::HEIGHT / 32,
+ 32 * CFPlus::ceil $::WIDTH / 32,
+ 32 * CFPlus::ceil $::HEIGHT / 32,
)
}
@@ -76,300 +311,590 @@
$self->SUPER::update;
}
+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"],
+);
+
+sub invoke_key_down {
+ my ($self, $ev) = @_;
+
+ my $mod = $ev->{mod};
+ my $sym = $ev->{sym};
+ my $uni = $ev->{unicode};
+
+ $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 ($mod & CFPlus::KMOD_SHIFT) {
+ $self->{shft}++;
+ if ($DIR{$sym}[0] != $self->{fire_dir}) {
+ $::CONN->user_send ("fire $DIR{$sym}[0]");
+ }
+ $self->{fire_dir} = $DIR{$sym}[0];
+ } elsif ($mod & CFPlus::KMOD_CTRL) {
+ $self->{ctrl}++;
+ $::CONN->user_send ("run $DIR{$sym}[0]");
+ } else {
+ $::CONN->user_send ("$DIR{$sym}[1]");
+ }
+ } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
+ $self->{completer}->inject_key_down ($ev);
+ $self->{completer}->show;
+ } else {
+ return 0;
+ }
+
+ 1
+}
+
+sub invoke_key_up {
+ my ($self, $ev) = @_;
+
+ my $res = 0;
+ my $mod = $ev->{mod};
+ my $sym = $ev->{sym};
+
+ if ($::CFG->{shift_fire_stop}) {
+ if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
+ $::CONN->user_send ("fire_stop");
+ delete $self->{fire_dir};
+ $res = 1;
+ }
+ } else {
+ if (exists $DIR{$sym} && delete $self->{shft}) {
+ $::CONN->user_send ("fire_stop");
+ delete $self->{fire_dir};
+ $res = 1;
+ } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+ $::CONN->user_send ("fire_stop");
+ delete $self->{fire_dir};
+ $res = 1;
+ }
+ }
+
+ if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
+ $::CONN->user_send ("run_stop");
+ $res = 1;
+ }
+
+ $res
+}
+
+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;
+
+ $self->{magicmap} = [$x, $y, $w, $h, $data];
+
+ $self->update;
+}
+
sub draw {
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};
+
+ my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
+ my $sy = $self->{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 $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;
+ }
+
+ $self->{fow_texture} = new CFPlus::Texture
+ w => $w,
+ h => $h,
+ data => $data,
+ internalformat => GL_ALPHA,
+ format => GL_ALPHA;
+
+ glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
+ } else {
+ delete $self->{fow_texture};
+ }
+
glNewList $self->{list};
- if ($::MAP) {
- my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});
- my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
-
- glPushMatrix;
- glScale $::CFG->{map_scale}, $::CFG->{map_scale};
-
- my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
- my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
-
- glTranslate $sx0 - 32, $sy0 - 32, 0;
-
- my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
-
- if ($::CFG->{fow_enable}) {
- if ($::CFG->{fow_smooth} && $CFClient::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*",
- 0.05, 0.13, 0.05,
- 0.13, 0.30, 0.13,
- 0.05, 0.13, 0.05,
- );
- glEnable GL_CONVOLUTION_2D;
- }
+ glPushMatrix;
+ glTranslate $sx0, $sy0;
+ glScale $::CFG->{map_scale}, $::CFG->{map_scale};
- $self->{fow_texture} = new CFClient::Texture
- w => $w,
- h => $h,
- data => $data,
- internalformat => GL_ALPHA,
- format => GL_ALPHA;
-
- glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
-
- 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_MODULATE;
+ $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
- glColor +($::CFG->{fow_intensity}) x 3, 0.8;
- $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
+ glScale 32, 32;
- glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
- }
+ if (my $tex = $self->{fow_texture}) {
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
- # HACK BEGIN
- {
- glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
-
- glTranslate 0, 30;
- my ($w, $h) = (250, 250);
-
- my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
-
- 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;
-
- glPopMatrix;
-
- $self->{mapmap_texture} =
- new CFClient::Texture
- w => $w,
- h => $h,
- data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
- type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
-
- $self->{mapmap_texture}->draw_quad (0, 0);
-
- glDisable GL_TEXTURE_2D;
-
- glTranslate 0.375, 0.375;
-
- glColor 1, 1, 0, 1;
- glBegin GL_LINE_LOOP;
- glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
- glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
- glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
- glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
- glEnd;
-
- glDisable GL_BLEND;
- }
- # HACK END
+ glColor +($::CFG->{fow_intensity}) x 3, 0.9;
+ $self->{fow_texture}->draw_quad_alpha (0, 0);
+
+ glDisable GL_TEXTURE_2D;
+ }
+
+ if ($self->{magicmap}) {
+ my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
+
+ $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
+ $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+
+ glTranslate - $x - 1, - $y - 1;
+ glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+ $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
}
+ glPopMatrix;
glEndList;
}
- glPushMatrix;
glCallList $self->{list};
- glPopMatrix;
- if ($CFClient::UI::FOCUS != $self) {
- glColor 64/255, 64/255, 64/255;
- glLogicOp GL_AND;
- glEnable GL_COLOR_LOGIC_OP;
+ # TNT2 emulates logops in software (or worse :)
+ unless ($focused) {
+ glColor 0.4, 0.2, 0.2, 0.6;
+ glEnable GL_BLEND;
+ glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glBegin GL_QUADS;
glVertex 0, 0;
glVertex 0, $::HEIGHT;
glVertex $::WIDTH, $::HEIGHT;
glVertex $::WIDTH, 0;
glEnd;
- glDisable GL_COLOR_LOGIC_OP;
+ glDisable GL_BLEND;
}
}
-my %DIR = (
- CFClient::SDLK_KP8, [1, "north"],
- CFClient::SDLK_KP9, [2, "northeast"],
- CFClient::SDLK_KP6, [3, "east"],
- CFClient::SDLK_KP3, [4, "southeast"],
- CFClient::SDLK_KP2, [5, "south"],
- CFClient::SDLK_KP1, [6, "southwest"],
- CFClient::SDLK_KP4, [7, "west"],
- CFClient::SDLK_KP7, [8, "northwest"],
-
- CFClient::SDLK_UP, [1, "north"],
- CFClient::SDLK_RIGHT, [3, "east"],
- CFClient::SDLK_DOWN, [5, "south"],
- CFClient::SDLK_LEFT, [7, "west"],
-);
+sub DESTROY {
+ my $self = shift;
-sub key_down {
- my ($self, $ev) = @_;
+ glDeleteList $self->{list};
- my $mod = $ev->{mod};
- my $sym = $ev->{sym};
+ $self->SUPER::DESTROY;
+}
- if ($sym == CFClient::SDLK_KP5) {
- $::CONN->user_send ("stay fire");
- } elsif ($sym == ord ",") {
- $::CONN->user_send ("take");
- } elsif ($sym == ord "a") {
- $::CONN->user_send ("apply");
- } elsif ($sym == ord "'") {
- $self->emit ('activate_console');
- } elsif ($sym == ord "/") {
- $self->emit (activate_console => '/');
- } elsif (exists $DIR{$sym}) {
- if ($mod & CFClient::KMOD_SHIFT) {
- $self->{shft}++;
- $::CONN->user_send ("fire $DIR{$sym}[0]");
- } elsif ($mod & CFClient::KMOD_CTRL) {
- $self->{ctrl}++;
- $::CONN->user_send ("run $DIR{$sym}[0]");
- } else {
- $::CONN->user_send ("$DIR{$sym}[1]");
- }
- } elsif ($ev->{unicode}) {
- $self->{command_widget} ||=
- new CFClient::MapWidget::Command::
- command => $self->{command},
- can_focus => 1,
- connect_execute => sub {
- # todo: support callback instead of user_send
- $::CONN->user_send ($_[1][1]);
- },
- connect_close => sub {
- (delete $self->{command_widget})->hide;
- $self->focus_in;
- },
- ;
- $self->{command_widget}->key_down ($ev);
- return unless $self->{command_widget};
- $self->{command_widget}->show;
- $self->{command_widget}->focus_in;
- }
+package CFPlus::MapWidget::MapMap;
+
+our @ISA = CFPlus::UI::Base::;
+
+use Time::HiRes qw(time);
+use CFPlus::OpenGL;
+
+sub size_request {
+ ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
}
-sub key_up {
- my ($self, $ev) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
- my $mod = $ev->{mod};
- my $sym = $ev->{sym};
+ $self->update;
- if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
- $::CONN->user_send ("fire_stop");
- }
- if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
- $::CONN->user_send ("run_stop");
- }
+ 1
}
-sub add_command {
- my ($self, $command, $tooltip, $widget, $cb) = @_;
+sub update {
+ my ($self) = @_;
+
+ delete $self->{texture_atime};
+ $self->SUPER::update;
+}
+
+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;
+
+ my $ox = 0.5 * ($w - $sw);
+ my $oy = 0.5 * ($h - $sh);
+
+ 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;
+ }
- (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
+ $self->{texture}->draw_quad (0, 0);
- push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
+ 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 ;
+ glEnd;
+
+ glDisable GL_BLEND;
}
-package CFClient::MapWidget::Command;
+package CFPlus::MapWidget::Command;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::Frame::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
+ bg => [0, 0, 0, 0.8],
@_,
- children => [map
- CFClient::UI::Label->new (
- can_hover => 1,
- can_events => 1,
- fontsize => $_,
- ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
- ],
+ );
+
+ $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+
+ $self->{label} = [
+ map
+ CFPlus::UI::Label->new (
+ can_hover => 1,
+ can_events => 1,
+ tooltip_width => 0.33,
+ fontsize => $_,
+ ), (0.8) x 16
+ ];
+
+ $self->{entry} = new CFPlus::UI::Entry
+ on_changed => sub {
+ $self->update_labels;
+ 0
+ },
+ on_button_down => sub {
+ my ($entry, $ev, $x, $y) = @_;
+
+ if ($ev->{button} == 3) {
+ (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 }) }]
+ ],
+ )->popup ($ev);
+ return 1;
+ }
+ 0
+ },
+ on_key_down => sub {
+ my ($entry, $ev) = @_;
+
+ my $self = $entry->{parent}{parent};
+
+ if ($ev->{sym} == 13) {
+ if (exists $self->{select}) {
+ $self->{last_command} = $self->{select};
+ $::CONN->user_send ($self->{select});
+
+ unshift @{$self->{history}}, $self->{entry}->get_text;
+ $self->{hist_ptr} = 0;
+
+ $self->hide;
+ }
+ } elsif ($ev->{sym} == 27) {
+ $self->{hist_ptr} = 0;
+ $self->hide;
+ } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
+ if ($self->{hist_ptr} > 1) {
+ $self->{hist_ptr}--;
+ $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
+ } elsif ($self->{hist_ptr} > 0) {
+ $self->{hist_ptr}--;
+ $self->{entry}->set_text ($self->{hist_saveback});
+ } else {
+ ++$self->{select_offset}
+ if $self->{select_offset} < $#{ $self->{last_match} || [] };
+ }
+ $self->update_labels;
+ } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
+ if ($self->{select_offset}) {
+ --$self->{select_offset}
+ } else {
+ unless ($self->{hist_ptr}) {
+ $self->{hist_saveback} = $self->{entry}->get_text;
+ }
+ if ($self->{hist_ptr} <= $#{$self->{history}}) {
+ $self->{hist_ptr}++;
+ }
+ $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
+ if exists $self->{history}->[$self->{hist_ptr} - 1];
+ }
+ $self->update_labels;
+ } else {
+ return 0;
+ }
+
+ 1
+ }
+ ;
+
+ $self->{vbox}->add (
+ $self->{entry},
+ @{$self->{label}},
);
$self
}
-sub size_allocate {
+sub set_prefix {
+ my ($self, $prefix) = @_;
+
+ $self->{entry}->set_text ($prefix);
+ $self->show;
+}
+
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
- $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
+ $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
+
+ $self->SUPER::invoke_size_allocate ($w, $h)
+}
+
+sub show {
+ my ($self) = @_;
+
+ $self->SUPER::show;
+ $self->{entry}->grab_focus;
+}
+
+sub hide {
+ my ($self) = @_;
+
+ $self->{hist_ptr} = 0;
+
+ $self->SUPER::hide;
+ $self->{entry}->set_text ("");
+}
+
+sub inject_key_down {
+ my ($self, $ev) = @_;
+
+ $self->{entry}->grab_focus;
+ $self->{entry}->emit (key_down => $ev);
}
sub update_labels {
my ($self) = @_;
- my $command = $self->{command};
- my $search_abbrev = qr/^\Q$self->{search}/;
- my $search_full = qr/\Q$self->{search}/;
+ my $text = $self->{entry}->get_text;
+
+ length $text
+ or return $self->hide;
- my @found;
+ my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
- for (@$command) {
- if ($_->[0] =~ $search_abbrev) {
- push @found, [$_->[0], $_];
- } elsif ($_->[1] =~ $search_full) {
- push @found, [$_->[1], $_];
+ if ($text ne $self->{last_search}) {
+ my @match;
+
+ if ($text =~ /^(.*?)\s+$/) {
+ @match = [$cmd, "(appended whitespace suppresses completion)"];
+ } else {
+ my $regexp = do {
+ my ($beg, @chr) = split //, lc $cmd;
+
+ # the following regex is used to match our "completion entry"
+ # to an actual command - the parentheses match kind of "overhead"
+ # - the more characters the parentheses match, the less attractive
+ # is the match.
+ my $regexp = "^\Q$beg\E"
+ . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
+ qr<$regexp>
+ };
+
+ my @penalty;
+
+ for (keys %{$self->{command}}) {
+ if (@penalty = $_ =~ $regexp) {
+ push @match, [$_, length join "", map "::$_", grep defined, @penalty];
+ }
+ }
+
+ @match = map $self->{command}{$_->[0]},
+ sort {
+ $a->[1] <=> $b->[1]
+ or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
+ or (length $b->[0]) <=> (length $a->[0])
+ } @match;
}
+
+ $self->{last_search} = $text;
+ $self->{last_match} = \@match;
+
+ $self->{select_offset} = 0;
}
- @found = sort { $a->[0] cmp $b->[0] } @found;
+ my @labels = @{ $self->{label} };
+ my @matches = @{ $self->{last_match} || [] };
+
+ if ($self->{select_offset}) {
+ splice @matches, 0, $self->{select_offset}, ();
- $self->{children}[0]->set_text ("$self->{search}_");
+ my $label = shift @labels;
+ $label->set_text ("...");
+ $label->set_tooltip ("Use Cursor-Up to view previous matches");
+ }
- for (0..5) {
- $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
- $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
+ for my $label (@labels) {
+ $label->{fg} = [1, 1, 1, 1];
+ $label->{bg} = [0, 0, 0, 0];
}
- $self->{select} = $found[0][1]
- if @found;
+ if (@matches) {
+ $self->{select} = "$matches[0][0]$arg";
- if (@found > 6) {
- $self->{children}[6]->set_text ("...");
+ $labels[0]->{fg} = [0, 0, 0, 1];
+ $labels[0]->{bg} = [1, 1, 1, 0.8];
+ } else {
+ $self->{select} = "$cmd$arg";
}
- $self->check_size;
-}
+ for my $match (@matches) {
+ my $label = shift @labels;
-sub key_down {
- my ($self, $ev) = @_;
+ if (@labels) {
+ $label->set_text ("$match->[0]$arg");
+ $label->set_tooltip ($match->[1]);
+ } else {
+ $label->set_text ("...");
+ $label->set_tooltip ("Use Cursor-Down to view more matches");
+ last;
+ }
+ }
- if ($ev->{sym} == 8) {
- substr $self->{search}, -1, 1, "";
- $self->update_labels;
- } elsif ($ev->{sym} == 13) {
- if (exists $self->{select}) {
- $self->emit (execute => $self->{select});
- $self->emit ("close");
- }
- } elsif ($ev->{sym} == 27) {
- $self->emit ("close");
- return;
- } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
- $self->{search} .= chr $ev->{unicode};
- $self->update_labels;
+ for my $label (@labels) {
+ $label->set_text ("");
+ $label->set_tooltip ("");
}
- length $self->{search}
- or $self->emit ("close");
+ $self->update;
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ # hack
+ local $CFPlus::UI::FOCUS = $self->{entry};
+
+ $self->SUPER::_draw;
}
1
+