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

Diff Legend

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