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.63 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.112 by root, Tue Jul 10 16:25:16 2007 UTC

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

Diff Legend

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