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

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

Diff Legend

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