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.61 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.85 by root, Sun Oct 8 21:22:30 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 keybindings.",
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}} = ();
65}
66 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 # putting the password into the env is somewhat tasteless
86# local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
87# local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
88# local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
89
90 my ($pid, $fh);
91 unless ($pid = open $fh, "-|:utf8", "-") {
92 $SIG{__DIE__} = sub {
93 warn "@_\n";
94 CFPlus::_exit 99;
95 };
96
97 open STDERR, ">&STDOUT";
98 binmode STDOUT, ":utf8";
99 binmode STDERR, ":utf8";
100 close $fh;
101
102 $| = 1;
103 print "preparing editor startup...\n";
104 CFPlus::set_proxy;
105
106 my $server = $editsup->{gameserver} || "default";
107 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
109 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
110 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
111
112 print "map directory is $mapdir\n";
113 print "lib directory is $libdir\n";
114
115 require LWP::UserAgent;
116
117 my $ua = LWP::UserAgent->new (
118 agent => "cfplus $CFPlus::VERSION",
119 keep_alive => 1,
120 env_proxy => 1,
121 timeout => 30,
122 );
123
124 for my $file (qw(archetypes crossfire.0)) {
125 my $url = "$editsup->{lib_root}$file";
126 print "mirroring $url...\n";
127 check_lwp $ua->mirror ($url, "$libdir/$file");
128 printf "%s size %d octets\n", $file, -s "$libdir/$file";
129 }
130
131 if (1) { # upload a map
132 my $mapname = $::CONN->{map_info}[0];
133
134 print "getting map revision for $mapname...\n";
135
136 # try to get the most recent head revision, what a hack,
137 # this should have been returned while downloading *sigh*
138 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139
140 if ($log =~ /\?rev=(\d+\.\d+)"/) {
141 my $rev = $1;
142
143 print "downloading revision $rev...\n";
144
145 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
146
147 # now upload it
148# require HTTP::Request::Common;
149#
150# my $res = $ua->post (
151# $ENV{CFPLUS_UPLOAD},
152# Content_Type => 'multipart/form-data',
153# Content => [
154# path => $mapname,
155# mapdir => $ENV{CROSSFIRE_MAPDIR},
156# map => $map,
157# revision => $rev,
158# cf_login => $ENV{CFPLUS_LOGIN},
159# cf_password => $ENV{CFPLUS_PASSWORD},
160# comment => "",
161# ]
162# );
163#
164# if ($res->is_error) {
165# # fatal condition
166# warn $res->status_line;
167# } else {
168# # script replies are marked as {{..}}
169# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
170# warn map "$_\n", @msgs;
171# }
172 } else {
173 die "viewvc parse error, unable to detect revision\n";
174 }
175 }
176
177 print "invoking editor...\n";
178 exec "/root/s2/gce";#d#
179
180 CFPlus::_exit;
181 }
182
183 my $buffer;
184
185 Event->io (fd => $fh, poll => 'r', cb => sub {
186 unless (sysread $fh, $buffer, 4096, length $buffer) {
187 $_[0]->w->cancel;
188 $buffer .= "done\n";
189 }
190
191 while ($buffer =~ s/^(.*)\n//) {
192 ::message ({
193 markup => "editor($pid): " . CFPlus::asxml $1,
194 });
195 }
196 });
197}
198
67sub button_down { 199sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 200 my ($self, $ev, $x, $y) = @_;
69 201
70 return unless $::CONN;
71
72 $self->focus_in;
73
74 if ($ev->{button} == 1) { 202 if ($ev->{button} == 1) {
203 $self->grab_focus;
204 return unless $::CONN;
205
75 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 206 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 207 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77 208
78 $x -= int 0.5 * $self->{sw}; 209 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh}; 210 $y -= int 0.5 * $self->{sh};
80 211
81 $::CONN->lookat ($x, $y) 212 $::CONN->lookat ($x, $y)
82 if $::CONN; 213 if $::CONN;
83 214
84 } elsif ($ev->{button} == 2) { 215 } elsif ($ev->{button} == 2) {
216 $self->grab_focus;
217 return unless $::CONN;
218
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 219 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 220 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 221
88 $self->{motion} = sub { 222 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 223 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 227 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 228 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 229
96 $self->update; 230 $self->update;
97 }; 231 };
232 } elsif ($ev->{button} == 3) {
233 my @items = (
234 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
235 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
236 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
237 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
238 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
239 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
240 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
241 [
242 $::PICKUP_ENABLE->{state}
243 ? "Disable automatic pickup"
244 : "Enable automatic pickup",
245 sub { $::PICKUP_ENABLE->toggle }
246 ],
247 );
248
249 if ($::CONN && $::CONN->{editor_support}) {
250 push @items, [
251 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
252 \&editor_invoke,
253 ];
254
255 for my $type (qw(test name)) {
256 $::CONN->{editor_support}{type} ne $type
257 or next;
258 my $server = $::CONN->{editor_support}{"${type}server"}
259 or next;
260
261 push @items, [
262 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
263 sub { server_login $server },
264 ];
265 }
266 }
267
268 push @items,
269 ["Quit",
270 sub {
271 if ($::CONN) {
272 &::open_quit_dialog;
273 } else {
274 exit;
275 }
276 }
277 ],
278 ;
279
280 (new CFPlus::UI::Menu
281 items => \@items,
282 )->popup ($ev);
98 } 283 }
99 284
100 1 285 1
101} 286}
102 287
103sub button_up { 288sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 289 my ($self, $ev, $x, $y) = @_;
105 290
106 delete $self->{motion}; 291 delete $self->{motion};
107 292
108 1 293 1
109} 294}
110 295
111sub mouse_motion { 296sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 297 my ($self, $ev, $x, $y) = @_;
113 298
114 if ($self->{motion}) { 299 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 300 $self->{motion}->($ev, $x, $y);
116 } else { 301 } else {
… …
120 1 305 1
121} 306}
122 307
123sub size_request { 308sub size_request {
124 ( 309 (
125 1 + 32 * int $::WIDTH / 32, 310 32 * CFPlus::ceil $::WIDTH / 32,
126 1 + 32 * int $::HEIGHT / 32, 311 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 312 )
128} 313}
129 314
130sub update { 315sub update {
131 my ($self) = @_; 316 my ($self) = @_;
… …
133 $self->{need_update} = 1; 318 $self->{need_update} = 1;
134 $self->SUPER::update; 319 $self->SUPER::update;
135} 320}
136 321
137my %DIR = ( 322my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 323 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 324 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 325 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 326 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 327 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 328 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 329 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 330 CFPlus::SDLK_KP7, [8, "northwest"],
146 331
147 CFClient::SDLK_UP, [1, "north"], 332 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 333 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 334 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 335 CFPlus::SDLK_LEFT, [7, "west"],
151); 336);
152 337
153sub key_down { 338sub invoke_key_down {
154 my ($self, $ev) = @_; 339 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 340
158 my $mod = $ev->{mod}; 341 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 342 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 343 my $uni = $ev->{unicode};
161 344
162 if ($sym == CFClient::SDLK_KP5) { 345 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
346
347 if ($uni == ord "\t") {
348 $::PL_WINDOW->toggle_visibility;
349 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
350 $::HELP_WINDOW->toggle_visibility;
351 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
352 ::toggle_player_page ($::STATS_PAGE);
353 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
354 ::toggle_player_page ($::SKILL_PAGE);
355 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
356 ::toggle_player_page ($::SPELL_PAGE);
357 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
358 ::toggle_player_page ($::INVENTORY_PAGE);
359 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
360 $::SETUP_DIALOG->toggle_visibility;
361 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
362 $::BIND_EDITOR->set_binding (undef, undef, [],
363 sub {
364 my ($mod, $sym, $cmds) = @_;
365 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
366 });
367 $::BIND_EDITOR->start;
368 $::BIND_EDITOR->show;
369#TODO: elmex, what was this supposed to do? it currently crashes the client.
370# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
371# $::BIND_EDITOR->stop;
372# $::BIND_EDITOR->ask_for_bind_and_commit;
373# $::BIND_EDITOR->hide;
374 } elsif (!$::CONN) {
375 return 0; # bindings further down need a valid connection
376
377 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 378 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 379 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 380 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 381 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 382 $::CONN->user_send ("apply");
383 } elsif ($uni == 13) {
384 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 385 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 386 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 387 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 388 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
172 $::INV_WINDOW->toggle_visibility; 389 $::CONN->user_send ($_) for @$bind_cmd;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 390 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 391 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 392 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 393 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') { 394 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 395 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show; 396 $self->{completer}->show;
180 } elsif ($uni == ord "'") { 397 } elsif ($uni == ord "'") {
181 $self->{completer}->set_prefix (""); 398 $self->{completer}->set_prefix ("");
182 $self->{completer}->show; 399 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) { 400 } elsif (exists $DIR{$sym}) {
184 if ($mod & CFClient::KMOD_SHIFT) { 401 if ($mod & CFPlus::KMOD_SHIFT) {
185 $self->{shft}++; 402 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) { 403 if ($DIR{$sym}[0] != $self->{fire_dir}) {
187 $::CONN->user_send ("fire $DIR{$sym}[0]"); 404 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 } 405 }
189 $self->{fire_dir} = $DIR{$sym}[0]; 406 $self->{fire_dir} = $DIR{$sym}[0];
190 } elsif ($mod & CFClient::KMOD_CTRL) { 407 } elsif ($mod & CFPlus::KMOD_CTRL) {
191 $self->{ctrl}++; 408 $self->{ctrl}++;
192 $::CONN->user_send ("run $DIR{$sym}[0]"); 409 $::CONN->user_send ("run $DIR{$sym}[0]");
193 } else { 410 } else {
194 $::CONN->user_send ("$DIR{$sym}[1]"); 411 $::CONN->user_send ("$DIR{$sym}[1]");
195 } 412 }
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 413 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211 $self->{completer}->key_down ($ev); 414 $self->{completer}->inject_key_down ($ev);
212 $self->{completer}->show; 415 $self->{completer}->show;
213 } else { 416 } else {
214 return 0; 417 return 0;
215 } 418 }
216 419
217 1 420 1
218} 421}
219 422
220sub key_up { 423sub invoke_key_up {
221 my ($self, $ev) = @_; 424 my ($self, $ev) = @_;
222 425
223 my $res = 0; 426 my $res = 0;
224 my $mod = $ev->{mod}; 427 my $mod = $ev->{mod};
225 my $sym = $ev->{sym}; 428 my $sym = $ev->{sym};
226 429
227 if ($::CFG->{shift_fire_stop}) { 430 if ($::CFG->{shift_fire_stop}) {
228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 431 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
229 $::CONN->user_send ("fire_stop"); 432 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir}; 433 delete $self->{fire_dir};
231 $res = 1; 434 $res = 1;
232 } 435 }
233 } else { 436 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) { 437 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop"); 438 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir}; 439 delete $self->{fire_dir};
237 $res = 1; 440 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 441 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop"); 442 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir}; 443 delete $self->{fire_dir};
241 $res = 1; 444 $res = 1;
242 } 445 }
243 } 446 }
244 447
245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 448 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
246 $::CONN->user_send ("run_stop"); 449 $::CONN->user_send ("run_stop");
247 $res = 1; 450 $res = 1;
248 } 451 }
249 452
250 $res 453 $res
251} 454}
252 455
253sub set_magicmap { 456sub set_magicmap {
254 my ($self, $w, $h, $x, $y, $data) = @_; 457 my ($self, $w, $h, $x, $y, $data) = @_;
255 458
256 $x += - $::MAP->x - int 0.5 * $::MAP->w; 459 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
257 $y += - $::MAP->y - int 0.5 * $::MAP->h; 460 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
258 461
259 $self->{magicmap} = [$x, $y, $w, $h, $data]; 462 $self->{magicmap} = [$x, $y, $w, $h, $data];
260 463
261 $self->update; 464 $self->update;
262} 465}
… …
264sub draw { 467sub draw {
265 my ($self) = @_; 468 my ($self) = @_;
266 469
267 return unless $::MAP; 470 return unless $::MAP;
268 471
269 my $focused = $CFClient::UI::FOCUS == $self 472 my $focused = $CFPlus::UI::FOCUS == $self
270 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 473 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
271 474
272 return 475 return
273 unless $focused || !$::FAST; 476 unless $focused || !$::FAST;
274 477
275 if (delete $self->{need_update}) { 478 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 479 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277 480
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 481 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 482 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
280 483
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283 486
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 487 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 488 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
286 489
287 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 491 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289 492
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 493 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 494 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D ( 495 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D, 496 GL_CONVOLUTION_2D,
294 GL_ALPHA, 497 GL_ALPHA,
295 3, 3, 498 3, 3,
… …
297 (pack "f*", @{ $self->{smooth_matrix} }), 500 (pack "f*", @{ $self->{smooth_matrix} }),
298 ); 501 );
299 glEnable GL_CONVOLUTION_2D; 502 glEnable GL_CONVOLUTION_2D;
300 } 503 }
301 504
302 $self->{fow_texture} = new CFClient::Texture 505 $self->{fow_texture} = new CFPlus::Texture
303 w => $w, 506 w => $w,
304 h => $h, 507 h => $h,
305 data => $data, 508 data => $data,
306 internalformat => GL_ALPHA, 509 internalformat => GL_ALPHA,
307 format => GL_ALPHA; 510 format => GL_ALPHA;
… …
332 } 535 }
333 536
334 if ($self->{magicmap}) { 537 if ($self->{magicmap}) {
335 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 538 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336 539
337 $x += $::MAP->x - $sx + int 0.5 * ($::MAP->w - $sw + 1); 540 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338 $y += $::MAP->y - $sy + int 0.5 * ($::MAP->h - $sh + 1); 541 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339 542
340 glTranslate - $x - 1, - $y - 1; 543 glTranslate - $x - 1, - $y - 1;
341 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 544 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 545 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343 } 546 }
… …
369 glDeleteList $self->{list}; 572 glDeleteList $self->{list};
370 573
371 $self->SUPER::DESTROY; 574 $self->SUPER::DESTROY;
372} 575}
373 576
374package CFClient::MapWidget::MapMap; 577package CFPlus::MapWidget::MapMap;
375 578
376our @ISA = CFClient::UI::Base::; 579our @ISA = CFPlus::UI::Base::;
377 580
378use Time::HiRes qw(time); 581use Time::HiRes qw(time);
379use CFClient::OpenGL; 582use CFPlus::OpenGL;
380 583
381sub size_request { 584sub size_request {
382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 585 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
383} 586}
384 587
385sub size_allocate { 588sub invoke_size_allocate {
386 my ($self, $w, $h) = @_; 589 my ($self, $w, $h) = @_;
387 590
388 $self->SUPER::size_allocate ($w, $h);
389 $self->update; 591 $self->update;
592
593 1
390} 594}
391 595
392sub update { 596sub update {
393 my ($self) = @_; 597 my ($self) = @_;
394 598
… …
419 623
420 if ($self->{texture_atime} < time) { 624 if ($self->{texture_atime} < time) {
421 $self->{texture_atime} = time + 1/3; 625 $self->{texture_atime} = time + 1/3;
422 626
423 $self->{texture} = 627 $self->{texture} =
424 new CFClient::Texture 628 new CFPlus::Texture
425 w => $w, 629 w => $w,
426 h => $h, 630 h => $h,
427 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 631 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
428 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 632 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
429 } 633 }
430 634
431 $self->{texture}->draw_quad (0, 0); 635 $self->{texture}->draw_quad (0, 0);
432 636
433 glDisable GL_TEXTURE_2D; 637 glDisable GL_TEXTURE_2D;
… …
448 glEnd; 652 glEnd;
449 653
450 glDisable GL_BLEND; 654 glDisable GL_BLEND;
451} 655}
452 656
453package CFClient::MapWidget::Command; 657package CFPlus::MapWidget::Command;
454 658
455use strict; 659use strict;
456 660
457use CFClient::OpenGL; 661use CFPlus::OpenGL;
458 662
459our @ISA = CFClient::UI::Frame::; 663our @ISA = CFPlus::UI::Frame::;
460 664
461sub new { 665sub new {
462 my $class = shift; 666 my $class = shift;
463 667
464 my $self = $class->SUPER::new ( 668 my $self = $class->SUPER::new (
465 bg => [0, 0, 0, 0.8], 669 bg => [0, 0, 0, 0.8],
466 @_, 670 @_,
467 ); 671 );
468 672
469 $self->add ($self->{vbox} = new CFClient::UI::VBox); 673 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
470 674
471 $self->{label} = [ 675 $self->{label} = [
472 map 676 map
473 CFClient::UI::Label->new ( 677 CFPlus::UI::Label->new (
474 can_hover => 1, 678 can_hover => 1,
475 can_events => 1, 679 can_events => 1,
476 tooltip_width => 0.33, 680 tooltip_width => 0.33,
477 fontsize => $_, 681 fontsize => $_,
478 ), (0.8) x 16 682 ), (0.8) x 16
479 ]; 683 ];
480 684
481 $self->{entry} = new CFClient::UI::Entry 685 $self->{entry} = new CFPlus::UI::Entry
482 on_changed => sub { 686 on_changed => sub {
483 $self->update_labels; 687 $self->update_labels;
688 0
484 }, 689 },
485 on_button_down => sub { 690 on_button_down => sub {
486 my ($entry, $ev, $x, $y) = @_; 691 my ($entry, $ev, $x, $y) = @_;
487 692
488 if ($ev->{button} == 3) { 693 if ($ev->{button} == 3) {
489 (new CFClient::UI::Menu 694 (new CFPlus::UI::Menu
490 items => [ 695 items => [
696 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
491 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 697 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
492 ], 698 ],
493 )->popup ($ev); 699 )->popup ($ev);
494 return 1; 700 return 1;
495 } 701 }
496 0 702 0
… …
503 if ($ev->{sym} == 13) { 709 if ($ev->{sym} == 13) {
504 if (exists $self->{select}) { 710 if (exists $self->{select}) {
505 $self->{last_command} = $self->{select}; 711 $self->{last_command} = $self->{select};
506 $::CONN->user_send ($self->{select}); 712 $::CONN->user_send ($self->{select});
507 713
508 unshift @{$self->{history}}, $self->{select}; 714 unshift @{$self->{history}}, $self->{entry}->get_text;
509 $self->{hist_ptr} = 0; 715 $self->{hist_ptr} = 0;
510 716
511 $self->hide; 717 $self->hide;
512 } 718 }
513 } elsif ($ev->{sym} == 27) { 719 } elsif ($ev->{sym} == 27) {
514 $self->{hist_ptr} = 0; 720 $self->{hist_ptr} = 0;
515 $self->hide; 721 $self->hide;
516 return;
517 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 722 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
518 if ($self->{hist_ptr} > 1) { 723 if ($self->{hist_ptr} > 1) {
519 $self->{hist_ptr}--; 724 $self->{hist_ptr}--;
520 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 725 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
521 } elsif ($self->{hist_ptr} > 0) { 726 } elsif ($self->{hist_ptr} > 0) {
522 $self->{hist_ptr}--; 727 $self->{hist_ptr}--;
… …
524 } else { 729 } else {
525 ++$self->{select_offset} 730 ++$self->{select_offset}
526 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 731 if $self->{select_offset} < $#{ $self->{last_match} || [] };
527 } 732 }
528 $self->update_labels; 733 $self->update_labels;
529 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 734 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
530 if ($self->{select_offset}) { 735 if ($self->{select_offset}) {
531 --$self->{select_offset} 736 --$self->{select_offset}
532 } else { 737 } else {
533 unless ($self->{hist_ptr}) { 738 unless ($self->{hist_ptr}) {
534 $self->{hist_saveback} = $self->{entry}->get_text; 739 $self->{hist_saveback} = $self->{entry}->get_text;
… …
561 766
562 $self->{entry}->set_text ($prefix); 767 $self->{entry}->set_text ($prefix);
563 $self->show; 768 $self->show;
564} 769}
565 770
566sub size_allocate { 771sub invoke_size_allocate {
567 my ($self, $w, $h) = @_; 772 my ($self, $w, $h) = @_;
568 773
569 $self->SUPER::size_allocate ($w, $h);
570 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 774 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
775
776 $self->SUPER::invoke_size_allocate ($w, $h)
571} 777}
572 778
573sub show { 779sub show {
574 my ($self) = @_; 780 my ($self) = @_;
575 781
576 $self->SUPER::show; 782 $self->SUPER::show;
577 $self->{entry}->focus_in; 783 $self->{entry}->grab_focus;
578} 784}
579 785
580sub hide { 786sub hide {
581 my ($self) = @_; 787 my ($self) = @_;
582 788
789 $self->{hist_ptr} = 0;
790
583 $self->SUPER::hide; 791 $self->SUPER::hide;
584 $self->{entry}->set_text (""); 792 $self->{entry}->set_text ("");
585} 793}
586 794
587sub key_down { 795sub inject_key_down {
588 my ($self, $ev) = @_; 796 my ($self, $ev) = @_;
589 797
798 $self->{entry}->grab_focus;
590 $self->{entry}->key_down ($ev) 799 $self->{entry}->emit (key_down => $ev);
591} 800}
592 801
593sub update_labels { 802sub update_labels {
594 my ($self) = @_; 803 my ($self) = @_;
595 804
… …
682 $label->set_text (""); 891 $label->set_text ("");
683 $label->set_tooltip (""); 892 $label->set_tooltip ("");
684 } 893 }
685 894
686 $self->update; 895 $self->update;
687 ###
688} 896}
689 897
690sub _draw { 898sub _draw {
691 my ($self) = @_; 899 my ($self) = @_;
692 900
693 # hack 901 # hack
694 local $CFClient::UI::FOCUS = $self->{entry}; 902 local $CFPlus::UI::FOCUS = $self->{entry};
695 903
696 $self->SUPER::_draw; 904 $self->SUPER::_draw;
697} 905}
698 906
6991 9071
908

Diff Legend

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