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.86 by root, Sun Oct 8 21:54:20 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 my ($pid, $fh);
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 warn "FATAL: @_\n";
89 CFPlus::_exit 99;
90 };
91
92 open STDERR, ">&STDOUT";
93 binmode STDOUT, ":utf8";
94 binmode STDERR, ":utf8";
95 close $fh;
96
97 $| = 1;
98 print "preparing editor startup...\n";
99 CFPlus::set_proxy;
100
101 my $server = $editsup->{gameserver} || "default";
102 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
103
104 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
105 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
106
107 print "map directory is $mapdir\n";
108 print "lib directory is $libdir\n";
109
110 require LWP::UserAgent;
111
112 my $ua = LWP::UserAgent->new (
113 agent => "cfplus $CFPlus::VERSION",
114 keep_alive => 1,
115 env_proxy => 1,
116 timeout => 30,
117 );
118
119 for my $file (qw(archetypes crossfire.0)) {
120 my $url = "$editsup->{lib_root}$file";
121 print "mirroring $url...\n";
122 check_lwp $ua->mirror ($url, "$libdir/$file");
123 printf "%s size %d octets\n", $file, -s "$libdir/$file";
124 }
125
126 if (1) { # upload a map
127 my $mapname = $::CONN->{map_info}[0];
128
129 print "getting map revision for $mapname...\n";
130
131 # try to get the most recent head revision, what a hack,
132 # this should have been returned while downloading *sigh*
133 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
134
135 if ($log =~ /\?rev=(\d+\.\d+)"/) {
136 my $rev = $1;
137
138 print "downloading revision $rev...\n";
139
140 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
141
142 my $meta = {
143 %$editsup,
144 path => $mapname,
145 revision => $rev,
146 cf_login => $::PROFILE->{user},
147 };
148
149 my $mappath = "$mapdir/$mapname";
150
151 require File::Basename;
152 require File::Path;
153
154 File::Path::mkpath (File::Basename::dirname ($mappath));
155 open my $fh, ">:raw:perlio", "$mappath.meta"
156 or die "$mappath.meta: $!";
157 print $fh CFPlus::to_json $meta;
158 close $fh;
159 open my $fh, ">:raw:perlio:utf8", $mappath
160 or die "$mappath: $!";
161 print $fh $map;
162 close $fh;
163
164 print "saved as $mappath\n";
165
166 print "invoking editor...\n";
167 exec "/root/s2/gce $mappath";#d#
168
169 # now upload it
170# require HTTP::Request::Common;
171#
172# my $res = $ua->post (
173# $ENV{CFPLUS_UPLOAD},
174# Content_Type => 'multipart/form-data',
175# Content => [
176# path => $mapname,
177# mapdir => $ENV{CROSSFIRE_MAPDIR},
178# map => $map,
179# revision => $rev,
180# cf_login => $ENV{CFPLUS_LOGIN},
181# cf_password => $ENV{CFPLUS_PASSWORD},
182# comment => "",
183# ]
184# );
185#
186# if ($res->is_error) {
187# # fatal condition
188# warn $res->status_line;
189# } else {
190# # script replies are marked as {{..}}
191# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
192# warn map "$_\n", @msgs;
193# }
194 } else {
195 die "viewvc parse error, unable to detect revision\n";
196 }
197 }
198
199 CFPlus::_exit;
200 }
201
202 my $buffer;
203
204 Event->io (fd => $fh, poll => 'r', cb => sub {
205 unless (sysread $fh, $buffer, 4096, length $buffer) {
206 $_[0]->w->cancel;
207 $buffer .= "done\n";
208 }
209
210 while ($buffer =~ s/^(.*)\n//) {
211 ::message ({
212 markup => "editor($pid): " . CFPlus::asxml $1,
213 });
214 }
215 });
65} 216}
66 217
67sub invoke_button_down { 218sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 219 my ($self, $ev, $x, $y) = @_;
69 220
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 221 if ($ev->{button} == 1) {
222 $self->grab_focus;
223 return unless $::CONN;
224
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 225 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 226 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77 227
78 $x -= int 0.5 * $self->{sw}; 228 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh}; 229 $y -= int 0.5 * $self->{sh};
80 230
81 $::CONN->lookat ($x, $y) 231 $::CONN->lookat ($x, $y)
82 if $::CONN; 232 if $::CONN;
83 233
84 } elsif ($ev->{button} == 2) { 234 } elsif ($ev->{button} == 2) {
235 $self->grab_focus;
236 return unless $::CONN;
237
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 238 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 239 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 240
88 $self->{motion} = sub { 241 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 242 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 246 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 247 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 248
96 $self->update; 249 $self->update;
97 }; 250 };
251 } elsif ($ev->{button} == 3) {
252 my @items = (
253 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
254 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
255 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
256 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
257 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
258 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
259 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
260 [
261 $::PICKUP_ENABLE->{state}
262 ? "Disable automatic pickup"
263 : "Enable automatic pickup",
264 sub { $::PICKUP_ENABLE->toggle }
265 ],
266 );
267
268 if ($::CONN && $::CONN->{editor_support}) {
269 push @items, [
270 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
271 \&editor_invoke,
272 ];
273
274 for my $type (qw(test name)) {
275 $::CONN->{editor_support}{type} ne $type
276 or next;
277 my $server = $::CONN->{editor_support}{"${type}server"}
278 or next;
279
280 push @items, [
281 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
282 sub { server_login $server },
283 ];
284 }
285 }
286
287 push @items,
288 ["Quit",
289 sub {
290 if ($::CONN) {
291 &::open_quit_dialog;
292 } else {
293 exit;
294 }
295 }
296 ],
297 ;
298
299 (new CFPlus::UI::Menu
300 items => \@items,
301 )->popup ($ev);
98 } 302 }
99 303
100 1 304 1
101} 305}
102 306
… …
120 1 324 1
121} 325}
122 326
123sub size_request { 327sub size_request {
124 ( 328 (
125 32 * CFClient::ceil $::WIDTH / 32, 329 32 * CFPlus::ceil $::WIDTH / 32,
126 32 * CFClient::ceil $::HEIGHT / 32, 330 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 331 )
128} 332}
129 333
130sub update { 334sub update {
131 my ($self) = @_; 335 my ($self) = @_;
… …
133 $self->{need_update} = 1; 337 $self->{need_update} = 1;
134 $self->SUPER::update; 338 $self->SUPER::update;
135} 339}
136 340
137my %DIR = ( 341my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 342 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 343 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 344 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 345 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 346 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 347 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 348 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 349 CFPlus::SDLK_KP7, [8, "northwest"],
146 350
147 CFClient::SDLK_UP, [1, "north"], 351 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 352 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 353 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 354 CFPlus::SDLK_LEFT, [7, "west"],
151); 355);
152 356
153sub invoke_key_down { 357sub invoke_key_down {
154 my ($self, $ev) = @_; 358 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 359
158 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 362 my $uni = $ev->{unicode};
161 363
162 if ($sym == CFClient::SDLK_KP5) { 364 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
365
366 if ($uni == ord "\t") {
367 $::PL_WINDOW->toggle_visibility;
368 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
369 $::HELP_WINDOW->toggle_visibility;
370 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
371 ::toggle_player_page ($::STATS_PAGE);
372 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
373 ::toggle_player_page ($::SKILL_PAGE);
374 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
375 ::toggle_player_page ($::SPELL_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
377 ::toggle_player_page ($::INVENTORY_PAGE);
378 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
379 $::SETUP_DIALOG->toggle_visibility;
380 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
381 $::BIND_EDITOR->set_binding (undef, undef, [],
382 sub {
383 my ($mod, $sym, $cmds) = @_;
384 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
385 });
386 $::BIND_EDITOR->start;
387 $::BIND_EDITOR->show;
388#TODO: elmex, what was this supposed to do? it currently crashes the client.
389# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
390# $::BIND_EDITOR->stop;
391# $::BIND_EDITOR->ask_for_bind_and_commit;
392# $::BIND_EDITOR->hide;
393 } elsif (!$::CONN) {
394 return 0; # bindings further down need a valid connection
395
396 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 397 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 398 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 399 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 400 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 401 $::CONN->user_send ("apply");
402 } elsif ($uni == 13) {
403 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 404 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 405 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 406 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 407 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
172 $::PL_WINDOW->toggle_visibility; 408 $::CONN->user_send ($_) for @$bind_cmd;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 409 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 410 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 411 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 412 $::CONN->user_send ("rotateshoottype -");
178 } elsif ($uni == ord '"') { 413 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 414 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 415 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 416 } elsif ($uni == ord "'") {
182 $self->{completer}->set_prefix (""); 417 $self->{completer}->set_prefix ("");
183 $self->{completer}->show; 418 $self->{completer}->show;
184 } elsif (exists $DIR{$sym}) { 419 } elsif (exists $DIR{$sym}) {
185 if ($mod & CFClient::KMOD_SHIFT) { 420 if ($mod & CFPlus::KMOD_SHIFT) {
186 $self->{shft}++; 421 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) { 422 if ($DIR{$sym}[0] != $self->{fire_dir}) {
188 $::CONN->user_send ("fire $DIR{$sym}[0]"); 423 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 } 424 }
190 $self->{fire_dir} = $DIR{$sym}[0]; 425 $self->{fire_dir} = $DIR{$sym}[0];
191 } elsif ($mod & CFClient::KMOD_CTRL) { 426 } elsif ($mod & CFPlus::KMOD_CTRL) {
192 $self->{ctrl}++; 427 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 428 $::CONN->user_send ("run $DIR{$sym}[0]");
194 } else { 429 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 430 $::CONN->user_send ("$DIR{$sym}[1]");
196 } 431 }
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')) { 432 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 433 $self->{completer}->inject_key_down ($ev);
213 $self->{completer}->show; 434 $self->{completer}->show;
214 } else { 435 } else {
215 return 0; 436 return 0;
216 } 437 }
217 438
… …
224 my $res = 0; 445 my $res = 0;
225 my $mod = $ev->{mod}; 446 my $mod = $ev->{mod};
226 my $sym = $ev->{sym}; 447 my $sym = $ev->{sym};
227 448
228 if ($::CFG->{shift_fire_stop}) { 449 if ($::CFG->{shift_fire_stop}) {
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 450 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230 $::CONN->user_send ("fire_stop"); 451 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir}; 452 delete $self->{fire_dir};
232 $res = 1; 453 $res = 1;
233 } 454 }
234 } else { 455 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) { 456 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop"); 457 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir}; 458 delete $self->{fire_dir};
238 $res = 1; 459 $res = 1;
239 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 460 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
240 $::CONN->user_send ("fire_stop"); 461 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir}; 462 delete $self->{fire_dir};
242 $res = 1; 463 $res = 1;
243 } 464 }
244 } 465 }
245 466
246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 467 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247 $::CONN->user_send ("run_stop"); 468 $::CONN->user_send ("run_stop");
248 $res = 1; 469 $res = 1;
249 } 470 }
250 471
251 $res 472 $res
… …
265sub draw { 486sub draw {
266 my ($self) = @_; 487 my ($self) = @_;
267 488
268 return unless $::MAP; 489 return unless $::MAP;
269 490
270 my $focused = $CFClient::UI::FOCUS == $self 491 my $focused = $CFPlus::UI::FOCUS == $self
271 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 492 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
272 493
273 return 494 return
274 unless $focused || !$::FAST; 495 unless $focused || !$::FAST;
275 496
276 if (delete $self->{need_update}) { 497 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 498 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278 499
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 500 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 501 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
281 502
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 503 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 504 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284 505
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 506 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 507 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
287 508
288 if ($::CFG->{fow_enable}) { 509 if ($::CFG->{fow_enable}) {
289 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 510 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
290 511
291 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 512 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); 513 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D ( 514 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D, 515 GL_CONVOLUTION_2D,
295 GL_ALPHA, 516 GL_ALPHA,
296 3, 3, 517 3, 3,
… …
298 (pack "f*", @{ $self->{smooth_matrix} }), 519 (pack "f*", @{ $self->{smooth_matrix} }),
299 ); 520 );
300 glEnable GL_CONVOLUTION_2D; 521 glEnable GL_CONVOLUTION_2D;
301 } 522 }
302 523
303 $self->{fow_texture} = new CFClient::Texture 524 $self->{fow_texture} = new CFPlus::Texture
304 w => $w, 525 w => $w,
305 h => $h, 526 h => $h,
306 data => $data, 527 data => $data,
307 internalformat => GL_ALPHA, 528 internalformat => GL_ALPHA,
308 format => GL_ALPHA; 529 format => GL_ALPHA;
… …
370 glDeleteList $self->{list}; 591 glDeleteList $self->{list};
371 592
372 $self->SUPER::DESTROY; 593 $self->SUPER::DESTROY;
373} 594}
374 595
375package CFClient::MapWidget::MapMap; 596package CFPlus::MapWidget::MapMap;
376 597
377our @ISA = CFClient::UI::Base::; 598our @ISA = CFPlus::UI::Base::;
378 599
379use Time::HiRes qw(time); 600use Time::HiRes qw(time);
380use CFClient::OpenGL; 601use CFPlus::OpenGL;
381 602
382sub size_request { 603sub size_request {
383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 604 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
384} 605}
385 606
… …
421 642
422 if ($self->{texture_atime} < time) { 643 if ($self->{texture_atime} < time) {
423 $self->{texture_atime} = time + 1/3; 644 $self->{texture_atime} = time + 1/3;
424 645
425 $self->{texture} = 646 $self->{texture} =
426 new CFClient::Texture 647 new CFPlus::Texture
427 w => $w, 648 w => $w,
428 h => $h, 649 h => $h,
429 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 650 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; 651 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
431 } 652 }
432 653
433 $self->{texture}->draw_quad (0, 0); 654 $self->{texture}->draw_quad (0, 0);
434 655
435 glDisable GL_TEXTURE_2D; 656 glDisable GL_TEXTURE_2D;
… …
450 glEnd; 671 glEnd;
451 672
452 glDisable GL_BLEND; 673 glDisable GL_BLEND;
453} 674}
454 675
455package CFClient::MapWidget::Command; 676package CFPlus::MapWidget::Command;
456 677
457use strict; 678use strict;
458 679
459use CFClient::OpenGL; 680use CFPlus::OpenGL;
460 681
461our @ISA = CFClient::UI::Frame::; 682our @ISA = CFPlus::UI::Frame::;
462 683
463sub new { 684sub new {
464 my $class = shift; 685 my $class = shift;
465 686
466 my $self = $class->SUPER::new ( 687 my $self = $class->SUPER::new (
467 bg => [0, 0, 0, 0.8], 688 bg => [0, 0, 0, 0.8],
468 @_, 689 @_,
469 ); 690 );
470 691
471 $self->add ($self->{vbox} = new CFClient::UI::VBox); 692 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
472 693
473 $self->{label} = [ 694 $self->{label} = [
474 map 695 map
475 CFClient::UI::Label->new ( 696 CFPlus::UI::Label->new (
476 can_hover => 1, 697 can_hover => 1,
477 can_events => 1, 698 can_events => 1,
478 tooltip_width => 0.33, 699 tooltip_width => 0.33,
479 fontsize => $_, 700 fontsize => $_,
480 ), (0.8) x 16 701 ), (0.8) x 16
481 ]; 702 ];
482 703
483 $self->{entry} = new CFClient::UI::Entry 704 $self->{entry} = new CFPlus::UI::Entry
484 on_changed => sub { 705 on_changed => sub {
485 $self->update_labels; 706 $self->update_labels;
486 0 707 0
487 }, 708 },
488 on_button_down => sub { 709 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 710 my ($entry, $ev, $x, $y) = @_;
490 711
491 if ($ev->{button} == 3) { 712 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 713 (new CFPlus::UI::Menu
493 items => [ 714 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 715 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 716 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
496 ], 717 ],
497 )->popup ($ev); 718 )->popup ($ev);
498 return 1; 719 return 1;
499 } 720 }
… …
515 $self->hide; 736 $self->hide;
516 } 737 }
517 } elsif ($ev->{sym} == 27) { 738 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0; 739 $self->{hist_ptr} = 0;
519 $self->hide; 740 $self->hide;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 741 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 742 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 743 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 744 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 745 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 746 $self->{hist_ptr}--;
… …
527 } else { 748 } else {
528 ++$self->{select_offset} 749 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 750 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 751 }
531 $self->update_labels; 752 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 753 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 754 if ($self->{select_offset}) {
534 --$self->{select_offset} 755 --$self->{select_offset}
535 } else { 756 } else {
536 unless ($self->{hist_ptr}) { 757 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 758 $self->{hist_saveback} = $self->{entry}->get_text;
… …
582} 803}
583 804
584sub hide { 805sub hide {
585 my ($self) = @_; 806 my ($self) = @_;
586 807
808 $self->{hist_ptr} = 0;
809
587 $self->SUPER::hide; 810 $self->SUPER::hide;
588 $self->{entry}->set_text (""); 811 $self->{entry}->set_text ("");
589} 812}
590 813
591sub invoke_key_down { 814sub inject_key_down {
592 my ($self, $ev) = @_; 815 my ($self, $ev) = @_;
593 816
817 $self->{entry}->grab_focus;
594 $self->{entry}->emit (key_down => $ev) 818 $self->{entry}->emit (key_down => $ev);
595} 819}
596 820
597sub update_labels { 821sub update_labels {
598 my ($self) = @_; 822 my ($self) = @_;
599 823
… …
692 916
693sub _draw { 917sub _draw {
694 my ($self) = @_; 918 my ($self) = @_;
695 919
696 # hack 920 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 921 local $CFPlus::UI::FOCUS = $self->{entry};
698 922
699 $self->SUPER::_draw; 923 $self->SUPER::_draw;
700} 924}
701 925
7021 9261
927

Diff Legend

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