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.76 by elmex, Sat Jul 22 12:36:17 2006 UTC vs.
Revision 1.88 by root, Mon Oct 9 01:06:36 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
… …
65 59
66 $self->{completer}->hide 60 $self->{completer}->hide
67 if $self->{completer}; 61 if $self->{completer};
68} 62}
69 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 }
189}
190
70sub invoke_button_down { 191sub invoke_button_down {
71 my ($self, $ev, $x, $y) = @_; 192 my ($self, $ev, $x, $y) = @_;
72 193
73 if ($ev->{button} == 1) { 194 if ($ev->{button} == 1) {
74 $self->grab_focus; 195 $self->grab_focus;
75 return unless $::CONN; 196 return unless $::CONN;
76 197
77 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 198 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
78 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 199 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
79 200
80 $x -= int 0.5 * $self->{sw}; 201 $x -= int 0.5 * $self->{sw};
81 $y -= int 0.5 * $self->{sh}; 202 $y -= int 0.5 * $self->{sh};
82 203
83 $::CONN->lookat ($x, $y) 204 $::CONN->lookat ($x, $y)
… …
99 $::CFG->{map_shift_y} = $bh + $y - $oy; 220 $::CFG->{map_shift_y} = $bh + $y - $oy;
100 221
101 $self->update; 222 $self->update;
102 }; 223 };
103 } elsif ($ev->{button} == 3) { 224 } elsif ($ev->{button} == 3) {
104 (new CFClient::UI::Menu 225 my @items = (
105 items => [
106 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 226 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
107 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 227 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
108 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 228 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
109 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 229 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
110 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 230 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
114 $::PICKUP_ENABLE->{state} 234 $::PICKUP_ENABLE->{state}
115 ? "Disable automatic pickup" 235 ? "Disable automatic pickup"
116 : "Enable automatic pickup", 236 : "Enable automatic pickup",
117 sub { $::PICKUP_ENABLE->toggle } 237 sub { $::PICKUP_ENABLE->toggle }
118 ], 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 }
119 ], 269 ],
270 ;
271
272 (new CFPlus::UI::Menu
273 items => \@items,
120 )->popup ($ev); 274 )->popup ($ev);
121 } 275 }
122 276
123 1 277 1
124} 278}
… …
143 1 297 1
144} 298}
145 299
146sub size_request { 300sub size_request {
147 ( 301 (
148 32 * CFClient::ceil $::WIDTH / 32, 302 32 * CFPlus::ceil $::WIDTH / 32,
149 32 * CFClient::ceil $::HEIGHT / 32, 303 32 * CFPlus::ceil $::HEIGHT / 32,
150 ) 304 )
151} 305}
152 306
153sub update { 307sub update {
154 my ($self) = @_; 308 my ($self) = @_;
… …
156 $self->{need_update} = 1; 310 $self->{need_update} = 1;
157 $self->SUPER::update; 311 $self->SUPER::update;
158} 312}
159 313
160my %DIR = ( 314my %DIR = (
161 CFClient::SDLK_KP8, [1, "north"], 315 CFPlus::SDLK_KP8, [1, "north"],
162 CFClient::SDLK_KP9, [2, "northeast"], 316 CFPlus::SDLK_KP9, [2, "northeast"],
163 CFClient::SDLK_KP6, [3, "east"], 317 CFPlus::SDLK_KP6, [3, "east"],
164 CFClient::SDLK_KP3, [4, "southeast"], 318 CFPlus::SDLK_KP3, [4, "southeast"],
165 CFClient::SDLK_KP2, [5, "south"], 319 CFPlus::SDLK_KP2, [5, "south"],
166 CFClient::SDLK_KP1, [6, "southwest"], 320 CFPlus::SDLK_KP1, [6, "southwest"],
167 CFClient::SDLK_KP4, [7, "west"], 321 CFPlus::SDLK_KP4, [7, "west"],
168 CFClient::SDLK_KP7, [8, "northwest"], 322 CFPlus::SDLK_KP7, [8, "northwest"],
169 323
170 CFClient::SDLK_UP, [1, "north"], 324 CFPlus::SDLK_UP, [1, "north"],
171 CFClient::SDLK_RIGHT, [3, "east"], 325 CFPlus::SDLK_RIGHT, [3, "east"],
172 CFClient::SDLK_DOWN, [5, "south"], 326 CFPlus::SDLK_DOWN, [5, "south"],
173 CFClient::SDLK_LEFT, [7, "west"], 327 CFPlus::SDLK_LEFT, [7, "west"],
174); 328);
175 329
176sub invoke_key_down { 330sub invoke_key_down {
177 my ($self, $ev) = @_; 331 my ($self, $ev) = @_;
178 332
179 my $mod = $ev->{mod}; 333 my $mod = $ev->{mod};
180 my $sym = $ev->{sym}; 334 my $sym = $ev->{sym};
181 my $uni = $ev->{unicode}; 335 my $uni = $ev->{unicode};
182 336
183 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
184 338
185 if ($uni == ord "\t") { 339 if ($uni == ord "\t") {
186 $::PL_WINDOW->toggle_visibility; 340 $::PL_WINDOW->toggle_visibility;
187 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
188 $::HELP_WINDOW->toggle_visibility; 342 $::HELP_WINDOW->toggle_visibility;
189 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
190 ::toggle_player_page ($::STATS_PAGE); 344 ::toggle_player_page ($::STATS_PAGE);
191 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
192 ::toggle_player_page ($::SKILL_PAGE); 346 ::toggle_player_page ($::SKILL_PAGE);
193 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
194 ::toggle_player_page ($::SPELL_PAGE); 348 ::toggle_player_page ($::SPELL_PAGE);
195 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
196 ::toggle_player_page ($::INVENTORY_PAGE); 350 ::toggle_player_page ($::INVENTORY_PAGE);
197 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
198 $::SETUP_DIALOG->toggle_visibility; 352 $::SETUP_DIALOG->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 353 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
200 $::BIND_EDITOR->set_binding (undef, undef, [], 354 $::BIND_EDITOR->set_binding (undef, undef, [],
201 sub { 355 sub {
202 my ($mod, $sym, $cmds) = @_; 356 my ($mod, $sym, $cmds) = @_;
203 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 357 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
204 }); 358 });
205 $::BIND_EDITOR->start; 359 $::BIND_EDITOR->start;
206 $::BIND_EDITOR->show; 360 $::BIND_EDITOR->show;
361#TODO: elmex, what was this supposed to do? it currently crashes the client.
207 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 362# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
208 $::BIND_EDITOR->stop; 363# $::BIND_EDITOR->stop;
209 $::BIND_EDITOR->ask_for_bind_and_commit; 364# $::BIND_EDITOR->ask_for_bind_and_commit;
210 $::BIND_EDITOR->hide; 365# $::BIND_EDITOR->hide;
211 } elsif (!$::CONN) { 366 } elsif (!$::CONN) {
212 return 0; # bindings further down need a valid connection 367 return 0; # bindings further down need a valid connection
213 368
214 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
215 $::CONN->user_send ("stay fire"); 370 $::CONN->user_send ("stay fire");
216 } elsif ($uni == ord ",") { 371 } elsif ($uni == ord ",") {
217 $::CONN->user_send ("take"); 372 $::CONN->user_send ("take");
218 } elsif ($uni == ord " ") { 373 } elsif ($uni == ord " ") {
219 $::CONN->user_send ("apply"); 374 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine");
220 } elsif ($uni == ord ".") { 377 } elsif ($uni == ord ".") {
221 $::CONN->user_send ($self->{completer}{last_command}) 378 $::CONN->user_send ($self->{completer}{last_command})
222 if exists $self->{completer}{last_command}; 379 if exists $self->{completer}{last_command};
223 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
224 $::CONN->user_send ($_) for @$bind_cmd; 381 $::CONN->user_send ($_) for @$bind_cmd;
225 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
226 $::CONN->user_send ("rotateshoottype +"); 383 $::CONN->user_send ("rotateshoottype +");
227 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
228 $::CONN->user_send ("rotateshoottype -"); 385 $::CONN->user_send ("rotateshoottype -");
229 } elsif ($uni == ord '"') { 386 } elsif ($uni == ord '"') {
230 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 387 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
231 $self->{completer}->show; 388 $self->{completer}->show;
232 } elsif ($uni == ord "'") { 389 } elsif ($uni == ord "'") {
233 $self->{completer}->set_prefix (""); 390 $self->{completer}->set_prefix ("");
234 $self->{completer}->show; 391 $self->{completer}->show;
235 } elsif (exists $DIR{$sym}) { 392 } elsif (exists $DIR{$sym}) {
236 if ($mod & CFClient::KMOD_SHIFT) { 393 if ($mod & CFPlus::KMOD_SHIFT) {
237 $self->{shft}++; 394 $self->{shft}++;
238 if ($DIR{$sym}[0] != $self->{fire_dir}) { 395 if ($DIR{$sym}[0] != $self->{fire_dir}) {
239 $::CONN->user_send ("fire $DIR{$sym}[0]"); 396 $::CONN->user_send ("fire $DIR{$sym}[0]");
240 } 397 }
241 $self->{fire_dir} = $DIR{$sym}[0]; 398 $self->{fire_dir} = $DIR{$sym}[0];
242 } elsif ($mod & CFClient::KMOD_CTRL) { 399 } elsif ($mod & CFPlus::KMOD_CTRL) {
243 $self->{ctrl}++; 400 $self->{ctrl}++;
244 $::CONN->user_send ("run $DIR{$sym}[0]"); 401 $::CONN->user_send ("run $DIR{$sym}[0]");
245 } else { 402 } else {
246 $::CONN->user_send ("$DIR{$sym}[1]"); 403 $::CONN->user_send ("$DIR{$sym}[1]");
247 } 404 }
248 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 405 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
249 $self->{completer}->invoke_key_down ($ev); 406 $self->{completer}->inject_key_down ($ev);
250 $self->{completer}->show; 407 $self->{completer}->show;
251 } else { 408 } else {
252 return 0; 409 return 0;
253 } 410 }
254 411
… …
261 my $res = 0; 418 my $res = 0;
262 my $mod = $ev->{mod}; 419 my $mod = $ev->{mod};
263 my $sym = $ev->{sym}; 420 my $sym = $ev->{sym};
264 421
265 if ($::CFG->{shift_fire_stop}) { 422 if ($::CFG->{shift_fire_stop}) {
266 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 423 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop"); 424 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir}; 425 delete $self->{fire_dir};
269 $res = 1; 426 $res = 1;
270 } 427 }
271 } else { 428 } else {
272 if (exists $DIR{$sym} && delete $self->{shft}) { 429 if (exists $DIR{$sym} && delete $self->{shft}) {
273 $::CONN->user_send ("fire_stop"); 430 $::CONN->user_send ("fire_stop");
274 delete $self->{fire_dir}; 431 delete $self->{fire_dir};
275 $res = 1; 432 $res = 1;
276 } 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?
277 $::CONN->user_send ("fire_stop"); 434 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir}; 435 delete $self->{fire_dir};
279 $res = 1; 436 $res = 1;
280 } 437 }
281 } 438 }
282 439
283 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 440 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
284 $::CONN->user_send ("run_stop"); 441 $::CONN->user_send ("run_stop");
285 $res = 1; 442 $res = 1;
286 } 443 }
287 444
288 $res 445 $res
… …
302sub draw { 459sub draw {
303 my ($self) = @_; 460 my ($self) = @_;
304 461
305 return unless $::MAP; 462 return unless $::MAP;
306 463
307 my $focused = $CFClient::UI::FOCUS == $self 464 my $focused = $CFPlus::UI::FOCUS == $self
308 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 465 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
309 466
310 return 467 return
311 unless $focused || !$::FAST; 468 unless $focused || !$::FAST;
312 469
313 if (delete $self->{need_update}) { 470 if (delete $self->{need_update}) {
314 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
315 472
316 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
317 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
318 475
319 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
320 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
321 478
322 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
323 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
324 481
325 if ($::CFG->{fow_enable}) { 482 if ($::CFG->{fow_enable}) {
326 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
327 484
328 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 485 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
329 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 486 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
330 glConvolutionFilter2D ( 487 glConvolutionFilter2D (
331 GL_CONVOLUTION_2D, 488 GL_CONVOLUTION_2D,
332 GL_ALPHA, 489 GL_ALPHA,
333 3, 3, 490 3, 3,
… …
335 (pack "f*", @{ $self->{smooth_matrix} }), 492 (pack "f*", @{ $self->{smooth_matrix} }),
336 ); 493 );
337 glEnable GL_CONVOLUTION_2D; 494 glEnable GL_CONVOLUTION_2D;
338 } 495 }
339 496
340 $self->{fow_texture} = new CFClient::Texture 497 $self->{fow_texture} = new CFPlus::Texture
341 w => $w, 498 w => $w,
342 h => $h, 499 h => $h,
343 data => $data, 500 data => $data,
344 internalformat => GL_ALPHA, 501 internalformat => GL_ALPHA,
345 format => GL_ALPHA; 502 format => GL_ALPHA;
… …
407 glDeleteList $self->{list}; 564 glDeleteList $self->{list};
408 565
409 $self->SUPER::DESTROY; 566 $self->SUPER::DESTROY;
410} 567}
411 568
412package CFClient::MapWidget::MapMap; 569package CFPlus::MapWidget::MapMap;
413 570
414our @ISA = CFClient::UI::Base::; 571our @ISA = CFPlus::UI::Base::;
415 572
416use Time::HiRes qw(time); 573use Time::HiRes qw(time);
417use CFClient::OpenGL; 574use CFPlus::OpenGL;
418 575
419sub size_request { 576sub size_request {
420 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 577 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
421} 578}
422 579
… …
458 615
459 if ($self->{texture_atime} < time) { 616 if ($self->{texture_atime} < time) {
460 $self->{texture_atime} = time + 1/3; 617 $self->{texture_atime} = time + 1/3;
461 618
462 $self->{texture} = 619 $self->{texture} =
463 new CFClient::Texture 620 new CFPlus::Texture
464 w => $w, 621 w => $w,
465 h => $h, 622 h => $h,
466 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 623 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
467 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 624 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
468 } 625 }
469 626
470 $self->{texture}->draw_quad (0, 0); 627 $self->{texture}->draw_quad (0, 0);
471 628
472 glDisable GL_TEXTURE_2D; 629 glDisable GL_TEXTURE_2D;
… …
487 glEnd; 644 glEnd;
488 645
489 glDisable GL_BLEND; 646 glDisable GL_BLEND;
490} 647}
491 648
492package CFClient::MapWidget::Command; 649package CFPlus::MapWidget::Command;
493 650
494use strict; 651use strict;
495 652
496use CFClient::OpenGL; 653use CFPlus::OpenGL;
497 654
498our @ISA = CFClient::UI::Frame::; 655our @ISA = CFPlus::UI::Frame::;
499 656
500sub new { 657sub new {
501 my $class = shift; 658 my $class = shift;
502 659
503 my $self = $class->SUPER::new ( 660 my $self = $class->SUPER::new (
504 bg => [0, 0, 0, 0.8], 661 bg => [0, 0, 0, 0.8],
505 @_, 662 @_,
506 ); 663 );
507 664
508 $self->add ($self->{vbox} = new CFClient::UI::VBox); 665 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
509 666
510 $self->{label} = [ 667 $self->{label} = [
511 map 668 map
512 CFClient::UI::Label->new ( 669 CFPlus::UI::Label->new (
513 can_hover => 1, 670 can_hover => 1,
514 can_events => 1, 671 can_events => 1,
515 tooltip_width => 0.33, 672 tooltip_width => 0.33,
516 fontsize => $_, 673 fontsize => $_,
517 ), (0.8) x 16 674 ), (0.8) x 16
518 ]; 675 ];
519 676
520 $self->{entry} = new CFClient::UI::Entry 677 $self->{entry} = new CFPlus::UI::Entry
521 on_changed => sub { 678 on_changed => sub {
522 $self->update_labels; 679 $self->update_labels;
523 0 680 0
524 }, 681 },
525 on_button_down => sub { 682 on_button_down => sub {
526 my ($entry, $ev, $x, $y) = @_; 683 my ($entry, $ev, $x, $y) = @_;
527 684
528 if ($ev->{button} == 3) { 685 if ($ev->{button} == 3) {
529 (new CFClient::UI::Menu 686 (new CFPlus::UI::Menu
530 items => [ 687 items => [
531 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
532 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
533 ], 690 ],
534 )->popup ($ev); 691 )->popup ($ev);
535 return 1; 692 return 1;
536 } 693 }
… …
552 $self->hide; 709 $self->hide;
553 } 710 }
554 } elsif ($ev->{sym} == 27) { 711 } elsif ($ev->{sym} == 27) {
555 $self->{hist_ptr} = 0; 712 $self->{hist_ptr} = 0;
556 $self->hide; 713 $self->hide;
557 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 714 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
558 if ($self->{hist_ptr} > 1) { 715 if ($self->{hist_ptr} > 1) {
559 $self->{hist_ptr}--; 716 $self->{hist_ptr}--;
560 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 717 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
561 } elsif ($self->{hist_ptr} > 0) { 718 } elsif ($self->{hist_ptr} > 0) {
562 $self->{hist_ptr}--; 719 $self->{hist_ptr}--;
… …
564 } else { 721 } else {
565 ++$self->{select_offset} 722 ++$self->{select_offset}
566 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 723 if $self->{select_offset} < $#{ $self->{last_match} || [] };
567 } 724 }
568 $self->update_labels; 725 $self->update_labels;
569 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 726 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
570 if ($self->{select_offset}) { 727 if ($self->{select_offset}) {
571 --$self->{select_offset} 728 --$self->{select_offset}
572 } else { 729 } else {
573 unless ($self->{hist_ptr}) { 730 unless ($self->{hist_ptr}) {
574 $self->{hist_saveback} = $self->{entry}->get_text; 731 $self->{hist_saveback} = $self->{entry}->get_text;
… …
625 782
626 $self->SUPER::hide; 783 $self->SUPER::hide;
627 $self->{entry}->set_text (""); 784 $self->{entry}->set_text ("");
628} 785}
629 786
630sub invoke_key_down { 787sub inject_key_down {
631 my ($self, $ev) = @_; 788 my ($self, $ev) = @_;
632 789
790 $self->{entry}->grab_focus;
633 $self->{entry}->emit (key_down => $ev) 791 $self->{entry}->emit (key_down => $ev);
634} 792}
635 793
636sub update_labels { 794sub update_labels {
637 my ($self) = @_; 795 my ($self) = @_;
638 796
… …
731 889
732sub _draw { 890sub _draw {
733 my ($self) = @_; 891 my ($self) = @_;
734 892
735 # hack 893 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 894 local $CFPlus::UI::FOCUS = $self->{entry};
737 895
738 $self->SUPER::_draw; 896 $self->SUPER::_draw;
739} 897}
740 898
7411 8991
900

Diff Legend

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