--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/07/02 19:32:55 1.70 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/12/26 11:42:58 1.123 @@ -1,16 +1,19 @@ -package CFClient::MapWidget; +package CFPlus::MapWidget; use strict; use utf8; use List::Util qw(min max); -use CFClient::OpenGL; +use CFPlus; +use CFPlus::OpenGL; +use CFPlus::UI; +use CFPlus::Macro; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; my $magicmap_tex = - new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", + new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", mipmap => 1, wrap => 0, internalformat => GL_ALPHA; sub new { @@ -19,33 +22,19 @@ my $self = $class->SUPER::new ( 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, - ], - + tilesize => 32, @_ ); - $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 key bindings.", - ; - $self } +sub set_tilesize { + my ($self, $tilesize) = @_; + + $self->{tilesize} = $tilesize; +} + sub add_command { my ($self, $command, $tooltip, $widget, $cb) = @_; @@ -55,33 +44,149 @@ $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}} = (); + + $::COMPLETER->hide + if $::COMPLETER; } -sub invoke_button_down { - my ($self, $ev, $x, $y) = @_; +sub server_login { + my ($server) = @_; + + ::stop_game (); + local $::PROFILE->{host} = $server; + ::start_game (); +} + +sub editor_invoke { + my $editsup = $::CONN && $::CONN->{editor_support} + or return; + + CFPlus::background { + print "preparing editor startup...\n"; + + my $server = $editsup->{gameserver} || "default"; + $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; - return unless $::CONN; + local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; + local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; - $self->grab_focus; + print "map directory is $mapdir\n"; + print "lib directory is $libdir\n"; + + my $ua = CFPlus::lwp_useragent; + + for my $file (qw(archetypes crossfire.0)) { + my $url = "$editsup->{lib_root}$file"; + print "mirroring $url...\n"; + CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); + printf "%s size %d octets\n", $file, -s "$libdir/$file"; + } + + if (1) { # upload a map + my $mapname = $::CONN->{map_info}[0]; + + my $mappath = "$mapdir/$mapname"; + + -e $mappath and die "$mappath already exists\n"; + + print "getting map revision for $mapname...\n"; + + # try to get the most recent head revision, what a hack, + # this should have been returned while downloading *sigh* + my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; + + if ($log =~ /\?rev=(\d+\.\d+)"/) { + my $rev = $1; + + print "downloading revision $rev...\n"; + + my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; + + my $meta = { + %$editsup, + path => $mapname, + revision => $rev, + cf_login => $::PROFILE->{user}, + }; + + require File::Basename; + require File::Path; + + File::Path::mkpath (File::Basename::dirname ($mappath)); + open my $fh, ">:raw:perlio", "$mappath.meta" + or die "$mappath.meta: $!\n"; + print $fh CFPlus::encode_json $meta; + close $fh; + open my $fh, ">:raw:perlio:utf8", $mappath + or die "$mappath: $!\n"; + print $fh $map; + close $fh; + + print "saved as $mappath\n"; + + print "invoking editor...\n"; + exec "/root/s2/gce $mappath";#d# + + # now upload it +# require HTTP::Request::Common; +# +# my $res = $ua->post ( +# $ENV{CFPLUS_UPLOAD}, +# Content_Type => 'multipart/form-data', +# Content => [ +# path => $mapname, +# mapdir => $ENV{CROSSFIRE_MAPDIR}, +# map => $map, +# revision => $rev, +# cf_login => $ENV{CFPLUS_LOGIN}, +# cf_password => $ENV{CFPLUS_PASSWORD}, +# comment => "", +# ] +# ); +# +# if ($res->is_error) { +# # fatal condition +# warn $res->status_line; +# } else { +# # script replies are marked as {{..}} +# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; +# warn map "$_\n", @msgs; +# } + } else { + die "viewvc parse error, unable to detect revision\n"; + } + } + } +} + +sub invoke_button_down { + my ($self, $ev, $x, $y) = @_; if ($ev->{button} == 1) { - my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; - my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; + $self->grab_focus; + return unless $::CONN; + + my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; + my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; - $x -= int 0.5 * $self->{sw}; - $y -= int 0.5 * $self->{sh}; + $x -= CFPlus::floor $::MAP->w * 0.5; + $y -= CFPlus::floor $::MAP->h * 0.5; - $::CONN->lookat ($x, $y) - if $::CONN; + if ($::CONN) { + $::CONN->lookat ($x, $y) + } } elsif ($ev->{button} == 2) { + $self->grab_focus; + return unless $::CONN; + my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); @@ -95,6 +200,57 @@ $self->update; }; + } elsif ($ev->{button} == 3) { + my @items = ( + ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], + ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], + ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], + ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], + ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], + ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], + ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], + [ + $::PICKUP_ENABLE->{state} + ? "Disable automatic pickup" + : "Enable automatic pickup", + sub { $::PICKUP_ENABLE->toggle } + ], + ); + + if ($::CONN && $::CONN->{editor_support}) { + push @items, [ + "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")", + \&editor_invoke, + ]; + + for my $type (qw(test name)) { + $::CONN->{editor_support}{type} ne $type + or next; + my $server = $::CONN->{editor_support}{"${type}server"} + or next; + + push @items, [ + "Login on $type server (" . (CFPlus::asxml $server) . ")", + sub { server_login $server }, + ]; + } + } + + push @items, + ["Quit", + sub { + if ($::CONN) { + &::open_quit_dialog; + } else { + exit; + } + } + ], + ; + + (new CFPlus::UI::Menu + items => \@items, + )->popup ($ev); } 1 @@ -121,9 +277,11 @@ } sub size_request { + my ($self) = @_; + ( - 32 * CFClient::ceil $::WIDTH / 32, - 32 * CFClient::ceil $::HEIGHT / 32, + $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, + $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, ) } @@ -135,87 +293,53 @@ } my %DIR = ( - 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"], + ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], + ( "," . CFPlus::SDLK_KP8 ), [1, "north"], + ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], + ( "," . CFPlus::SDLK_KP6 ), [3, "east"], + ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], + ( "," . CFPlus::SDLK_KP2 ), [5, "south"], + ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], + ( "," . CFPlus::SDLK_KP4 ), [7, "west"], + ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], + + ( "," . CFPlus::SDLK_UP ), [1, "north"], + ("1," . CFPlus::SDLK_UP ), [2, "northeast"], + ( "," . CFPlus::SDLK_RIGHT), [3, "east"], + ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], + ( "," . CFPlus::SDLK_DOWN ), [5, "south"], + ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], + ( "," . CFPlus::SDLK_LEFT ), [7, "west"], + ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], ); sub invoke_key_down { my ($self, $ev) = @_; - return 0 unless $::CONN; - my $mod = $ev->{mod}; my $sym = $ev->{sym}; my $uni = $ev->{unicode}; - if ($sym == CFClient::SDLK_KP5) { - $::CONN->user_send ("stay fire"); - } elsif ($uni == ord ",") { - $::CONN->user_send ("take"); - } 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") { - $::PL_WINDOW->toggle_visibility; - $::PL_NOTEBOOK->set_current_page ("Inventory"); - } 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->{completer}->set_prefix (""); - $self->{completer}->show; - } elsif (exists $DIR{$sym}) { - if ($mod & CFClient::KMOD_SHIFT) { + $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; + + if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { + if ($mod & CFPlus::KMOD_SHIFT) { $self->{shft}++; - if ($DIR{$sym}[0] != $self->{fire_dir}) { - $::CONN->user_send ("fire $DIR{$sym}[0]"); + if ($dir->[0] != $self->{fire_dir}) { + $::CONN->user_send ("fire $dir->[0]"); } - $self->{fire_dir} = $DIR{$sym}[0]; - } elsif ($mod & CFClient::KMOD_CTRL) { + $self->{fire_dir} = $dir->[0]; + } elsif ($mod & CFPlus::KMOD_CTRL) { $self->{ctrl}++; - $::CONN->user_send ("run $DIR{$sym}[0]"); + $::CONN->user_send ("run $dir->[0]"); } else { - $::CONN->user_send ("$DIR{$sym}[1]"); + $::CONN->user_send ("$dir->[1]"); } - } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { - $::BIND_EDITOR->set_binding (undef, undef, [], - sub { - my ($mod, $sym, $cmds) = @_; - $::BIND_EDITOR->cfg_bind ($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->{profile}{default}{bindings}{$mod}{$sym}) { - $::CONN->user_send ($_) for @$bind_cmd; - } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { - $self->{completer}->invoke_key_down ($ev); - $self->{completer}->show; - } else { - return 0; + + return 1; } - 1 + 0 } sub invoke_key_up { @@ -226,24 +350,25 @@ my $sym = $ev->{sym}; if ($::CFG->{shift_fire_stop}) { - if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { + if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { $::CONN->user_send ("fire_stop"); delete $self->{fire_dir}; $res = 1; } } else { - if (exists $DIR{$sym} && delete $self->{shft}) { + if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { $::CONN->user_send ("fire_stop"); delete $self->{fire_dir}; $res = 1; - } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? + } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) + && delete $self->{shft}) { # XXX: is RSHIFT ok? $::CONN->user_send ("fire_stop"); delete $self->{fire_dir}; $res = 1; } } - if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { + if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { $::CONN->user_send ("run_stop"); $res = 1; } @@ -251,109 +376,120 @@ $res } +sub invoke_visibility_change { + my ($self) = @_; + + $self->refresh_hook; + + 0 +} + sub set_magicmap { my ($self, $w, $h, $x, $y, $data) = @_; - $x -= $::MAP->ox + int 0.5 * $::MAP->w; - $y -= $::MAP->oy + int 0.5 * $::MAP->h; + $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; + $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; $self->{magicmap} = [$x, $y, $w, $h, $data]; $self->update; } -sub draw { +sub refresh_hook { my ($self) = @_; - return unless $::MAP; - - my $focused = $CFClient::UI::FOCUS == $self - || $CFClient::UI::FOCUS == $self->{completer}{entry}; - - return - unless $focused || !$::FAST; - - if (delete $self->{need_update}) { - my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; - - my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; - my $sy = $self->{sy} = CFClient::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 $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; - my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; - - if ($::CFG->{fow_enable}) { - my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); - - 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; - } + glPushMatrix; + glTranslate $sx0, $sy0; + glScale $::CFG->{map_scale}, $::CFG->{map_scale}; - $self->{fow_texture} = new CFClient::Texture - w => $w, - h => $h, - data => $data, - internalformat => GL_ALPHA, - format => GL_ALPHA; + $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); - glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; - } 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 ($sx, $sy, 0, 0, $sw, $sh); + glDisable GL_TEXTURE_2D; + glPopMatrix; + } - glScale 32, 32; + if ($self->{magicmap}) { + my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; - if (my $tex = $self->{fow_texture}) { - 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; } + } else { + glDeleteList delete $self->{list} + if $self->{list}; + } +} - if ($self->{magicmap}) { - my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; +sub draw { + my ($self) = @_; - $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); - $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); + $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); - glTranslate - $x - 1, - $y - 1; - glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; - $::MAP->draw_magicmap ($x, $y, $w, $h, $data); - } + return unless $self->{list}; - glPopMatrix; - glEndList; - } + my $focused = $CFPlus::UI::FOCUS == $self + || $CFPlus::UI::FOCUS == $::COMPLETER->{entry}; + + return + unless $focused || !$::FAST; glCallList $self->{list}; # 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; @@ -372,15 +508,63 @@ $self->SUPER::DESTROY; } -package CFClient::MapWidget::MapMap; +package CFPlus::MapWidget::MapMap; + +use strict; +use utf8; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; use Time::HiRes qw(time); -use CFClient::OpenGL; +use CFPlus::OpenGL; sub size_request { - ($::HEIGHT * 0.25, $::HEIGHT * 0.25) + ($::HEIGHT * 0.2, $::HEIGHT * 0.2) +} + +sub refresh_hook { + my ($self) = @_; + + if ($::MAP && $self->{texture_atime} < time) { + my ($w, $h) = @$self{qw(w h)}; + + my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; + my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; + + my $ox = 0.5 * ($w - $sw); + my $oy = 0.5 * ($h - $sh); + + my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; + my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; + + #TODO: map scale is completely borked + + my $x0 = int $ox - $sx + 0.5; + my $y0 = int $oy - $sy + 0.5; + + $self->{sw} = $sw; + $self->{sh} = $sh; + + $self->{x0} = $x0; + $self->{y0} = $y0; + + $self->{texture_atime} = time + 1/3; + + $self->{texture} = + new CFPlus::Texture + w => $w, + h => $h, + data => $::MAP->mapmap (-$ox, -$oy, $w, $h), + type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; + } +} + +sub invoke_visibility_change { + my ($self) = @_; + + $self->refresh_hook; + + 0 } sub invoke_size_allocate { @@ -401,64 +585,39 @@ 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; + $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); - 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); + $self->{texture} or return; 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 ; + glVertex $self->{x0} , $self->{y0} ; + glVertex $self->{x0} , $self->{y0} + $self->{sh}; + glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; + glVertex $self->{x0} + $self->{sw}, $self->{y0} ; glEnd; glDisable GL_BLEND; } -package CFClient::MapWidget::Command; +package CFPlus::MapWidget::Command; use strict; -use CFClient::OpenGL; +use CFPlus::OpenGL; -our @ISA = CFClient::UI::Frame::; +our @ISA = CFPlus::UI::Frame::; sub new { my $class = shift; @@ -468,11 +627,11 @@ @_, ); - $self->add ($self->{vbox} = new CFClient::UI::VBox); + $self->add ($self->{vbox} = new CFPlus::UI::VBox); $self->{label} = [ map - CFClient::UI::Label->new ( + CFPlus::UI::Label->new ( can_hover => 1, can_events => 1, tooltip_width => 0.33, @@ -480,7 +639,7 @@ ), (0.8) x 16 ]; - $self->{entry} = new CFClient::UI::Entry + $self->{entry} = new CFPlus::UI::Entry on_changed => sub { $self->update_labels; 0 @@ -489,10 +648,10 @@ my ($entry, $ev, $x, $y) = @_; if ($ev->{button} == 3) { - (new CFClient::UI::Menu + (new CFPlus::UI::Menu items => [ - ["bind " . (CFClient::UI::Label::escape $self->{select}) . " to a key" - => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] + ["bind " . (CFPlus::asxml $self->{select}) . " to a key" + => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] ], )->popup ($ev); return 1; @@ -517,7 +676,7 @@ } elsif ($ev->{sym} == 27) { $self->{hist_ptr} = 0; $self->hide; - } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { + } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { if ($self->{hist_ptr} > 1) { $self->{hist_ptr}--; $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); @@ -529,7 +688,7 @@ if $self->{select_offset} < $#{ $self->{last_match} || [] }; } $self->update_labels; - } elsif ($ev->{sym} == CFClient::SDLK_UP) { + } elsif ($ev->{sym} == CFPlus::SDLK_UP) { if ($self->{select_offset}) { --$self->{select_offset} } else { @@ -584,14 +743,17 @@ sub hide { my ($self) = @_; + $self->{hist_ptr} = 0; + $self->SUPER::hide; $self->{entry}->set_text (""); } -sub invoke_key_down { +sub inject_key_down { my ($self, $ev) = @_; - $self->{entry}->emit (key_down => $ev) + $self->{entry}->grab_focus; + $self->{entry}->emit (key_down => $ev); } sub update_labels { @@ -694,9 +856,10 @@ my ($self) = @_; # hack - local $CFClient::UI::FOCUS = $self->{entry}; + local $CFPlus::UI::FOCUS = $self->{entry}; $self->SUPER::_draw; } 1 +