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

Diff Legend

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