ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.108 by root, Sun Jun 24 04:11:22 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 %{$arg{setup_req} || {}},
27 },
28 );
18 29
19 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
20 31
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 32 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 34 or die "unparseable command help: $_->{kw}[0]";
29 35
30 my $cmd = $1; 36 my $cmd = $1;
31 my @args = split /\|/, $2; 37 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 38 @args = (".*") unless @args;
33 39
40 my (undef, @par) = CFPlus::Pod::section_of $_;
41 my $text = CFPlus::Pod::as_label @par;
42
34 $_ = $_ eq ".*" ? "" : " $_" 43 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 44 for @args;
36 45
37 my $text = CFPlus::Pod::as_markup $head2->content; 46 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
41 @args; 48 @args
49 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*";
51
52 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_;
54
55 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 }
42 } 66 }
43
44 \@cmd_help
45 }; 67 });
46 68
47 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 70 for @cmd_help;
49 71
72 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76 }
77
78 {
50 $self->{noface} = new_from_file CFPlus::Texture 79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 80 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
82 }
52 83
53 $self->{open_container} = 0; 84 $self->{open_container} = 0;
54 85
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 86 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 88
62 $self 89 $self
63} 90}
64 91
65sub logprint { 92sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 249 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 250 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 251 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $rng =~ s/^Range: //; # thank you so much dear server
229 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
230 my $title = $stats->{+CS_STAT_TITLE}; 255 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 256 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 257 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 258
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 259 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
265 290
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 292
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 295
272 my ($x, $y) = (0, 1); 296 my ($x, $y) = (0, 1);
273 for ( 297 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 298 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 299 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 308 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 309 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 310 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 311 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 312 } elsif ($ev->{button} == 3) {
313 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 314 (new CFPlus::UI::Menu
290 items => [ 315 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 316 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 317 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 318 ],
294 )->popup ($ev); 319 )->popup ($ev);
295 } else { 320 } else {
296 return 0; 321 return 0;
297 } 322 }
… …
301 326
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 333
308 $x++ and ($x, $y) = (0, $y + 1); 334 $x++ and ($x, $y) = (0, $y + 1);
309 } 335 }
310 } 336 }
311 337
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 341 }
316} 342}
317 343
344sub macro_send {
345 my ($self, $macro) = @_;
346
347 for my $cmd (@{ $macro->{action} }) {
348 $self->send_command ($cmd);
349 }
350}
351
318sub user_send { 352sub user_send {
319 my ($self, $command) = @_; 353 my ($self, $command) = @_;
320 354
355 $self->{record}->($command)
321 if ($self->{record}) { 356 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 357
325 $self->logprint ("send: ", $command); 358 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 359 $self->send_command ($command);
327 ::status ($command); 360 ::status ($command);
328} 361}
329 362
330sub start_record { 363sub record {
331 my ($self) = @_; 364 my ($self, $cb) = @_;
332 365
333 $self->{record} = []; 366 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 367}
340 368
341sub map_scroll { 369sub map_scroll {
342 my ($self, $dx, $dy) = @_; 370 my ($self, $dx, $dy) = @_;
343 371
… …
345} 373}
346 374
347sub feed_map1a { 375sub feed_map1a {
348 my ($self, $data) = @_; 376 my ($self, $data) = @_;
349 377
350 $self->{map}->map1a_update ($data); 378 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 379 $self->{map_widget}->update;
352} 380}
353 381
354sub magicmap { 382sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 383 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 392 or return;
365 393
366 my ($hash, $x, $y, $w, $h) = @$map_info; 394 my ($hash, $x, $y, $w, $h) = @$map_info;
367 395
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 396 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 399}
372 400
373sub map_clear { 401sub map_clear {
374 my ($self) = @_; 402 my ($self) = @_;
… …
378 406
379 $self->{map}->clear; 407 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 408 delete $self->{map_widget}{magicmap};
381} 409}
382 410
411sub bg_fetch {
412 my ($self) = @_;
413
414 my $id;
415
416 do {
417 $id = pop @{$self->{bg_fetch}}
418 or return;
419 } while $self->{texture}[$id];
420
421 CFPlus::DB::get tilecache => $id, sub {
422 my ($data) = @_;
423
424 return unless $self->{map}; # stop when destroyed
425
426 $self->set_texture ($id => $data)
427 if defined $data;
428
429 $self->bg_fetch;
430 };
431}
383 432
384sub load_map($$$) { 433sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 434 my ($self, $hash, $x, $y) = @_;
386 435
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 436 my $gen = $self->{map_change_gen};
437
438 CFPlus::DB::get $self->{mapcache} => $hash, sub {
439 return unless $gen == $self->{map_change_gen};
440
441 my ($data) = @_;
442
443 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 444 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 446
394 $self->set_texture ($id => $data); 447 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress;
395 } 450 }
396 } 451 };
397} 452}
398 453
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 454# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 455# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 456# the right fix is to make real tiled maps with an overview file
… …
465 520
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 521 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 522 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 523
469 } else { 524 } else {
525 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 526 $self->send_mapinfo ("spatial $path$tile", sub {
527 return unless $gen == $self->{map_change_gen};
528
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 529 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 530
473 return if $mode ne "spatial"; 531 return if $mode ne "spatial";
474 532
475 $x += $self->{map}->ox; 533 $x += $self->{map}->ox;
… …
489 547
490sub map_change { 548sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 550
493 $self->flush_map; 551 $self->flush_map;
552
553 ++$self->{map_change_gen};
494 554
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 556
497 my $mapmapw = $self->{mapmap}->{w}; 557 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 558 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 575 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 576 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 577}
518 578
519sub face_find { 579sub face_find {
520 my ($self, $facenum, $face) = @_; 580 my ($self, $facenum, $face, $cb) = @_;
521 581
522 my $hash = "$face->{chksum},$face->{name}"; 582 my $hash = "$face->{chksum},$face->{name}";
523 583
524 my $id = $self->{facemap}->get ($hash); 584 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 585
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 586 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 587 $self->{faceid}[$facenum] = $id;
551 588
552 my $face = $self->{tilecache}->get ($id); 589 $self->{map}->set_tileid ($facenum => $id);
553 590
554 if ($face) { 591 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch;
556 $face
557 } else {
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 };
562} 592}
563 593
564sub face_update { 594sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 595 my ($self, $facenum, $face, $changed) = @_;
566 596
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
598 if $changed;
568 599
569 $self->set_texture ($face->{id} => delete $face->{image}); 600 $self->set_texture ($face->{id} => delete $face->{image});
601}
602
603sub smooth_update {
604 my ($self, $facenum, $face) = @_;
605
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 607}
571 608
572sub set_texture { 609sub set_texture {
573 my ($self, $id, $data) = @_; 610 my ($self, $id, $data) = @_;
574 611
575 $self->{texture}[$id] ||= do { 612 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFPlus::Texture 613 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 614 $data, minify => 1, mipmap => 1;
579 615
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 617 $self->{map_widget}->update;
582
583 $tex
584 };
585} 618}
586 619
587sub sound_play { 620sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 621 my ($self, $x, $y, $soundnum, $type) = @_;
589 622
… …
599 $LAST_QUERY = $prompt; 632 $LAST_QUERY = $prompt;
600 633
601 $self->{query}-> ($self, $flags, $prompt); 634 $self->{query}-> ($self, $flags, $prompt);
602} 635}
603 636
604sub drawinfo { 637sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 638 local $_ = shift;
606 639
607 my @color = ( 640 # we now weed out all tags we do not support
641 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
642 # now all entities
643 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
644
645 # handle some elements
646 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
647 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
648
649 $_
650}
651
652our %NAME_TO_COLOR = (
653 black => 0,
654 white => 1,
655 darkblue => 2,
656 red => 3,
657 orange => 4,
658 lightblue => 5,
659 darkorange => 6,
660 green => 7,
661 darkgreen => 8,
662 grey => 9,
663 brown => 10,
664 yellow => 11,
665 tan => 12,
666);
667
668our @CF_COLOR = (
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 669 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00], 670 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 671 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00], 672 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 673 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 674 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 675 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 676 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 677 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 678 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 679 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 680 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 681 [0.74, 0.65, 0.41],
621 ); 682);
622 683
684sub msg {
685 my ($self, $color, $type, $text, @extra) = @_;
686
687 $text = sanitise_xml $text;
688
689 if (my $cb = $self->{cb_msg}{$type}) {
690 $_->($self, $color, $type, $text, @extra) for values %$cb;
691 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
692 $type =~ s/-/_/g;
693 $self->{$type} = $text;
694 } else {
623 $self->logprint ("info: ", $text); 695 $self->logprint ("msg: ", $text);
696 return if $color < 0; # negative color == ignore if not understood
624 697
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 698 my $fg = $CF_COLOR[$color % @CF_COLOR];
626 699
627 # try to create single paragraphs of multiple lines sent by the server 700 ## try to create single paragraphs of multiple lines sent by the server
701 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 702 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 703
630 $text = CFPlus::asxml $text; 704 ::message ({ fg => $fg, markup => $_ })
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 705 for split /\n/, $text;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 706
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637
638 $self->{statusbox}->add ($text, 707 $self->{statusbox}->add ($text,
639 group => $text, 708 group => $text,
640 fg => $color[$color], 709 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 710 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 711 tooltip_font => $::FONT_FIXED,
643 ); 712 );
644} 713 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 714}
651 715
652sub spell_add { 716sub spell_add {
653 my ($self, $spell) = @_; 717 my ($self, $spell) = @_;
654 718
655 # try to create single paragraphs out of the multiple lines sent by the server 719 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 720 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 721 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 722 $spell->{message} ||= "Server did not provide a description for this spell.";
659 723
660 $::SPELL_PAGE->add_spell ($spell); 724 $::SPELL_LIST->add_spell ($spell);
661 725
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 726 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 727 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 728}
665 729
666sub spell_delete { 730sub spell_delete {
667 my ($self, $spell) = @_; 731 my ($self, $spell) = @_;
668 732
669 $::SPELL_PAGE->remove_spell ($spell); 733 $::SPELL_LIST->remove_spell ($spell);
734}
735
736sub setup {
737 my ($self, $setup) = @_;
738
739 $self->{map_widget}->set_tilesize ($self->{tilesize});
740 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 741}
671 742
672sub addme_success { 743sub addme_success {
673 my ($self) = @_; 744 my ($self) = @_;
674 745
675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 746 my %skill_help;
679 747
680 for my $head2 ($pom->head1->[3]->head2) { 748 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 749 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 750 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 751 };
686 752
687 for my $skill (values %{$self->{skill_info}}) { 753 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 754 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 755 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 756 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 757 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 758 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 759 . $skill_help{$skill});
694 } 760 }
695} 761}
696 762
697sub eof { 763sub eof {
698 my ($self) = @_; 764 my ($self) = @_;
… …
885 $::SERVER_INFO->set_markup ( 951 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 952 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 953 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 954 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 955 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
956 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
957 . "editing support $yesno[!!$self->{editor_support}]\n"
958 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
959 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 960 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 961 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 962 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 963 );
964
965 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 966}
895 967
896sub logged_in { 968sub logged_in {
897 my ($self) = @_; 969 my ($self) = @_;
898 970
899 $self->send_ext_req (cfplus_support => "1", sub { 971 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 972 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 973 $self->update_server_info;
974
975 if ($self->{cfplus_ext} >= 2) {
976 $self->send_ext_req ("editor_support", sub {
977 $self->{editor_support} = $_[0];
978 $self->update_server_info;
979
980 0
981 });
982 }
983
984 0
902 }); 985 });
903 986
904 $self->update_server_info; 987 $self->update_server_info;
905 988
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 989 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 990 $self->send_command ("output-count $::CFG->{output_count}");
991 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 992 $self->send_command ("pickup $::CFG->{pickup}");
993}
994
995sub buildat {
996 my ($self, $builditem, $x, $y) = @_;
997
998 if ($self->{cfplus_ext}) {
999 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1000 }
909} 1001}
910 1002
911sub lookat { 1003sub lookat {
912 my ($self, $x, $y) = @_; 1004 my ($self, $x, $y) = @_;
913 1005
914 if ($self->{cfplus_ext}) { 1006 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 1007 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 1008 my ($msg) = @_;
917 1009
918 if (exists $res{npc_dialog}) { 1010 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 1011 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1012 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 1013 dx => $x,
922 dy => $y, 1014 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 1015 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 1016 conn => $self,
925 ; 1017 ;
926 } 1018 }
927 }); 1019 });
928 } 1020 }
… …
931} 1023}
932 1024
933sub destroy { 1025sub destroy {
934 my ($self) = @_; 1026 my ($self) = @_;
935 1027
936 $self->{npc_dialog}->destroy 1028 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 1029 if $self->{npc_dialog};
938 1030
939 $self->SUPER::destroy; 1031 $self->SUPER::destroy;
940} 1032}
941 1033
942package CFPlus::NPCDialog; 1034package CFPlus::NPCDialog;
943 1035
944our @ISA = 'CFPlus::UI::FancyFrame'; 1036our @ISA = 'CFPlus::UI::Toplevel';
945 1037
946sub new { 1038sub new {
947 my $class = shift; 1039 my $class = shift;
948 1040
949 my $self = $class->SUPER::new ( 1041 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1048 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1049 has_close_button => 1,
958 @_, 1050 @_,
959 ); 1051 );
960 1052
961 Scalar::Util::weaken (my $this = $self); 1053 CFPlus::weaken (my $this = $self);
962 1054
963 $self->connect (delete => sub { $this->destroy; 1 }); 1055 $self->connect (delete => sub { $this->destroy; 1 });
964 1056
965 # better use a pane... 1057 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1058 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1060
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1061 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1062
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1063 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1064 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1065 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 1066 on_activate => sub {
979 my ($entry, $text) = @_; 1067 my ($entry, $text) = @_;
980 1068
981 return unless $text =~ /\S/; 1069 return unless $text =~ /\S/;
982 1070
… …
995 on_activate => sub { $this->destroy; 1 }, 1083 on_activate => sub { $this->destroy; 1 },
996 ; 1084 ;
997 1085
998 $self->update_options; 1086 $self->update_options;
999 1087
1000 $self->{token} = $self->{conn}->ext_token; 1088 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1089 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1090 sub { $this && $this->feed (@_) }
1091 );
1003 1092
1004 $self->{entry}->grab_focus; 1093 $self->{entry}->grab_focus;
1005 1094
1006 $self->{textview}->add_paragraph ({ 1095 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1096 fg => [1, 1, 0, 1],
… …
1013}; 1102};
1014 1103
1015sub update_options { 1104sub update_options {
1016 my ($self) = @_; 1105 my ($self) = @_;
1017 1106
1018 Scalar::Util::weaken $self; 1107 CFPlus::weaken $self;
1019 1108
1020 $self->{options}->clear; 1109 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1110 $self->{options}->add ($self->{bye_button});
1022 1111
1023 for my $kw (sort keys %{ $self->{kw} }) { 1112 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1119 );
1031 } 1120 }
1032} 1121}
1033 1122
1034sub feed { 1123sub feed {
1035 my ($self, $data) = @_; 1124 my ($self, $msg) = @_;
1036 1125
1037 Scalar::Util::weaken $self; 1126 CFPlus::weaken $self;
1038 1127
1039 my ($type, $msg) = split / /, $data, 2; 1128 if ($msg->{msgtype} eq "reply") {
1129 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1130 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1131
1041 if ($type eq "msg") { 1132 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFPlus::UI::asxml $msg;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1133 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1134 my @link;
1051 $msg =~ s{ 1135 $text =~ s{
1052 ($match) 1136 ($match)
1053 }{ 1137 }{
1054 my $kw = $1; 1138 my $kw = $1;
1055 1139
1056 push @link, new CFPlus::UI::Label 1140 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1145 padding_y => 0,
1062 on_button_up => sub { 1146 on_button_up => sub {
1063 $self->send ($kw); 1147 $self->send ($kw);
1064 }; 1148 };
1065 1149
1066 chr 0xfffc 1150 "\x{fffc}"
1067 }giex; 1151 }giex;
1068 1152
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1153 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1154 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1155 $self->update_options;
1072 } else { 1156 } else {
1073 $self->destroy; 1157 $self->destroy;
1074 } 1158 }
… …
1080 my ($self, $msg) = @_; 1164 my ($self, $msg) = @_;
1081 1165
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1166 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1167 $self->{textview}->scroll_to_bottom;
1084 1168
1085 utf8::encode $msg; 1169 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1170}
1088 1171
1089sub destroy { 1172sub destroy {
1090 my ($self) = @_; 1173 my ($self) = @_;
1091 1174
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1175 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1176
1177 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1178 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1179 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1180 $self->{conn}->disconnect_ext ($self->{id});
1181 }
1097 1182
1098 $self->SUPER::destroy; 1183 $self->SUPER::destroy;
1099} 1184}
1100 1185
11011 11861
1187

Diff Legend

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