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.118 by elmex, Tue Aug 14 13:25:25 2007 UTC vs.
Revision 1.155 by root, Thu Dec 17 02:49:38 2009 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 CFPlus::Macro; 11use DC::Macro;
12 12
13our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my $class = shift;
21 21
… …
24 can_focus => 1, 24 can_focus => 1,
25 tilesize => 32, 25 tilesize => 32,
26 @_ 26 @_
27 ); 27 );
28 28
29 $self->{completer} = new CFPlus::MapWidget::Command::
30 command => $self->{command},
31 tooltip => "#completer_help",
32 ;
33
34 $self 29 $self
35}
36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
41} 30}
42 31
43sub add_command { 32sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 33 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 34
… …
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
… …
71 60
72sub editor_invoke { 61sub editor_invoke {
73 my $editsup = $::CONN && $::CONN->{editor_support} 62 my $editsup = $::CONN && $::CONN->{editor_support}
74 or return; 63 or return;
75 64
76 CFPlus::background { 65 DC::background {
77 print "preparing editor startup...\n"; 66 print "preparing editor startup...\n";
78 67
79 my $server = $editsup->{gameserver} || "default"; 68 my $server = $editsup->{gameserver} || "default";
80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81 70
82 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;
83 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;
84 73
85 print "map directory is $mapdir\n"; 74 print "map directory is $mapdir\n";
86 print "lib directory is $libdir\n"; 75 print "lib directory is $libdir\n";
87 76
88 my $ua = CFPlus::lwp_useragent; 77 my $ua = DC::lwp_useragent;
89 78
90 for my $file (qw(archetypes crossfire.0)) { 79 for my $file (qw(archetypes crossfire.0)) {
91 my $url = "$editsup->{lib_root}$file"; 80 my $url = "$editsup->{lib_root}$file";
92 print "mirroring $url...\n"; 81 print "mirroring $url...\n";
93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
94 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
95 } 84 }
96 85
97 if (1) { # upload a map 86 if (1) { # upload a map
98 my $mapname = $::CONN->{map_info}[0]; 87 my $mapname = $::CONN->{map_info}[0];
… …
103 92
104 print "getting map revision for $mapname...\n"; 93 print "getting map revision for $mapname...\n";
105 94
106 # try to get the most recent head revision, what a hack, 95 # try to get the most recent head revision, what a hack,
107 # this should have been returned while downloading *sigh* 96 # this should have been returned while downloading *sigh*
108 my $log = (CFPlus::lwp_check $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;
109 98
110 if ($log =~ /\?rev=(\d+\.\d+)"/) { 99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
111 my $rev = $1; 100 my $rev = $1;
112 101
113 print "downloading revision $rev...\n"; 102 print "downloading revision $rev...\n";
114 103
115 my $map = (CFPlus::lwp_check $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;
116 105
117 my $meta = { 106 my $meta = {
118 %$editsup, 107 %$editsup,
119 path => $mapname, 108 path => $mapname,
120 revision => $rev, 109 revision => $rev,
… …
125 require File::Path; 114 require File::Path;
126 115
127 File::Path::mkpath (File::Basename::dirname ($mappath)); 116 File::Path::mkpath (File::Basename::dirname ($mappath));
128 open my $fh, ">:raw:perlio", "$mappath.meta" 117 open my $fh, ">:raw:perlio", "$mappath.meta"
129 or die "$mappath.meta: $!\n"; 118 or die "$mappath.meta: $!\n";
130 print $fh CFPlus::to_json $meta; 119 print $fh DC::encode_json $meta;
131 close $fh; 120 close $fh;
132 open my $fh, ">:raw:perlio:utf8", $mappath 121 open my $fh, ">:raw:perlio:utf8", $mappath
133 or die "$mappath: $!\n"; 122 or die "$mappath: $!\n";
134 print $fh $map; 123 print $fh $map;
135 close $fh; 124 close $fh;
… …
174sub invoke_button_down { 163sub invoke_button_down {
175 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
176 165
177 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
178 $self->grab_focus; 167 $self->grab_focus;
179 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
180 169
181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183 172
184 $x -= CFPlus::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
185 $y -= CFPlus::floor $::MAP->h * 0.5; 174 $y -= DC::floor $::MAP->h * 0.5;
186 175
187 if ($::CONN) { 176 if ($::CONN) {
188 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
189 } 178 }
190 179
… …
211 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
212 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
213 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
214 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
215 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
216 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
217 [
218 $::PICKUP_ENABLE->{state}
219 ? "Disable automatic pickup"
220 : "Enable automatic pickup",
221 sub { $::PICKUP_ENABLE->toggle }
222 ],
223 ); 206 );
224 207
225 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
226 push @items, [ 209# push @items, [
227 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
228 \&editor_invoke, 211# \&editor_invoke,
229 ]; 212# ];
230 213
231 for my $type (qw(test name)) { 214 for my $type (qw(test name)) {
232 $::CONN->{editor_support}{type} ne $type 215 $::CONN->{editor_support}{type} ne $type
233 or next; 216 or next;
234 my $server = $::CONN->{editor_support}{"${type}server"} 217 my $server = $::CONN->{editor_support}{"${type}server"}
235 or next; 218 or next;
236 219
237 push @items, [ 220 push @items, [
238 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 221 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
239 sub { server_login $server }, 222 sub { server_login $server },
240 ]; 223 ];
241 } 224 }
242 } 225 }
243 226
… …
251 } 234 }
252 } 235 }
253 ], 236 ],
254 ; 237 ;
255 238
256 (new CFPlus::UI::Menu 239 (new DC::UI::Menu
257 items => \@items, 240 items => \@items,
258 )->popup ($ev); 241 )->popup ($ev);
259 } 242 }
260 243
261 1 244 1
… …
283 266
284sub size_request { 267sub size_request {
285 my ($self) = @_; 268 my ($self) = @_;
286 269
287 ( 270 (
288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, 271 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, 272 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
290 ) 273 )
291} 274}
292 275
293sub update { 276sub update {
294 my ($self) = @_; 277 my ($self) = @_;
… …
296 $self->{need_update} = 1; 279 $self->{need_update} = 1;
297 $self->SUPER::update; 280 $self->SUPER::update;
298} 281}
299 282
300my %DIR = ( 283my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"], 285 ( "," . DC::SDLK_KP8 ), [1, "north"],
303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], 292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
310 293
294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
296 ( "," . DC::SDLK_END ), [6, "southwest"],
297 ( "," . DC::SDLK_HOME ), [8, "northwest"],
298
311 ( "," . CFPlus::SDLK_UP ), [1, "north"], 299 ( "," . DC::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"], 300 ("1," . DC::SDLK_UP ), [2, "northeast"],
313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"], 301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], 302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"], 303 ( "," . DC::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], 304 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"], 305 ( "," . DC::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], 306 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
319); 307);
320 308
321sub invoke_key_down { 309sub invoke_key_down {
322 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
323 311
324 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
325 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
326 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
327 315
328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
329 317
330 if ($sym == 9) { 318 # ignore repeated keypresses
331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility; 319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 320 $self->{last_mod} = $mod;
333 $::HELP_WINDOW->toggle_visibility; 321 $self->{last_sym} = $sym;
334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
335 ::toggle_player_page ($::STATS_PAGE);
336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
337 ::toggle_player_page ($::SKILL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
339 ::toggle_player_page ($::SPELL_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
341 ::toggle_player_page ($::INVENTORY_PAGE);
342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343 $::SETUP_DIALOG->toggle_visibility;
344 } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) {
345 $::MESSAGE_WINDOW->user_switch_to_page (chr $uni);
346 } elsif (!$::CONN) {
347 return 0; # bindings further down need a valid connection
348 322
349 } elsif ($uni == ord ",") { 323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
350 $::CONN->user_send ("take"); 324
351 } elsif ($uni == ord " ") { 325 if ($::CONN && $dir) {
352 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) {
354 $::MESSAGE_WINDOW->activate_current;
355 } elsif ($uni == ord ".") {
356 $::CONN->user_send ($self->{completer}{last_command})
357 if exists $self->{completer}{last_command};
358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
359 $::CONN->macro_send ($_) for @macros;
360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
361 $::CONN->user_send ("rotateshoottype +");
362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
367 } elsif ($uni == ord '"') {
368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
369 $self->{completer}->show;
370 } elsif ($uni == ord "'") {
371 $self->{completer}->set_prefix ("");
372 $self->{completer}->show;
373 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
374 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
375 $self->{shft}++; 327 $self->{shft}++;
376 if ($dir->[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
377 $::CONN->user_send ("fire $dir->[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
378 } 330 }
379 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
380 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & DC::KMOD_CTRL) {
381 $self->{ctrl}++; 333 $self->{ctrl}++;
382 $::CONN->user_send ("run $dir->[0]"); 334 $::CONN->user_send ("run $dir->[0]");
383 } else { 335 } else {
384 $::CONN->user_send ("$dir->[1]"); 336 $::CONN->user_send ("$dir->[1]");
385 } 337 }
386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
387 $self->{completer}->inject_key_down ($ev);
388 $self->{completer}->show;
389 } else {
390 return 0; 339 return 1;
391 }
392
393 1 340 }
341
342 0
394} 343}
395 344
396sub invoke_key_up { 345sub invoke_key_up {
397 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
398 347
399 my $res = 0; 348 my $res = 0;
400 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
401 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
402 351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
403 if ($::CFG->{shift_fire_stop}) { 355 if ($::CFG->{shift_fire_stop}) {
404 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
405 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
406 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
407 $res = 1; 359 $res = 1;
408 } 360 }
409 } else { 361 } else {
362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
410 if (exists $DIR{$sym} && delete $self->{shft}) { 364 if ($dir && delete $self->{shft}) {
411 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
412 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
413 $res = 1; 367 $res = 1;
414 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
369 && delete $self->{shft}) { # XXX: is RSHIFT ok?
415 $::CONN->user_send ("fire_stop"); 370 $::CONN->user_send ("fire_stop");
416 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
417 $res = 1; 372 $res = 1;
418 } 373 }
419 } 374 }
420 375
421 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
422 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
423 $res = 1; 378 $res = 1;
424 } 379 }
425 380
426 $res 381 $res
… …
432 $self->refresh_hook; 387 $self->refresh_hook;
433 388
434 0 389 0
435} 390}
436 391
392sub set_tilesize {
393 my ($self, $tilesize) = @_;
394
395 $self->{tilesize} = $tilesize;
396}
397
398sub scroll {
399 my ($self, $dx, $dy) = @_;
400
401 $::MAP->scroll ($dx, $dy);
402
403 $self->{last_fow_texture} = $self->{fow_texture};
404 $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
405 $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
406
407 $self->movement_update;
408
409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
410 $self->{sdy} += $dy * $self->{tilesize};
411}
412
437sub set_magicmap { 413sub set_magicmap {
438 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
439 415
440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 416 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 417 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
443 $self->{magicmap} = [$x, $y, $w, $h, $data]; 419 $self->{magicmap} = [$x, $y, $w, $h, $data];
444 420
445 $self->update; 421 $self->update;
446} 422}
447 423
424sub movement_update {
425 my ($self) = @_;
426
427 if ($::CFG->{smooth_movement}) {
428 if ($self->{sdx} || $self->{sdy}) {
429 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
431
432 # the minimum time for a single tile movement
433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
434
435 $spd *= $self->{tilesize};
436
437 # jump if "impossibly high" speed
438 if (
439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $mintime * 2.1
441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0;
444 } else {
445 $spd *= $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
454 $self->update;
455 }
456 } else {
457 $self->{sdx} = $self->{sdy} = 0;
458 }
459
460 $self->{last_update} = EV::time;
461}
462
448sub refresh_hook { 463sub refresh_hook {
449 my ($self) = @_; 464 my ($self) = @_;
450 465
451 if ($::MAP && $::CONN) { 466 if ($::MAP && $::CONN) {
452 if (delete $self->{need_update}) { 467 if (delete $self->{need_update}) {
468 $self->movement_update;
469
453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
454 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
455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
457 478
479 # the map displacement, in tiles
458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
459 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
460 482
483 # the upper left "visible" corner, in pixels
461 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
462 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
463 486
464 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; 488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
466 489
467 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 my ($sdx_t, $sdy_t);#d# do not anchor at player
492
468 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 493 my ($w, $h, $data) = $::MAP->fow_texture (
494 $dx + (min 0, $sdx_t),
495 $dy + (min 0, $sdy_t),
496 $sw + abs $sdx_t,
497 $sh + abs $sdy_t
498 );
469 499
470 $self->{fow_texture} = new CFPlus::Texture 500 $self->{fow_texture} = new DC::Texture
471 w => $w, 501 w => $w,
472 h => $h, 502 h => $h,
473 data => $data, 503 data => $data,
474 internalformat => GL_ALPHA, 504 internalformat => GL_INTENSITY,
475 format => GL_ALPHA; 505 format => GL_LUMINANCE;
476 } else { 506 } else {
477 delete $self->{fow_texture}; 507 delete $self->{fow_texture};
478 } 508 }
479 509
480 glNewList ($self->{list} ||= glGenList); 510 glNewList ($self->{list} ||= glGenList);
481 511
482 glPushMatrix; 512 glPushMatrix;
483 glTranslate $sx0, $sy0; 513 glTranslate $sx0, $sy0;
484 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 514 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
515 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
485 516
486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 517 $::MAP->draw ($dx, $dy, $sw, $sh,
518 $self->{tilesize},
519 $::CONN->{player}{tag},
520 -$self->{sdx}, -$self->{sdy});
487 521
522 #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
488 glScale $self->{tilesize}, $self->{tilesize}; 523 glScale $self->{tilesize}, $self->{tilesize};
489 524
490 if (my $tex = $self->{fow_texture}) { 525 if (my $tex = $self->{fow_texture}) {
526 if (0 && $self->{last_fow_texture}) {
527 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
528 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
529
530 if ($d1 * $d2) {
531 my $a2 = $d1 / $d2;
532 my $a1 = 1 - $a2;
533
534 #$a1 *= 0.9;
535 #$a2 *= 0.9;
536
537 printf "%8g %8g %8g %8g\n", $d1, $d2, $a1, $a2;#d#
538
539 #$a1 = 1 - (1-$a1) * 0.707;
540 #$a2 = 1 - (1-$a2) * 0.707;
541
542 glColor 1,0,0,1;
543 glBegin GL_QUADS;
544 glVertex 10 + $sdx_t, 10;
545 glVertex 11 + $sdx_t, 10;
546 glVertex 11 + $sdx_t, 11;
547 glVertex 10 + $sdx_t, 11;
548 glEnd;
549
550 if(0){
551 glBlendFunc GL_ZERO, GL_DST_COLOR;
552 glColor +($::CFG->{fow_intensity}) x 3, $a2;
491 glPushMatrix; 553 glPushMatrix;
554 glTranslate $sdx_t, $sdy_t; # anchor at player
555 glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
492 glScale 1/3, 1/3; 556 glScale 1/3, 1/3;
493 glEnable GL_TEXTURE_2D;
494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
495
496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
497 $self->{fow_texture}->draw_quad_alpha (0, 0); 557 $self->{last_fow_texture}->draw_quad_alpha (0, 0);
498
499 glDisable GL_TEXTURE_2D;
500 glPopMatrix; 558 glPopMatrix;
559 }
560 } else {
561 delete $self->{last_fow_texture};
562 }
563 } else {
564 DC::Texture::draw_fow_texture
565 $::CFG->{fow_intensity},
566 @{$self->{fow_texture}}{qw(name s t w h)};
567 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
568 }
501 } 569 }
502 570
503 if ($self->{magicmap}) { 571 if ($self->{magicmap}) {
504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 572 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
505 573
… …
525 593
526 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 594 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
527 595
528 return unless $self->{list}; 596 return unless $self->{list};
529 597
530 my $focused = $CFPlus::UI::FOCUS == $self 598 my $focused = $DC::UI::FOCUS == $self
531 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 599 || $DC::UI::FOCUS == $::COMPLETER->{entry};
532 600
533 return 601 return
534 unless $focused || !$::FAST; 602 unless $focused || !$::FAST;
535 603
536 glCallList $self->{list}; 604 glCallList $self->{list};
537 605
538 # TNT2 emulates logops in software (or worse :) 606 # TNT2 emulates logops in software (or worse :)
539 unless ($focused) { 607 unless ($focused) {
540 glColor 0.4, 0.2, 0.2, 0.6; 608 glColor_premultiply 0, 0, 1, 0.25;
541 glEnable GL_BLEND; 609 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 610 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glBegin GL_QUADS; 611 glBegin GL_QUADS;
544 glVertex 0, 0; 612 glVertex 0, 0;
545 glVertex 0, $::HEIGHT; 613 glVertex 0, $::HEIGHT;
546 glVertex $::WIDTH, $::HEIGHT; 614 glVertex $::WIDTH, $::HEIGHT;
547 glVertex $::WIDTH, 0; 615 glVertex $::WIDTH, 0;
… …
556 glDeleteList $self->{list}; 624 glDeleteList $self->{list};
557 625
558 $self->SUPER::DESTROY; 626 $self->SUPER::DESTROY;
559} 627}
560 628
561package CFPlus::MapWidget::MapMap; 629package DC::MapWidget::MapMap;
562 630
563use strict; 631use strict;
564use utf8; 632use utf8;
565 633
566our @ISA = CFPlus::UI::Base::; 634our @ISA = DC::UI::Base::;
567 635
568use Time::HiRes qw(time); 636use Time::HiRes qw(time);
569use CFPlus::OpenGL; 637use DC::OpenGL;
570 638
571sub size_request { 639sub size_request {
572 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 640 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
573} 641}
574 642
… …
576 my ($self) = @_; 644 my ($self) = @_;
577 645
578 if ($::MAP && $self->{texture_atime} < time) { 646 if ($::MAP && $self->{texture_atime} < time) {
579 my ($w, $h) = @$self{qw(w h)}; 647 my ($w, $h) = @$self{qw(w h)};
580 648
649 return unless $w && $h;
650
581 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 651 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
582 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 652 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583 653
584 my $ox = 0.5 * ($w - $sw); 654 my $ox = 0.5 * ($w - $sw);
585 my $oy = 0.5 * ($h - $sh); 655 my $oy = 0.5 * ($h - $sh);
… …
599 $self->{y0} = $y0; 669 $self->{y0} = $y0;
600 670
601 $self->{texture_atime} = time + 1/3; 671 $self->{texture_atime} = time + 1/3;
602 672
603 $self->{texture} = 673 $self->{texture} =
604 new CFPlus::Texture 674 new DC::Texture
605 w => $w, 675 w => $w,
606 h => $h, 676 h => $h,
607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 677 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 678 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
609 } 679 }
610} 680}
611 681
612sub invoke_visibility_change { 682sub invoke_visibility_change {
613 my ($self) = @_; 683 my ($self) = @_;
… …
659 glEnd; 729 glEnd;
660 730
661 glDisable GL_BLEND; 731 glDisable GL_BLEND;
662} 732}
663 733
664package CFPlus::MapWidget::Command; 734package DC::MapWidget::Command;
665 735
666use strict; 736use strict;
667 737
668use CFPlus::OpenGL; 738use DC::OpenGL;
669 739
670our @ISA = CFPlus::UI::Frame::; 740our @ISA = DC::UI::Frame::;
671 741
672sub new { 742sub new {
673 my $class = shift; 743 my $class = shift;
674 744
675 my $self = $class->SUPER::new ( 745 my $self = $class->SUPER::new (
676 bg => [0, 0, 0, 0.8], 746 bg => [0, 0, 0, 0.8],
677 @_, 747 @_,
678 ); 748 );
679 749
680 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 750 $self->add ($self->{vbox} = new DC::UI::VBox);
681 751
682 $self->{label} = [ 752 $self->{label} = [
683 map 753 map
684 CFPlus::UI::Label->new ( 754 DC::UI::Label->new (
755 align => 0,
685 can_hover => 1, 756 can_hover => 1,
686 can_events => 1, 757 can_events => 1,
687 tooltip_width => 0.33, 758 tooltip_width => 0.33,
688 fontsize => $_, 759 fontsize => $_,
689 ), (0.8) x 16 760 ), (0.8) x 16
690 ]; 761 ];
691 762
692 $self->{entry} = new CFPlus::UI::Entry 763 $self->{entry} = new DC::UI::Entry
693 on_changed => sub { 764 on_changed => sub {
694 $self->update_labels; 765 $self->update_labels;
695 0 766 0
696 }, 767 },
697 on_button_down => sub { 768 on_button_down => sub {
698 my ($entry, $ev, $x, $y) = @_; 769 my ($entry, $ev, $x, $y) = @_;
699 770
700 if ($ev->{button} == 3) { 771 if ($ev->{button} == 3) {
701 (new CFPlus::UI::Menu 772 (new DC::UI::Menu
702 items => [ 773 items => [
703 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 774 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
704 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 775 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
705 ], 776 ],
706 )->popup ($ev); 777 )->popup ($ev);
707 return 1; 778 return 1;
708 } 779 }
709 0 780 0
… …
724 $self->hide; 795 $self->hide;
725 } 796 }
726 } elsif ($ev->{sym} == 27) { 797 } elsif ($ev->{sym} == 27) {
727 $self->{hist_ptr} = 0; 798 $self->{hist_ptr} = 0;
728 $self->hide; 799 $self->hide;
729 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 800 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
730 if ($self->{hist_ptr} > 1) { 801 if ($self->{hist_ptr} > 1) {
731 $self->{hist_ptr}--; 802 $self->{hist_ptr}--;
732 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 803 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
733 } elsif ($self->{hist_ptr} > 0) { 804 } elsif ($self->{hist_ptr} > 0) {
734 $self->{hist_ptr}--; 805 $self->{hist_ptr}--;
… …
736 } else { 807 } else {
737 ++$self->{select_offset} 808 ++$self->{select_offset}
738 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 809 if $self->{select_offset} < $#{ $self->{last_match} || [] };
739 } 810 }
740 $self->update_labels; 811 $self->update_labels;
741 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 812 } elsif ($ev->{sym} == DC::SDLK_UP) {
742 if ($self->{select_offset}) { 813 if ($self->{select_offset}) {
743 --$self->{select_offset} 814 --$self->{select_offset}
744 } else { 815 } else {
745 unless ($self->{hist_ptr}) { 816 unless ($self->{hist_ptr}) {
746 $self->{hist_saveback} = $self->{entry}->get_text; 817 $self->{hist_saveback} = $self->{entry}->get_text;
… …
812 my $text = $self->{entry}->get_text; 883 my $text = $self->{entry}->get_text;
813 884
814 length $text 885 length $text
815 or return $self->hide; 886 or return $self->hide;
816 887
817 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
818
819 if ($text ne $self->{last_search}) { 888 if ($text ne $self->{last_search}) {
820 my @match; 889 my @match;
821 890
822 if ($text =~ /^(.*?)\s+$/) { 891 if ($text =~ /^(.*?)\s+$/) {
892 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
823 @match = [$cmd, "(appended whitespace suppresses completion)"]; 893 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
824 } else { 894 } else {
895 # @match is [command, penalty, command with arguments] until sort
896
897 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
898
825 my $regexp = do { 899 my $regexp_abbrev = do {
826 my ($beg, @chr) = split //, lc $cmd; 900 my ($beg, @chr) = split //, lc $cmd;
827 901
828 # the following regex is used to match our "completion entry" 902 # the following regex is used to match our "completion entry"
829 # to an actual command - the parentheses match kind of "overhead" 903 # to an actual command - the parentheses match kind of "overhead"
830 # - the more characters the parentheses match, the less attractive 904 # - the more characters the parentheses match, the less attractive
… …
832 my $regexp = "^\Q$beg\E" 906 my $regexp = "^\Q$beg\E"
833 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 907 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
834 qr<$regexp> 908 qr<$regexp>
835 }; 909 };
836 910
837 my @penalty; 911 my $regexp_partial = do {
912 my $regexp = "^\Q$text\E(.*)";
913 qr<$regexp>
914 };
838 915
839 for (keys %{$self->{command}}) { 916 for (keys %{$self->{command}}) {
840 if (@penalty = $_ =~ $regexp) { 917 my @scores;
841 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 918
919 # 1. Complete command [with args]
920 # command is a prefix of the text
921 # score is length of complete command matched
922 # e.g. "invoke summon pet monster bat"
923 # "invoke" "summon pet monster bat" = 6
924 # "invoke summon pet monster" "bat" = 25
925 if ($text =~ /^\Q$_\E(.*)/) {
926 push @scores, [$_, length $_, $text];
842 } 927 }
928
929 # 2. Partial command
930 # text is a prefix of the full command
931 # score is the length of the input text
932 # e.g. "invoke s"
933 # "invoke small fireball" = 8
934 # "invoke summon pet monster" = 8
935
936 if ($_ =~ $regexp_partial) {
937 push @scores, [$_, length $text, $_];
938 }
939
940 # 3. Abbreviation match
941 # attempts to use first word of text as an abbreviated command
942 # score is length of word + 1 - 3 per non-word-initial character
943
944 if (my @penalty = $_ =~ $regexp_abbrev) {
945 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
946 }
947
948 # Pick the best option for this command
949 push @match, (sort {
950 $b->[1] <=> $a->[1]
951 } @scores)[0];
843 } 952 }
844 953
954 # @match is now [command object, command with arguments]
845 @match = map $self->{command}{$_->[0]}, 955 @match = map [$self->{command}{$_->[0]}, $_->[2]],
846 sort { 956 sort {
847 $a->[1] <=> $b->[1] 957 $b->[1] <=> $a->[1]
848 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 958 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
849 or (length $b->[0]) <=> (length $a->[0]) 959 or (length $b->[0]) <=> (length $a->[0])
850 } @match; 960 } @match;
851 } 961 }
852 962
… …
871 $label->{fg} = [1, 1, 1, 1]; 981 $label->{fg} = [1, 1, 1, 1];
872 $label->{bg} = [0, 0, 0, 0]; 982 $label->{bg} = [0, 0, 0, 0];
873 } 983 }
874 984
875 if (@matches) { 985 if (@matches) {
876 $self->{select} = "$matches[0][0]$arg"; 986 $self->{select} = "$matches[0][1]";
877 987
878 $labels[0]->{fg} = [0, 0, 0, 1]; 988 $labels[0]->{fg} = [0, 0, 0, 1];
879 $labels[0]->{bg} = [1, 1, 1, 0.8]; 989 $labels[0]->{bg} = [1, 1, 1, 0.8];
880 } else { 990 } else {
881 $self->{select} = "$cmd$arg"; 991 $self->{select} = "$text";
882 } 992 }
883 993
884 for my $match (@matches) { 994 for my $match (@matches) {
885 my $label = shift @labels; 995 my $label = shift @labels;
886 996
887 if (@labels) { 997 if (@labels) {
888 $label->set_text ("$match->[0]$arg"); 998 $label->set_text ("$match->[1]");
889 $label->set_tooltip ($match->[1]); 999 $label->set_tooltip ("$match->[0][1]");
890 } else { 1000 } else {
891 $label->set_text ("..."); 1001 $label->set_text ("...");
892 $label->set_tooltip ("Use Cursor-Down to view more matches"); 1002 $label->set_tooltip ("Use Cursor-Down to view more matches");
893 last; 1003 last;
894 } 1004 }
… …
904 1014
905sub _draw { 1015sub _draw {
906 my ($self) = @_; 1016 my ($self) = @_;
907 1017
908 # hack 1018 # hack
909 local $CFPlus::UI::FOCUS = $self->{entry}; 1019 local $DC::UI::FOCUS = $self->{entry};
910 1020
911 $self->SUPER::_draw; 1021 $self->SUPER::_draw;
912} 1022}
913 1023
9141 10241

Diff Legend

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