--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/19 09:40:00 1.2 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/25 12:56:34 1.18 @@ -1,11 +1,11 @@ package CFClient::MapWidget; use strict; +use utf8; use List::Util qw(min max); -use SDL; -use SDL::OpenGL; +use CFClient::OpenGL; our @ISA = CFClient::UI::Base::; @@ -15,16 +15,17 @@ $class->SUPER::new ( z => -1, can_focus => 1, - list => (glGenLists 1), + list => glGenList, @_ ) } -sub key_down { - print "MAPKEYDOWN\n"; -} +sub DESTROY { + my $self = shift; -sub key_up { + glDeleteList $self->{list}; + + $self->SUPER::DESTROY; } sub button_down { @@ -32,14 +33,14 @@ $self->focus_in; - if ($ev->button == 2) { - my ($ox, $oy) = ($ev->button_x, $ev->button_y); + if ($ev->{button} == 2) { + my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); $self->{motion} = sub { my ($ev, $x, $y) = @_; - ($x, $y) = ($ev->motion_x, $ev->motion_y); + ($x, $y) = ($ev->{x}, $ev->{y}); $::CFG->{map_shift_x} = $bw + $x - $ox; $::CFG->{map_shift_y} = $bh + $y - $oy; @@ -79,14 +80,17 @@ my ($self) = @_; if (delete $self->{need_update}) { - glNewList $self->{list}, GL_COMPILE; + glNewList $self->{list}; if ($::MAP) { - my $sw = int $::WIDTH / 32; - my $sh = int $::HEIGHT / 32; + 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; - 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; + glPushMatrix; + glScale $::CFG->{map_scale}, $::CFG->{map_scale}; glTranslate $sx0 - 32, $sy0 - 32, 0; @@ -101,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; } @@ -122,36 +126,14 @@ 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; glDisable GL_BLEND; } - # HACK BEGIN - { - glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove - my ($w, $h) = (250, 250); - - 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; - - $self->{mapmap_texture} = - new CFClient::Texture - w => $w, - h => $h, - data => $::MAP->mapmap ($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); - - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; - } - # HACK END + glPopMatrix; } glEndList; @@ -176,67 +158,258 @@ } my %DIR = ( - SDLK_KP8, [1, "north"], - SDLK_KP9, [2, "northeast"], - SDLK_KP6, [3, "east"], - SDLK_KP3, [4, "southeast"], - SDLK_KP2, [5, "south"], - SDLK_KP1, [6, "southwest"], - SDLK_KP4, [7, "west"], - SDLK_KP7, [8, "northwest"], - - SDLK_UP, [1, "north"], - SDLK_RIGHT, [3, "east"], - SDLK_DOWN, [5, "south"], - SDLK_LEFT, [7, "west"], + 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 key_down { my ($self, $ev) = @_; - my $mod = $ev->key_mod; - my $sym = $ev->key_sym; + my $mod = $ev->{mod}; + my $sym = $ev->{sym}; - if ($sym == SDLK_KP5) { + if ($sym == CFClient::SDLK_KP5) { $::CONN->user_send ("stay fire"); - } elsif ($sym == SDLK_a) { + } elsif ($sym == ord ",") { + $::CONN->user_send ("take"); + } elsif ($sym == ord "a") { $::CONN->user_send ("apply"); - } elsif ($sym == SDLK_QUOTE) { + } elsif ($sym == ord "'") { $self->emit ('activate_console'); - } elsif ($sym == SDLK_SLASH) { - $self->emit ('activate_console' => '/'); + } elsif ($sym == ord "/") { + $self->emit (activate_console => '/'); } elsif (exists $DIR{$sym}) { - if ($mod & KMOD_SHIFT) { + if ($mod & CFClient::KMOD_SHIFT) { $self->{shft}++; $::CONN->user_send ("fire $DIR{$sym}[0]"); - } elsif ($mod & KMOD_CTRL) { + } 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; } } sub key_up { my ($self, $ev) = @_; - my $mod = $ev->key_mod; - my $sym = $ev->key_sym; + my $mod = $ev->{mod}; + my $sym = $ev->{sym}; - if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { + if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { $::CONN->user_send ("fire_stop"); } - if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { + if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { $::CONN->user_send ("run_stop"); } } sub add_command { - my ($self, $command, $widget, $cb) = @_; + my ($self, $command, $tooltip, $widget, $cb) = @_; + + (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; + + push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; +} + +package CFClient::MapWidget::MapMap; + +use base CFClient::UI::Base::; + +use Time::HiRes qw(time); +use CFClient::OpenGL; + +sub size_request { + ($::HEIGHT * 0.25, $::HEIGHT * 0.25) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + $self->update; +} + +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 CFClient::Texture + w => $w, + h => $h, + data => $::MAP->mapmap (-$ox, -$oy, $w, $h), + type => $CFClient::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 ; + glEnd; + + glDisable GL_BLEND; +} + +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; + } - (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]*/$1/g; - warn "$command|$abbrev|$widget\n";#d# + length $self->{search} + or $self->emit ("close"); } 1