--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/05/17 10:14:52 1.24
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/12 13:26:14 1.56
@@ -16,18 +16,48 @@
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 CFClient::MapWidget::Command::
+ command => $self->{command},
+ can_focus => 1,
+ tooltip => "The Command Completer\n\n"
+ . "This is your central interface to send text commands to the server. "
+ . "To enter a verbatim command to send to the server, just type the command, "
+ . "followed by a space, and press return. "
+ . "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.",
+ ;
+
$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 clr_commands {
+ my ($self) = @_;
+
+ %{$self->{completer}{command}} = ();
}
sub button_down {
@@ -35,7 +65,23 @@
$self->focus_in;
- if ($ev->{button} == 2) {
+ if ($ev->{button} == 1) {
+ my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
+ my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
+
+ $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
+ $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
+
+ $x -= int 0.5 * $::MAP->w;
+ $y -= int 0.5 * $::MAP->h;
+
+ $x += 1;
+ $y += 1;
+
+ $::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});
@@ -50,18 +96,28 @@
$self->update;
};
}
+
+ 1
}
sub button_up {
my ($self, $ev, $x, $y) = @_;
delete $self->{motion};
+
+ 1
}
sub 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 {
@@ -78,87 +134,6 @@
$self->SUPER::update;
}
-sub draw {
- my ($self) = @_;
-
- if (delete $self->{need_update}) {
- 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::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;
- }
-
- $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;
-
- glColor +($::CFG->{fow_intensity}) x 3, 0.8;
- $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
-
- glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
- }
-
- 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;
- glBegin GL_QUADS;
- glVertex 0, 0;
- glVertex 0, $::HEIGHT;
- glVertex $::WIDTH, $::HEIGHT;
- glVertex $::WIDTH, 0;
- glEnd;
- glDisable GL_COLOR_LOGIC_OP;
- }
-}
-
my %DIR = (
CFClient::SDLK_KP8, [1, "north"],
CFClient::SDLK_KP9, [2, "northeast"],
@@ -178,7 +153,7 @@
sub key_down {
my ($self, $ev) = @_;
- return unless $::CONN;
+ return 0 unless $::CONN;
my $mod = $ev->{mod};
my $sym = $ev->{sym};
@@ -188,12 +163,23 @@
$::CONN->user_send ("stay fire");
} elsif ($uni == ord ",") {
$::CONN->user_send ("take");
- } elsif ($uni == ord "\t") {
+ } elsif ($uni == ord " ") {
$::CONN->user_send ("apply");
+ } elsif ($uni == ord ".") {
+ $::CONN->user_send ($self->{completer}{last_command})
+ if exists $self->{completer}{last_command};
+ } elsif ($uni == ord "\t") {
+ $::INV_WINDOW->toggle_visibility;
+ } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
+ $::CONN->user_send ("rotateshoottype +");
+ } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
+ $::CONN->user_send ("rotateshoottype -");
+ } elsif ($uni == ord '"') {
+ $self->{completer}->set_prefix ("$::CFG->{say_command} ");
+ $self->{completer}->show;
} elsif ($uni == ord "'") {
- $self->emit ('activate_console');
- } elsif ($uni == ord "/") {
- $self->emit (activate_console => '/');
+ $self->{completer}->set_prefix ("");
+ $self->{completer}->show;
} elsif (exists $DIR{$sym}) {
if ($mod & CFClient::KMOD_SHIFT) {
$self->{shft}++;
@@ -204,61 +190,168 @@
} 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]);
- },
- connect_close => sub {
- (delete $self->{command_widget})->hide;
- $self->focus_in;
- },
- ;
- $self->{command_widget}->key_down ($ev)
- unless $ev->{unicode} == 20;
- return unless $self->{command_widget};
- $self->{command_widget}->show;
- $self->{command_widget}->focus_in;
+ } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
+ $::BIND_EDITOR->set_binding (undef, undef, [],
+ sub {
+ my ($mod, $sym, $cmds) = @_;
+ $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
+ });
+ $::BIND_EDITOR->start;
+ $::BIND_EDITOR->show;
+ } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
+ $::BIND_EDITOR->stop;
+ $::BIND_EDITOR->ask_for_bind_and_commit;
+ $::BIND_EDITOR->hide;
+ } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
+ $::CONN->user_send ($_) for @$bind_cmd;
+ } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
+ $self->{completer}->key_down ($ev);
+ $self->{completer}->show;
+ } else {
+ return 0;
}
+
+ 1
}
sub 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 (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
$::CONN->user_send ("run_stop");
+ $res = 1;
}
+
+ $res
}
-sub add_command {
- my ($self, $command, $tooltip, $widget, $cb) = @_;
+sub draw {
+ my ($self) = @_;
- (my $data = $command) =~ s/\\//g;
+ my $focused = $CFClient::UI::FOCUS == $self
+ || $CFClient::UI::FOCUS == $self->{completer}{entry};
- $tooltip =~ s/^\s+//;
+ return
+ unless $focused || !$::FAST;
- $tooltip = "" . (CFClient::UI::Label::escape $data) . "\n\n"
- . CFClient::UI::Label::escape $tooltip;
+ if (delete $self->{need_update}) {
+ glNewList $self->{list};
- $tooltip =~ s/\s+$//;
+ if ($::MAP) {
+ my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
+ my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
+
+ my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
+ my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
+ my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
+ my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
+
+ glPushMatrix;
+ glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+
+ glTranslate $sx0, $sy0;
+
+ 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*", @{ $self->{smooth_matrix} }),
+ );
+ glEnable GL_CONVOLUTION_2D;
+ }
+
+ $self->{fow_texture_name} ||= glGenTexture;
+ # try to re-use the texture name: TODO improve texture class instead
+
+ $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};
+
+ 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);
- $self->{command}{$command} = [$data, $tooltip, $widget, $cb];
+ glDisable GL_TEXTURE_2D;
+ }
+
+ 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 {
+ 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_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
+# };
+ }
}
-sub clr_commands {
- my ($self) = @_;
+sub DESTROY {
+ my $self = shift;
+
+ glDeleteList $self->{list};
- %{$self->{command}} = ();
+ $self->SUPER::DESTROY;
}
package CFClient::MapWidget::MapMap;
@@ -361,16 +454,69 @@
$self->{label} = [
map
CFClient::UI::Label->new (
- can_hover => 1,
- can_events => 1,
- fontsize => $_,
- ), (0.8) x 6
+ can_hover => 1,
+ can_events => 1,
+ tooltip_width => 0.33,
+ fontsize => $_,
+ ), (0.8) x 16
];
$self->{entry} = new CFClient::UI::Entry
- connect_changed => sub {
+ on_changed => sub {
$self->update_labels;
- };
+ },
+ 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->{select};
+ $self->{hist_ptr} = 0;
+
+ $self->hide;
+ }
+ } elsif ($ev->{sym} == 27) {
+ $self->{hist_ptr} = 0;
+ $self->hide;
+ return;
+ } elsif ($ev->{sym} == CFClient::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} == CFClient::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},
@@ -380,37 +526,38 @@
$self
}
+sub set_prefix {
+ my ($self, $prefix) = @_;
+
+ $self->{entry}->set_text ($prefix);
+ $self->show;
+}
+
sub 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);
+}
+
+sub show {
+ my ($self) = @_;
+
+ $self->SUPER::show;
+ $self->{entry}->focus_in;
+}
+
+sub hide {
+ my ($self) = @_;
+
+ $self->SUPER::hide;
+ $self->{entry}->set_text ("");
}
sub key_down {
my ($self, $ev) = @_;
- if ($ev->{sym} == 13) {
- if (exists $self->{select}) {
- $self->emit (execute => $self->{select});
- $self->emit ("close");
- }
- } elsif ($ev->{sym} == 27) {
- $self->{entry}->set_text ("");
- $self->emit ("close");
- return;
- } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
- ++$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};
- $self->update_labels;
- } else {
- #$self->{entry}{force_alloc} = 1;
- $self->{entry}->key_down ($ev);
- }
+ $self->{entry}->key_down ($ev)
}
sub update_labels {
@@ -419,39 +566,45 @@
my $text = $self->{entry}->get_text;
length $text
- or return $self->emit ("close");
+ or return $self->hide;
my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
- if ($cmd ne $self->{last_search}) {
- 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>
- };
-
+ if ($text ne $self->{last_search}) {
my @match;
- my @penalty;
- for (keys %{$self->{command}}) {
- if (@penalty = $_ =~ $regexp) {
- push @match, [$_, length join "", map "::$_", grep defined, @penalty];
+ 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 (length $a->[0]) <=> (length $b->[0])
- } @match;
+ @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} = $cmd;
+ $self->{last_search} = $text;
$self->{last_match} = \@match;
$self->{select_offset} = 0;