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.72 by root, Wed Jul 5 01:53:24 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 if ($ev->{button} == 1) { 221 if ($ev->{button} == 1) {
71 $self->grab_focus; 222 $self->grab_focus;
72 return unless $::CONN; 223 return unless $::CONN;
73 224
74 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};
75 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};
76 227
77 $x -= int 0.5 * $self->{sw}; 228 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $self->{sh}; 229 $y -= int 0.5 * $self->{sh};
79 230
80 $::CONN->lookat ($x, $y) 231 $::CONN->lookat ($x, $y)
… …
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 247 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 248
98 $self->update; 249 $self->update;
99 }; 250 };
100 } elsif ($ev->{button} == 3) { 251 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu 252 my @items = (
102 items => [
103 ["Help Browser…\t(F1)", sub { $::HELP_WINDOW->toggle_visibility }], 253 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills…\t(F2)", sub { ::toggle_player_page ($::STATS_PAGE) }], 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) }],
105 ["Inventory…\t(F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 257 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells…\t(F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… \t(F5)", sub { $::SETUP_DIALOG->toggle_visibility }], 258 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 259 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [ 260 [
110 $::PICKUP_ENABLE->{state} 261 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup" 262 ? "Disable automatic pickup"
112 : "Enable automatic pickup", 263 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle } 264 sub { $::PICKUP_ENABLE->toggle }
114 ], 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 }
115 ], 296 ],
297 ;
298
299 (new CFPlus::UI::Menu
300 items => \@items,
116 )->popup ($ev); 301 )->popup ($ev);
117 } 302 }
118 303
119 1 304 1
120} 305}
… …
139 1 324 1
140} 325}
141 326
142sub size_request { 327sub size_request {
143 ( 328 (
144 32 * CFClient::ceil $::WIDTH / 32, 329 32 * CFPlus::ceil $::WIDTH / 32,
145 32 * CFClient::ceil $::HEIGHT / 32, 330 32 * CFPlus::ceil $::HEIGHT / 32,
146 ) 331 )
147} 332}
148 333
149sub update { 334sub update {
150 my ($self) = @_; 335 my ($self) = @_;
… …
152 $self->{need_update} = 1; 337 $self->{need_update} = 1;
153 $self->SUPER::update; 338 $self->SUPER::update;
154} 339}
155 340
156my %DIR = ( 341my %DIR = (
157 CFClient::SDLK_KP8, [1, "north"], 342 CFPlus::SDLK_KP8, [1, "north"],
158 CFClient::SDLK_KP9, [2, "northeast"], 343 CFPlus::SDLK_KP9, [2, "northeast"],
159 CFClient::SDLK_KP6, [3, "east"], 344 CFPlus::SDLK_KP6, [3, "east"],
160 CFClient::SDLK_KP3, [4, "southeast"], 345 CFPlus::SDLK_KP3, [4, "southeast"],
161 CFClient::SDLK_KP2, [5, "south"], 346 CFPlus::SDLK_KP2, [5, "south"],
162 CFClient::SDLK_KP1, [6, "southwest"], 347 CFPlus::SDLK_KP1, [6, "southwest"],
163 CFClient::SDLK_KP4, [7, "west"], 348 CFPlus::SDLK_KP4, [7, "west"],
164 CFClient::SDLK_KP7, [8, "northwest"], 349 CFPlus::SDLK_KP7, [8, "northwest"],
165 350
166 CFClient::SDLK_UP, [1, "north"], 351 CFPlus::SDLK_UP, [1, "north"],
167 CFClient::SDLK_RIGHT, [3, "east"], 352 CFPlus::SDLK_RIGHT, [3, "east"],
168 CFClient::SDLK_DOWN, [5, "south"], 353 CFPlus::SDLK_DOWN, [5, "south"],
169 CFClient::SDLK_LEFT, [7, "west"], 354 CFPlus::SDLK_LEFT, [7, "west"],
170); 355);
171 356
172sub invoke_key_down { 357sub invoke_key_down {
173 my ($self, $ev) = @_; 358 my ($self, $ev) = @_;
174 359
175 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
177 my $uni = $ev->{unicode}; 362 my $uni = $ev->{unicode};
178 363
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 364 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
180 365
181 if ($uni == ord "\t") { 366 if ($uni == ord "\t") {
182 $::PL_WINDOW->toggle_visibility; 367 $::PL_WINDOW->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 368 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility; 369 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 370 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE); 371 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 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) {
188 ::toggle_player_page ($::INVENTORY_PAGE); 377 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 378 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility; 379 $::SETUP_DIALOG->toggle_visibility;
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 380 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [], 381 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub { 382 sub {
196 my ($mod, $sym, $cmds) = @_; 383 my ($mod, $sym, $cmds) = @_;
197 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 384 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 }); 385 });
199 $::BIND_EDITOR->start; 386 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show; 387 $::BIND_EDITOR->show;
388#TODO: elmex, what was this supposed to do? it currently crashes the client.
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 389# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop; 390# $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit; 391# $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide; 392# $::BIND_EDITOR->hide;
205 } elsif (!$::CONN) { 393 } elsif (!$::CONN) {
206 return 0; # bindings further down need a valid connection 394 return 0; # bindings further down need a valid connection
207 395
208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 396 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
209 $::CONN->user_send ("stay fire"); 397 $::CONN->user_send ("stay fire");
210 } elsif ($uni == ord ",") { 398 } elsif ($uni == ord ",") {
211 $::CONN->user_send ("take"); 399 $::CONN->user_send ("take");
212 } elsif ($uni == ord " ") { 400 } elsif ($uni == ord " ") {
213 $::CONN->user_send ("apply"); 401 $::CONN->user_send ("apply");
402 } elsif ($uni == 13) {
403 $::CONN->user_send ("examine");
214 } elsif ($uni == ord ".") { 404 } elsif ($uni == ord ".") {
215 $::CONN->user_send ($self->{completer}{last_command}) 405 $::CONN->user_send ($self->{completer}{last_command})
216 if exists $self->{completer}{last_command}; 406 if exists $self->{completer}{last_command};
217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 407 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
218 $::CONN->user_send ($_) for @$bind_cmd; 408 $::CONN->user_send ($_) for @$bind_cmd;
219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 409 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
220 $::CONN->user_send ("rotateshoottype +"); 410 $::CONN->user_send ("rotateshoottype +");
221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 411 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
222 $::CONN->user_send ("rotateshoottype -"); 412 $::CONN->user_send ("rotateshoottype -");
223 } elsif ($uni == ord '"') { 413 } elsif ($uni == ord '"') {
224 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 414 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
225 $self->{completer}->show; 415 $self->{completer}->show;
226 } elsif ($uni == ord "'") { 416 } elsif ($uni == ord "'") {
227 $self->{completer}->set_prefix (""); 417 $self->{completer}->set_prefix ("");
228 $self->{completer}->show; 418 $self->{completer}->show;
229 } elsif (exists $DIR{$sym}) { 419 } elsif (exists $DIR{$sym}) {
230 if ($mod & CFClient::KMOD_SHIFT) { 420 if ($mod & CFPlus::KMOD_SHIFT) {
231 $self->{shft}++; 421 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) { 422 if ($DIR{$sym}[0] != $self->{fire_dir}) {
233 $::CONN->user_send ("fire $DIR{$sym}[0]"); 423 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 } 424 }
235 $self->{fire_dir} = $DIR{$sym}[0]; 425 $self->{fire_dir} = $DIR{$sym}[0];
236 } elsif ($mod & CFClient::KMOD_CTRL) { 426 } elsif ($mod & CFPlus::KMOD_CTRL) {
237 $self->{ctrl}++; 427 $self->{ctrl}++;
238 $::CONN->user_send ("run $DIR{$sym}[0]"); 428 $::CONN->user_send ("run $DIR{$sym}[0]");
239 } else { 429 } else {
240 $::CONN->user_send ("$DIR{$sym}[1]"); 430 $::CONN->user_send ("$DIR{$sym}[1]");
241 } 431 }
242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 432 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
243 $self->{completer}->invoke_key_down ($ev); 433 $self->{completer}->inject_key_down ($ev);
244 $self->{completer}->show; 434 $self->{completer}->show;
245 } else { 435 } else {
246 return 0; 436 return 0;
247 } 437 }
248 438
… …
255 my $res = 0; 445 my $res = 0;
256 my $mod = $ev->{mod}; 446 my $mod = $ev->{mod};
257 my $sym = $ev->{sym}; 447 my $sym = $ev->{sym};
258 448
259 if ($::CFG->{shift_fire_stop}) { 449 if ($::CFG->{shift_fire_stop}) {
260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 450 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
261 $::CONN->user_send ("fire_stop"); 451 $::CONN->user_send ("fire_stop");
262 delete $self->{fire_dir}; 452 delete $self->{fire_dir};
263 $res = 1; 453 $res = 1;
264 } 454 }
265 } else { 455 } else {
266 if (exists $DIR{$sym} && delete $self->{shft}) { 456 if (exists $DIR{$sym} && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop"); 457 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir}; 458 delete $self->{fire_dir};
269 $res = 1; 459 $res = 1;
270 } 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?
271 $::CONN->user_send ("fire_stop"); 461 $::CONN->user_send ("fire_stop");
272 delete $self->{fire_dir}; 462 delete $self->{fire_dir};
273 $res = 1; 463 $res = 1;
274 } 464 }
275 } 465 }
276 466
277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 467 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
278 $::CONN->user_send ("run_stop"); 468 $::CONN->user_send ("run_stop");
279 $res = 1; 469 $res = 1;
280 } 470 }
281 471
282 $res 472 $res
… …
296sub draw { 486sub draw {
297 my ($self) = @_; 487 my ($self) = @_;
298 488
299 return unless $::MAP; 489 return unless $::MAP;
300 490
301 my $focused = $CFClient::UI::FOCUS == $self 491 my $focused = $CFPlus::UI::FOCUS == $self
302 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 492 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
303 493
304 return 494 return
305 unless $focused || !$::FAST; 495 unless $focused || !$::FAST;
306 496
307 if (delete $self->{need_update}) { 497 if (delete $self->{need_update}) {
308 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 498 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
309 499
310 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 500 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
311 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 501 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
312 502
313 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 503 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
314 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 504 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
315 505
316 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 506 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
317 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 507 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
318 508
319 if ($::CFG->{fow_enable}) { 509 if ($::CFG->{fow_enable}) {
320 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);
321 511
322 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
323 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 513 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
324 glConvolutionFilter2D ( 514 glConvolutionFilter2D (
325 GL_CONVOLUTION_2D, 515 GL_CONVOLUTION_2D,
326 GL_ALPHA, 516 GL_ALPHA,
327 3, 3, 517 3, 3,
… …
329 (pack "f*", @{ $self->{smooth_matrix} }), 519 (pack "f*", @{ $self->{smooth_matrix} }),
330 ); 520 );
331 glEnable GL_CONVOLUTION_2D; 521 glEnable GL_CONVOLUTION_2D;
332 } 522 }
333 523
334 $self->{fow_texture} = new CFClient::Texture 524 $self->{fow_texture} = new CFPlus::Texture
335 w => $w, 525 w => $w,
336 h => $h, 526 h => $h,
337 data => $data, 527 data => $data,
338 internalformat => GL_ALPHA, 528 internalformat => GL_ALPHA,
339 format => GL_ALPHA; 529 format => GL_ALPHA;
… …
401 glDeleteList $self->{list}; 591 glDeleteList $self->{list};
402 592
403 $self->SUPER::DESTROY; 593 $self->SUPER::DESTROY;
404} 594}
405 595
406package CFClient::MapWidget::MapMap; 596package CFPlus::MapWidget::MapMap;
407 597
408our @ISA = CFClient::UI::Base::; 598our @ISA = CFPlus::UI::Base::;
409 599
410use Time::HiRes qw(time); 600use Time::HiRes qw(time);
411use CFClient::OpenGL; 601use CFPlus::OpenGL;
412 602
413sub size_request { 603sub size_request {
414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 604 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
415} 605}
416 606
… …
452 642
453 if ($self->{texture_atime} < time) { 643 if ($self->{texture_atime} < time) {
454 $self->{texture_atime} = time + 1/3; 644 $self->{texture_atime} = time + 1/3;
455 645
456 $self->{texture} = 646 $self->{texture} =
457 new CFClient::Texture 647 new CFPlus::Texture
458 w => $w, 648 w => $w,
459 h => $h, 649 h => $h,
460 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 650 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
461 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;
462 } 652 }
463 653
464 $self->{texture}->draw_quad (0, 0); 654 $self->{texture}->draw_quad (0, 0);
465 655
466 glDisable GL_TEXTURE_2D; 656 glDisable GL_TEXTURE_2D;
… …
481 glEnd; 671 glEnd;
482 672
483 glDisable GL_BLEND; 673 glDisable GL_BLEND;
484} 674}
485 675
486package CFClient::MapWidget::Command; 676package CFPlus::MapWidget::Command;
487 677
488use strict; 678use strict;
489 679
490use CFClient::OpenGL; 680use CFPlus::OpenGL;
491 681
492our @ISA = CFClient::UI::Frame::; 682our @ISA = CFPlus::UI::Frame::;
493 683
494sub new { 684sub new {
495 my $class = shift; 685 my $class = shift;
496 686
497 my $self = $class->SUPER::new ( 687 my $self = $class->SUPER::new (
498 bg => [0, 0, 0, 0.8], 688 bg => [0, 0, 0, 0.8],
499 @_, 689 @_,
500 ); 690 );
501 691
502 $self->add ($self->{vbox} = new CFClient::UI::VBox); 692 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
503 693
504 $self->{label} = [ 694 $self->{label} = [
505 map 695 map
506 CFClient::UI::Label->new ( 696 CFPlus::UI::Label->new (
507 can_hover => 1, 697 can_hover => 1,
508 can_events => 1, 698 can_events => 1,
509 tooltip_width => 0.33, 699 tooltip_width => 0.33,
510 fontsize => $_, 700 fontsize => $_,
511 ), (0.8) x 16 701 ), (0.8) x 16
512 ]; 702 ];
513 703
514 $self->{entry} = new CFClient::UI::Entry 704 $self->{entry} = new CFPlus::UI::Entry
515 on_changed => sub { 705 on_changed => sub {
516 $self->update_labels; 706 $self->update_labels;
517 0 707 0
518 }, 708 },
519 on_button_down => sub { 709 on_button_down => sub {
520 my ($entry, $ev, $x, $y) = @_; 710 my ($entry, $ev, $x, $y) = @_;
521 711
522 if ($ev->{button} == 3) { 712 if ($ev->{button} == 3) {
523 (new CFClient::UI::Menu 713 (new CFPlus::UI::Menu
524 items => [ 714 items => [
525 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 715 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
526 => 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 }) }]
527 ], 717 ],
528 )->popup ($ev); 718 )->popup ($ev);
529 return 1; 719 return 1;
530 } 720 }
… …
546 $self->hide; 736 $self->hide;
547 } 737 }
548 } elsif ($ev->{sym} == 27) { 738 } elsif ($ev->{sym} == 27) {
549 $self->{hist_ptr} = 0; 739 $self->{hist_ptr} = 0;
550 $self->hide; 740 $self->hide;
551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 741 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
552 if ($self->{hist_ptr} > 1) { 742 if ($self->{hist_ptr} > 1) {
553 $self->{hist_ptr}--; 743 $self->{hist_ptr}--;
554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 744 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
555 } elsif ($self->{hist_ptr} > 0) { 745 } elsif ($self->{hist_ptr} > 0) {
556 $self->{hist_ptr}--; 746 $self->{hist_ptr}--;
… …
558 } else { 748 } else {
559 ++$self->{select_offset} 749 ++$self->{select_offset}
560 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 750 if $self->{select_offset} < $#{ $self->{last_match} || [] };
561 } 751 }
562 $self->update_labels; 752 $self->update_labels;
563 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 753 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
564 if ($self->{select_offset}) { 754 if ($self->{select_offset}) {
565 --$self->{select_offset} 755 --$self->{select_offset}
566 } else { 756 } else {
567 unless ($self->{hist_ptr}) { 757 unless ($self->{hist_ptr}) {
568 $self->{hist_saveback} = $self->{entry}->get_text; 758 $self->{hist_saveback} = $self->{entry}->get_text;
… …
613} 803}
614 804
615sub hide { 805sub hide {
616 my ($self) = @_; 806 my ($self) = @_;
617 807
808 $self->{hist_ptr} = 0;
809
618 $self->SUPER::hide; 810 $self->SUPER::hide;
619 $self->{entry}->set_text (""); 811 $self->{entry}->set_text ("");
620} 812}
621 813
622sub invoke_key_down { 814sub inject_key_down {
623 my ($self, $ev) = @_; 815 my ($self, $ev) = @_;
624 816
817 $self->{entry}->grab_focus;
625 $self->{entry}->emit (key_down => $ev) 818 $self->{entry}->emit (key_down => $ev);
626} 819}
627 820
628sub update_labels { 821sub update_labels {
629 my ($self) = @_; 822 my ($self) = @_;
630 823
… …
723 916
724sub _draw { 917sub _draw {
725 my ($self) = @_; 918 my ($self) = @_;
726 919
727 # hack 920 # hack
728 local $CFClient::UI::FOCUS = $self->{entry}; 921 local $CFPlus::UI::FOCUS = $self->{entry};
729 922
730 $self->SUPER::_draw; 923 $self->SUPER::_draw;
731} 924}
732 925
7331 9261
927

Diff Legend

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