ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC

1package CFClient::MapWidget; 1package CFPlus::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus;
8use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
11 13
12my $magicmap_tex = 14my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 17
16sub new { 18sub new {
17 my $class = shift; 19 my $class = shift;
18 20
… …
28 ], 30 ],
29 31
30 @_ 32 @_
31 ); 33 );
32 34
33 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 36 command => $self->{command},
35 can_focus => 1, 37 tooltip => "#completer_help",
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "This is your central interface to send text commands to the server. "
38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ; 38 ;
45 39
46 $self 40 $self
47} 41}
48 42
… …
60 54
61sub clr_commands { 55sub clr_commands {
62 my ($self) = @_; 56 my ($self) = @_;
63 57
64 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
64sub server_login {
65 my ($server) = @_;
66
67 ::stop_game ();
68 local $::PROFILE->{host} = $server;
69 ::start_game ();
70}
71
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return;
84
85 CFPlus::background {
86 print "preparing editor startup...\n";
87 CFPlus::set_proxy;
88
89 my $server = $editsup->{gameserver} || "default";
90 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91
92 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
93 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94
95 print "map directory is $mapdir\n";
96 print "lib directory is $libdir\n";
97
98 require LWP::UserAgent;
99
100 my $ua = LWP::UserAgent->new (
101 agent => "cfplus $CFPlus::VERSION",
102 keep_alive => 1,
103 env_proxy => 1,
104 timeout => 30,
105 );
106
107 for my $file (qw(archetypes crossfire.0)) {
108 my $url = "$editsup->{lib_root}$file";
109 print "mirroring $url...\n";
110 check_lwp $ua->mirror ($url, "$libdir/$file");
111 printf "%s size %d octets\n", $file, -s "$libdir/$file";
112 }
113
114 if (1) { # upload a map
115 my $mapname = $::CONN->{map_info}[0];
116
117 my $mappath = "$mapdir/$mapname";
118
119 -e $mappath and die "$mappath already exists\n";
120
121 print "getting map revision for $mapname...\n";
122
123 # try to get the most recent head revision, what a hack,
124 # this should have been returned while downloading *sigh*
125 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126
127 if ($log =~ /\?rev=(\d+\.\d+)"/) {
128 my $rev = $1;
129
130 print "downloading revision $rev...\n";
131
132 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133
134 my $meta = {
135 %$editsup,
136 path => $mapname,
137 revision => $rev,
138 cf_login => $::PROFILE->{user},
139 };
140
141 require File::Basename;
142 require File::Path;
143
144 File::Path::mkpath (File::Basename::dirname ($mappath));
145 open my $fh, ">:raw:perlio", "$mappath.meta"
146 or die "$mappath.meta: $!\n";
147 print $fh CFPlus::to_json $meta;
148 close $fh;
149 open my $fh, ">:raw:perlio:utf8", $mappath
150 or die "$mappath: $!\n";
151 print $fh $map;
152 close $fh;
153
154 print "saved as $mappath\n";
155
156 print "invoking editor...\n";
157 exec "/root/s2/gce $mappath";#d#
158
159 # now upload it
160# require HTTP::Request::Common;
161#
162# my $res = $ua->post (
163# $ENV{CFPLUS_UPLOAD},
164# Content_Type => 'multipart/form-data',
165# Content => [
166# path => $mapname,
167# mapdir => $ENV{CROSSFIRE_MAPDIR},
168# map => $map,
169# revision => $rev,
170# cf_login => $ENV{CFPLUS_LOGIN},
171# cf_password => $ENV{CFPLUS_PASSWORD},
172# comment => "",
173# ]
174# );
175#
176# if ($res->is_error) {
177# # fatal condition
178# warn $res->status_line;
179# } else {
180# # script replies are marked as {{..}}
181# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
182# warn map "$_\n", @msgs;
183# }
184 } else {
185 die "viewvc parse error, unable to detect revision\n";
186 }
187 }
188 }
65} 189}
66 190
67sub invoke_button_down { 191sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 192 my ($self, $ev, $x, $y) = @_;
69 193
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 194 if ($ev->{button} == 1) {
195 $self->grab_focus;
196 return unless $::CONN;
197
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 198 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 199 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
77 200
78 $x -= int 0.5 * $self->{sw}; 201 $x -= CFPlus::floor $::MAP->w * 0.5;
79 $y -= int 0.5 * $self->{sh}; 202 $y -= CFPlus::floor $::MAP->h * 0.5;
80 203
81 $::CONN->lookat ($x, $y) 204 $::CONN->lookat ($x, $y)
82 if $::CONN; 205 if $::CONN;
83 206
84 } elsif ($ev->{button} == 2) { 207 } elsif ($ev->{button} == 2) {
208 $self->grab_focus;
209 return unless $::CONN;
210
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 212 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 213
88 $self->{motion} = sub { 214 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 215 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 219 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 220 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 221
96 $self->update; 222 $self->update;
97 }; 223 };
224 } elsif ($ev->{button} == 3) {
225 my @items = (
226 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
227 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
228 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
229 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
230 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
231 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
232 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
233 [
234 $::PICKUP_ENABLE->{state}
235 ? "Disable automatic pickup"
236 : "Enable automatic pickup",
237 sub { $::PICKUP_ENABLE->toggle }
238 ],
239 );
240
241 if ($::CONN && $::CONN->{editor_support}) {
242 push @items, [
243 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
244 \&editor_invoke,
245 ];
246
247 for my $type (qw(test name)) {
248 $::CONN->{editor_support}{type} ne $type
249 or next;
250 my $server = $::CONN->{editor_support}{"${type}server"}
251 or next;
252
253 push @items, [
254 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
255 sub { server_login $server },
256 ];
257 }
258 }
259
260 push @items,
261 ["Quit",
262 sub {
263 if ($::CONN) {
264 &::open_quit_dialog;
265 } else {
266 exit;
267 }
268 }
269 ],
270 ;
271
272 (new CFPlus::UI::Menu
273 items => \@items,
274 )->popup ($ev);
98 } 275 }
99 276
100 1 277 1
101} 278}
102 279
… …
120 1 297 1
121} 298}
122 299
123sub size_request { 300sub size_request {
124 ( 301 (
125 32 * CFClient::ceil $::WIDTH / 32, 302 32 * CFPlus::ceil $::WIDTH / 32,
126 32 * CFClient::ceil $::HEIGHT / 32, 303 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 304 )
128} 305}
129 306
130sub update { 307sub update {
131 my ($self) = @_; 308 my ($self) = @_;
… …
133 $self->{need_update} = 1; 310 $self->{need_update} = 1;
134 $self->SUPER::update; 311 $self->SUPER::update;
135} 312}
136 313
137my %DIR = ( 314my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 315 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 316 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 317 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 318 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 319 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 320 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 321 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 322 CFPlus::SDLK_KP7, [8, "northwest"],
146 323
147 CFClient::SDLK_UP, [1, "north"], 324 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 325 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 326 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 327 CFPlus::SDLK_LEFT, [7, "west"],
151); 328);
152 329
153sub invoke_key_down { 330sub invoke_key_down {
154 my ($self, $ev) = @_; 331 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 332
158 my $mod = $ev->{mod}; 333 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 334 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 335 my $uni = $ev->{unicode};
161 336
162 if ($sym == CFClient::SDLK_KP5) { 337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
338
339 if ($uni == ord "\t") {
340 $::PL_WINDOW->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342 $::HELP_WINDOW->toggle_visibility;
343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
344 ::toggle_player_page ($::STATS_PAGE);
345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
346 ::toggle_player_page ($::SKILL_PAGE);
347 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
348 ::toggle_player_page ($::SPELL_PAGE);
349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350 ::toggle_player_page ($::INVENTORY_PAGE);
351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352 $::SETUP_DIALOG->toggle_visibility;
353 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
354 $::BIND_EDITOR->set_binding (undef, undef, [],
355 sub {
356 my ($mod, $sym, $cmds) = @_;
357 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
358 });
359 $::BIND_EDITOR->start;
360 $::BIND_EDITOR->show;
361#TODO: elmex, what was this supposed to do? it currently crashes the client.
362# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
363# $::BIND_EDITOR->stop;
364# $::BIND_EDITOR->ask_for_bind_and_commit;
365# $::BIND_EDITOR->hide;
366 } elsif (!$::CONN) {
367 return 0; # bindings further down need a valid connection
368
369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 370 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 371 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 372 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 373 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 374 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 377 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 378 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 379 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
172 $::PL_WINDOW->toggle_visibility; 381 $::CONN->user_send ($_) for @$bind_cmd;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 383 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 385 $::CONN->user_send ("rotateshoottype -");
178 } elsif ($uni == ord '"') { 386 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 387 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 388 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 389 } elsif ($uni == ord "'") {
182 $self->{completer}->set_prefix (""); 390 $self->{completer}->set_prefix ("");
183 $self->{completer}->show; 391 $self->{completer}->show;
184 } elsif (exists $DIR{$sym}) { 392 } elsif (exists $DIR{$sym}) {
185 if ($mod & CFClient::KMOD_SHIFT) { 393 if ($mod & CFPlus::KMOD_SHIFT) {
186 $self->{shft}++; 394 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) { 395 if ($DIR{$sym}[0] != $self->{fire_dir}) {
188 $::CONN->user_send ("fire $DIR{$sym}[0]"); 396 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 } 397 }
190 $self->{fire_dir} = $DIR{$sym}[0]; 398 $self->{fire_dir} = $DIR{$sym}[0];
191 } elsif ($mod & CFClient::KMOD_CTRL) { 399 } elsif ($mod & CFPlus::KMOD_CTRL) {
192 $self->{ctrl}++; 400 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 401 $::CONN->user_send ("run $DIR{$sym}[0]");
194 } else { 402 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 403 $::CONN->user_send ("$DIR{$sym}[1]");
196 } 404 }
197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
207 $::BIND_EDITOR->ask_for_bind_and_commit;
208 $::BIND_EDITOR->hide;
209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210 $::CONN->user_send ($_) for @$bind_cmd;
211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 405 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 406 $self->{completer}->inject_key_down ($ev);
213 $self->{completer}->show; 407 $self->{completer}->show;
214 } else { 408 } else {
215 return 0; 409 return 0;
216 } 410 }
217 411
… …
224 my $res = 0; 418 my $res = 0;
225 my $mod = $ev->{mod}; 419 my $mod = $ev->{mod};
226 my $sym = $ev->{sym}; 420 my $sym = $ev->{sym};
227 421
228 if ($::CFG->{shift_fire_stop}) { 422 if ($::CFG->{shift_fire_stop}) {
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 423 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230 $::CONN->user_send ("fire_stop"); 424 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir}; 425 delete $self->{fire_dir};
232 $res = 1; 426 $res = 1;
233 } 427 }
234 } else { 428 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) { 429 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop"); 430 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir}; 431 delete $self->{fire_dir};
238 $res = 1; 432 $res = 1;
239 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 433 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
240 $::CONN->user_send ("fire_stop"); 434 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir}; 435 delete $self->{fire_dir};
242 $res = 1; 436 $res = 1;
243 } 437 }
244 } 438 }
245 439
246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 440 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247 $::CONN->user_send ("run_stop"); 441 $::CONN->user_send ("run_stop");
248 $res = 1; 442 $res = 1;
249 } 443 }
250 444
251 $res 445 $res
… …
265sub draw { 459sub draw {
266 my ($self) = @_; 460 my ($self) = @_;
267 461
268 return unless $::MAP; 462 return unless $::MAP;
269 463
270 my $focused = $CFClient::UI::FOCUS == $self 464 my $focused = $CFPlus::UI::FOCUS == $self
271 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 465 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
272 466
273 return 467 return
274 unless $focused || !$::FAST; 468 unless $focused || !$::FAST;
275 469
276 if (delete $self->{need_update}) { 470 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278 472
473 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
474 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
475
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 476 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 477 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
281 478
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 479 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 480 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284 481
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 482 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 483 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
287 484
288 if ($::CFG->{fow_enable}) { 485 if ($::CFG->{fow_enable}) {
289 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 486 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
290 487
291 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 488 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
292 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 489 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D ( 490 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D, 491 GL_CONVOLUTION_2D,
295 GL_ALPHA, 492 GL_ALPHA,
296 3, 3, 493 3, 3,
… …
298 (pack "f*", @{ $self->{smooth_matrix} }), 495 (pack "f*", @{ $self->{smooth_matrix} }),
299 ); 496 );
300 glEnable GL_CONVOLUTION_2D; 497 glEnable GL_CONVOLUTION_2D;
301 } 498 }
302 499
303 $self->{fow_texture} = new CFClient::Texture 500 $self->{fow_texture} = new CFPlus::Texture
304 w => $w, 501 w => $w,
305 h => $h, 502 h => $h,
306 data => $data, 503 data => $data,
307 internalformat => GL_ALPHA, 504 internalformat => GL_ALPHA,
308 format => GL_ALPHA; 505 format => GL_ALPHA;
… …
316 513
317 glPushMatrix; 514 glPushMatrix;
318 glTranslate $sx0, $sy0; 515 glTranslate $sx0, $sy0;
319 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 516 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
320 517
321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 518 $::MAP->draw ($dx, $dy, $sw, $sh);
322 519
323 glScale 32, 32; 520 glScale 32, 32;
324 521
325 if (my $tex = $self->{fow_texture}) { 522 if (my $tex = $self->{fow_texture}) {
326 glEnable GL_TEXTURE_2D; 523 glEnable GL_TEXTURE_2D;
… …
370 glDeleteList $self->{list}; 567 glDeleteList $self->{list};
371 568
372 $self->SUPER::DESTROY; 569 $self->SUPER::DESTROY;
373} 570}
374 571
375package CFClient::MapWidget::MapMap; 572package CFPlus::MapWidget::MapMap;
376 573
377our @ISA = CFClient::UI::Base::; 574our @ISA = CFPlus::UI::Base::;
378 575
379use Time::HiRes qw(time); 576use Time::HiRes qw(time);
380use CFClient::OpenGL; 577use CFPlus::OpenGL;
381 578
382sub size_request { 579sub size_request {
383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 580 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
384} 581}
385 582
… …
421 618
422 if ($self->{texture_atime} < time) { 619 if ($self->{texture_atime} < time) {
423 $self->{texture_atime} = time + 1/3; 620 $self->{texture_atime} = time + 1/3;
424 621
425 $self->{texture} = 622 $self->{texture} =
426 new CFClient::Texture 623 new CFPlus::Texture
427 w => $w, 624 w => $w,
428 h => $h, 625 h => $h,
429 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 626 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
430 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 627 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
431 } 628 }
432 629
433 $self->{texture}->draw_quad (0, 0); 630 $self->{texture}->draw_quad (0, 0);
434 631
435 glDisable GL_TEXTURE_2D; 632 glDisable GL_TEXTURE_2D;
… …
450 glEnd; 647 glEnd;
451 648
452 glDisable GL_BLEND; 649 glDisable GL_BLEND;
453} 650}
454 651
455package CFClient::MapWidget::Command; 652package CFPlus::MapWidget::Command;
456 653
457use strict; 654use strict;
458 655
459use CFClient::OpenGL; 656use CFPlus::OpenGL;
460 657
461our @ISA = CFClient::UI::Frame::; 658our @ISA = CFPlus::UI::Frame::;
462 659
463sub new { 660sub new {
464 my $class = shift; 661 my $class = shift;
465 662
466 my $self = $class->SUPER::new ( 663 my $self = $class->SUPER::new (
467 bg => [0, 0, 0, 0.8], 664 bg => [0, 0, 0, 0.8],
468 @_, 665 @_,
469 ); 666 );
470 667
471 $self->add ($self->{vbox} = new CFClient::UI::VBox); 668 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
472 669
473 $self->{label} = [ 670 $self->{label} = [
474 map 671 map
475 CFClient::UI::Label->new ( 672 CFPlus::UI::Label->new (
476 can_hover => 1, 673 can_hover => 1,
477 can_events => 1, 674 can_events => 1,
478 tooltip_width => 0.33, 675 tooltip_width => 0.33,
479 fontsize => $_, 676 fontsize => $_,
480 ), (0.8) x 16 677 ), (0.8) x 16
481 ]; 678 ];
482 679
483 $self->{entry} = new CFClient::UI::Entry 680 $self->{entry} = new CFPlus::UI::Entry
484 on_changed => sub { 681 on_changed => sub {
485 $self->update_labels; 682 $self->update_labels;
486 0 683 0
487 }, 684 },
488 on_button_down => sub { 685 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 686 my ($entry, $ev, $x, $y) = @_;
490 687
491 if ($ev->{button} == 3) { 688 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 689 (new CFPlus::UI::Menu
493 items => [ 690 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 691 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 692 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
496 ], 693 ],
497 )->popup ($ev); 694 )->popup ($ev);
498 return 1; 695 return 1;
499 } 696 }
… …
515 $self->hide; 712 $self->hide;
516 } 713 }
517 } elsif ($ev->{sym} == 27) { 714 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0; 715 $self->{hist_ptr} = 0;
519 $self->hide; 716 $self->hide;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 717 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 718 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 719 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 720 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 721 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 722 $self->{hist_ptr}--;
… …
527 } else { 724 } else {
528 ++$self->{select_offset} 725 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 726 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 727 }
531 $self->update_labels; 728 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 729 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 730 if ($self->{select_offset}) {
534 --$self->{select_offset} 731 --$self->{select_offset}
535 } else { 732 } else {
536 unless ($self->{hist_ptr}) { 733 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 734 $self->{hist_saveback} = $self->{entry}->get_text;
… …
582} 779}
583 780
584sub hide { 781sub hide {
585 my ($self) = @_; 782 my ($self) = @_;
586 783
784 $self->{hist_ptr} = 0;
785
587 $self->SUPER::hide; 786 $self->SUPER::hide;
588 $self->{entry}->set_text (""); 787 $self->{entry}->set_text ("");
589} 788}
590 789
591sub invoke_key_down { 790sub inject_key_down {
592 my ($self, $ev) = @_; 791 my ($self, $ev) = @_;
593 792
793 $self->{entry}->grab_focus;
594 $self->{entry}->emit (key_down => $ev) 794 $self->{entry}->emit (key_down => $ev);
595} 795}
596 796
597sub update_labels { 797sub update_labels {
598 my ($self) = @_; 798 my ($self) = @_;
599 799
… …
692 892
693sub _draw { 893sub _draw {
694 my ($self) = @_; 894 my ($self) = @_;
695 895
696 # hack 896 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 897 local $CFPlus::UI::FOCUS = $self->{entry};
698 898
699 $self->SUPER::_draw; 899 $self->SUPER::_draw;
700} 900}
701 901
7021 9021
903

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines