--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/19 23:43:07 1.5 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/24 13:04:31 1.16 @@ -1,6 +1,7 @@ package CFClient::MapWidget; use strict; +use utf8; use List::Util qw(min max); @@ -27,13 +28,6 @@ $self->SUPER::DESTROY; } -sub key_down { - print "MAPKEYDOWN\n"; -} - -sub key_up { -} - sub button_down { my ($self, $ev, $x, $y) = @_; @@ -89,11 +83,14 @@ glNewList $self->{list}; if ($::MAP) { - my $sw = int $::WIDTH / 32; - my $sh = int $::HEIGHT / 32; + 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}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; - my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; + 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; @@ -108,9 +105,9 @@ 3, 3, GL_ALPHA, GL_FLOAT, pack "f*", - 0.1, 0.1, 0.1, - 0.1, 0.2, 0.1, - 0.1, 0.1, 0.1, + 0.05, 0.13, 0.05, + 0.13, 0.30, 0.13, + 0.05, 0.13, 0.05, ); glEnable GL_CONVOLUTION_2D; } @@ -129,7 +126,7 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glColor +($::CFG->{fow_intensity}) x 3, 1; + glColor +($::CFG->{fow_intensity}) x 3, 0.8; $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); glDisable GL_TEXTURE_2D; @@ -139,23 +136,40 @@ # 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, $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 (100, 100); + $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 @@ -206,12 +220,14 @@ 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' => '/'); + $self->emit (activate_console => '/'); } elsif (exists $DIR{$sym}) { if ($mod & CFClient::KMOD_SHIFT) { $self->{shft}++; @@ -222,6 +238,24 @@ } 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; } } @@ -240,10 +274,102 @@ } sub add_command { - my ($self, $command, $widget, $cb) = @_; + my ($self, $command, $tooltip, $widget, $cb) = @_; (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; - warn "$command|$abbrev|$widget\n";#d# + + push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; +} + +package CFClient::MapWidget::Command; + +use strict; + +use CFClient::OpenGL; + +our @ISA = CFClient::UI::VBox::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + @_, + 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 +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); +} + +sub update_labels { + my ($self) = @_; + + my $command = $self->{command}; + my $search_abbrev = qr/^\Q$self->{search}/; + my $search_full = qr/\Q$self->{search}/; + + my @found; + + for (@$command) { + if ($_->[0] =~ $search_abbrev) { + push @found, [$_->[0], $_]; + } elsif ($_->[1] =~ $search_full) { + push @found, [$_->[1], $_]; + } + } + + @found = sort { $a->[0] cmp $b->[0] } @found; + + $self->{children}[0]->set_text ("$self->{search}_"); + + for (0..5) { + $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : ""); + $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : ""); + } + + $self->{select} = $found[0][1] + if @found; + + if (@found > 6) { + $self->{children}[6]->set_text ("..."); + } + + $self->check_size; +} + +sub key_down { + my ($self, $ev) = @_; + + 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; + } + + length $self->{search} + or $self->emit ("close"); } 1