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.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.176 by root, Sun Oct 14 15:33:30 2007 UTC

… …
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro; 12use CFPlus::Macro;
13use CFPlus::Item; 13use CFPlus::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 ywidget => 1, 24 xwidget2 => 1,#d#
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
52 50
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 } else {
80 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
81 $self->ask_face ($face, -100 - $pri, undef, sub {
82 my $len = length $_[1];
83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
84
85 CFPlus::DB::write_file $path, $data, sub {
86 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87 my $meta = $self->{json_coder}->decode ($meta_json);
88 $meta->{path} = $path;
89 $self->{music_meta}{$chksum} = $meta;
90
91 ::message ({ markup => "downloaded song #$face, size $len octets" });
92 &::audio_music_set ($self->{songs});
93 };
94 };
95 });
96 }
97 }
98 }
99 }
100
101 if (my $play = $ev->{play}) {
102 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
103 }
104 });
105
106 $self->connect_ext (event_capabilities => sub {
107 my ($cap) = @_;
108
109 if (my $ts = $cap->{tileset}) {
110 if (my ($default) = grep $_->[2] & 1, @$ts) {
111 $self->{tileset} = $default;
112 $self->{tilesize} = $default->[3];
113 $self->setup_req (tileset => $default->[0]);
114
115 my $w = int $self->{mapw} * 32 / $self->{tilesize};
116 my $h = int $self->{maph} * 32 / $self->{tilesize};
117
118 $self->setup_req (mapsize => "${w}x${h}");
119 }
120 }
121 });
122
123 $self->{json_coder} 51 $self->{json_coder}
124 ->convert_blessed 52 ->convert_blessed
125 ->filter_json_single_key_object (__widget_ref__ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
126 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
127 }); 61 });
128 62
129 $self->connect_ext (ws_n => sub { 63 # destroy widgets on logout
130 my ($arg) = @_;
131
132 $self->{widgetset}{$arg{id}} = {
133 w => {},
134 };
135 });
136
137 $self->connect_ext (ws_d => sub {
138 my ($arg) = @_;
139
140 my $ws = delete $self->{widgetset}{$arg{id}}
141 or return;
142
143 $_->destroy
144 for values %{$ws->{w}};
145 });
146
147 $self->connect_ext (ws_c => sub {
148 my ($arg) = @_;
149
150 my $args = $arg->{args} || {};
151
152 for my $ev (grep /^on_/, keys %$args) {
153 $args->{$ev} = sub {
154 my $id = shift->{s_id};
155 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
156
157 1
158 };
159 }
160
161 if (my $widget = eval {
162 local $SIG{__DIE__};
163 "CFPlus::UI::$arg->{class}"->new (
164 %$args,
165 s_ws => $arg->{ws},
166 s_id => $arg->{id},
167 )
168 }
169 ) {
170 $self->{widget}{$arg->{id}}
171 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
172 = $widget;
173
174 $widget->connect (on_destroy => sub {
175 my ($widget) = @_;
176
177 delete $self->{widget}{$widget->{s_id}};
178 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
179 });
180 } else {
181 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
182 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
183 }
184 });
185
186 $self->connect_ext (w_c => sub {
187 my ($arg) = @_;
188
189 my $w = $self->{widget}{$arg->{id}}
190 or return;
191 my $m = $arg->{name};
192
193 my $a = $arg->{args} || [];
194
195 if (exists $arg->{rid}) {
196 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
197 } else {
198 $w->$m (@$a);
199 }
200 });
201
202 $self->connect_ext (w_s => sub {
203 my ($arg) = @_;
204
205 my $w = $self->{widget}{$arg->{id}}
206 or return;
207
208 $w->{$arg->{name}} = $arg->{value};
209 });
210
211 $self->connect_ext (w_g => sub {
212 my ($arg) = @_;
213
214 my $w = $self->{widget}{$arg->{id}}
215 or return;
216
217 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
218 });
219
220 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
221 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
222 $_->destroy 66 $_->destroy
223 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
224 } 68 }
… …
245 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
246 90
247 $self 91 $self
248} 92}
249 93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]);
128
129 my $w = int $self->{mapw} * 32 / $self->{tilesize};
130 my $h = int $self->{maph} * 32 / $self->{tilesize};
131
132 $self->setup_req (mapsize => "${w}x${h}");
133 }
134 }
135}
136
137sub ext_ambient_music {
138 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs);
140}
141
142#############################################################################
143
144sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_;
146
147 $widget ||= new CFPlus::UI::Bin;
148
149 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget;
151
152 if ($ws) {
153 $widget->{s_ws} = $ws;
154 $self->{widgetset}{$ws}{w}{$id} = $widget;
155 }
156
157 $widget->connect (on_destroy => sub {
158 my ($widget) = @_;
159
160 delete $self->{widget}{$widget->{s_id}};
161 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
162 if exists $widget->{s_ws};
163 });
164}
165
166# widgetset new
167sub ext_ws_n {
168 my ($self, $id) = @_;
169
170 $self->{widgetset}{$id} = {
171 w => {},
172 };
173}
174
175# widgetset destroy
176sub ext_ws_d {
177 my ($self, $id) = @_;
178
179 my $ws = delete $self->{widgetset}{$id}
180 or return;
181
182 $_->destroy
183 for values %{$ws->{w}};
184}
185
186# widgetset create
187sub ext_ws_c {
188 my ($self, $ws, $id, $class, $args) = @_;
189
190 $self->widget_associate (
191 $ws, $id => scalar eval {
192 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args)
194 }
195 );
196}
197
198# widgetset associate
199sub ext_ws_a {
200 my ($self, %ass) = @_;
201
202 # everything that has a name, wether conceivably useful or not
203 my %wkw = (
204 root => $CFPlus::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP,
206
207 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG,
213 host_entry => $::HOST_ENTRY,
214 metaserver => $::METASERVER,
215 server_info => $::SERVER_INFO,
216
217 setup_dialog => $::SETUP_DIALOG,
218 setup_notebook => $::SETUP_NOTEBOOK,
219 setup_server => $::SETUP_SERVER,
220 setup_keyboard => $::SETUP_KEYBOARD,
221
222 pl_notebook => $::PL_NOTEBOOK,
223 pl_window => $::PL_WINDOW,
224 inventory_page => $::INVENTORY_PAGE,
225 stats_page => $::STATS_PAGE,
226 skill_page => $::SKILL_PAGE,
227 spell_page => $::SPELL_PAGE,
228 spell_list => $::SPELL_LIST,
229
230 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW,
233 statusbox => $::SDTATUSBOX,
234
235 inv => $::INV,
236 invr => $::INVR,
237 invr_hb => $::INVR_HB,
238 );
239
240 while (my ($id, $name) = each %ass) {
241 $self->widget_associate (undef, $id => $wkw{$name});
242 }
243}
244
245# widget call
246sub ext_w_c {
247 my ($self, $id, $rcb, $method, @args) = @_;
248
249 my $w = $self->{widget}{$id}
250 or return;
251
252 if ($rcb) {
253 $rcb->($w->$method (@args));
254 } else {
255 $w->$method (@args);
256 }
257}
258
259# widget set
260sub ext_w_s {
261 my ($self, $id, $attr) = @_;
262
263 my $w = $self->{widget}{$id}
264 or return;
265
266 for (my $i = 0; $i < $#$attr; $i += 2) {
267 my ($member, $value) = @$attr[$i, $i+1];
268 if (defined $value) {
269 $w->{$member} = $value;
270 } else {
271 delete $w->{$member};
272 }
273 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
274 }
275}
276
277# widget get
278sub ext_w_g {
279 my ($self, $id, $rid, @attr) = @_;
280
281 my $w = $self->{widget}{$id}
282 or return;
283
284 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
285}
286
287# message window
288sub ext_channel_info {
289 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info);
292}
293
294#############################################################################
295
250sub logprint { 296sub logprint {
251 my ($self, @a) = @_; 297 my ($self, @a) = @_;
252 298
253 $self->{log_fh} ||= do { 299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
254 my $path = "$Crossfire::VARDIR/log.$self->{host}";
255
256 open my $fh, ">>:utf8", $path
257 or die "Couldn't open logfile $path: $!";
258
259 $fh->autoflush (1);
260
261 $fh;
262 };
263
264 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
265
266 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
267 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
268
269 print {$self->{log_fh}} "$ts ", @a, "\n";
270} 300}
271 301
272sub _stat_numdiff { 302sub _stat_numdiff {
273 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
274 304
… …
358 388
359 if ( 389 if (
360 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
361 ) { 391 ) {
362 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
363 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
364 } 394 }
365 395
366 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
367 397
368 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
407 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
408 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
409 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
410 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
411 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
412 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
413 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
414 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
415 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
416 447
… …
434 for keys %RES_TBL; 465 for keys %RES_TBL;
435 466
436 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
437 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
438 469
439 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 470 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
471 map [$_, $self->{skill_info}{$_}],
472 grep exists $stats->{$_},
473 @skills;
474
475 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
476 $self->{stat_order} = join ",", map $_->[0], @order;
477
440 $sktbl->clear; 478 $sktbl->clear;
441 479
480 my $sw = $self->{skillwid}{""} ||= [
442 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
443 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
444 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
445 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
446 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
447 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
489 ];
490
491 my @add = @$sw;
448 492
449 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
450 494
451 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
452 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
453 497
454 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
455 for ( 499 for (@order) {
456 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
457 map [$_, $self->{skill_info}{$_}],
458 grep exists $stats->{$_},
459 @skills
460 ) {
461 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
462 501
463 my $spell_cb = sub { 502 my $spell_cb = sub {
464 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
465 504
… …
480 } 519 }
481 520
482 1 521 1
483 }; 522 };
484 523
485 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp
526 (new CFPlus::UI::Label
486 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
487 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 528
529 # level
530 (new CFPlus::UI::Label
488 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532
533 # progress
534 (new CFPlus::UI::ExperienceProgress),
535
536 # label
489 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
490 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ];
540
541 push @add,
542 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1],
544 $x * 4 + 2, $y, $sw->[2],
545 $x * 4 + 3, $y, $sw->[3],
546 ;
491 547
492 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
493 } 549 }
494 }
495 550
496 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
497 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
498 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
499 } 552 }
500}
501 553
502sub macro_send { 554 for (@order) {
503 my ($self, $macro) = @_; 555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
504 557
505 for my $cmd (@{ $macro->{action} }) { 558 next if $prev->{$idx}[1] eq $val->[1];
506 $self->send_command ($cmd); 559
560 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val);
564
565 $::GAUGES->{sklprg}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val);
507 } 567 }
508} 568}
509 569
510sub user_send { 570sub user_send {
511 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
513 $self->{record}->($command) 573 $self->{record}->($command)
514 if $self->{record}; 574 if $self->{record};
515 575
516 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
517 $self->send_command ($command); 577 $self->send_command ($command);
518 ::status ($command);
519} 578}
520 579
521sub record { 580sub record {
522 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
523 582
… …
531} 590}
532 591
533sub feed_map1a { 592sub feed_map1a {
534 my ($self, $data) = @_; 593 my ($self, $data) = @_;
535 594
536 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
596 my $delay;
597
598 for my $tile (@$missing) {
599 next if $self->{delay}{$tile};
600
601 $delay = 1;
602
603 if (my $tex = $::CONN->{texture}[$tile]) {
604 $tex->upload;
605 } else {
606 $self->{delay}{$tile} = 1;
607
608 # we assume the face is in-flight and will eventually come
609 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile};
611 $_[0]->upload;
612 };
613 }
614 }
615
616 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
618 Event->timer (after => 0.03, cb => sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update
621 if $self->{map_widget};
622 });
623 } else {
537 $self->{map_widget}->update; 624 $self->{map_widget}->update;
625 }
538} 626}
539 627
540sub magicmap { 628sub magicmap {
541 my ($self, $w, $h, $x, $y, $data) = @_; 629 my ($self, $w, $h, $x, $y, $data) = @_;
542 630
… …
549 my $map_info = delete $self->{map_info} 637 my $map_info = delete $self->{map_info}
550 or return; 638 or return;
551 639
552 my ($hash, $x, $y, $w, $h) = @$map_info; 640 my ($hash, $x, $y, $w, $h) = @$map_info;
553 641
554 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
643 $self->{map_cache_new}{$hash} = \$data;
555 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
556 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
557} 645}
558 646
559sub map_clear { 647sub map_clear {
560 my ($self) = @_; 648 my ($self) = @_;
561 649
… …
567} 655}
568 656
569sub bg_fetch { 657sub bg_fetch {
570 my ($self) = @_; 658 my ($self) = @_;
571 659
572 my $id; 660 my $tile;
573 661
574 do { 662 do {
575 $id = pop @{$self->{bg_fetch}} 663 $tile = pop @{$self->{bg_fetch}}
576 or return; 664 or return;
577 } while $self->{texture}[$id]; 665 } while $self->{texture}[$tile];
578 666
579 CFPlus::DB::get tilecache => $id, sub { 667 CFPlus::DB::get tilecache => $tile, sub {
580 my ($data) = @_; 668 my ($data) = @_;
581 669
582 return unless $self->{map}; # stop when destroyed 670 return unless $self->{map}; # stop when destroyed
583 671
584 $self->set_texture ($id => $data)
585 if defined $data; 672 if (defined $data) {
673 $self->have_tile ($tile, $data);
674 $self->{texture}[$tile]->upload;
675 }
586 676
587 $self->bg_fetch; 677 $self->bg_fetch;
588 }; 678 };
589} 679}
590 680
591sub load_map($$$) { 681sub load_map($$$) {
592 my ($self, $hash, $x, $y) = @_; 682 my ($self, $hash, $x, $y) = @_;
593 683
594 my $gen = $self->{map_change_gen}; 684 my $gen = $self->{map_change_gen};
595 685
596 CFPlus::DB::get $self->{mapcache} => $hash, sub { 686 my $cb = sub {
597 return unless $gen == $self->{map_change_gen}; 687 return unless $gen == $self->{map_change_gen};
598 688
599 my ($data) = @_; 689 my ($data) = @_;
600 690
601 if (defined $data) { 691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
602 $data = Compress::LZF::decompress $data; 694 my $data = Compress::LZF::decompress $data;
603 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
604 695
605 my $inprogress = @{ $self->{bg_fetch} || [] }; 696 my $inprogress = @{ $self->{bg_fetch} || [] };
606 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
607 $self->bg_fetch unless $inprogress; 698 $self->bg_fetch unless $inprogress;
608 } 699 }
609 }; 700 };
701
702 if (my $rdata = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata);
704 } else {
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
706 }
610} 707}
611 708
612# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 709# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
613# (server resource,s latency, bandwidth), so this hack is warranted. 710# (server resource,s latency, bandwidth), so this hack is warranted.
614# the right fix is to make real tiled maps with an overview file 711# the right fix is to make real tiled maps with an overview file
… …
707 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
708 805
709 $self->flush_map; 806 $self->flush_map;
710 807
711 ++$self->{map_change_gen}; 808 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new};
712 810
713 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
714 812
715 my $mapmapw = $self->{mapmap}->{w}; 813 my $mapmapw = $self->{mapmap}->{w};
716 my $mapmaph = $self->{mapmap}->{h}; 814 my $mapmaph = $self->{mapmap}->{h};
… …
735} 833}
736 834
737sub face_find { 835sub face_find {
738 my ($self, $facenum, $face, $cb) = @_; 836 my ($self, $facenum, $face, $cb) = @_;
739 837
740 my $hash = "$face->{chksum},$face->{name}"; 838 if ($face->{type} == 0) { # FT_FACE
741
742 my $id = CFPlus::DB::get_tile_id_sync $hash; 839 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
743 840
744 $face->{id} = $id; 841 $face->{id} = $id;
745 $self->{faceid}[$facenum] = $id;
746
747 $self->{map}->set_tileid ($facenum => $id); 842 $self->{map}->set_tileid ($facenum => $id);
748 843
749 CFPlus::DB::get tilecache => $id, $cb; 844 CFPlus::DB::get tilecache => $id, $cb;
845
846 } elsif ($face->{type} & 1) { # with metadata
847 CFPlus::DB::get res_meta => $face->{name}, $cb;
848
849 } else { # no metadata
850 CFPlus::DB::get res_data => $face->{name}, $cb;
851 }
750} 852}
751 853
752sub face_update { 854sub face_update {
753 my ($self, $facenum, $face, $changed) = @_; 855 my ($self, $facenum, $face, $changed) = @_;
754 856
857 if ($face->{type} == 0) {
858 # image, FT_FACE
755 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
756 if $changed; 860 if $changed;
757 861
758 $self->set_texture ($face->{id} => delete $face->{image}); 862 $self->have_tile ($face->{id}, delete $face->{data});
863
864 } elsif ($face->{type} & 1) {
865 # split metadata case, FT_MUSIC, FT_SOUND
866 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta;
869
870 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
873 }
874
875 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed;
879
880 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum);
884 }
885
886 } else {
887 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed;
890 }
891
892 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs;
894 }
759} 895}
760 896
761sub smooth_update { 897sub smooth_update {
762 my ($self, $facenum, $face) = @_; 898 my ($self, $facenum, $face) = @_;
763 899
764 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 900 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
765} 901}
766 902
767sub set_texture { 903sub have_tile {
768 my ($self, $id, $data) = @_; 904 my ($self, $tile, $data) = @_;
769 905
770 return unless $self->{map}; 906 return unless $self->{map};
771 907
772 $self->{texture}[$id] = my $tex = 908 my $tex = $self->{texture}[$tile] ||=
773 new_from_image CFPlus::Texture 909 new CFPlus::Texture
910 tile => $tile,
911 image => $data, delete_image => 1,
774 $data, minify => 1, mipmap => 1; 912 minify => 1, mipmap => 1;
775 913
776 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 914 if (my $cbs = delete $self->{tile_cb}{$tile}) {
777 $self->{map_widget}->update; 915 $_->($tex) for @$cbs;
916 }
917}
918
919# call in non-void context registers a temporary
920# hook with handle, otherwise its permanent
921sub on_face_change {
922 my ($self, $num, $cb) = @_;
923
924 push @{$self->{face_cb}{$num}}, $cb;
925
926 defined wantarray
927 ? CFPlus::guard {
928 @{$self->{face_cb}{$num}}
929 = grep $_ != $cb,
930 @{$self->{face_cb}{$num}};
931 }
932 : ()
933}
934
935# call in non-void context registers a temporary
936# hook with handle, otherwise its permanent
937sub register_face_handler {
938 my ($self, $num, $cb) = @_;
939
940 return unless $num;
941
942 # invoke if available right now
943 $cb->($self->{face}[$num], 0)
944 unless exists $self->{face}[$num]{loading};
945
946 # future changes
947 $self->on_face_change ($num => $cb)
778} 948}
779 949
780sub sound_play { 950sub sound_play {
781 my ($self, $x, $y, $soundnum, $type) = @_; 951 my ($self, $type, $face, $dx, $dy, $vol) = @_;
782 952
783 $self->{sound_play}->($x, $y, $soundnum, $type); 953 &::audio_sound_play ($face, $dx, $dy, $vol)
954 unless $type & 1; # odd types are silent for future expansion
784} 955}
785 956
786my $LAST_QUERY; # server is stupid, stupid, stupid 957my $LAST_QUERY; # server is stupid, stupid, stupid
787 958
788sub query { 959sub query {
… …
796 967
797sub sanitise_xml($) { 968sub sanitise_xml($) {
798 local $_ = shift; 969 local $_ = shift;
799 970
800 # we now weed out all tags we do not support 971 # we now weed out all tags we do not support
801 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
802 # now all entities 977 # now all entities
803 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
804 979
805 # handle some elements 980 # handle some elements
806 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
853 $self->{$type} = $text; 1028 $self->{$type} = $text;
854 } else { 1029 } else {
855 $self->logprint ("msg: ", $text); 1030 $self->logprint ("msg: ", $text);
856 return if $color < 0; # negative color == ignore if not understood 1031 return if $color < 0; # negative color == ignore if not understood
857 1032
858 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
859 1034
860 ## try to create single paragraphs of multiple lines sent by the server 1035 ## try to create single paragraphs of multiple lines sent by the server
861 # no longer neecssary with TRT servers 1036 # no longer neecssary with TRT servers
862 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
863 1038
864 ::message ({ fg => $fg, markup => $_ })
865 for split /\n/, $text; 1039 for (split /\n/, $text) {
1040 ::message ({
1041 fg => $fg,
1042 markup => $_,
1043 type => $type,
1044 extra => [@extra],
1045 color_flags => $color, #d# ugly, kill
1046 });
1047
1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1049 # actually, this is an ugly design. _we_ should control the channels,
1050 # not some random other widget, as the channels are clearly protocol-specific.
1051 # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above.
1053 }
866 1054
867 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
868 group => $text, 1056 group => $text,
869 fg => $fg, 1057 fg => $fg,
870 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
871 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
872 ); 1060 ) if $type eq "info";
873 } 1061 }
874} 1062}
875 1063
876sub spell_add { 1064sub spell_add {
877 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
… …
926 $self->{map_widget}->clr_commands; 1114 $self->{map_widget}->clr_commands;
927 1115
928 ::stop_game (); 1116 ::stop_game ();
929} 1117}
930 1118
931sub image_info {
932 my ($self, $numfaces) = @_;
933
934 $self->{num_faces} = $numfaces;
935 $self->{face_prefetch} = [1 .. $numfaces];
936 $self->face_prefetch;
937}
938
939sub face_prefetch {
940 my ($self) = @_;
941
942 return unless $::CFG->{face_prefetch};
943
944 if ($self->{num_faces}) {
945 return if @{ $self->{send_queue} || [] };
946 my $todo = @{ $self->{face_prefetch} }
947 or return;
948
949 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
950
951 $self->send ("requestinfo image_sums $face $face");
952
953 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
954 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
955 } elsif (!exists $self->{num_faces}) {
956 $self->send ("requestinfo image_info");
957
958 $self->{num_faces} = 0;
959
960 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
961 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
962 }
963}
964
965sub update_floorbox { 1119sub update_floorbox {
966 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
967 return unless $::CONN; 1121 return unless $::CONN;
968 1122
969 $::FLOORBOX->clear; 1123 $::FLOORBOX->clear;
1124
1125 my @add;
970 1126
971 my $row; 1127 my $row;
972 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1128 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
973 if ($row < 6) { 1129 if ($row < 6) {
974 local $_->{face_widget}; # hack to force recreation of widget 1130 local $_->{face_widget}; # hack to force recreation of widget
975 local $_->{desc_widget}; # hack to force recreation of widget 1131 local $_->{desc_widget}; # hack to force recreation of widget
976 CFPlus::Item::update_widgets $_; 1132 CFPlus::Item::update_widgets $_;
977 1133
1134 push @add,
978 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1135 0, $row, $_->{face_widget},
979 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1136 1, $row, $_->{desc_widget};
980 1137
981 $row++; 1138 $row++;
982 } else { 1139 } else {
983 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1140 push @add, 1, $row, new CFPlus::UI::Button
984 text => "More...", 1141 text => "More...",
985 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
986 ); 1143 ;
987 last; 1144 last;
988 } 1145 }
989 } 1146 }
990 if ($::CONN->{open_container}) { 1147 if ($::CONN->{open_container}) {
991 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1148 push @add, 1, $row++, new CFPlus::UI::Button
992 text => "Close container", 1149 text => "Close container",
993 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
994 ); 1151 ;
995 } 1152 }
1153
1154 $::FLOORBOX->add_at (@add);
996 }); 1155 });
997 1156
998 $::WANT_REFRESH++; 1157 $::WANT_REFRESH->start;
999} 1158}
1000 1159
1001sub set_opencont { 1160sub set_opencont {
1002 my ($conn, $tag, $name) = @_; 1161 my ($conn, $tag, $name) = @_;
1003 $conn->{open_container} = $tag; 1162 $conn->{open_container} = $tag;
1004 update_floorbox; 1163 update_floorbox;
1005 1164
1006 $::INV_RIGHT_HB->clear (); 1165 $::INVR_HB->clear ();
1007 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1166 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1008 1167
1009 if ($tag != 0) { # Floor isn't closable, is it? 1168 if ($tag != 0) { # Floor isn't closable, is it?
1010 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1169 $::INVR_HB->add (new CFPlus::UI::Button
1011 text => "Close container", 1170 text => "Close container",
1012 tooltip => "Close the currently open container (if one is open)", 1171 tooltip => "Close the currently open container (if one is open)",
1013 on_activate => sub { 1172 on_activate => sub {
1014 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1015 if $tag != 0; 1174 if $tag != 0;
1016 #if $CONN->{open_container} != 0;
1017 0 1175 0
1018 }, 1176 },
1019 ); 1177 );
1020 } 1178 }
1021 1179
… …
1120 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1121 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1122 . "map size $self->{mapw}×$self->{maph}\n" 1280 . "map size $self->{mapw}×$self->{maph}\n"
1123 ); 1281 );
1124 1282
1125 ::setup_build_button ($self->{editor_support}->{builder_ui});
1126} 1283}
1127 1284
1128sub logged_in { 1285sub logged_in {
1129 my ($self) = @_; 1286 my ($self) = @_;
1130 1287
1131 $self->send_ext_req (cfplus_support => version => 1, sub { 1288 $self->send_ext_req (cfplus_support => version => 2, sub {
1289 my (%msg) = @_;
1290
1132 $self->{cfplus_ext} = $_[0]{version}; 1291 $self->{cfplus_ext} = $msg{version};
1133 $self->update_server_info; 1292 $self->update_server_info;
1134 1293
1135 if ($self->{cfplus_ext} >= 2) { 1294 if ($self->{cfplus_ext} >= 2) {
1136 $self->send_ext_req ("editor_support", sub { 1295 $self->send_ext_req ("editor_support", sub {
1137 $self->{editor_support} = $_[0]; 1296 $self->{editor_support} = { @_ };
1138 $self->update_server_info; 1297 $self->update_server_info;
1139 1298
1140 0 1299 0
1141 }); 1300 });
1142 } 1301 }
… …
1144 0 1303 0
1145 }); 1304 });
1146 1305
1147 $self->update_server_info; 1306 $self->update_server_info;
1148 1307
1149 $self->send_command ("output-sync $::CFG->{output_sync}");
1150 $self->send_command ("output-count $::CFG->{output_count}");
1151 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1308 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1152 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
1153} 1310}
1154 1311
1155sub buildat {
1156 my ($self, $builditem, $x, $y) = @_;
1157
1158 if ($self->{cfplus_ext}) {
1159 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1160 }
1161}
1162
1163sub lookat { 1312sub lookat {
1164 my ($self, $x, $y) = @_; 1313 my ($self, $x, $y) = @_;
1165 1314
1166 if ($self->{cfplus_ext}) { 1315 if ($self->{cfplus_ext}) {
1167 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1316 $self->send_ext_req (lookat => $x, $y, sub {
1168 my ($msg) = @_; 1317 my (%msg) = @_;
1169 1318
1170 if (exists $msg->{npc_dialog}) { 1319 if (exists $msg{npc_dialog}) {
1171 # start npc chat dialog 1320 # start npc chat dialog
1172 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1321 $self->{npc_dialog} = new CFPlus::NPCDialog::
1173 dx => $x, 1322 token => $msg{npc_dialog},
1174 dy => $y,
1175 title => "$msg->{npc_dialog} (NPC)", 1323 title => "$msg{npc_dialog}[0] (NPC)",
1176 conn => $self, 1324 conn => $self,
1177 ; 1325 ;
1178 } 1326 }
1179 }); 1327 });
1180 } 1328 }
… …
1245 on_activate => sub { $this->destroy; 1 }, 1393 on_activate => sub { $this->destroy; 1 },
1246 ; 1394 ;
1247 1395
1248 $self->update_options; 1396 $self->update_options;
1249 1397
1250 $self->{id} = $self->{conn}->send_ext_req ( 1398 $self->{id} = "npc-channel-" . $self->{conn}->token;
1251 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1399 $self->{conn}->connect_ext ($self->{id} => sub {
1252 sub { $this && $this->feed (@_) } 1400 $this->feed (@_) if $this;
1253 ); 1401 });
1402
1403 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1254 1404
1255 $self->{entry}->grab_focus; 1405 $self->{entry}->grab_focus;
1256 1406
1257 $self->{textview}->add_paragraph ({ 1407 $self->{textview}->add_paragraph ({
1258 fg => [1, 1, 0, 1], 1408 fg => [1, 1, 0, 1],
… …
1281 ); 1431 );
1282 } 1432 }
1283} 1433}
1284 1434
1285sub feed { 1435sub feed {
1286 my ($self, $msg) = @_; 1436 my ($self, $type, @arg) = @_;
1287 1437
1288 CFPlus::weaken $self; 1438 CFPlus::weaken $self;
1289 1439
1290 if ($msg->{msgtype} eq "reply") { 1440 if ($type eq "update") {
1441 my (%info) = @arg;
1442
1291 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1292 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1293
1294 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1295 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1296 my @link;
1297 $text =~ s{
1298 ($match)
1299 }{
1300 my $kw = $1;
1301
1302 push @link, new CFPlus::UI::Label
1303 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1304 can_hover => 1,
1305 can_events => 1,
1306 padding_x => 0,
1307 padding_y => 0,
1308 on_button_up => sub {
1309 $self->send ($kw);
1310 };
1311
1312 "\x{fffc}"
1313 }giex;
1314 1445
1446 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1448 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link;
1450 $text =~ s{
1451 ($match)
1452 }{
1453 my $kw = $1;
1454
1455 push @link, new CFPlus::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1,
1458 can_events => 1,
1459 padding_x => 0,
1460 padding_y => 0,
1461 on_button_up => sub {
1462 $self->send ($kw);
1463 };
1464
1465 "\x{fffc}"
1466 }giex;
1467
1315 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1468 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1316 $self->{textview}->scroll_to_bottom; 1469 $self->{textview}->scroll_to_bottom;
1470 }
1471
1317 $self->update_options; 1472 $self->update_options;
1318 } else { 1473 } else {
1319 $self->destroy; 1474 $self->destroy;
1320 } 1475 }
1321 1476
… …
1326 my ($self, $msg) = @_; 1481 my ($self, $msg) = @_;
1327 1482
1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1329 $self->{textview}->scroll_to_bottom; 1484 $self->{textview}->scroll_to_bottom;
1330 1485
1331 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1332} 1487}
1333 1488
1334sub destroy { 1489sub destroy {
1335 my ($self) = @_; 1490 my ($self) = @_;
1336 1491
1337 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1492 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1338 1493
1339 if ($self->{conn}) { 1494 if ($self->{conn}) {
1340 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1495 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1341 delete $self->{conn}{npc_dialog}; 1496 delete $self->{conn}{npc_dialog};
1342 $self->{conn}->disconnect_ext ($self->{id}); 1497 $self->{conn}->disconnect_ext ($self->{id});
1343 } 1498 }
1344 1499
1345 $self->SUPER::destroy; 1500 $self->SUPER::destroy;

Diff Legend

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