--- deliantra/Deliantra-Client/DC/MapWidget.pm 2007/07/20 18:42:45 1.112 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/08/28 16:26:13 1.121 @@ -22,16 +22,10 @@ my $self = $class->SUPER::new ( z => -1, can_focus => 1, - list => glGenList, tilesize => 32, @_ ); - $self->{completer} = new CFPlus::MapWidget::Command:: - command => $self->{command}, - tooltip => "#completer_help", - ; - $self } @@ -50,16 +44,16 @@ $tooltip = "$data\n\n$tooltip"; $tooltip =~ s/\s+$//; - $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; + $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; } sub clr_commands { my ($self) = @_; - %{$self->{completer}{command}} = (); + %{$::COMPLETER->{command}} = (); - $self->{completer}->hide - if $self->{completer}; + $::COMPLETER->hide + if $::COMPLETER; } sub server_login { @@ -186,11 +180,7 @@ $y -= CFPlus::floor $::MAP->h * 0.5; if ($::CONN) { - if ($::IN_BUILD_MODE) { - $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); - } else { - $::CONN->lookat ($x, $y) - } + $::CONN->lookat ($x, $y) } } elsif ($ev->{button} == 2) { @@ -332,48 +322,7 @@ $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; - if ($sym == 9) { - ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; - } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { - $::HELP_WINDOW->toggle_visibility; - } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { - ::toggle_player_page ($::STATS_PAGE); - } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { - ::toggle_player_page ($::SKILL_PAGE); - } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { - ::toggle_player_page ($::SPELL_PAGE); - } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { - ::toggle_player_page ($::INVENTORY_PAGE); - } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { - $::SETUP_DIALOG->toggle_visibility; - } elsif (!$::CONN) { - return 0; # bindings further down need a valid connection - - } elsif ($uni == ord ",") { - $::CONN->user_send ("take"); - } elsif ($uni == ord " ") { - $::CONN->user_send ("apply"); - } elsif ($uni == 13) { - $::CONN->user_send ("examine"); - } elsif ($uni == ord ".") { - $::CONN->user_send ($self->{completer}{last_command}) - if exists $self->{completer}{last_command}; - } elsif (my @macros = CFPlus::Macro::match_event $ev) { - $::CONN->macro_send ($_) for @macros; - } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { - $::CONN->user_send ("rotateshoottype +"); - } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { - $::CONN->user_send ("rotateshoottype -"); - } elsif ($uni == ord '!') { - $self->{completer}->set_prefix ("shout "); - $self->{completer}->show; - } elsif ($uni == ord '"') { - $self->{completer}->set_prefix ("$::CFG->{say_command} "); - $self->{completer}->show; - } elsif ($uni == ord "'") { - $self->{completer}->set_prefix (""); - $self->{completer}->show; - } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) { + if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { if ($mod & CFPlus::KMOD_SHIFT) { $self->{shft}++; if ($dir->[0] != $self->{fire_dir}) { @@ -386,14 +335,11 @@ } else { $::CONN->user_send ("$dir->[1]"); } - } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { - $self->{completer}->inject_key_down ($ev); - $self->{completer}->show; - } else { - return 0; + + return 1; } - 1 + 0 } sub invoke_key_up { @@ -451,74 +397,76 @@ sub refresh_hook { my ($self) = @_; - return unless $::MAP; - - if (delete $self->{need_update}) { - my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; - - my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; - my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; - - my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; - my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; + if ($::MAP && $::CONN) { + if (delete $self->{need_update}) { + my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; + + my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; + my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; + + my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; + my $sy = CFPlus::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 $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; + my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; + + if ($::CFG->{fow_enable}) { + my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); + + $self->{fow_texture} = new CFPlus::Texture + w => $w, + h => $h, + data => $data, + internalformat => GL_ALPHA, + format => GL_ALPHA; + } else { + delete $self->{fow_texture}; + } - my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; - my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; + glNewList ($self->{list} ||= glGenList); - my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; - my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; + glPushMatrix; + glTranslate $sx0, $sy0; + glScale $::CFG->{map_scale}, $::CFG->{map_scale}; - if ($::CFG->{fow_enable}) { - my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); + $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); - $self->{fow_texture} = new CFPlus::Texture - w => $w, - h => $h, - data => $data, - internalformat => GL_ALPHA, - format => GL_ALPHA; - } else { - delete $self->{fow_texture}; - } + glScale $self->{tilesize}, $self->{tilesize}; - glNewList $self->{list}; + if (my $tex = $self->{fow_texture}) { + glPushMatrix; + glScale 1/3, 1/3; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glPushMatrix; - glTranslate $sx0, $sy0; - glScale $::CFG->{map_scale}, $::CFG->{map_scale}; + glColor +($::CFG->{fow_intensity}) x 3, 0.9; + $self->{fow_texture}->draw_quad_alpha (0, 0); - $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); + glDisable GL_TEXTURE_2D; + glPopMatrix; + } - glScale $self->{tilesize}, $self->{tilesize}; + if ($self->{magicmap}) { + my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; - if (my $tex = $self->{fow_texture}) { - glPushMatrix; - glScale 1/3, 1/3; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + $x += $::MAP->ox + $self->{dx}; + $y += $::MAP->oy + $self->{dy}; - glColor +($::CFG->{fow_intensity}) x 3, 0.9; - $self->{fow_texture}->draw_quad_alpha (0, 0); + glTranslate - $x - 1, - $y - 1; + glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; + $::MAP->draw_magicmap ($x, $y, $w, $h, $data); + } - glDisable GL_TEXTURE_2D; glPopMatrix; + glEndList; } - - if ($self->{magicmap}) { - my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; - - $x += $::MAP->ox + $self->{dx}; - $y += $::MAP->oy + $self->{dy}; - - glTranslate - $x - 1, - $y - 1; - glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; - $::MAP->draw_magicmap ($x, $y, $w, $h, $data); - } - - glPopMatrix; - glEndList; + } else { + glDeleteList delete $self->{list} + if $self->{list}; } - } sub draw { @@ -529,7 +477,7 @@ return unless $self->{list}; my $focused = $CFPlus::UI::FOCUS == $self - || $CFPlus::UI::FOCUS == $self->{completer}{entry}; + || $CFPlus::UI::FOCUS == $::COMPLETER->{entry}; return unless $focused || !$::FAST; @@ -538,9 +486,9 @@ # TNT2 emulates logops in software (or worse :) unless ($focused) { - glColor 0.4, 0.2, 0.2, 0.6; + glColor_premultiply 0, 0, 1, 0.25; glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glBegin GL_QUADS; glVertex 0, 0; glVertex 0, $::HEIGHT;