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.64 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.157 by root, Tue Aug 21 02:39:17 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 xwidget1 => 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 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
77 if (my $ts = $cap{tileset}) {
78 if (my ($default) = grep $_->[2] & 1, @$ts) {
79 $self->{tileset} = $default;
80 $self->{tilesize} = $default->[3];
81 $self->setup_req (tileset => $default->[0]);
82
83 my $w = int $self->{mapw} * 32 / $self->{tilesize};
84 my $h = int $self->{maph} * 32 / $self->{tilesize};
85
86 $self->setup_req (mapsize => "${w}x${h}");
87 }
88 }
89 });
90
91 $self->{json_coder}
92 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub {
94 $self->{widget}{$_[0]}
95 });
96
97 # widgetset new
98 $self->connect_ext (ws_n => sub {
99 my ($id) = @_;
100
101 $self->{widgetset}{$id} = {
102 w => {},
41 } 103 };
42
43 \@cmd_help
44 }; 104 });
105
106 # widgetset destroy
107 $self->connect_ext (ws_d => sub {
108 my ($id) = @_;
109
110 my $ws = delete $self->{widgetset}{$id}
111 or return;
112
113 $_->destroy
114 for values %{$ws->{w}};
115 });
116
117 # widgetset create
118 $self->connect_ext (ws_c => sub {
119 my ($ws, $id, $class, $args) = @_;
120
121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
123 $args->{$ev} = sub {
124 my $id = shift->{s_id};
125 $self->send_exti_msg (w_e => $id, $rid, @_);
126
127 1
128 };
129 }
130
131 $self->widget_associate (
132 $ws, $id => scalar eval {
133 local $SIG{__DIE__};
134 "CFPlus::UI::$class"->new (%$args)
135 }
136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
184 }
185 });
186
187 # widget call
188 $self->connect_ext (w_c => sub {
189 my ($id, $rid, $method, @args) = @_;
190
191 my $w = $self->{widget}{$id}
192 or return;
193
194 if ($rid) {
195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
196 } else {
197 $w->$method (@args);
198 }
199 });
200
201 # widget set
202 $self->connect_ext (w_s => sub {
203 my ($id, $attr) = @_;
204
205 my $w = $self->{widget}{$id}
206 or return;
207
208 for (my $i = 0; $i < $#$attr; $i += 2) {
209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
217 });
218
219 # widget get
220 $self->connect_ext (w_g => sub {
221 my ($id, $rid, $attr) = @_;
222
223 my $w = $self->{widget}{$id}
224 or return;
225
226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
234 });
235
236 # destroy widgets on logout
237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
238 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy
240 for values %{delete $ws->{w} || {}};
241 }
242 });
45 243
46 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 245 for @cmd_help;
48 246
247 {
248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
251 }
252
253 {
49 $self->{noface} = new_from_file CFClient::Texture 254 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 255 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
256 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
257 }
51 258
52 $self->{open_container} = 0; 259 $self->{open_container} = 0;
53 260
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 261 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 263
61 $self 264 $self
265}
266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
295sub update_fx_want {
296 my ($self) = @_;
297
298 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
302 });
62} 303}
63 304
64sub logprint { 305sub logprint {
65 my ($self, @a) = @_; 306 my ($self, @a) = @_;
66 307
67 $self->{log_fh} ||= do { 308 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} 309}
85 310
86sub _stat_numdiff { 311sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
88 313
… …
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
227 $rng =~ s/^Range: //; # thank you so much dear server 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 456
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 457 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
253 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
254 478
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 480 $sktbl->clear;
257 481
482 my @add;
483
484 push @add,
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
493 ;
264 494
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
496
497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
499
265 my ($x, $y) = (1, 0); 500 my ($x, $y) = (0, 1);
266 for ( 501 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 502 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 503 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 504 grep exists $stats->{$_},
270 @skills 505 @skills
271 ) { 506 ) {
272 my ($idx, $name) = @$_; 507 my ($idx, $name) = @$_;
273 508
509 my $spell_cb = sub {
510 my ($widget, $ev) = @_;
511
512 if ($ev->{button} == 1) {
513 $::CONN->user_send ("ready_skill $name");
514 } elsif ($ev->{button} == 2) {
515 $::CONN->user_send ("use_skill $name");
516 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14;
518 (new CFPlus::UI::Menu
519 items => [
520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
521 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
522 ],
523 )->popup ($ev);
524 } else {
525 return 0;
526 }
527
528 1
529 };
530
531 push @add,
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 533 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 534 $x * 4 + 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); 535 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); 536 $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
537 $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ;
279 540
280 $x++ and ($x, $y) = (0, $y + 1); 541 $x++ and ($x, $y) = (0, $y + 1);
281 } 542 }
543
544 $sktbl->add_at (@add);
282 } 545 }
283 546
284 for (grep exists $stats->{$_}, @skills) { 547 for (grep exists $stats->{$_}, @skills) {
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
551 }
552}
553
554sub macro_send {
555 my ($self, $macro) = @_;
556
557 for my $cmd (@{ $macro->{action} }) {
558 $self->send_command ($cmd);
287 } 559 }
288} 560}
289 561
290sub user_send { 562sub user_send {
291 my ($self, $command) = @_; 563 my ($self, $command) = @_;
292 564
565 $self->{record}->($command)
293 if ($self->{record}) { 566 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 567
297 $self->logprint ("send: ", $command); 568 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 569 $self->send_command ($command);
299 ::status ($command); 570 ::status ($command);
300} 571}
301 572
302sub start_record { 573sub record {
303 my ($self) = @_; 574 my ($self, $cb) = @_;
304 575
305 $self->{record} = []; 576 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 577}
312 578
313sub map_scroll { 579sub map_scroll {
314 my ($self, $dx, $dy) = @_; 580 my ($self, $dx, $dy) = @_;
315 581
… …
317} 583}
318 584
319sub feed_map1a { 585sub feed_map1a {
320 my ($self, $data) = @_; 586 my ($self, $data) = @_;
321 587
322 $self->{map}->map1a_update ($data); 588 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
589 my $delay;
590
591 for my $tile (@$missing) {
592 next if $self->{delay}{$tile};
593
594 $delay = 1;
595
596 if (my $tex = $::CONN->{texture}[$tile]) {
597 $tex->upload;
598 } else {
599 $self->{delay}{$tile} = 1;
600
601 # we assume the face is in-flight and will eventually come
602 push @{$self->{tile_cb}{$tile}}, sub {
603 delete $self->{delay}{$tile};
604 $_[0]->upload;
605 };
606 }
607 }
608
609 if ($delay) {
610 # delay the map drawing a tiny bit in the hope of getting the missing fetched
611 Event->timer (after => 0.03, cb => sub {
612 $_[0]->w->cancel;
613 $self->{map_widget}->update;
614 });
615 } else {
323 $self->{map_widget}->update; 616 $self->{map_widget}->update;
617 }
324} 618}
325 619
326sub magicmap { 620sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 621 my ($self, $w, $h, $x, $y, $data) = @_;
328 622
… …
335 my $map_info = delete $self->{map_info} 629 my $map_info = delete $self->{map_info}
336 or return; 630 or return;
337 631
338 my ($hash, $x, $y, $w, $h) = @$map_info; 632 my ($hash, $x, $y, $w, $h) = @$map_info;
339 633
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 634 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 635 $self->{map_cache_new}{$hash} = \$data;
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 636 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
343} 637}
344 638
345sub map_clear { 639sub map_clear {
346 my ($self) = @_; 640 my ($self) = @_;
347 641
… …
350 644
351 $self->{map}->clear; 645 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 646 delete $self->{map_widget}{magicmap};
353} 647}
354 648
649sub bg_fetch {
650 my ($self) = @_;
651
652 my $tile;
653
654 do {
655 $tile = pop @{$self->{bg_fetch}}
656 or return;
657 } while $self->{texture}[$tile];
658
659 CFPlus::DB::get tilecache => $tile, sub {
660 my ($data) = @_;
661
662 return unless $self->{map}; # stop when destroyed
663
664 if (defined $data) {
665 $self->have_tile ($tile, $data);
666 $self->{texture}[$tile]->upload;
667 }
668
669 $self->bg_fetch;
670 };
671}
355 672
356sub load_map($$$) { 673sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 674 my ($self, $hash, $x, $y) = @_;
358 675
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 676 my $gen = $self->{map_change_gen};
677
678 my $cb = sub {
679 return unless $gen == $self->{map_change_gen};
680
681 my ($data) = @_;
682
683 if (defined $data) {
684 $self->{map_cache_new}{$hash} = \$data;
685
360 $data = Compress::LZF::decompress $data; 686 my $data = Compress::LZF::decompress $data;
361 #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 687
366 $self->set_texture ($id => $data); 688 my $inprogress = @{ $self->{bg_fetch} || [] };
689 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
690 $self->bg_fetch unless $inprogress;
367 } 691 }
692 };
693
694 if (my $rdata = $self->{map_cache_old}{$hash}) {
695 $cb->($$rdata);
696 } else {
697 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
368 } 698 }
369} 699}
370 700
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 701# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 702# (server resource,s latency, bandwidth), so this hack is warranted.
… …
437 767
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 768 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 769 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 770
441 } else { 771 } else {
772 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 773 $self->send_mapinfo ("spatial $path$tile", sub {
774 return unless $gen == $self->{map_change_gen};
775
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 776 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 777
445 return if $mode ne "spatial"; 778 return if $mode ne "spatial";
446 779
447 $x += $self->{map}->ox; 780 $x += $self->{map}->ox;
… …
461 794
462sub map_change { 795sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 796 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 797
465 $self->flush_map; 798 $self->flush_map;
799
800 ++$self->{map_change_gen};
801 $self->{map_cache_old} = delete $self->{map_cache_new};
466 802
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 803 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 804
469 my $mapmapw = $self->{mapmap}->{w}; 805 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 806 my $mapmaph = $self->{mapmap}->{h};
… …
487 $self->load_map ($hash, $x, $y); 823 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 824 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 825}
490 826
491sub face_find { 827sub face_find {
492 my ($self, $facenum, $face) = @_; 828 my ($self, $facenum, $face, $cb) = @_;
493 829
494 my $hash = "$face->{chksum},$face->{name}"; 830 if ($face->{type} == 0) { # FT_FACE
831 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
495 832
496 my $id = $self->{facemap}->get ($hash);
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; 833 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 834 $self->{map}->set_tileid ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d#
523 835
524 my $face = $self->{tilecache}->get ($id); 836 CFPlus::DB::get tilecache => $id, $cb;
525 837
526 if ($face) { 838 } elsif ($face->{type} & 1) { # with metadata
527 #$self->face_prefetch; 839 CFPlus::DB::get res_meta => $face->{name}, $cb;
528 $face 840
529 } else { 841 } else { # no metadata
530 my $tex = $self->{noface}; 842 CFPlus::DB::get res_data => $face->{name}, $cb;
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 843 }
534} 844}
535 845
536sub face_update { 846sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 847 my ($self, $facenum, $face, $changed) = @_;
538 848
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 849 if ($face->{type} == 0) {
850 # image, FT_FACE
851 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
852 if $changed;
540 853
541 $self->set_texture ($face->{id} => delete $face->{image}); 854 $self->have_tile ($face->{id}, delete $face->{data});
542}
543 855
544sub set_texture { 856 } elsif ($face->{type} & 1) {
857 # split metadata case, FT_MUSIC, FT_SOUND
858 if ($changed) { # new data
859 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
860 $face->{data} = $meta;
861
862 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
864 }
865
866 $face->{data} = $self->{json_coder}->decode ($face->{data});
867
868 ::add_license ($face);
869
870 if ($face->{type} == 3) { # FT_MUSIC
871 ::message ({ markup => "downloaded song #$facenum" })
872 if $changed;
873
874 &::audio_music_push ($facenum);
875 } elsif ($face->{type} == 5) { # FT_SOUND
876 ::message ({ markup => "downloaded sound #$facenum" })
877 if $changed;
878
879 &::audio_sound_push ($facenum);
880 }
881
882 } else {
883 # flat resource case, FT_RSRC
884 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
885 if $changed;
886 }
887
888 if (my $cbs = $self->{face_cb}{$facenum}) {
889 $_->($face, $changed) for @$cbs;
890 }
891}
892
893sub smooth_update {
894 my ($self, $facenum, $face) = @_;
895
896 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
897}
898
899sub have_tile {
545 my ($self, $id, $data) = @_; 900 my ($self, $tile, $data) = @_;
546 901
547 $self->{texture}[$id] ||= do { 902 return unless $self->{map};
548 my $tex = 903
549 new_from_image CFClient::Texture 904 my $tex = $self->{texture}[$tile] ||=
905 new CFPlus::Texture
906 tile => $tile,
907 image => $data, delete_image => 1,
550 $data, minify => 1, mipmap => 1; 908 minify => 1, mipmap => 1;
551 909
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 910 if (my $cbs = delete $self->{tile_cb}{$tile}) {
553 $self->{map_widget}->update; 911 $_->($tex) for @$cbs;
554
555 $tex
556 }; 912 }
913}
914
915# call in non-void context registers a temporary
916# hook with handle, otherwise its permanent
917sub on_face_change {
918 my ($self, $num, $cb) = @_;
919
920 push @{$self->{face_cb}{$num}}, $cb;
921
922 defined wantarray
923 ? CFPlus::guard {
924 @{$self->{face_cb}{$num}}
925 = grep $_ != $cb,
926 @{$self->{face_cb}{$num}};
927 }
928 : ()
929}
930
931# call in non-void context registers a temporary
932# hook with handle, otherwise its permanent
933sub register_face_handler {
934 my ($self, $num, $cb) = @_;
935
936 return unless $num;
937
938 # invoke if available right now
939 $cb->($self->{face}[$num], 0)
940 unless exists $self->{face}[$num]{loading};
941
942 # future changes
943 $self->on_face_change ($num => $cb)
557} 944}
558 945
559sub sound_play { 946sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 947 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 948
562 $self->{sound_play}->($x, $y, $soundnum, $type); 949 &::audio_sound_play ($face, $dx, $dy, $vol)
950 unless $type & 1; # odd types are silent for future expansion
563} 951}
564 952
565my $LAST_QUERY; # server is stupid, stupid, stupid 953my $LAST_QUERY; # server is stupid, stupid, stupid
566 954
567sub query { 955sub query {
… …
571 $LAST_QUERY = $prompt; 959 $LAST_QUERY = $prompt;
572 960
573 $self->{query}-> ($self, $flags, $prompt); 961 $self->{query}-> ($self, $flags, $prompt);
574} 962}
575 963
576sub drawinfo { 964sub sanitise_xml($) {
577 my ($self, $color, $text) = @_; 965 local $_ = shift;
578 966
579 my @color = ( 967 # we now weed out all tags we do not support
968 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
969 # now all entities
970 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
971
972 # handle some elements
973 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
974 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
975
976 $_
977}
978
979our %NAME_TO_COLOR = (
980 black => 0,
981 white => 1,
982 darkblue => 2,
983 red => 3,
984 orange => 4,
985 lightblue => 5,
986 darkorange => 6,
987 green => 7,
988 darkgreen => 8,
989 grey => 9,
990 brown => 10,
991 yellow => 11,
992 tan => 12,
993);
994
995our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 996 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 997 [1.00, 1.00, 1.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 998 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
583 [1.00, 0.00, 0.00], 999 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 1000 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 1001 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 1002 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 1003 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 1004 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 1005 [0.80, 0.80, 0.80],
590 [0.75, 0.61, 0.20], 1006 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 1007 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 1008 [0.74, 0.65, 0.41],
593 ); 1009);
594 1010
1011sub msg {
1012 my ($self, $color, $type, $text, @extra) = @_;
1013
1014 $text = sanitise_xml $text;
1015
1016 if (my $cb = $self->{cb_msg}{$type}) {
1017 $_->($self, $color, $type, $text, @extra) for values %$cb;
1018 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1019 $type =~ s/-/_/g;
1020 $self->{$type} = $text;
1021 } else {
595 $self->logprint ("info: ", $text); 1022 $self->logprint ("msg: ", $text);
1023 return if $color < 0; # negative color == ignore if not understood
596 1024
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1025 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
598 1026
599 # try to create single paragraphs of multiple lines sent by the server 1027 ## try to create single paragraphs of multiple lines sent by the server
1028 # no longer neecssary with TRT servers
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1029 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 1030
602 $text = CFClient::UI::Label::escape $text; 1031 ::message ({
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1032 fg => $fg,
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1033 markup => $_,
1034 type => $type,
1035 extra => [@extra],
1036 color_flags => $color
1037 }) for split /\n/, $text;
605 1038
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, 1039 $self->{statusbox}->add ($text,
611 group => $text, 1040 group => $text,
612 fg => $color[$color], 1041 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 1042 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 1043 tooltip_font => $::FONT_FIXED,
615 ); 1044 );
616} 1045 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 1046}
623 1047
624sub spell_add { 1048sub spell_add {
625 my ($self, $spell) = @_; 1049 my ($self, $spell) = @_;
626 1050
627 # try to create single paragraphs of multiple lines sent by the server 1051 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1052 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 1053 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 1054 $spell->{message} ||= "Server did not provide a description for this spell.";
631 1055
632 $::SPELL_PAGE->add_spell ($spell); 1056 $::SPELL_LIST->add_spell ($spell);
633 1057
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1058 $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}); 1059 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 1060}
637 1061
638sub spell_delete { 1062sub spell_delete {
639 my ($self, $spell) = @_; 1063 my ($self, $spell) = @_;
640 1064
641 $::SPELL_PAGE->remove_spell ($spell); 1065 $::SPELL_LIST->remove_spell ($spell);
1066}
1067
1068sub setup {
1069 my ($self, $setup) = @_;
1070
1071 $self->{map_widget}->set_tilesize ($self->{tilesize});
1072 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 1073}
643 1074
644sub addme_success { 1075sub addme_success {
645 my ($self) = @_; 1076 my ($self) = @_;
646 1077
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; 1078 my %skill_help;
651 1079
652 for my $head2 ($pom->head1->[3]->head2) { 1080 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1081 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 1082 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 1083 };
658 1084
659 for my $skill (values %{$self->{skill_info}}) { 1085 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 1086 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1087 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 1088 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 1089 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1090 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 1091 . $skill_help{$skill});
666 } 1092 }
667} 1093}
668 1094
669sub eof { 1095sub eof {
670 my ($self) = @_; 1096 my ($self) = @_;
… …
672 $self->{map_widget}->clr_commands; 1098 $self->{map_widget}->clr_commands;
673 1099
674 ::stop_game (); 1100 ::stop_game ();
675} 1101}
676 1102
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 { 1103sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1104 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 1105 return unless $::CONN;
714 1106
715 $::FLOORBOX->clear; 1107 $::FLOORBOX->clear;
1108
1109 my @add;
716 1110
717 my $row; 1111 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1112 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 1113 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 1114 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 1115 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 1116 CFPlus::Item::update_widgets $_;
723 1117
1118 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1119 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1120 1, $row, $_->{desc_widget};
726 1121
727 $row++; 1122 $row++;
728 } else { 1123 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1124 push @add, 1, $row, new CFPlus::UI::Button
730 text => "More...", 1125 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1126 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1127 ;
733 last; 1128 last;
734 } 1129 }
735 } 1130 }
736 if ($::CONN->{open_container}) { 1131 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1132 push @add, 1, $row++, new CFPlus::UI::Button
738 text => "Close container", 1133 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1134 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 1135 ;
741 } 1136 }
742 });
743 1137
1138 $::FLOORBOX->add_at (@add);
1139 });
1140
744 $::WANT_REFRESH++; 1141 $::WANT_REFRESH->start;
745} 1142}
746 1143
747sub set_opencont { 1144sub set_opencont {
748 my ($conn, $tag, $name) = @_; 1145 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 1146 $conn->{open_container} = $tag;
750 update_floorbox; 1147 update_floorbox;
751 1148
752 $::INV_RIGHT_HB->clear (); 1149 $::INVR_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1150 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 1151
755 if ($tag != 0) { # Floor isn't closable, is it? 1152 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1153 $::INVR_HB->add (new CFPlus::UI::Button
757 text => "Close container", 1154 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 1155 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 1156 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1157 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 1158 if $tag != 0;
762 #if $CONN->{open_container} != 0;
763 0 1159 0
764 }, 1160 },
765 ); 1161 );
766 } 1162 }
767 1163
… …
769} 1165}
770 1166
771sub update_containers { 1167sub update_containers {
772 my ($self) = @_; 1168 my ($self) = @_;
773 1169
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1170 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 1171 my $todo = delete $self->{update_container}
776 or return; 1172 or return;
777 1173
778 for my $tag (keys %$todo) { 1174 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1175 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 1212sub item_update {
817 my ($self, $item) = @_; 1213 my ($self, $item) = @_;
818 1214
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1215 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 1216
821 CFClient::Item::update_widgets $item; 1217 CFPlus::Item::update_widgets $item;
822 1218
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1219 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 1220 set_opencont ($::CONN, 0, "Floor");
825 1221
826 } elsif ($item->{flags} & F_OPEN) { 1222 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1223 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 1224
829 } else { 1225 } else {
830 $self->{update_container}{$item->{container}}++; 1226 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 1227 $self->update_containers;
832 } 1228 }
… …
857 $::SERVER_INFO->set_markup ( 1253 $::SERVER_INFO->set_markup (
858 "server <tt>$self->{host}:$self->{port}</tt>\n" 1254 "server <tt>$self->{host}:$self->{port}</tt>\n"
859 . "protocol version <tt>$self->{version}</tt>\n" 1255 . "protocol version <tt>$self->{version}</tt>\n"
860 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1256 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
861 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1257 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1258 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1259 . "editing support $yesno[!!$self->{editor_support}]\n"
1260 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1261 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
862 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1262 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
863 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1263 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
864 . "map size $self->{mapw}×$self->{maph}\n" 1264 . "map size $self->{mapw}×$self->{maph}\n"
865 ); 1265 );
1266
866} 1267}
867 1268
868sub logged_in { 1269sub logged_in {
869 my ($self) = @_; 1270 my ($self) = @_;
870 1271
871 $self->send_ext_req (cfplus_support => "1", sub { 1272 $self->send_ext_req (cfplus_support => version => 2, sub {
1273 my (%msg) = @_;
1274
872 $self->{cfplus_ext} = $_[0]; 1275 $self->{cfplus_ext} = $msg{version};
873 $self->update_server_info; 1276 $self->update_server_info;
1277
1278 if ($self->{cfplus_ext} >= 2) {
1279 $self->send_ext_req ("editor_support", sub {
1280 $self->{editor_support} = { @_ };
1281 $self->update_server_info;
1282
1283 0
1284 });
1285 }
1286
1287 0
874 }); 1288 });
875 1289
876 $self->update_server_info; 1290 $self->update_server_info;
877 1291
878 $self->send_command ("output-sync $::CFG->{output_sync}"); 1292 $self->send_command ("output-sync $::CFG->{output_sync}");
879 $self->send_command ("output-count $::CFG->{output_count}"); 1293 $self->send_command ("output-count $::CFG->{output_count}");
1294 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
880 $self->send_command ("pickup $::CFG->{pickup}"); 1295 $self->send_command ("pickup $::CFG->{pickup}");
881} 1296}
882 1297
883sub lookat { 1298sub lookat {
884 my ($self, $x, $y) = @_; 1299 my ($self, $x, $y) = @_;
885 1300
886 if ($self->{cfplus_ext}) { 1301 if ($self->{cfplus_ext}) {
887 $self->send_ext_req (lookat => "$x $y", sub { 1302 $self->send_ext_req (lookat => $x, $y, sub {
888 my %res = split /\x00/, $_[0]; 1303 my (%msg) = @_;
889 1304
890 if (exists $res{npc_dialog}) { 1305 if (exists $msg{npc_dialog}) {
891 # start npc chat dialog 1306 # start npc chat dialog
892 $self->{npc_dialog} = new CFClient::NPCDialog:: 1307 $self->{npc_dialog} = new CFPlus::NPCDialog::
893 dx => $x, 1308 token => $msg{npc_dialog},
894 dy => $y,
895 title => "$res{npc_dialog} (NPC)", 1309 title => "$msg{npc_dialog}[0] (NPC)",
896 conn => $self, 1310 conn => $self,
897 ; 1311 ;
898 } 1312 }
899 }); 1313 });
900 } 1314 }
… …
903} 1317}
904 1318
905sub destroy { 1319sub destroy {
906 my ($self) = @_; 1320 my ($self) = @_;
907 1321
908 $self->{npc_dialog}->destroy 1322 (delete $self->{npc_dialog})->destroy
909 if $self->{npc_dialog}; 1323 if $self->{npc_dialog};
910 1324
911 $self->SUPER::destroy; 1325 $self->SUPER::destroy;
912}
913 1326
1327 %$self = ();
1328}
1329
914package CFClient::NPCDialog; 1330package CFPlus::NPCDialog;
915 1331
916our @ISA = 'CFClient::UI::FancyFrame'; 1332our @ISA = 'CFPlus::UI::Toplevel';
917 1333
918sub new { 1334sub new {
919 my $class = shift; 1335 my $class = shift;
920 1336
921 my $self = $class->SUPER::new ( 1337 my $self = $class->SUPER::new (
… …
928 kw => { hi => 0, yes => 0, no => 0 }, 1344 kw => { hi => 0, yes => 0, no => 0 },
929 has_close_button => 1, 1345 has_close_button => 1,
930 @_, 1346 @_,
931 ); 1347 );
932 1348
933 Scalar::Util::weaken (my $this = $self); 1349 CFPlus::weaken (my $this = $self);
934 1350
935 $self->connect (delete => sub { $this->destroy; 1 }); 1351 $self->connect (delete => sub { $this->destroy; 1 });
936 1352
937 # better use a pane... 1353 # better use a pane...
938 $self->add (my $hbox = new CFClient::UI::HBox); 1354 $self->add (my $hbox = new CFPlus::UI::HBox);
939 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1355 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
940 1356
941 $hbox->add (my $vbox = new CFClient::UI::VBox); 1357 $hbox->add (my $vbox = new CFPlus::UI::VBox);
942 1358
943 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1359 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
944 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1360 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
945 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1361 tooltip => "#npc_message_entry",
946 . "Sometimes you have to tell an NPC something you cannot find out during "
947 . "a normal conversation (such as a password). In those cases you have to use "
948 . "this text entry. You can also enter responses manually instead of using the response "
949 . "buttons below.",
950 on_activate => sub { 1362 on_activate => sub {
951 my ($entry, $text) = @_; 1363 my ($entry, $text) = @_;
952 1364
953 return unless $text =~ /\S/; 1365 return unless $text =~ /\S/;
954 1366
… …
957 1369
958 0 1370 0
959 }, 1371 },
960 ); 1372 );
961 1373
962 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1374 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
963 1375
964 $self->{bye_button} = new CFClient::UI::Button 1376 $self->{bye_button} = new CFPlus::UI::Button
965 text => "Bye (close)", 1377 text => "Bye (close)",
966 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1378 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
967 on_activate => sub { $this->destroy; 1 }, 1379 on_activate => sub { $this->destroy; 1 },
968 ; 1380 ;
969 1381
970 $self->update_options; 1382 $self->update_options;
971 1383
972 $self->{token} = $self->{conn}->ext_token; 1384 $self->{id} = "npc-channel-" . $self->{conn}->token;
973 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1385 $self->{conn}->connect_ext ($self->{id} => sub {
974 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1386 $this->feed (@_) if $this;
1387 });
1388
1389 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
975 1390
976 $self->{entry}->grab_focus; 1391 $self->{entry}->grab_focus;
977 1392
978 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1393 $self->{textview}->add_paragraph ({
1394 fg => [1, 1, 0, 1],
1395 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1396 });
979 1397
980 $self->show; 1398 $self->show;
981 $self 1399 $self
982}; 1400};
983 1401
984sub update_options { 1402sub update_options {
985 my ($self) = @_; 1403 my ($self) = @_;
986 1404
987 Scalar::Util::weaken $self; 1405 CFPlus::weaken $self;
988 1406
989 $self->{options}->clear; 1407 $self->{options}->clear;
990 $self->{options}->add ($self->{bye_button}); 1408 $self->{options}->add ($self->{bye_button});
991 1409
992 for my $kw (sort keys %{ $self->{kw} }) { 1410 for my $kw (sort keys %{ $self->{kw} }) {
993 $self->{options}->add (new CFClient::UI::Button 1411 $self->{options}->add (new CFPlus::UI::Button
994 text => $kw, 1412 text => $kw,
995 on_activate => sub { 1413 on_activate => sub {
996 $self->send ($kw); 1414 $self->send ($kw);
997 0 1415 0
998 }, 1416 },
999 ); 1417 );
1000 } 1418 }
1001} 1419}
1002 1420
1003sub feed { 1421sub feed {
1004 my ($self, $data) = @_; 1422 my ($self, $type, @arg) = @_;
1005 1423
1006 Scalar::Util::weaken $self; 1424 CFPlus::weaken $self;
1007 1425
1008 my ($type, $msg) = split / /, $data, 2;
1009
1010 if ($type eq "msg") { 1426 if ($type eq "update") {
1011 my ($msg, @kw) = split /\x00/, $msg; 1427 my (%info) = @arg;
1012 1428
1013 utf8::decode $_ for ($msg, @kw); 1429 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1430 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1014 1431
1015 $self->{kw}{$_} = 1 for @kw; 1432 if (exists $info{msg}) {
1016 1433 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1017 $msg = "\n" . CFClient::UI::Label::escape $msg;
1018 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1434 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1019 my @link; 1435 my @link;
1020 $msg =~ s{ 1436 $text =~ s{
1021 ($match) 1437 ($match)
1022 }{ 1438 }{
1023 my $kw = $1; 1439 my $kw = $1;
1024 1440
1025 push @link, new CFClient::UI::Label 1441 push @link, new CFPlus::UI::Label
1026 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1442 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1027 can_hover => 1, 1443 can_hover => 1,
1028 can_events => 1, 1444 can_events => 1,
1029 padding_x => 0, 1445 padding_x => 0,
1030 padding_y => 0, 1446 padding_y => 0,
1031 on_button_up => sub { 1447 on_button_up => sub {
1032 $self->send ($kw); 1448 $self->send ($kw);
1033 }; 1449 };
1034 1450
1035 chr 0xfffc 1451 "\x{fffc}"
1036 }giex; 1452 }giex;
1037 1453
1038 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1454 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1039 $self->{textview}->scroll_to_bottom; 1455 $self->{textview}->scroll_to_bottom;
1456 }
1457
1040 $self->update_options; 1458 $self->update_options;
1041 } else { 1459 } else {
1042 $self->destroy; 1460 $self->destroy;
1043 } 1461 }
1044 1462
… …
1046} 1464}
1047 1465
1048sub send { 1466sub send {
1049 my ($self, $msg) = @_; 1467 my ($self, $msg) = @_;
1050 1468
1051 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1469 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1052 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1053 1471
1054 utf8::encode $msg;
1055 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1472 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1056} 1473}
1057 1474
1058sub destroy { 1475sub destroy {
1059 my ($self) = @_; 1476 my ($self) = @_;
1060 1477
1061 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1478 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1062 1479
1480 if ($self->{conn}) {
1063 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1481 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1064 delete $self->{conn}{npc_dialog}; 1482 delete $self->{conn}{npc_dialog};
1065 $self->{conn}->disconnect_ext ($self->{token}); 1483 $self->{conn}->disconnect_ext ($self->{id});
1484 }
1066 1485
1067 $self->SUPER::destroy; 1486 $self->SUPER::destroy;
1068} 1487}
1069 1488
10701; 14891
1490

Diff Legend

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