--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/24 02:41:48 1.9 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/04/25 12:56:34 1.18 @@ -1,6 +1,7 @@ package CFClient::MapWidget; use strict; +use utf8; use List::Util qw(min max); @@ -82,14 +83,15 @@ glNewList $self->{list}; if ($::MAP) { - my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}); - my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}); - - glScale $::CFG->{map_scale}, $::CFG->{map_scale}; + 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); @@ -131,44 +133,7 @@ glDisable GL_BLEND; } - # 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; - - $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 + glPopMatrix; } glEndList; @@ -216,6 +181,8 @@ 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 "'") { @@ -238,7 +205,8 @@ command => $self->{command}, can_focus => 1, connect_execute => sub { - $::CONN->user_send ($_[1]); + # todo: support callback instead of user_send + $::CONN->user_send ($_[1][1]); }, connect_close => sub { (delete $self->{command_widget})->hide; @@ -246,6 +214,7 @@ }, ; $self->{command_widget}->key_down ($ev); + return unless $self->{command_widget}; $self->{command_widget}->show; $self->{command_widget}->focus_in; } @@ -266,12 +235,90 @@ } 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]; - #warn "$command|$abbrev|$widget\n";#d# + 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; @@ -289,8 +336,9 @@ @_, children => [map CFClient::UI::Label->new ( - can_hover => 1, - fontsize => $_, + can_hover => 1, + can_events => 1, + fontsize => $_, ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 ], ); @@ -317,7 +365,7 @@ for (@$command) { if ($_->[0] =~ $search_abbrev) { push @found, [$_->[0], $_]; - } elsif ($_[1] =~ $search_full) { + } elsif ($_->[1] =~ $search_full) { push @found, [$_->[1], $_]; } } @@ -328,9 +376,10 @@ 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][1] + $self->{select} = $found[0][1] if @found; if (@found > 6) { @@ -353,10 +402,14 @@ } } elsif ($ev->{sym} == 27) { $self->emit ("close"); - } elsif ($ev->{unicode}) { + return; + } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { $self->{search} .= chr $ev->{unicode}; $self->update_labels; } + + length $self->{search} + or $self->emit ("close"); } 1