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

Diff Legend

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