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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my @cmd_help = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 51 CFPlus::Pod::find command => "*";
39 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 => {},
103 };
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 });
243
40 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 245 for @cmd_help;
42 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 {
43 $self->{noface} = new_from_file CFPlus::Texture 254 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::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 }
45 258
46 $self->{open_container} = 0; 259 $self->{open_container} = 0;
47 260
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 261 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 263
55 $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 });
56} 303}
57 304
58sub logprint { 305sub logprint {
59 my ($self, @a) = @_; 306 my ($self, @a) = @_;
60 307
61 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
62 my $path = "$Crossfire::VARDIR/log.$self->{host}";
63
64 open my $fh, ">>:utf8", $path
65 or die "Couldn't open logfile $path: $!";
66
67 $fh->autoflush (1);
68
69 $fh;
70 };
71
72 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
73
74 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
75 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
76
77 print {$self->{log_fh}} "$ts ", @a, "\n";
78} 309}
79 310
80sub _stat_numdiff { 311sub _stat_numdiff {
81 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
82 313
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
221 $rng =~ s/^Range: //; # thank you so much dear server 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 456
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 457 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
247 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
248 478
249 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
250 $sktbl->clear; 480 $sktbl->clear;
251 481
482 my $sw = $self->{skillwid}{""} ||= [
252 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
253 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
254 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
255 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
256 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
257 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
491 ];
492
493 my @add = @$sw;
258 494
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 496
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this 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);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 499
265 my ($x, $y) = (0, 1); 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}{$_}],
… …
277 if ($ev->{button} == 1) { 512 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 513 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 514 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 515 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 516 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 518 (new CFPlus::UI::Menu
283 items => [ 519 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 521 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 522 ],
287 )->popup ($ev); 523 )->popup ($ev);
288 } else { 524 } else {
289 return 0; 525 return 0;
290 } 526 }
291 527
292 1 528 1
293 }; 529 };
294 530
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 531 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp
533 (new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 535
536 # level
537 (new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 538 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539
540 # progress
541 (new CFPlus::UI::ExperienceProgress),
542
543 # label
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ];
547
548 push @add,
549 $x * 4 + 0, $y, $sw->[0],
550 $x * 4 + 1, $y, $sw->[1],
551 $x * 4 + 2, $y, $sw->[2],
552 $x * 4 + 3, $y, $sw->[3],
553 ;
300 554
301 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
302 } 556 }
557
558 $sktbl->add_at (@add);
303 } 559 }
304 560
305 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
566 }
567}
568
569sub macro_send {
570 my ($self, $macro) = @_;
571
572 for my $cmd (@{ $macro->{action} }) {
573 $self->send_command ($cmd);
308 } 574 }
309} 575}
310 576
311sub user_send { 577sub user_send {
312 my ($self, $command) = @_; 578 my ($self, $command) = @_;
313 579
580 $self->{record}->($command)
314 if ($self->{record}) { 581 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 582
318 $self->logprint ("send: ", $command); 583 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 584 $self->send_command ($command);
320 ::status ($command); 585 ::status ($command);
321} 586}
322 587
323sub start_record { 588sub record {
324 my ($self) = @_; 589 my ($self, $cb) = @_;
325 590
326 $self->{record} = []; 591 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 592}
333 593
334sub map_scroll { 594sub map_scroll {
335 my ($self, $dx, $dy) = @_; 595 my ($self, $dx, $dy) = @_;
336 596
… …
338} 598}
339 599
340sub feed_map1a { 600sub feed_map1a {
341 my ($self, $data) = @_; 601 my ($self, $data) = @_;
342 602
343 $self->{map}->map1a_update ($data); 603 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
604 my $delay;
605
606 for my $tile (@$missing) {
607 next if $self->{delay}{$tile};
608
609 $delay = 1;
610
611 if (my $tex = $::CONN->{texture}[$tile]) {
612 $tex->upload;
613 } else {
614 $self->{delay}{$tile} = 1;
615
616 # we assume the face is in-flight and will eventually come
617 push @{$self->{tile_cb}{$tile}}, sub {
618 delete $self->{delay}{$tile};
619 $_[0]->upload;
620 };
621 }
622 }
623
624 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update;
629 });
630 } else {
344 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
345} 633}
346 634
347sub magicmap { 635sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
349 637
… …
356 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
357 or return; 645 or return;
358 646
359 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
360 648
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 650 $self->{map_cache_new}{$hash} = \$data;
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
364} 652}
365 653
366sub map_clear { 654sub map_clear {
367 my ($self) = @_; 655 my ($self) = @_;
368 656
… …
371 659
372 $self->{map}->clear; 660 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 661 delete $self->{map_widget}{magicmap};
374} 662}
375 663
664sub bg_fetch {
665 my ($self) = @_;
666
667 my $tile;
668
669 do {
670 $tile = pop @{$self->{bg_fetch}}
671 or return;
672 } while $self->{texture}[$tile];
673
674 CFPlus::DB::get tilecache => $tile, sub {
675 my ($data) = @_;
676
677 return unless $self->{map}; # stop when destroyed
678
679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
683
684 $self->bg_fetch;
685 };
686}
376 687
377sub load_map($$$) { 688sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
379 690
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 691 my $gen = $self->{map_change_gen};
692
693 my $cb = sub {
694 return unless $gen == $self->{map_change_gen};
695
696 my ($data) = @_;
697
698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
381 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 702
387 $self->set_texture ($id => $data); 703 my $inprogress = @{ $self->{bg_fetch} || [] };
704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
705 $self->bg_fetch unless $inprogress;
388 } 706 }
707 };
708
709 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata);
711 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
389 } 713 }
390} 714}
391 715
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
… …
458 782
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 783 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 784 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 785
462 } else { 786 } else {
787 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 788 $self->send_mapinfo ("spatial $path$tile", sub {
789 return unless $gen == $self->{map_change_gen};
790
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 791 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 792
466 return if $mode ne "spatial"; 793 return if $mode ne "spatial";
467 794
468 $x += $self->{map}->ox; 795 $x += $self->{map}->ox;
… …
482 809
483sub map_change { 810sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 812
486 $self->flush_map; 813 $self->flush_map;
814
815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
487 817
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 819
490 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 838 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 839 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 840}
511 841
512sub face_find { 842sub face_find {
513 my ($self, $facenum, $face) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
514 844
515 my $hash = "$face->{chksum},$face->{name}"; 845 if ($face->{type} == 0) { # FT_FACE
846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
516 847
517 my $id = $self->{facemap}->get ($hash);
518
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 848 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d#
544 850
545 my $face = $self->{tilecache}->get ($id); 851 CFPlus::DB::get tilecache => $id, $cb;
546 852
547 if ($face) { 853 } elsif ($face->{type} & 1) { # with metadata
548 #$self->face_prefetch; 854 CFPlus::DB::get res_meta => $face->{name}, $cb;
549 $face 855
550 } else { 856 } else { # no metadata
551 my $tex = $self->{noface}; 857 CFPlus::DB::get res_data => $face->{name}, $cb;
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 }; 858 }
555} 859}
556 860
557sub face_update { 861sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
559 863
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 864 if ($face->{type} == 0) {
865 # image, FT_FACE
866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
867 if $changed;
561 868
562 $self->set_texture ($face->{id} => delete $face->{image}); 869 $self->have_tile ($face->{id}, delete $face->{data});
563}
564 870
565sub set_texture { 871 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta;
876
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
879 }
880
881 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face);
884
885 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum);
895 }
896
897 } else {
898 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed;
901 }
902
903 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs;
905 }
906}
907
908sub smooth_update {
909 my ($self, $facenum, $face) = @_;
910
911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
912}
913
914sub have_tile {
566 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
567 916
568 $self->{texture}[$id] ||= do { 917 return unless $self->{map};
569 my $tex = 918
919 my $tex = $self->{texture}[$tile] ||=
570 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
571 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
572 924
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
574 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
575
576 $tex
577 }; 927 }
928}
929
930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
933 my ($self, $num, $cb) = @_;
934
935 push @{$self->{face_cb}{$num}}, $cb;
936
937 defined wantarray
938 ? CFPlus::guard {
939 @{$self->{face_cb}{$num}}
940 = grep $_ != $cb,
941 @{$self->{face_cb}{$num}};
942 }
943 : ()
944}
945
946# call in non-void context registers a temporary
947# hook with handle, otherwise its permanent
948sub register_face_handler {
949 my ($self, $num, $cb) = @_;
950
951 return unless $num;
952
953 # invoke if available right now
954 $cb->($self->{face}[$num], 0)
955 unless exists $self->{face}[$num]{loading};
956
957 # future changes
958 $self->on_face_change ($num => $cb)
578} 959}
579 960
580sub sound_play { 961sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
582 963
583 $self->{sound_play}->($x, $y, $soundnum, $type); 964 &::audio_sound_play ($face, $dx, $dy, $vol)
965 unless $type & 1; # odd types are silent for future expansion
584} 966}
585 967
586my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
587 969
588sub query { 970sub query {
… …
592 $LAST_QUERY = $prompt; 974 $LAST_QUERY = $prompt;
593 975
594 $self->{query}-> ($self, $flags, $prompt); 976 $self->{query}-> ($self, $flags, $prompt);
595} 977}
596 978
597sub drawinfo { 979sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 980 local $_ = shift;
599 981
600 my @color = ( 982 # we now weed out all tags we do not support
983 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
984 # now all entities
985 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
986
987 # handle some elements
988 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
989 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
990
991 $_
992}
993
994our %NAME_TO_COLOR = (
995 black => 0,
996 white => 1,
997 darkblue => 2,
998 red => 3,
999 orange => 4,
1000 lightblue => 5,
1001 darkorange => 6,
1002 green => 7,
1003 darkgreen => 8,
1004 grey => 9,
1005 brown => 10,
1006 yellow => 11,
1007 tan => 12,
1008);
1009
1010our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1011 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 1012 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1013 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 1014 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 1015 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 1016 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 1017 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 1018 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 1019 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 1020 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 1021 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 1022 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 1023 [0.74, 0.65, 0.41],
614 ); 1024);
615 1025
1026sub msg {
1027 my ($self, $color, $type, $text, @extra) = @_;
1028
1029 $text = sanitise_xml $text;
1030
1031 if (my $cb = $self->{cb_msg}{$type}) {
1032 $_->($self, $color, $type, $text, @extra) for values %$cb;
1033 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1034 $type =~ s/-/_/g;
1035 $self->{$type} = $text;
1036 } else {
616 $self->logprint ("info: ", $text); 1037 $self->logprint ("msg: ", $text);
1038 return if $color < 0; # negative color == ignore if not understood
617 1039
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
619 1041
620 # try to create single paragraphs of multiple lines sent by the server 1042 ## try to create single paragraphs of multiple lines sent by the server
1043 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 1045
623 $text = CFPlus::asxml $text; 1046 ::message ({
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1047 fg => $fg,
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1048 markup => $_,
1049 type => $type,
1050 extra => [@extra],
1051 color_flags => $color
1052 }) for split /\n/, $text;
626 1053
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
632 group => $text, 1055 group => $text,
633 fg => $color[$color], 1056 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
636 ); 1059 );
637} 1060 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 1061}
644 1062
645sub spell_add { 1063sub spell_add {
646 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
647 1065
648 # try to create single paragraphs out of the multiple lines sent by the server 1066 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1067 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
652 1070
653 $::SPELL_PAGE->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
654 1072
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1073 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1074 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 1075}
658 1076
659sub spell_delete { 1077sub spell_delete {
660 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
661 1079
662 $::SPELL_PAGE->remove_spell ($spell); 1080 $::SPELL_LIST->remove_spell ($spell);
1081}
1082
1083sub setup {
1084 my ($self, $setup) = @_;
1085
1086 $self->{map_widget}->set_tilesize ($self->{tilesize});
1087 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 1088}
664 1089
665sub addme_success { 1090sub addme_success {
666 my ($self) = @_; 1091 my ($self) = @_;
667 1092
… …
688 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
689 1114
690 ::stop_game (); 1115 ::stop_game ();
691} 1116}
692 1117
693sub image_info {
694 my ($self, $numfaces) = @_;
695
696 $self->{num_faces} = $numfaces;
697 $self->{face_prefetch} = [1 .. $numfaces];
698 $self->face_prefetch;
699}
700
701sub face_prefetch {
702 my ($self) = @_;
703
704 return unless $::CFG->{face_prefetch};
705
706 if ($self->{num_faces}) {
707 return if @{ $self->{send_queue} || [] };
708 my $todo = @{ $self->{face_prefetch} }
709 or return;
710
711 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
712
713 $self->send ("requestinfo image_sums $face $face");
714
715 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
716 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
717 } elsif (!exists $self->{num_faces}) {
718 $self->send ("requestinfo image_info");
719
720 $self->{num_faces} = 0;
721
722 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
723 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
724 }
725}
726
727sub update_floorbox { 1118sub update_floorbox {
728 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
729 return unless $::CONN; 1120 return unless $::CONN;
730 1121
731 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
732 1125
733 my $row; 1126 my $row;
734 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
735 if ($row < 6) { 1128 if ($row < 6) {
736 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
737 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
738 CFPlus::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
739 1132
1133 push @add,
740 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
741 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
742 1136
743 $row++; 1137 $row++;
744 } else { 1138 } else {
745 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
746 text => "More...", 1140 text => "More...",
747 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
748 ); 1142 ;
749 last; 1143 last;
750 } 1144 }
751 } 1145 }
752 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
753 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new CFPlus::UI::Button
754 text => "Close container", 1148 text => "Close container",
755 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
756 ); 1150 ;
757 } 1151 }
758 });
759 1152
1153 $::FLOORBOX->add_at (@add);
1154 });
1155
760 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
761} 1157}
762 1158
763sub set_opencont { 1159sub set_opencont {
764 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
765 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
766 update_floorbox; 1162 update_floorbox;
767 1163
768 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
769 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
770 1166
771 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
772 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
773 text => "Close container", 1169 text => "Close container",
774 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
775 on_activate => sub { 1171 on_activate => sub {
776 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
777 if $tag != 0; 1173 if $tag != 0;
778 #if $CONN->{open_container} != 0;
779 0 1174 0
780 }, 1175 },
781 ); 1176 );
782 } 1177 }
783 1178
… …
873 $::SERVER_INFO->set_markup ( 1268 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1269 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1270 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1271 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1274 . "editing support $yesno[!!$self->{editor_support}]\n"
1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1280 );
1281
882} 1282}
883 1283
884sub logged_in { 1284sub logged_in {
885 my ($self) = @_; 1285 my ($self) = @_;
886 1286
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
888 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
889 $self->update_server_info; 1291 $self->update_server_info;
1292
1293 if ($self->{cfplus_ext} >= 2) {
1294 $self->send_ext_req ("editor_support", sub {
1295 $self->{editor_support} = { @_ };
1296 $self->update_server_info;
1297
1298 0
1299 });
1300 }
890 1301
891 0 1302 0
892 }); 1303 });
893 1304
894 $self->update_server_info; 1305 $self->update_server_info;
895 1306
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1307 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
1309 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1310 $self->send_command ("pickup $::CFG->{pickup}");
899} 1311}
900 1312
901sub lookat { 1313sub lookat {
902 my ($self, $x, $y) = @_; 1314 my ($self, $x, $y) = @_;
903 1315
904 if ($self->{cfplus_ext}) { 1316 if ($self->{cfplus_ext}) {
905 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1317 $self->send_ext_req (lookat => $x, $y, sub {
906 my ($msg) = @_; 1318 my (%msg) = @_;
907 1319
908 if (exists $msg->{npc_dialog}) { 1320 if (exists $msg{npc_dialog}) {
909 # start npc chat dialog 1321 # start npc chat dialog
910 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1322 $self->{npc_dialog} = new CFPlus::NPCDialog::
911 dx => $x, 1323 token => $msg{npc_dialog},
912 dy => $y,
913 title => "$msg->{npc_dialog} (NPC)", 1324 title => "$msg{npc_dialog}[0] (NPC)",
914 conn => $self, 1325 conn => $self,
915 ; 1326 ;
916 } 1327 }
917 }); 1328 });
918 } 1329 }
… …
921} 1332}
922 1333
923sub destroy { 1334sub destroy {
924 my ($self) = @_; 1335 my ($self) = @_;
925 1336
926 $self->{npc_dialog}->destroy 1337 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1338 if $self->{npc_dialog};
928 1339
929 $self->SUPER::destroy; 1340 $self->SUPER::destroy;
1341
1342 %$self = ();
930} 1343}
931 1344
932package CFPlus::NPCDialog; 1345package CFPlus::NPCDialog;
933 1346
934our @ISA = 'CFPlus::UI::FancyFrame'; 1347our @ISA = 'CFPlus::UI::Toplevel';
935 1348
936sub new { 1349sub new {
937 my $class = shift; 1350 my $class = shift;
938 1351
939 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1359 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1360 has_close_button => 1,
948 @_, 1361 @_,
949 ); 1362 );
950 1363
951 Scalar::Util::weaken (my $this = $self); 1364 CFPlus::weaken (my $this = $self);
952 1365
953 $self->connect (delete => sub { $this->destroy; 1 }); 1366 $self->connect (delete => sub { $this->destroy; 1 });
954 1367
955 # better use a pane... 1368 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1369 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1371
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1372 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1373
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1374 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1375 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1376 tooltip => "#npc_message_entry",
964 . "Sometimes you have to tell an NPC something you cannot find out during "
965 . "a normal conversation (such as a password). In those cases you have to use "
966 . "this text entry. You can also enter responses manually instead of using the response "
967 . "buttons below.",
968 on_activate => sub { 1377 on_activate => sub {
969 my ($entry, $text) = @_; 1378 my ($entry, $text) = @_;
970 1379
971 return unless $text =~ /\S/; 1380 return unless $text =~ /\S/;
972 1381
… …
985 on_activate => sub { $this->destroy; 1 }, 1394 on_activate => sub { $this->destroy; 1 },
986 ; 1395 ;
987 1396
988 $self->update_options; 1397 $self->update_options;
989 1398
990 $self->{id} = $self->{conn}->send_ext_req ( 1399 $self->{id} = "npc-channel-" . $self->{conn}->token;
991 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1400 $self->{conn}->connect_ext ($self->{id} => sub {
992 sub { $this && $this->feed (@_) } 1401 $this->feed (@_) if $this;
993 ); 1402 });
1403
1404 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
994 1405
995 $self->{entry}->grab_focus; 1406 $self->{entry}->grab_focus;
996 1407
997 $self->{textview}->add_paragraph ({ 1408 $self->{textview}->add_paragraph ({
998 fg => [1, 1, 0, 1], 1409 fg => [1, 1, 0, 1],
… …
1004}; 1415};
1005 1416
1006sub update_options { 1417sub update_options {
1007 my ($self) = @_; 1418 my ($self) = @_;
1008 1419
1009 Scalar::Util::weaken $self; 1420 CFPlus::weaken $self;
1010 1421
1011 $self->{options}->clear; 1422 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1423 $self->{options}->add ($self->{bye_button});
1013 1424
1014 for my $kw (sort keys %{ $self->{kw} }) { 1425 for my $kw (sort keys %{ $self->{kw} }) {
… …
1021 ); 1432 );
1022 } 1433 }
1023} 1434}
1024 1435
1025sub feed { 1436sub feed {
1026 my ($self, $msg) = @_; 1437 my ($self, $type, @arg) = @_;
1027 1438
1028 Scalar::Util::weaken $self; 1439 CFPlus::weaken $self;
1029 1440
1030 if ($msg->{msgtype} eq "reply") { 1441 if ($type eq "update") {
1442 my (%info) = @arg;
1443
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1033
1034 my $text = "\n" . CFPlus::asxml $msg->{msg};
1035 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1036 my @link;
1037 $text =~ s{
1038 ($match)
1039 }{
1040 my $kw = $1;
1041
1042 push @link, new CFPlus::UI::Label
1043 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1044 can_hover => 1,
1045 can_events => 1,
1046 padding_x => 0,
1047 padding_y => 0,
1048 on_button_up => sub {
1049 $self->send ($kw);
1050 };
1051
1052 chr 0xfffc
1053 }giex;
1054 1446
1447 if (exists $info{msg}) {
1448 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1449 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1450 my @link;
1451 $text =~ s{
1452 ($match)
1453 }{
1454 my $kw = $1;
1455
1456 push @link, new CFPlus::UI::Label
1457 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1458 can_hover => 1,
1459 can_events => 1,
1460 padding_x => 0,
1461 padding_y => 0,
1462 on_button_up => sub {
1463 $self->send ($kw);
1464 };
1465
1466 "\x{fffc}"
1467 }giex;
1468
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1469 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1471 }
1472
1057 $self->update_options; 1473 $self->update_options;
1058 } else { 1474 } else {
1059 $self->destroy; 1475 $self->destroy;
1060 } 1476 }
1061 1477
… …
1066 my ($self, $msg) = @_; 1482 my ($self, $msg) = @_;
1067 1483
1068 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1069 $self->{textview}->scroll_to_bottom; 1485 $self->{textview}->scroll_to_bottom;
1070 1486
1071 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1487 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1072} 1488}
1073 1489
1074sub destroy { 1490sub destroy {
1075 my ($self) = @_; 1491 my ($self) = @_;
1076 1492
1077 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1493 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1078 1494
1079 if ($self->{conn}) { 1495 if ($self->{conn}) {
1080 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1496 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1081 delete $self->{conn}{npc_dialog}; 1497 delete $self->{conn}{npc_dialog};
1082 $self->{conn}->disconnect_ext ($self->{id}); 1498 $self->{conn}->disconnect_ext ($self->{id});
1083 } 1499 }
1084 1500
1085 $self->SUPER::destroy; 1501 $self->SUPER::destroy;
1086} 1502}
1087 1503
10881 15041
1505

Diff Legend

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