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

Diff Legend

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