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.68 by elmex, Sun Jul 30 12:51:32 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
10use CFClient::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 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 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 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 33 or die "unparseable command help: $_->{kw}[0]";
29 34
30 my $cmd = $1; 35 my $cmd = $1;
31 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 37 @args = (".*") unless @args;
33 38
39 my (undef, @par) = CFPlus::Pod::section_of $_;
40 my $text = CFPlus::Pod::as_label @par;
41
34 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 43 for @args;
36 44
37 my $text = CFClient::Pod::as_markup $head2->content; 45 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
41 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*";
50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
42 } 65 }
43
44 \@cmd_help
45 }; 66 });
46 67
47 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 69 for @cmd_help;
49 70
71 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
75 }
76
77 {
50 $self->{noface} = new_from_file CFClient::Texture 78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
52 82
53 $self->{open_container} = 0; 83 $self->{open_container} = 0;
54 84
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server 85 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 87
62 $self 88 $self
63} 89}
64 90
65sub logprint { 91sub logprint {
… …
254 my @skills = keys %{ $self->{skill_info} }; 280 my @skills = keys %{ $self->{skill_info} };
255 281
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 283 $sktbl->clear;
258 284
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
265 291
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 293
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 294 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); 295 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 296
272 my ($x, $y) = (0, 1); 297 my ($x, $y) = (0, 1);
273 for ( 298 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 299 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 300 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 309 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 310 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 311 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 312 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
289 (new CFClient::UI::Menu 315 (new CFPlus::UI::Menu
290 items => [ 316 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 317 ["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"]) }], 318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 319 ],
294 )->popup ($ev); 320 )->popup ($ev);
295 } else { 321 } else {
296 return 0; 322 return 0;
297 } 323 }
298 324
299 1 325 1
300 }; 326 };
301 327
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 328 $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); 329 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 CFClient::UI::Label 330 $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); 331 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 CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 334
308 $x++ and ($x, $y) = (0, $y + 1); 335 $x++ and ($x, $y) = (0, $y + 1);
309 } 336 }
310 } 337 }
311 338
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 342 }
316} 343}
317 344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
351}
352
318sub user_send { 353sub user_send {
319 my ($self, $command) = @_; 354 my ($self, $command) = @_;
320 355
356 $self->{record}->($command)
321 if ($self->{record}) { 357 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 358
325 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 360 $self->send_command ($command);
327 ::status ($command); 361 ::status ($command);
328} 362}
329 363
330sub start_record { 364sub record {
331 my ($self) = @_; 365 my ($self, $cb) = @_;
332 366
333 $self->{record} = []; 367 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 368}
340 369
341sub map_scroll { 370sub map_scroll {
342 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
343 372
… …
345} 374}
346 375
347sub feed_map1a { 376sub feed_map1a {
348 my ($self, $data) = @_; 377 my ($self, $data) = @_;
349 378
350 $self->{map}->map1a_update ($data); 379 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 380 $self->{map_widget}->update;
352} 381}
353 382
354sub magicmap { 383sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 384 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 393 or return;
365 394
366 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
367 396
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 400}
372 401
373sub map_clear { 402sub map_clear {
374 my ($self) = @_; 403 my ($self) = @_;
… …
378 407
379 $self->{map}->clear; 408 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 409 delete $self->{map_widget}{magicmap};
381} 410}
382 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
383 433
384sub load_map($$$) { 434sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
386 436
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 my $gen = $self->{map_change_gen};
438
439 CFPlus::DB::get $self->{mapcache} => $hash, sub {
440 return unless $gen == $self->{map_change_gen};
441
442 my ($data) = @_;
443
444 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 445 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 446 #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 447
394 $self->set_texture ($id => $data); 448 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress;
395 } 451 }
396 } 452 };
397} 453}
398 454
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 455# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 456# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 457# the right fix is to make real tiled maps with an overview file
… …
465 521
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 522 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 523 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 524
469 } else { 525 } else {
526 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 527 $self->send_mapinfo ("spatial $path$tile", sub {
528 return unless $gen == $self->{map_change_gen};
529
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 530 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 531
473 return if $mode ne "spatial"; 532 return if $mode ne "spatial";
474 533
475 $x += $self->{map}->ox; 534 $x += $self->{map}->ox;
… …
489 548
490sub map_change { 549sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 551
493 $self->flush_map; 552 $self->flush_map;
553
554 ++$self->{map_change_gen};
494 555
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 557
497 my $mapmapw = $self->{mapmap}->{w}; 558 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 559 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 576 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 577 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 578}
518 579
519sub face_find { 580sub face_find {
520 my ($self, $facenum, $face) = @_; 581 my ($self, $facenum, $face, $cb) = @_;
521 582
522 my $hash = "$face->{chksum},$face->{name}"; 583 my $hash = "$face->{chksum},$face->{name}";
523 584
524 my $id = $self->{facemap}->get ($hash); 585 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 586
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFClient::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 CFClient::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 587 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 588 $self->{faceid}[$facenum] = $id;
551 589
552 my $face = $self->{tilecache}->get ($id); 590 $self->{map}->set_tileid ($facenum => $id);
553 591
554 if ($face) { 592 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} 593}
563 594
564sub face_update { 595sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 596 my ($self, $facenum, $face, $changed) = @_;
566 597
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
599 if $changed;
568 600
569 $self->set_texture ($face->{id} => delete $face->{image}); 601 $self->set_texture ($face->{id} => delete $face->{image});
602}
603
604sub smooth_update {
605 my ($self, $facenum, $face) = @_;
606
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 608}
571 609
572sub set_texture { 610sub set_texture {
573 my ($self, $id, $data) = @_; 611 my ($self, $id, $data) = @_;
574 612
575 $self->{texture}[$id] ||= do { 613 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFClient::Texture 614 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 615 $data, minify => 1, mipmap => 1;
579 616
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 618 $self->{map_widget}->update;
582
583 $tex
584 };
585} 619}
586 620
587sub sound_play { 621sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 622 my ($self, $x, $y, $soundnum, $type) = @_;
589 623
… …
618 [0.75, 0.61, 0.20], 652 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 653 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 654 [0.74, 0.65, 0.41],
621 ); 655 );
622 656
657 my $fg = $color[$color % @color];
658
623 $self->logprint ("info: ", $text); 659 $self->logprint ("info: ", $text);
624 660
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626
627 # try to create single paragraphs of multiple lines sent by the server 661 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 663 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 664
630 $text = CFClient::asxml $text; 665 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 668
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 669 ::message ({ fg => $fg, markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 670 for split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637 671
638 $self->{statusbox}->add ($text, 672 $self->{statusbox}->add ($text,
639 group => $text, 673 group => $text,
640 fg => $color[$color], 674 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 675 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 676 tooltip_font => $::FONT_FIXED,
643 ); 677 );
644} 678}
645 679
646sub drawextinfo { 680sub drawextinfo {
… …
655 # try to create single paragraphs out of the multiple lines sent by the server 689 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 690 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 691 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 692 $spell->{message} ||= "Server did not provide a description for this spell.";
659 693
660 $::SPELL_PAGE->add_spell ($spell); 694 $::SPELL_LIST->add_spell ($spell);
661 695
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 696 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 698}
665 699
666sub spell_delete { 700sub spell_delete {
667 my ($self, $spell) = @_; 701 my ($self, $spell) = @_;
668 702
669 $::SPELL_PAGE->remove_spell ($spell); 703 $::SPELL_LIST->remove_spell ($spell);
704}
705
706sub setup {
707 my ($self, $setup) = @_;
708
709 $self->{map_widget}->set_tilesize ($self->{tilesize});
710 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 711}
671 712
672sub addme_success { 713sub addme_success {
673 my ($self) = @_; 714 my ($self) = @_;
674 715
675 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 716 my %skill_help;
679 717
680 for my $head2 ($pom->head1->[3]->head2) { 718 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 719 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 720 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 721 };
686 722
687 for my $skill (values %{$self->{skill_info}}) { 723 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 724 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFClient::asxml "Ready the skill '$skill'\n\n") 725 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 726 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 727 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 728 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 729 . $skill_help{$skill});
694 } 730 }
695} 731}
696 732
697sub eof { 733sub eof {
698 my ($self) = @_; 734 my ($self) = @_;
… …
722 758
723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 759 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724 760
725 $self->send ("requestinfo image_sums $face $face"); 761 $self->send ("requestinfo image_sums $face $face");
726 762
727 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 763 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 764 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729 } elsif (!exists $self->{num_faces}) { 765 } elsif (!exists $self->{num_faces}) {
730 $self->send ("requestinfo image_info"); 766 $self->send ("requestinfo image_info");
731 767
732 $self->{num_faces} = 0; 768 $self->{num_faces} = 0;
733 769
734 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 770 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 771 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736 } 772 }
737} 773}
738 774
739sub update_floorbox { 775sub update_floorbox {
740 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 777 return unless $::CONN;
742 778
743 $::FLOORBOX->clear; 779 $::FLOORBOX->clear;
744 780
745 my $row; 781 my $row;
746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
747 if ($row < 6) { 783 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 784 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 785 local $_->{desc_widget}; # hack to force recreation of widget
750 CFClient::Item::update_widgets $_; 786 CFPlus::Item::update_widgets $_;
751 787
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 788 $::FLOORBOX->add (0, $row, $_->{face_widget});
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 789 $::FLOORBOX->add (1, $row, $_->{desc_widget});
754 790
755 $row++; 791 $row++;
756 } else { 792 } else {
757 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
758 text => "More...", 794 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 796 );
761 last; 797 last;
762 } 798 }
763 } 799 }
764 if ($::CONN->{open_container}) { 800 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
766 text => "Close container", 802 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 804 );
769 } 805 }
770 }); 806 });
… …
776 my ($conn, $tag, $name) = @_; 812 my ($conn, $tag, $name) = @_;
777 $conn->{open_container} = $tag; 813 $conn->{open_container} = $tag;
778 update_floorbox; 814 update_floorbox;
779 815
780 $::INV_RIGHT_HB->clear (); 816 $::INV_RIGHT_HB->clear ();
781 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 817 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
782 818
783 if ($tag != 0) { # Floor isn't closable, is it? 819 if ($tag != 0) { # Floor isn't closable, is it?
784 $::INV_RIGHT_HB->add (new CFClient::UI::Button 820 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
785 text => "Close container", 821 text => "Close container",
786 tooltip => "Close the currently open container (if one is open)", 822 tooltip => "Close the currently open container (if one is open)",
787 on_activate => sub { 823 on_activate => sub {
788 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 824 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
789 if $tag != 0; 825 if $tag != 0;
… …
797} 833}
798 834
799sub update_containers { 835sub update_containers {
800 my ($self) = @_; 836 my ($self) = @_;
801 837
802 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 838 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
803 my $todo = delete $self->{update_container} 839 my $todo = delete $self->{update_container}
804 or return; 840 or return;
805 841
806 for my $tag (keys %$todo) { 842 for my $tag (keys %$todo) {
807 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 843 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
844sub item_update { 880sub item_update {
845 my ($self, $item) = @_; 881 my ($self, $item) = @_;
846 882
847 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 883 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
848 884
849 CFClient::Item::update_widgets $item; 885 CFPlus::Item::update_widgets $item;
850 886
851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 887 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
852 set_opencont ($::CONN, 0, "Floor"); 888 set_opencont ($::CONN, 0, "Floor");
853 889
854 } elsif ($item->{flags} & F_OPEN) { 890 } elsif ($item->{flags} & F_OPEN) {
855 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 891 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
856 892
857 } else { 893 } else {
858 $self->{update_container}{$item->{container}}++; 894 $self->{update_container}{$item->{container}}++;
859 $self->update_containers; 895 $self->update_containers;
860 } 896 }
… …
885 $::SERVER_INFO->set_markup ( 921 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 922 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 923 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 930 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 931 );
932
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 934}
895 935
896sub logged_in { 936sub logged_in {
897 my ($self) = @_; 937 my ($self) = @_;
898 938
899 $self->send_ext_req (cfplus_support => "1", sub { 939 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 940 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 941 $self->update_server_info;
942
943 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0];
946 $self->update_server_info;
947
948 0
949 });
950 }
951
952 0
902 }); 953 });
903 954
904 $self->update_server_info; 955 $self->update_server_info;
905 956
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 957 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 958 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 960 $self->send_command ("pickup $::CFG->{pickup}");
961}
962
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
909} 969}
910 970
911sub lookat { 971sub lookat {
912 my ($self, $x, $y) = @_; 972 my ($self, $x, $y) = @_;
913 973
914 if ($self->{cfplus_ext}) { 974 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 976 my ($msg) = @_;
917 977
918 if (exists $res{npc_dialog}) { 978 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 979 # start npc chat dialog
920 $self->{npc_dialog} = new CFClient::NPCDialog:: 980 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 981 dx => $x,
922 dy => $y, 982 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 983 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 984 conn => $self,
925 ; 985 ;
926 } 986 }
927 }); 987 });
928 } 988 }
… …
931} 991}
932 992
933sub destroy { 993sub destroy {
934 my ($self) = @_; 994 my ($self) = @_;
935 995
936 $self->{npc_dialog}->destroy 996 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 997 if $self->{npc_dialog};
938 998
939 $self->SUPER::destroy; 999 $self->SUPER::destroy;
940} 1000}
941 1001
942package CFClient::NPCDialog; 1002package CFPlus::NPCDialog;
943 1003
944our @ISA = 'CFClient::UI::FancyFrame'; 1004our @ISA = 'CFPlus::UI::Toplevel';
945 1005
946sub new { 1006sub new {
947 my $class = shift; 1007 my $class = shift;
948 1008
949 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1016 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1017 has_close_button => 1,
958 @_, 1018 @_,
959 ); 1019 );
960 1020
961 Scalar::Util::weaken (my $this = $self); 1021 CFPlus::weaken (my $this = $self);
962 1022
963 $self->connect (delete => sub { $this->destroy; 1 }); 1023 $self->connect (delete => sub { $this->destroy; 1 });
964 1024
965 # better use a pane... 1025 # better use a pane...
966 $self->add (my $hbox = new CFClient::UI::HBox); 1026 $self->add (my $hbox = new CFPlus::UI::HBox);
967 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1027 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
968 1028
969 $hbox->add (my $vbox = new CFClient::UI::VBox); 1029 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1030
971 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1031 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1032 $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" 1033 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 { 1034 on_activate => sub {
979 my ($entry, $text) = @_; 1035 my ($entry, $text) = @_;
980 1036
981 return unless $text =~ /\S/; 1037 return unless $text =~ /\S/;
982 1038
… …
985 1041
986 0 1042 0
987 }, 1043 },
988 ); 1044 );
989 1045
990 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1046 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
991 1047
992 $self->{bye_button} = new CFClient::UI::Button 1048 $self->{bye_button} = new CFPlus::UI::Button
993 text => "Bye (close)", 1049 text => "Bye (close)",
994 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1050 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
995 on_activate => sub { $this->destroy; 1 }, 1051 on_activate => sub { $this->destroy; 1 },
996 ; 1052 ;
997 1053
998 $self->update_options; 1054 $self->update_options;
999 1055
1000 $self->{token} = $self->{conn}->ext_token; 1056 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1058 sub { $this && $this->feed (@_) }
1059 );
1003 1060
1004 $self->{entry}->grab_focus; 1061 $self->{entry}->grab_focus;
1005 1062
1006 $self->{textview}->add_paragraph ({ 1063 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1064 fg => [1, 1, 0, 1],
… …
1013}; 1070};
1014 1071
1015sub update_options { 1072sub update_options {
1016 my ($self) = @_; 1073 my ($self) = @_;
1017 1074
1018 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1019 1076
1020 $self->{options}->clear; 1077 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1078 $self->{options}->add ($self->{bye_button});
1022 1079
1023 for my $kw (sort keys %{ $self->{kw} }) { 1080 for my $kw (sort keys %{ $self->{kw} }) {
1024 $self->{options}->add (new CFClient::UI::Button 1081 $self->{options}->add (new CFPlus::UI::Button
1025 text => $kw, 1082 text => $kw,
1026 on_activate => sub { 1083 on_activate => sub {
1027 $self->send ($kw); 1084 $self->send ($kw);
1028 0 1085 0
1029 }, 1086 },
1030 ); 1087 );
1031 } 1088 }
1032} 1089}
1033 1090
1034sub feed { 1091sub feed {
1035 my ($self, $data) = @_; 1092 my ($self, $msg) = @_;
1036 1093
1037 Scalar::Util::weaken $self; 1094 CFPlus::weaken $self;
1038 1095
1039 my ($type, $msg) = split / /, $data, 2; 1096 if ($msg->{msgtype} eq "reply") {
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1099
1041 if ($type eq "msg") { 1100 my $text = "\n" . CFPlus::asxml $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" . CFClient::UI::asxml $msg;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1102 my @link;
1051 $msg =~ s{ 1103 $text =~ s{
1052 ($match) 1104 ($match)
1053 }{ 1105 }{
1054 my $kw = $1; 1106 my $kw = $1;
1055 1107
1056 push @link, new CFClient::UI::Label 1108 push @link, new CFPlus::UI::Label
1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058 can_hover => 1, 1110 can_hover => 1,
1059 can_events => 1, 1111 can_events => 1,
1060 padding_x => 0, 1112 padding_x => 0,
1061 padding_y => 0, 1113 padding_y => 0,
1062 on_button_up => sub { 1114 on_button_up => sub {
1063 $self->send ($kw); 1115 $self->send ($kw);
1064 }; 1116 };
1065 1117
1066 chr 0xfffc 1118 "\x{fffc}"
1067 }giex; 1119 }giex;
1068 1120
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1122 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1123 $self->update_options;
1072 } else { 1124 } else {
1073 $self->destroy; 1125 $self->destroy;
1074 } 1126 }
… …
1077} 1129}
1078 1130
1079sub send { 1131sub send {
1080 my ($self, $msg) = @_; 1132 my ($self, $msg) = @_;
1081 1133
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1135 $self->{textview}->scroll_to_bottom;
1084 1136
1085 utf8::encode $msg; 1137 $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} 1138}
1088 1139
1089sub destroy { 1140sub destroy {
1090 my ($self) = @_; 1141 my ($self) = @_;
1091 1142
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1144
1145 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1147 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1148 $self->{conn}->disconnect_ext ($self->{id});
1149 }
1097 1150
1098 $self->SUPER::destroy; 1151 $self->SUPER::destroy;
1099} 1152}
1100 1153
11011 11541
1155

Diff Legend

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