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.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

1package CFPlus::MapWidget; 1package DC::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 DC;
9use CFPlus::OpenGL; 9use DC::OpenGL;
10use CFPlus::UI; 10use DC::UI;
11use DC::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my $class = shift;
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 tilesize => 32,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 26 @_
33 ); 27 );
34
35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command},
37 tooltip => "#completer_help",
38 ;
39 28
40 $self 29 $self
41} 30}
42 31
43sub add_command { 32sub add_command {
47 36
48 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
51 40
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53} 42}
54 43
55sub clr_commands { 44sub clr_commands {
56 my ($self) = @_; 45 my ($self) = @_;
57 46
58 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
59 48
60 $self->{completer}->hide 49 $::COMPLETER->hide
61 if $self->{completer}; 50 if $::COMPLETER;
62} 51}
63 52
64sub server_login { 53sub server_login {
65 my ($server) = @_; 54 my ($server) = @_;
66 55
67 ::stop_game (); 56 ::stop_game ();
68 local $::PROFILE->{host} = $server; 57 local $::PROFILE->{host} = $server;
69 ::start_game (); 58 ::start_game ();
70} 59}
71 60
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 { 61sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 62 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 63 or return;
84 64
85 # putting the password into the env is somewhat tasteless 65 DC::background {
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"; 66 print "preparing editor startup...\n";
104 CFPlus::set_proxy;
105 67
106 my $server = $editsup->{gameserver} || "default"; 68 my $server = $editsup->{gameserver} || "default";
107 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108 70
109 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 71 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
110 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 72 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
111 73
112 print "map directory is $mapdir\n"; 74 print "map directory is $mapdir\n";
113 print "lib directory is $libdir\n"; 75 print "lib directory is $libdir\n";
114 76
115 require LWP::UserAgent; 77 my $ua = DC::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 78
124 for my $file (qw(archetypes crossfire.0)) { 79 for my $file (qw(archetypes crossfire.0)) {
125 my $url = "$editsup->{lib_root}$file"; 80 my $url = "$editsup->{lib_root}$file";
126 print "mirroring $url...\n"; 81 print "mirroring $url...\n";
127 check_lwp $ua->mirror ($url, "$libdir/$file"); 82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
128 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
129 } 84 }
130 85
131 if (1) { # upload a map 86 if (1) { # upload a map
132 my $mapname = $::CONN->{map_info}[0]; 87 my $mapname = $::CONN->{map_info}[0];
133 88
89 my $mappath = "$mapdir/$mapname";
90
91 -e $mappath and die "$mappath already exists\n";
92
134 print "getting map revision for $mapname...\n"; 93 print "getting map revision for $mapname...\n";
135 94
136 # try to get the most recent head revision, what a hack, 95 # try to get the most recent head revision, what a hack,
137 # this should have been returned while downloading *sigh* 96 # 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; 97 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139 98
140 if ($log =~ /\?rev=(\d+\.\d+)"/) { 99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
141 my $rev = $1; 100 my $rev = $1;
142 101
143 print "downloading revision $rev...\n"; 102 print "downloading revision $rev...\n";
144 103
145 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 104 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
105
106 my $meta = {
107 %$editsup,
108 path => $mapname,
109 revision => $rev,
110 cf_login => $::PROFILE->{user},
111 };
112
113 require File::Basename;
114 require File::Path;
115
116 File::Path::mkpath (File::Basename::dirname ($mappath));
117 open my $fh, ">:raw:perlio", "$mappath.meta"
118 or die "$mappath.meta: $!\n";
119 print $fh DC::encode_json $meta;
120 close $fh;
121 open my $fh, ">:raw:perlio:utf8", $mappath
122 or die "$mappath: $!\n";
123 print $fh $map;
124 close $fh;
125
126 print "saved as $mappath\n";
127
128 print "invoking editor...\n";
129 exec "/root/s2/gce $mappath";#d#
146 130
147 # now upload it 131 # now upload it
148# require HTTP::Request::Common; 132# require HTTP::Request::Common;
149# 133#
150# my $res = $ua->post ( 134# my $res = $ua->post (
171# } 155# }
172 } else { 156 } else {
173 die "viewvc parse error, unable to detect revision\n"; 157 die "viewvc parse error, unable to detect revision\n";
174 } 158 }
175 } 159 }
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 }); 160 }
197} 161}
198 162
199sub invoke_button_down { 163sub invoke_button_down {
200 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
201 165
202 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
203 $self->grab_focus; 167 $self->grab_focus;
204 return unless $::CONN; 168 return unless $::CONN;
205 169
206 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
207 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
208 172
209 $x -= int 0.5 * $self->{sw}; 173 $x -= DC::floor $::MAP->w * 0.5;
210 $y -= int 0.5 * $self->{sh}; 174 $y -= DC::floor $::MAP->h * 0.5;
211 175
176 if ($::CONN) {
212 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
213 if $::CONN; 178 }
214 179
215 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
216 $self->grab_focus; 181 $self->grab_focus;
217 return unless $::CONN; 182 return unless $::CONN;
218 183
235 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
236 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
237 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
238 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
239 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
240 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
241 [ 206 [
242 $::PICKUP_ENABLE->{state} 207 $::PICKUP_ENABLE->{state}
243 ? "Disable automatic pickup" 208 ? "Disable automatic pickup"
244 : "Enable automatic pickup", 209 : "Enable automatic pickup",
245 sub { $::PICKUP_ENABLE->toggle } 210 sub { $::PICKUP_ENABLE->toggle }
246 ], 211 ],
247 ); 212 );
248 213
249 if ($::CONN && $::CONN->{editor_support}) { 214 if ($::CONN && $::CONN->{editor_support}) {
250 push @items, [ 215# push @items, [
251 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
252 \&editor_invoke, 217# \&editor_invoke,
253 ]; 218# ];
254 219
255 for my $type (qw(test name)) { 220 for my $type (qw(test name)) {
256 $::CONN->{editor_support}{type} ne $type 221 $::CONN->{editor_support}{type} ne $type
257 or next; 222 or next;
258 my $server = $::CONN->{editor_support}{"${type}server"} 223 my $server = $::CONN->{editor_support}{"${type}server"}
259 or next; 224 or next;
260 225
261 push @items, [ 226 push @items, [
262 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 227 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
263 sub { server_login $server }, 228 sub { server_login $server },
264 ]; 229 ];
265 } 230 }
266 } 231 }
267 232
275 } 240 }
276 } 241 }
277 ], 242 ],
278 ; 243 ;
279 244
280 (new CFPlus::UI::Menu 245 (new DC::UI::Menu
281 items => \@items, 246 items => \@items,
282 )->popup ($ev); 247 )->popup ($ev);
283 } 248 }
284 249
285 1 250 1
304 269
305 1 270 1
306} 271}
307 272
308sub size_request { 273sub size_request {
274 my ($self) = @_;
275
309 ( 276 (
310 32 * CFPlus::ceil $::WIDTH / 32, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
311 32 * CFPlus::ceil $::HEIGHT / 32, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
312 ) 279 )
313} 280}
314 281
315sub update { 282sub update {
316 my ($self) = @_; 283 my ($self) = @_;
318 $self->{need_update} = 1; 285 $self->{need_update} = 1;
319 $self->SUPER::update; 286 $self->SUPER::update;
320} 287}
321 288
322my %DIR = ( 289my %DIR = (
323 CFPlus::SDLK_KP8, [1, "north"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"],
324 CFPlus::SDLK_KP9, [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
325 CFPlus::SDLK_KP6, [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
326 CFPlus::SDLK_KP3, [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
327 CFPlus::SDLK_KP2, [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
328 CFPlus::SDLK_KP1, [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
329 CFPlus::SDLK_KP4, [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
330 CFPlus::SDLK_KP7, [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
331 299
332 CFPlus::SDLK_UP, [1, "north"], 300 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
301 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
302 ( "," . DC::SDLK_END ), [6, "southwest"],
303 ( "," . DC::SDLK_HOME ), [8, "northwest"],
304
305 ( "," . DC::SDLK_UP ), [1, "north"],
306 ("1," . DC::SDLK_UP ), [2, "northeast"],
333 CFPlus::SDLK_RIGHT, [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
334 CFPlus::SDLK_DOWN, [5, "south"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
335 CFPlus::SDLK_LEFT, [7, "west"], 309 ( "," . DC::SDLK_DOWN ), [5, "south"],
310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
311 ( "," . DC::SDLK_LEFT ), [7, "west"],
312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
336); 313);
337 314
338sub invoke_key_down { 315sub invoke_key_down {
339 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
340 317
341 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
342 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
343 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
344 321
345 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
346 323
347 if ($uni == ord "\t") { 324 # ignore repeated keypresses
348 $::PL_WINDOW->toggle_visibility; 325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
349 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 326 $self->{last_mod} = $mod;
350 $::HELP_WINDOW->toggle_visibility; 327 $self->{last_sym} = $sym;
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 328
377 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
378 $::CONN->user_send ("stay fire"); 330
379 } elsif ($uni == ord ",") { 331 if ($::CONN && $dir) {
380 $::CONN->user_send ("take");
381 } elsif ($uni == ord " ") {
382 $::CONN->user_send ("apply");
383 } elsif ($uni == 13) {
384 $::CONN->user_send ("examine");
385 } elsif ($uni == ord ".") {
386 $::CONN->user_send ($self->{completer}{last_command})
387 if exists $self->{completer}{last_command};
388 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
389 $::CONN->user_send ($_) for @$bind_cmd;
390 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
391 $::CONN->user_send ("rotateshoottype +");
392 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
393 $::CONN->user_send ("rotateshoottype -");
394 } elsif ($uni == ord '"') {
395 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
396 $self->{completer}->show;
397 } elsif ($uni == ord "'") {
398 $self->{completer}->set_prefix ("");
399 $self->{completer}->show;
400 } elsif (exists $DIR{$sym}) {
401 if ($mod & CFPlus::KMOD_SHIFT) { 332 if ($mod & DC::KMOD_SHIFT) {
402 $self->{shft}++; 333 $self->{shft}++;
403 if ($DIR{$sym}[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
404 $::CONN->user_send ("fire $DIR{$sym}[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
405 } 336 }
406 $self->{fire_dir} = $DIR{$sym}[0]; 337 $self->{fire_dir} = $dir->[0];
407 } elsif ($mod & CFPlus::KMOD_CTRL) { 338 } elsif ($mod & DC::KMOD_CTRL) {
408 $self->{ctrl}++; 339 $self->{ctrl}++;
409 $::CONN->user_send ("run $DIR{$sym}[0]"); 340 $::CONN->user_send ("run $dir->[0]");
410 } else { 341 } else {
411 $::CONN->user_send ("$DIR{$sym}[1]"); 342 $::CONN->user_send ("$dir->[1]");
412 } 343 }
413 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 344
414 $self->{completer}->inject_key_down ($ev);
415 $self->{completer}->show;
416 } else {
417 return 0; 345 return 1;
418 }
419
420 1 346 }
347
348 0
421} 349}
422 350
423sub invoke_key_up { 351sub invoke_key_up {
424 my ($self, $ev) = @_; 352 my ($self, $ev) = @_;
425 353
426 my $res = 0; 354 my $res = 0;
427 my $mod = $ev->{mod}; 355 my $mod = $ev->{mod};
428 my $sym = $ev->{sym}; 356 my $sym = $ev->{sym};
429 357
358 delete $self->{last_mod};
359 delete $self->{last_sym};
360
430 if ($::CFG->{shift_fire_stop}) { 361 if ($::CFG->{shift_fire_stop}) {
431 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 362 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
432 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
433 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
434 $res = 1; 365 $res = 1;
435 } 366 }
436 } else { 367 } else {
368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
437 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if ($dir && delete $self->{shft}) {
438 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
439 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
440 $res = 1; 373 $res = 1;
441 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 374 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
375 && delete $self->{shft}) { # XXX: is RSHIFT ok?
442 $::CONN->user_send ("fire_stop"); 376 $::CONN->user_send ("fire_stop");
443 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
444 $res = 1; 378 $res = 1;
445 } 379 }
446 } 380 }
447 381
448 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
449 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
450 $res = 1; 384 $res = 1;
451 } 385 }
452 386
453 $res 387 $res
454} 388}
455 389
390sub invoke_visibility_change {
391 my ($self) = @_;
392
393 $self->refresh_hook;
394
395 0
396}
397
398sub set_tilesize {
399 my ($self, $tilesize) = @_;
400
401 $self->{tilesize} = $tilesize;
402}
403
404sub scroll {
405 my ($self, $dx, $dy) = @_;
406
407 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update;
410
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize};
413}
414
456sub set_magicmap { 415sub set_magicmap {
457 my ($self, $w, $h, $x, $y, $data) = @_; 416 my ($self, $w, $h, $x, $y, $data) = @_;
458 417
459 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 418 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
460 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 419 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
461 420
462 $self->{magicmap} = [$x, $y, $w, $h, $data]; 421 $self->{magicmap} = [$x, $y, $w, $h, $data];
463 422
464 $self->update; 423 $self->update;
465} 424}
466 425
426sub movement_update {
427 my ($self) = @_;
428
429 if ($::CFG->{smooth_movement}) {
430 if ($self->{sdx} || $self->{sdy}) {
431 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433
434 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436
437 # jump if "impossibly high" speed
438 if (
439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $self->{tilesize} * $mintime * 1.1
441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
443 $self->{sdx} = $self->{sdy} = 0;
444 } else {
445 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452
453 $self->update;
454 }
455 }
456 } else {
457 $self->{sdx} = $self->{sdy} = 0;
458 }
459
460 $self->{last_update} = EV::time;
461}
462
463sub refresh_hook {
464 my ($self) = @_;
465
466 if ($::MAP && $::CONN) {
467 if (delete $self->{need_update}) {
468 $self->movement_update;
469
470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
471
472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
474
475 # width/height of map, in tiles
476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
478
479 # the map displacement, in tiles
480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
482
483 # the upper left "visible" corner, in pixels
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489
490 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d#
492 my ($w, $h, $data) = $::MAP->fow_texture (
493 $dx + (min 0, $sdx_t),
494 $dy + (min 0, $sdy_t),
495 $sw + abs $sdx_t,
496 $sh + abs $sdy_t
497 );
498
499 $self->{fow_texture} = new DC::Texture
500 w => $w,
501 h => $h,
502 data => $data,
503 internalformat => GL_ALPHA,
504 format => GL_ALPHA;
505 } else {
506 delete $self->{fow_texture};
507 }
508
509 glNewList ($self->{list} ||= glGenList);
510
511 glPushMatrix;
512 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy};
515
516 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize},
518 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy});
520
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
522 glScale $self->{tilesize}, $self->{tilesize};
523
524 if (my $tex = $self->{fow_texture}) {
525 glPushMatrix;
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
527 glScale 1/3, 1/3;
528 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532 $self->{fow_texture}->draw_quad_alpha (0, 0);
533
534 glDisable GL_TEXTURE_2D;
535 glPopMatrix;
536 }
537
538 if ($self->{magicmap}) {
539 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
540
541 $x += $::MAP->ox + $self->{dx};
542 $y += $::MAP->oy + $self->{dy};
543
544 glTranslate - $x - 1, - $y - 1;
545 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
546 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
547 }
548
549 glPopMatrix;
550 glEndList;
551 }
552 } else {
553 glDeleteList delete $self->{list}
554 if $self->{list};
555 }
556}
557
467sub draw { 558sub draw {
468 my ($self) = @_; 559 my ($self) = @_;
469 560
470 return unless $::MAP; 561 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
471 562
563 return unless $self->{list};
564
472 my $focused = $CFPlus::UI::FOCUS == $self 565 my $focused = $DC::UI::FOCUS == $self
473 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 566 || $DC::UI::FOCUS == $::COMPLETER->{entry};
474 567
475 return 568 return
476 unless $focused || !$::FAST; 569 unless $focused || !$::FAST;
477 570
478 if (delete $self->{need_update}) {
479 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
480
481 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
488 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
489
490 if ($::CFG->{fow_enable}) {
491 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
492
493 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
494 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
495 glConvolutionFilter2D (
496 GL_CONVOLUTION_2D,
497 GL_ALPHA,
498 3, 3,
499 GL_ALPHA, GL_FLOAT,
500 (pack "f*", @{ $self->{smooth_matrix} }),
501 );
502 glEnable GL_CONVOLUTION_2D;
503 }
504
505 $self->{fow_texture} = new CFPlus::Texture
506 w => $w,
507 h => $h,
508 data => $data,
509 internalformat => GL_ALPHA,
510 format => GL_ALPHA;
511
512 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
513 } else {
514 delete $self->{fow_texture};
515 }
516
517 glNewList $self->{list};
518
519 glPushMatrix;
520 glTranslate $sx0, $sy0;
521 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
522
523 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
524
525 glScale 32, 32;
526
527 if (my $tex = $self->{fow_texture}) {
528 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532 $self->{fow_texture}->draw_quad_alpha (0, 0);
533
534 glDisable GL_TEXTURE_2D;
535 }
536
537 if ($self->{magicmap}) {
538 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539
540 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
541 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
542
543 glTranslate - $x - 1, - $y - 1;
544 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546 }
547
548 glPopMatrix;
549 glEndList;
550 }
551
552 glCallList $self->{list}; 571 glCallList $self->{list};
553 572
554 # TNT2 emulates logops in software (or worse :) 573 # TNT2 emulates logops in software (or worse :)
555 unless ($focused) { 574 unless ($focused) {
556 glColor 0.4, 0.2, 0.2, 0.6; 575 glColor_premultiply 0, 0, 1, 0.25;
557 glEnable GL_BLEND; 576 glEnable GL_BLEND;
558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 577 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
559 glBegin GL_QUADS; 578 glBegin GL_QUADS;
560 glVertex 0, 0; 579 glVertex 0, 0;
561 glVertex 0, $::HEIGHT; 580 glVertex 0, $::HEIGHT;
562 glVertex $::WIDTH, $::HEIGHT; 581 glVertex $::WIDTH, $::HEIGHT;
563 glVertex $::WIDTH, 0; 582 glVertex $::WIDTH, 0;
572 glDeleteList $self->{list}; 591 glDeleteList $self->{list};
573 592
574 $self->SUPER::DESTROY; 593 $self->SUPER::DESTROY;
575} 594}
576 595
577package CFPlus::MapWidget::MapMap; 596package DC::MapWidget::MapMap;
578 597
598use strict;
599use utf8;
600
579our @ISA = CFPlus::UI::Base::; 601our @ISA = DC::UI::Base::;
580 602
581use Time::HiRes qw(time); 603use Time::HiRes qw(time);
582use CFPlus::OpenGL; 604use DC::OpenGL;
583 605
584sub size_request { 606sub size_request {
585 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 607 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
608}
609
610sub refresh_hook {
611 my ($self) = @_;
612
613 if ($::MAP && $self->{texture_atime} < time) {
614 my ($w, $h) = @$self{qw(w h)};
615
616 return unless $w && $h;
617
618 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
619 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
620
621 my $ox = 0.5 * ($w - $sw);
622 my $oy = 0.5 * ($h - $sh);
623
624 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
625 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
626
627 #TODO: map scale is completely borked
628
629 my $x0 = int $ox - $sx + 0.5;
630 my $y0 = int $oy - $sy + 0.5;
631
632 $self->{sw} = $sw;
633 $self->{sh} = $sh;
634
635 $self->{x0} = $x0;
636 $self->{y0} = $y0;
637
638 $self->{texture_atime} = time + 1/3;
639
640 $self->{texture} =
641 new DC::Texture
642 w => $w,
643 h => $h,
644 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
645 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
646 }
647}
648
649sub invoke_visibility_change {
650 my ($self) = @_;
651
652 $self->refresh_hook;
653
654 0
586} 655}
587 656
588sub invoke_size_allocate { 657sub invoke_size_allocate {
589 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
590 659
601} 670}
602 671
603sub _draw { 672sub _draw {
604 my ($self) = @_; 673 my ($self) = @_;
605 674
606 $::MAP or return; 675 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
607 676
608 my ($w, $h) = @$self{qw(w h)}; 677 $self->{texture} or return;
609
610 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
611 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
612
613 my $sx = int $::CFG->{map_shift_x} / 32;
614 my $sy = int $::CFG->{map_shift_y} / 32;
615
616 my $ox = 0.5 * ($w - $sw);
617 my $oy = 0.5 * ($h - $sh);
618 678
619 glEnable GL_BLEND; 679 glEnable GL_BLEND;
620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
621 glEnable GL_TEXTURE_2D; 681 glEnable GL_TEXTURE_2D;
622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
623 683
624 if ($self->{texture_atime} < time) {
625 $self->{texture_atime} = time + 1/3;
626
627 $self->{texture} =
628 new CFPlus::Texture
629 w => $w,
630 h => $h,
631 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
632 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
633 }
634
635 $self->{texture}->draw_quad (0, 0); 684 $self->{texture}->draw_quad (0, 0);
636 685
637 glDisable GL_TEXTURE_2D; 686 glDisable GL_TEXTURE_2D;
638 687
639 glTranslate 0.375, 0.375; 688 glTranslate 0.375, 0.375;
640
641 #TODO: map scale is completely borked
642
643 my $x0 = int $ox - $sx + 0.5;
644 my $y0 = int $oy - $sy + 0.5;
645 689
646 glColor 1, 1, 0, 1; 690 glColor 1, 1, 0, 1;
647 glBegin GL_LINE_LOOP; 691 glBegin GL_LINE_LOOP;
648 glVertex $x0 , $y0 ; 692 glVertex $self->{x0} , $self->{y0} ;
649 glVertex $x0 , $y0 + $sh; 693 glVertex $self->{x0} , $self->{y0} + $self->{sh};
650 glVertex $x0 + $sw, $y0 + $sh; 694 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
651 glVertex $x0 + $sw, $y0 ; 695 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
652 glEnd; 696 glEnd;
653 697
654 glDisable GL_BLEND; 698 glDisable GL_BLEND;
655} 699}
656 700
657package CFPlus::MapWidget::Command; 701package DC::MapWidget::Command;
658 702
659use strict; 703use strict;
660 704
661use CFPlus::OpenGL; 705use DC::OpenGL;
662 706
663our @ISA = CFPlus::UI::Frame::; 707our @ISA = DC::UI::Frame::;
664 708
665sub new { 709sub new {
666 my $class = shift; 710 my $class = shift;
667 711
668 my $self = $class->SUPER::new ( 712 my $self = $class->SUPER::new (
669 bg => [0, 0, 0, 0.8], 713 bg => [0, 0, 0, 0.8],
670 @_, 714 @_,
671 ); 715 );
672 716
673 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 717 $self->add ($self->{vbox} = new DC::UI::VBox);
674 718
675 $self->{label} = [ 719 $self->{label} = [
676 map 720 map
677 CFPlus::UI::Label->new ( 721 DC::UI::Label->new (
722 align => 0,
678 can_hover => 1, 723 can_hover => 1,
679 can_events => 1, 724 can_events => 1,
680 tooltip_width => 0.33, 725 tooltip_width => 0.33,
681 fontsize => $_, 726 fontsize => $_,
682 ), (0.8) x 16 727 ), (0.8) x 16
683 ]; 728 ];
684 729
685 $self->{entry} = new CFPlus::UI::Entry 730 $self->{entry} = new DC::UI::Entry
686 on_changed => sub { 731 on_changed => sub {
687 $self->update_labels; 732 $self->update_labels;
688 0 733 0
689 }, 734 },
690 on_button_down => sub { 735 on_button_down => sub {
691 my ($entry, $ev, $x, $y) = @_; 736 my ($entry, $ev, $x, $y) = @_;
692 737
693 if ($ev->{button} == 3) { 738 if ($ev->{button} == 3) {
694 (new CFPlus::UI::Menu 739 (new DC::UI::Menu
695 items => [ 740 items => [
696 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 741 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
697 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 742 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
698 ], 743 ],
699 )->popup ($ev); 744 )->popup ($ev);
700 return 1; 745 return 1;
701 } 746 }
702 0 747 0
717 $self->hide; 762 $self->hide;
718 } 763 }
719 } elsif ($ev->{sym} == 27) { 764 } elsif ($ev->{sym} == 27) {
720 $self->{hist_ptr} = 0; 765 $self->{hist_ptr} = 0;
721 $self->hide; 766 $self->hide;
722 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 767 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
723 if ($self->{hist_ptr} > 1) { 768 if ($self->{hist_ptr} > 1) {
724 $self->{hist_ptr}--; 769 $self->{hist_ptr}--;
725 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 770 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
726 } elsif ($self->{hist_ptr} > 0) { 771 } elsif ($self->{hist_ptr} > 0) {
727 $self->{hist_ptr}--; 772 $self->{hist_ptr}--;
729 } else { 774 } else {
730 ++$self->{select_offset} 775 ++$self->{select_offset}
731 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 776 if $self->{select_offset} < $#{ $self->{last_match} || [] };
732 } 777 }
733 $self->update_labels; 778 $self->update_labels;
734 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 779 } elsif ($ev->{sym} == DC::SDLK_UP) {
735 if ($self->{select_offset}) { 780 if ($self->{select_offset}) {
736 --$self->{select_offset} 781 --$self->{select_offset}
737 } else { 782 } else {
738 unless ($self->{hist_ptr}) { 783 unless ($self->{hist_ptr}) {
739 $self->{hist_saveback} = $self->{entry}->get_text; 784 $self->{hist_saveback} = $self->{entry}->get_text;
897 942
898sub _draw { 943sub _draw {
899 my ($self) = @_; 944 my ($self) = @_;
900 945
901 # hack 946 # hack
902 local $CFPlus::UI::FOCUS = $self->{entry}; 947 local $DC::UI::FOCUS = $self->{entry};
903 948
904 $self->SUPER::_draw; 949 $self->SUPER::_draw;
905} 950}
906 951
9071 9521

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines