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

Diff Legend

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