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.66 by root, Sun Jul 23 16:48:48 2006 UTC vs.
Revision 1.110 by root, Tue Jun 26 05:06:01 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 xwidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 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 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 35 or die "unparseable command help: $_->{kw}[0]";
29 36
30 my $cmd = $1; 37 my $cmd = $1;
31 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 39 @args = (".*") unless @args;
33 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
34 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 45 for @args;
36 46
37 my $text = CFClient::Pod::as_xml $head2->content; 47 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (event_capabilities => sub {
54 my ($cap) = @_;
55
56 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 }
42 } 67 }
43
44 \@cmd_help
45 }; 68 });
69
70 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_;
72
73 $self->{widgetset}{$arg{id}} = {
74 w => {},
75 };
76 });
77
78 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_;
80
81 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return;
83
84 $_->destroy
85 for values %{$ws->{w}};
86 });
87
88 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_;
90
91 my $args = $arg->{args} || {};
92
93 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub {
95 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98 1
99 };
100 }
101
102 if (my $widget = eval {
103 local $SIG{__DIE__};
104 "CFPlus::UI::$arg->{class}"->new (
105 %$args,
106 s_ws => $arg->{ws},
107 s_id => $arg->{id},
108 )
109 }
110 ) {
111 $self->{widget}{$arg->{id}}
112 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
113 = $widget;
114
115 $widget->connect (on_destroy => sub {
116 my ($widget) = @_;
117
118 delete $self->{widget}{$widget->{s_id}};
119 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120 });
121 } else {
122 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
124 }
125 });
126
127 $self->connect_ext (w_c => sub {
128 my ($arg) = @_;
129
130 my $w = $self->{widget}{$arg->{id}}
131 or return;
132 my $m = $arg->{name};
133
134 my @a = map {
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] };
139
140 if (exists $arg->{rid}) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
142 } else {
143 $w->$m (@a);
144 }
145 });
146
147 $self->connect_ext (w_s => sub {
148 my ($arg) = @_;
149
150 my $w = $self->{widget}{$arg->{id}}
151 or return;
152
153 $w->{$arg->{name}} = $arg->{value};
154 });
155
156 $self->connect_ext (w_g => sub {
157 my ($arg) = @_;
158
159 my $w = $self->{widget}{$arg->{id}}
160 or return;
161
162 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
163 });
164
165 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy
168 for values %{delete $ws->{w} || {}};
169 }
170 });
46 171
47 $self->{map_widget}->add_command (@$_) 172 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 173 for @cmd_help;
49 174
175 {
176 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
177 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
178 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
179 }
180
181 {
50 $self->{noface} = new_from_file CFClient::Texture 182 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 183 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
184 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
185 }
52 186
53 $self->{open_container} = 0; 187 $self->{open_container} = 0;
54 188
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server 189 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 190 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 191
62 $self 192 $self
63} 193}
64 194
65sub logprint { 195sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 352 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 353 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 354 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 355 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 356 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 357 $::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}; 358 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 359 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 360 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 361
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 362 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
254 my @skills = keys %{ $self->{skill_info} }; 382 my @skills = keys %{ $self->{skill_info} };
255 383
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 384 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 385 $sktbl->clear;
258 386
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 387 $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); 388 $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); 389 $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); 390 $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); 391 $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); 392 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
393
394 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395
396 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265 398
266 my ($x, $y) = (0, 1); 399 my ($x, $y) = (0, 1);
267 for ( 400 for (
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 401 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}], 402 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 403 grep exists $stats->{$_},
271 @skills 404 @skills
272 ) { 405 ) {
273 my ($idx, $name) = @$_; 406 my ($idx, $name) = @$_;
274 407
408 my $spell_cb = sub {
409 my ($widget, $ev) = @_;
410
411 if ($ev->{button} == 1) {
412 $::CONN->user_send ("ready_skill $name");
413 } elsif ($ev->{button} == 2) {
414 $::CONN->user_send ("use_skill $name");
415 } elsif ($ev->{button} == 3) {
416 my $shortname = CFPlus::shorten $name, 14;
417 (new CFPlus::UI::Menu
418 items => [
419 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
420 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
421 ],
422 )->popup ($ev);
423 } else {
424 return 0;
425 }
426
427 1
428 };
429
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 430 $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]); 431 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 432 $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); 433 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); 434 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
280 436
281 $x++ and ($x, $y) = (0, $y + 1); 437 $x++ and ($x, $y) = (0, $y + 1);
282 } 438 }
283 } 439 }
284 440
… …
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
288 } 444 }
289} 445}
290 446
447sub macro_send {
448 my ($self, $macro) = @_;
449
450 for my $cmd (@{ $macro->{action} }) {
451 $self->send_command ($cmd);
452 }
453}
454
291sub user_send { 455sub user_send {
292 my ($self, $command) = @_; 456 my ($self, $command) = @_;
293 457
458 $self->{record}->($command)
294 if ($self->{record}) { 459 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 460
298 $self->logprint ("send: ", $command); 461 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 462 $self->send_command ($command);
300 ::status ($command); 463 ::status ($command);
301} 464}
302 465
303sub start_record { 466sub record {
304 my ($self) = @_; 467 my ($self, $cb) = @_;
305 468
306 $self->{record} = []; 469 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 470}
313 471
314sub map_scroll { 472sub map_scroll {
315 my ($self, $dx, $dy) = @_; 473 my ($self, $dx, $dy) = @_;
316 474
… …
318} 476}
319 477
320sub feed_map1a { 478sub feed_map1a {
321 my ($self, $data) = @_; 479 my ($self, $data) = @_;
322 480
323 $self->{map}->map1a_update ($data); 481 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
324 $self->{map_widget}->update; 482 $self->{map_widget}->update;
325} 483}
326 484
327sub magicmap { 485sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 486 my ($self, $w, $h, $x, $y, $data) = @_;
… …
337 or return; 495 or return;
338 496
339 my ($hash, $x, $y, $w, $h) = @$map_info; 497 my ($hash, $x, $y, $w, $h) = @$map_info;
340 498
341 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 499 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
342 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 500 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
343 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 501 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
344} 502}
345 503
346sub map_clear { 504sub map_clear {
347 my ($self) = @_; 505 my ($self) = @_;
… …
351 509
352 $self->{map}->clear; 510 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap}; 511 delete $self->{map_widget}{magicmap};
354} 512}
355 513
514sub bg_fetch {
515 my ($self) = @_;
516
517 my $id;
518
519 do {
520 $id = pop @{$self->{bg_fetch}}
521 or return;
522 } while $self->{texture}[$id];
523
524 CFPlus::DB::get tilecache => $id, sub {
525 my ($data) = @_;
526
527 return unless $self->{map}; # stop when destroyed
528
529 $self->set_texture ($id => $data)
530 if defined $data;
531
532 $self->bg_fetch;
533 };
534}
356 535
357sub load_map($$$) { 536sub load_map($$$) {
358 my ($self, $hash, $x, $y) = @_; 537 my ($self, $hash, $x, $y) = @_;
359 538
360 if (defined (my $data = $self->{mapcache}->get ($hash))) { 539 my $gen = $self->{map_change_gen};
540
541 CFPlus::DB::get $self->{mapcache} => $hash, sub {
542 return unless $gen == $self->{map_change_gen};
543
544 my ($data) = @_;
545
546 if (defined $data) {
361 $data = Compress::LZF::decompress $data; 547 $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 548 #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 549
367 $self->set_texture ($id => $data); 550 my $inprogress = @{ $self->{bg_fetch} || [] };
551 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
552 $self->bg_fetch unless $inprogress;
368 } 553 }
369 } 554 };
370} 555}
371 556
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 557# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 558# (server resource,s latency, bandwidth), so this hack is warranted.
374# the right fix is to make real tiled maps with an overview file 559# the right fix is to make real tiled maps with an overview file
… …
438 623
439 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 624 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
440 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 625 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
441 626
442 } else { 627 } else {
628 my $gen = $self->{map_change_gen};
443 $self->send_mapinfo ("spatial $path$tile", sub { 629 $self->send_mapinfo ("spatial $path$tile", sub {
630 return unless $gen == $self->{map_change_gen};
631
444 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 632 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
445 633
446 return if $mode ne "spatial"; 634 return if $mode ne "spatial";
447 635
448 $x += $self->{map}->ox; 636 $x += $self->{map}->ox;
… …
462 650
463sub map_change { 651sub map_change {
464 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 652 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 653
466 $self->flush_map; 654 $self->flush_map;
655
656 ++$self->{map_change_gen};
467 657
468 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 658 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
469 659
470 my $mapmapw = $self->{mapmap}->{w}; 660 my $mapmapw = $self->{mapmap}->{w};
471 my $mapmaph = $self->{mapmap}->{h}; 661 my $mapmaph = $self->{mapmap}->{h};
… …
488 $self->load_map ($hash, $x, $y); 678 $self->load_map ($hash, $x, $y);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 679 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 680}
491 681
492sub face_find { 682sub face_find {
493 my ($self, $facenum, $face) = @_; 683 my ($self, $facenum, $face, $cb) = @_;
494 684
495 my $hash = "$face->{chksum},$face->{name}"; 685 my $hash = "$face->{chksum},$face->{name}";
496 686
497 my $id = $self->{facemap}->get ($hash); 687 my $id = CFPlus::DB::get_tile_id_sync $hash;
498 688
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; 689 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d# 690 $self->{faceid}[$facenum] = $id;
524 691
525 my $face = $self->{tilecache}->get ($id); 692 $self->{map}->set_tileid ($facenum => $id);
526 693
527 if ($face) { 694 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} 695}
536 696
537sub face_update { 697sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 698 my ($self, $facenum, $face, $changed) = @_;
539 699
540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 700 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
701 if $changed;
541 702
542 $self->set_texture ($face->{id} => delete $face->{image}); 703 $self->set_texture ($face->{id} => delete $face->{image});
704}
705
706sub smooth_update {
707 my ($self, $facenum, $face) = @_;
708
709 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
543} 710}
544 711
545sub set_texture { 712sub set_texture {
546 my ($self, $id, $data) = @_; 713 my ($self, $id, $data) = @_;
547 714
548 $self->{texture}[$id] ||= do { 715 $self->{texture}[$id] = my $tex =
549 my $tex =
550 new_from_image CFClient::Texture 716 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 717 $data, minify => 1, mipmap => 1;
552 718
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 719 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 $self->{map_widget}->update; 720 $self->{map_widget}->update;
555
556 $tex
557 };
558} 721}
559 722
560sub sound_play { 723sub sound_play {
561 my ($self, $x, $y, $soundnum, $type) = @_; 724 my ($self, $x, $y, $soundnum, $type) = @_;
562 725
… …
572 $LAST_QUERY = $prompt; 735 $LAST_QUERY = $prompt;
573 736
574 $self->{query}-> ($self, $flags, $prompt); 737 $self->{query}-> ($self, $flags, $prompt);
575} 738}
576 739
577sub drawinfo { 740sub sanitise_xml($) {
578 my ($self, $color, $text) = @_; 741 local $_ = shift;
579 742
580 my @color = ( 743 # we now weed out all tags we do not support
744 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
745 # now all entities
746 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
747
748 # handle some elements
749 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
750 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
751
752 $_
753}
754
755our %NAME_TO_COLOR = (
756 black => 0,
757 white => 1,
758 darkblue => 2,
759 red => 3,
760 orange => 4,
761 lightblue => 5,
762 darkorange => 6,
763 green => 7,
764 darkgreen => 8,
765 grey => 9,
766 brown => 10,
767 yellow => 11,
768 tan => 12,
769);
770
771our @CF_COLOR = (
581 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 772 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
582 [1.00, 1.00, 1.00], 773 [1.00, 1.00, 1.00],
583 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 774 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
584 [1.00, 0.00, 0.00], 775 [1.00, 0.00, 0.00],
585 [1.00, 0.54, 0.00], 776 [1.00, 0.54, 0.00],
586 [0.11, 0.56, 1.00], 777 [0.11, 0.56, 1.00],
587 [0.93, 0.46, 0.00], 778 [0.93, 0.46, 0.00],
588 [0.18, 0.54, 0.34], 779 [0.18, 0.54, 0.34],
589 [0.56, 0.73, 0.56], 780 [0.56, 0.73, 0.56],
590 [0.80, 0.80, 0.80], 781 [0.80, 0.80, 0.80],
591 [0.75, 0.61, 0.20], 782 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 783 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 784 [0.74, 0.65, 0.41],
594 ); 785);
595 786
787sub msg {
788 my ($self, $color, $type, $text, @extra) = @_;
789
790 $text = sanitise_xml $text;
791
792 if (my $cb = $self->{cb_msg}{$type}) {
793 $_->($self, $color, $type, $text, @extra) for values %$cb;
794 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
795 $type =~ s/-/_/g;
796 $self->{$type} = $text;
797 } else {
596 $self->logprint ("info: ", $text); 798 $self->logprint ("msg: ", $text);
799 return if $color < 0; # negative color == ignore if not understood
597 800
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 801 my $fg = $CF_COLOR[$color % @CF_COLOR];
599 802
600 # try to create single paragraphs of multiple lines sent by the server 803 ## try to create single paragraphs of multiple lines sent by the server
804 # no longer neecssary with TRT servers
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 805 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
602 806
603 $text = CFClient::asxml $text; 807 ::message ({ fg => $fg, markup => $_ })
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 808 for split /\n/, $text;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 809
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, 810 $self->{statusbox}->add ($text,
612 group => $text, 811 group => $text,
613 fg => $color[$color], 812 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 813 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 814 tooltip_font => $::FONT_FIXED,
616 ); 815 );
617} 816 }
618
619sub drawextinfo {
620 my ($self, $color, $type, $subtype, $message) = @_;
621
622 $self->drawinfo ($color, $message);
623} 817}
624 818
625sub spell_add { 819sub spell_add {
626 my ($self, $spell) = @_; 820 my ($self, $spell) = @_;
627 821
628 # try to create single paragraphs out of the multiple lines sent by the server 822 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 823 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 824 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 825 $spell->{message} ||= "Server did not provide a description for this spell.";
632 826
633 $::SPELL_PAGE->add_spell ($spell); 827 $::SPELL_LIST->add_spell ($spell);
634 828
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 829 $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}); 830 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 831}
638 832
639sub spell_delete { 833sub spell_delete {
640 my ($self, $spell) = @_; 834 my ($self, $spell) = @_;
641 835
642 $::SPELL_PAGE->remove_spell ($spell); 836 $::SPELL_LIST->remove_spell ($spell);
837}
838
839sub setup {
840 my ($self, $setup) = @_;
841
842 $self->{map_widget}->set_tilesize ($self->{tilesize});
843 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 844}
644 845
645sub addme_success { 846sub addme_success {
646 my ($self) = @_; 847 my ($self) = @_;
647 848
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; 849 my %skill_help;
652 850
653 for my $head2 ($pom->head1->[3]->head2) { 851 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 852 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 853 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 854 };
659 855
660 for my $skill (values %{$self->{skill_info}}) { 856 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 857 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 858 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 859 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 860 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 861 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 862 . $skill_help{$skill});
667 } 863 }
668} 864}
669 865
670sub eof { 866sub eof {
671 my ($self) = @_; 867 my ($self) = @_;
… …
695 891
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 892 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 893
698 $self->send ("requestinfo image_sums $face $face"); 894 $self->send ("requestinfo image_sums $face $face");
699 895
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 896 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 897 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 898 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 899 $self->send ("requestinfo image_info");
704 900
705 $self->{num_faces} = 0; 901 $self->{num_faces} = 0;
706 902
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 903 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 904 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 905 }
710} 906}
711 907
712sub update_floorbox { 908sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 909 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 910 return unless $::CONN;
715 911
716 $::FLOORBOX->clear; 912 $::FLOORBOX->clear;
717 913
718 my $row; 914 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 915 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 916 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 917 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 918 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 919 CFPlus::Item::update_widgets $_;
724 920
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 921 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 922 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 923
728 $row++; 924 $row++;
729 } else { 925 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 926 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 927 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 928 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 929 );
734 last; 930 last;
735 } 931 }
736 } 932 }
737 if ($::CONN->{open_container}) { 933 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 934 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 935 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 936 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 937 );
742 } 938 }
743 }); 939 });
… …
749 my ($conn, $tag, $name) = @_; 945 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 946 $conn->{open_container} = $tag;
751 update_floorbox; 947 update_floorbox;
752 948
753 $::INV_RIGHT_HB->clear (); 949 $::INV_RIGHT_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 950 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 951
756 if ($tag != 0) { # Floor isn't closable, is it? 952 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 953 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 954 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 955 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 956 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 957 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 958 if $tag != 0;
… …
770} 966}
771 967
772sub update_containers { 968sub update_containers {
773 my ($self) = @_; 969 my ($self) = @_;
774 970
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 971 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 972 my $todo = delete $self->{update_container}
777 or return; 973 or return;
778 974
779 for my $tag (keys %$todo) { 975 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 976 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 1013sub item_update {
818 my ($self, $item) = @_; 1014 my ($self, $item) = @_;
819 1015
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1016 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 1017
822 CFClient::Item::update_widgets $item; 1018 CFPlus::Item::update_widgets $item;
823 1019
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1020 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 1021 set_opencont ($::CONN, 0, "Floor");
826 1022
827 } elsif ($item->{flags} & F_OPEN) { 1023 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1024 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 1025
830 } else { 1026 } else {
831 $self->{update_container}{$item->{container}}++; 1027 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 1028 $self->update_containers;
833 } 1029 }
… …
858 $::SERVER_INFO->set_markup ( 1054 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 1055 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 1056 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1057 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1058 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1059 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1060 . "editing support $yesno[!!$self->{editor_support}]\n"
1061 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1062 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1063 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1064 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 1065 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 1066 );
1067
1068 ::setup_build_button ($self->{editor_support}->{builder_ui});
867} 1069}
868 1070
869sub logged_in { 1071sub logged_in {
870 my ($self) = @_; 1072 my ($self) = @_;
871 1073
872 $self->send_ext_req (cfplus_support => "1", sub { 1074 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 1075 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 1076 $self->update_server_info;
1077
1078 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0];
1081 $self->update_server_info;
1082
1083 0
1084 });
1085 }
1086
1087 0
875 }); 1088 });
876 1089
877 $self->update_server_info; 1090 $self->update_server_info;
878 1091
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 1092 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 1093 $self->send_command ("output-count $::CFG->{output_count}");
1094 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
881 $self->send_command ("pickup $::CFG->{pickup}"); 1095 $self->send_command ("pickup $::CFG->{pickup}");
1096}
1097
1098sub buildat {
1099 my ($self, $builditem, $x, $y) = @_;
1100
1101 if ($self->{cfplus_ext}) {
1102 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103 }
882} 1104}
883 1105
884sub lookat { 1106sub lookat {
885 my ($self, $x, $y) = @_; 1107 my ($self, $x, $y) = @_;
886 1108
887 if ($self->{cfplus_ext}) { 1109 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 1111 my ($msg) = @_;
890 1112
891 if (exists $res{npc_dialog}) { 1113 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 1114 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 1115 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 1116 dx => $x,
895 dy => $y, 1117 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 1118 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 1119 conn => $self,
898 ; 1120 ;
899 } 1121 }
900 }); 1122 });
901 } 1123 }
… …
904} 1126}
905 1127
906sub destroy { 1128sub destroy {
907 my ($self) = @_; 1129 my ($self) = @_;
908 1130
909 $self->{npc_dialog}->destroy 1131 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 1132 if $self->{npc_dialog};
911 1133
912 $self->SUPER::destroy; 1134 $self->SUPER::destroy;
913} 1135}
914 1136
915package CFClient::NPCDialog; 1137package CFPlus::NPCDialog;
916 1138
917our @ISA = 'CFClient::UI::FancyFrame'; 1139our @ISA = 'CFPlus::UI::Toplevel';
918 1140
919sub new { 1141sub new {
920 my $class = shift; 1142 my $class = shift;
921 1143
922 my $self = $class->SUPER::new ( 1144 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 1151 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 1152 has_close_button => 1,
931 @_, 1153 @_,
932 ); 1154 );
933 1155
934 Scalar::Util::weaken (my $this = $self); 1156 CFPlus::weaken (my $this = $self);
935 1157
936 $self->connect (delete => sub { $this->destroy; 1 }); 1158 $self->connect (delete => sub { $this->destroy; 1 });
937 1159
938 # better use a pane... 1160 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 1161 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1162 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 1163
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1164 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 1165
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1166 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1167 $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" 1168 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 { 1169 on_activate => sub {
952 my ($entry, $text) = @_; 1170 my ($entry, $text) = @_;
953 1171
954 return unless $text =~ /\S/; 1172 return unless $text =~ /\S/;
955 1173
… …
958 1176
959 0 1177 0
960 }, 1178 },
961 ); 1179 );
962 1180
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1181 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1182
965 $self->{bye_button} = new CFClient::UI::Button 1183 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1184 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1185 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1186 on_activate => sub { $this->destroy; 1 },
969 ; 1187 ;
970 1188
971 $self->update_options; 1189 $self->update_options;
972 1190
973 $self->{token} = $self->{conn}->ext_token; 1191 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1193 sub { $this && $this->feed (@_) }
1194 );
976 1195
977 $self->{entry}->grab_focus; 1196 $self->{entry}->grab_focus;
978 1197
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1198 $self->{textview}->add_paragraph ({
1199 fg => [1, 1, 0, 1],
1200 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1201 });
980 1202
981 $self->show; 1203 $self->show;
982 $self 1204 $self
983}; 1205};
984 1206
985sub update_options { 1207sub update_options {
986 my ($self) = @_; 1208 my ($self) = @_;
987 1209
988 Scalar::Util::weaken $self; 1210 CFPlus::weaken $self;
989 1211
990 $self->{options}->clear; 1212 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1213 $self->{options}->add ($self->{bye_button});
992 1214
993 for my $kw (sort keys %{ $self->{kw} }) { 1215 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1216 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1217 text => $kw,
996 on_activate => sub { 1218 on_activate => sub {
997 $self->send ($kw); 1219 $self->send ($kw);
998 0 1220 0
999 }, 1221 },
1000 ); 1222 );
1001 } 1223 }
1002} 1224}
1003 1225
1004sub feed { 1226sub feed {
1005 my ($self, $data) = @_; 1227 my ($self, $msg) = @_;
1006 1228
1007 Scalar::Util::weaken $self; 1229 CFPlus::weaken $self;
1008 1230
1009 my ($type, $msg) = split / /, $data, 2; 1231 if ($msg->{msgtype} eq "reply") {
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1010 1234
1011 if ($type eq "msg") { 1235 my $text = "\n" . CFPlus::Protocol::sanitise_xml $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} }; 1236 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1020 my @link; 1237 my @link;
1021 $msg =~ s{ 1238 $text =~ s{
1022 ($match) 1239 ($match)
1023 }{ 1240 }{
1024 my $kw = $1; 1241 my $kw = $1;
1025 1242
1026 push @link, new CFClient::UI::Label 1243 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1244 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1245 can_hover => 1,
1029 can_events => 1, 1246 can_events => 1,
1030 padding_x => 0, 1247 padding_x => 0,
1031 padding_y => 0, 1248 padding_y => 0,
1032 on_button_up => sub { 1249 on_button_up => sub {
1033 $self->send ($kw); 1250 $self->send ($kw);
1034 }; 1251 };
1035 1252
1036 chr 0xfffc 1253 "\x{fffc}"
1037 }giex; 1254 }giex;
1038 1255
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1257 $self->{textview}->scroll_to_bottom;
1041 $self->update_options; 1258 $self->update_options;
1042 } else { 1259 } else {
1043 $self->destroy; 1260 $self->destroy;
1044 } 1261 }
… …
1047} 1264}
1048 1265
1049sub send { 1266sub send {
1050 my ($self, $msg) = @_; 1267 my ($self, $msg) = @_;
1051 1268
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1270 $self->{textview}->scroll_to_bottom;
1054 1271
1055 utf8::encode $msg; 1272 $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} 1273}
1058 1274
1059sub destroy { 1275sub destroy {
1060 my ($self) = @_; 1276 my ($self) = @_;
1061 1277
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1278 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063 1279
1280 if ($self->{conn}) {
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1281 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1065 delete $self->{conn}{npc_dialog}; 1282 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1283 $self->{conn}->disconnect_ext ($self->{id});
1284 }
1067 1285
1068 $self->SUPER::destroy; 1286 $self->SUPER::destroy;
1069} 1287}
1070 1288
10711; 12891
1290

Diff Legend

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