--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/02 22:13:47 1.47
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/18 19:13:20 1.66
@@ -9,6 +9,10 @@
our @ISA = CFClient::UI::Base::;
+my $magicmap_tex =
+ new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
+ mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
+
sub new {
my $class = shift;
@@ -16,6 +20,13 @@
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,
+ ],
+
@_
);
@@ -29,7 +40,7 @@
. "Typing the initial letters of words (or just any letters) displays guesses "
. "for commands you might want to use.\n"
. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
- . "Right-Click opens a menu where you cna select further options, sich as redefining keybindings.",
+ . "Right-Click opens a menu where you cna select further options, sich as redefining key bindings.",
;
$self
@@ -53,12 +64,24 @@
%{$self->{completer}{command}} = ();
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
- $self->focus_in;
+ return unless $::CONN;
+
+ $self->grab_focus;
+
+ if ($ev->{button} == 1) {
+ my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
+ my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+
+ $x -= int 0.5 * $self->{sw};
+ $y -= int 0.5 * $self->{sh};
- if ($ev->{button} == 2) {
+ $::CONN->lookat ($x, $y)
+ if $::CONN;
+
+ } elsif ($ev->{button} == 2) {
my ($ox, $oy) = ($ev->{x}, $ev->{y});
my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
@@ -77,7 +100,7 @@
1
}
-sub button_up {
+sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
delete $self->{motion};
@@ -85,7 +108,7 @@
1
}
-sub mouse_motion {
+sub invoke_mouse_motion {
my ($self, $ev, $x, $y) = @_;
if ($self->{motion}) {
@@ -99,8 +122,8 @@
sub size_request {
(
- 1 + 32 * int $::WIDTH / 32,
- 1 + 32 * int $::HEIGHT / 32,
+ 32 * CFClient::ceil $::WIDTH / 32,
+ 32 * CFClient::ceil $::HEIGHT / 32,
)
}
@@ -127,7 +150,7 @@
CFClient::SDLK_LEFT, [7, "west"],
);
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
return 0 unless $::CONN;
@@ -160,7 +183,10 @@
} elsif (exists $DIR{$sym}) {
if ($mod & CFClient::KMOD_SHIFT) {
$self->{shft}++;
- $::CONN->user_send ("fire $DIR{$sym}[0]");
+ if ($DIR{$sym}[0] != $self->{fire_dir}) {
+ $::CONN->user_send ("fire $DIR{$sym}[0]");
+ }
+ $self->{fire_dir} = $DIR{$sym}[0];
} elsif ($mod & CFClient::KMOD_CTRL) {
$self->{ctrl}++;
$::CONN->user_send ("run $DIR{$sym}[0]");
@@ -171,7 +197,7 @@
$::BIND_EDITOR->set_binding (undef, undef, [],
sub {
my ($mod, $sym, $cmds) = @_;
- $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
+ $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
});
$::BIND_EDITOR->start;
$::BIND_EDITOR->show;
@@ -179,10 +205,10 @@
$::BIND_EDITOR->stop;
$::BIND_EDITOR->ask_for_bind_and_commit;
$::BIND_EDITOR->hide;
- } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
+ } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
$::CONN->user_send ($_) for @$bind_cmd;
} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
- $self->{completer}->key_down ($ev);
+ $self->{completer}->invoke_key_down ($ev);
$self->{completer}->show;
} else {
return 0;
@@ -191,16 +217,29 @@
1
}
-sub key_up {
+sub invoke_key_up {
my ($self, $ev) = @_;
my $res = 0;
my $mod = $ev->{mod};
my $sym = $ev->{sym};
- if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
- $::CONN->user_send ("fire_stop");
- $res = 1;
+ if ($::CFG->{shift_fire_stop}) {
+ if (!($mod & CFClient::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 == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+ $::CONN->user_send ("fire_stop");
+ delete $self->{fire_dir};
+ $res = 1;
+ }
}
if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
@@ -211,9 +250,22 @@
$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 = $CFClient::UI::FOCUS == $self
|| $CFClient::UI::FOCUS == $self->{completer}{entry};
@@ -221,75 +273,83 @@
unless $focused || !$::FAST;
if (delete $self->{need_update}) {
+ my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+
+ my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
+ my $sy = $self->{sy} = CFClient::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 + CFClient::ceil $self->{w} / $tilesize;
+ my $sh = $self->{sh} = 1 + CFClient::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} && $CFClient::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 CFClient::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}) + 0.99;
- my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
-
- 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;
-
- glPushMatrix;
- glScale $::CFG->{map_scale}, $::CFG->{map_scale};
-
- 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::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*",
- 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_name} ||= glGenTexture;
- # try to re-use the texture name: TODO improve texture class instead
+ $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
- $self->{fow_texture} = new CFClient::Texture
- w => $w,
- h => $h,
- data => $data,
- name => $self->{fow_texture_name},
- internalformat => GL_ALPHA,
- format => GL_ALPHA;
-
- glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
+ glScale 32, 32;
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+ if (my $tex = $self->{fow_texture}) {
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
- glColor +($::CFG->{fow_intensity}) x 3, 0.8;
- $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
+ glColor +($::CFG->{fow_intensity}) x 3, 0.9;
+ $self->{fow_texture}->draw_quad_alpha (0, 0);
- glDisable GL_TEXTURE_2D;
- }
+ glDisable GL_TEXTURE_2D;
+ }
+
+ if ($self->{magicmap}) {
+ my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
- glPopMatrix;
+ $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;
# TNT2 emulates logops in software (or worse :)
- if ($focused) {
- (delete $self->{out_of_focus})->destroy
- if $self->{out_of_focus};
- } else {
+ unless ($focused) {
glColor 0.4, 0.2, 0.2, 0.6;
glEnable GL_BLEND;
glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
@@ -300,27 +360,6 @@
glVertex $::WIDTH, 0;
glEnd;
glDisable GL_BLEND;
-
-# $self->{out_of_focus} ||= do {
-# my $label = new CFClient::UI::Label
-# x => 0,
-# y => 0,
-# z => 1,
-# ellipsise => 0,
-# text => "map out of focus (click map to play)";
-#
-# $label->show;
-# $label->update;
-#
-# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
-# $label->move_abs (
-# ($::WIDTH - $label->{w}) * 0.5,
-# ($::HEIGHT - $label->{h}) * 0.5,
-# );
-# });
-#
-# $label
-# };
}
}
@@ -343,11 +382,12 @@
($::HEIGHT * 0.25, $::HEIGHT * 0.25)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
$self->update;
+
+ 1
}
sub update {
@@ -442,6 +482,20 @@
$self->{entry} = new CFClient::UI::Entry
on_changed => sub {
$self->update_labels;
+ 0
+ },
+ on_button_down => sub {
+ my ($entry, $ev, $x, $y) = @_;
+
+ if ($ev->{button} == 3) {
+ (new CFClient::UI::Menu
+ items => [
+ ["bind 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) = @_;
@@ -452,18 +506,40 @@
if (exists $self->{select}) {
$self->{last_command} = $self->{select};
$::CONN->user_send ($self->{select});
+
+ unshift @{$self->{history}}, $self->{select};
+ $self->{hist_ptr} = 0;
+
$self->hide;
}
} elsif ($ev->{sym} == 27) {
+ $self->{hist_ptr} = 0;
$self->hide;
- return;
} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
- ++$self->{select_offset}
- if $self->{select_offset} < $#{ $self->{last_match} || [] };
+ 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} == CFClient::SDLK_UP) {
- --$self->{select_offset}
- if $self->{select_offset};
+ 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;
@@ -488,18 +564,19 @@
$self->show;
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
$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}->focus_in;
+ $self->{entry}->grab_focus;
}
sub hide {
@@ -509,10 +586,10 @@
$self->{entry}->set_text ("");
}
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
- $self->{entry}->key_down ($ev)
+ $self->{entry}->emit (key_down => $ev)
}
sub update_labels {
@@ -609,7 +686,6 @@
}
$self->update;
- ###
}
sub _draw {