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.94 by root, Fri Mar 16 02:33:49 2007 UTC vs.
Revision 1.177 by root, Sat Nov 3 12:08:44 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;
15
16use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
17 16
18sub new { 17sub new {
19 my $class = shift; 18 my ($class, %arg) = @_;
20 19
21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 20 my $self = $class->SUPER::new (%arg,
21 setup_req => {
22 extmap => 1,
23 excmd => 1,
24 widget => 1,
25 %{$arg{setup_req} || {}},
26 },
27 );
22 28
23 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
24 30
25 my @cmd_help = map { 31 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
37 for @args; 43 for @args;
38 44
39 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
41 @args 47 @args
42 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
44 50
51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
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 }
61 });
62
63 # destroy widgets on logout
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy
67 for values %{delete $ws->{w} || {}};
68 }
69 });
70
45 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 72 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 73
51 { 74 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 78 }
56 79
80 {
81 $self->{noface} = my $tex = new_from_file CFPlus::Texture
82 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 }
85
57 $self->{open_container} = 0; 86 $self->{open_container} = 0;
58 87
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 88 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 90
69 $self 91 $self
70} 92}
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#############################################################################
71 295
72sub logprint { 296sub logprint {
73 my ($self, @a) = @_; 297 my ($self, @a) = @_;
74 298
75 $self->{log_fh} ||= do { 299 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} 300}
93 301
94sub _stat_numdiff { 302sub _stat_numdiff {
95 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
96 304
180 388
181 if ( 389 if (
182 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
183 ) { 391 ) {
184 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
185 $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);
186 } 394 }
187 395
188 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
189 397
190 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
235 $rng =~ s/^Range: //; # thank you so much dear server 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
236 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
237 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 447
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 448 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
258 for keys %RES_TBL; 465 for keys %RES_TBL;
259 466
260 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
261 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
262 469
263 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
264 $sktbl->clear; 478 $sktbl->clear;
265 479
480 my $sw = $self->{skillwid}{""} ||= [
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $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),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $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),
271 $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;
272 492
273 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>";
274 494
275 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);
276 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);
277 497
278 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
279 for ( 499 for (@order) {
280 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
281 map [$_, $self->{skill_info}{$_}],
282 grep exists $stats->{$_},
283 @skills
284 ) {
285 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
286 501
287 my $spell_cb = sub { 502 my $spell_cb = sub {
288 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
289 504
304 } 519 }
305 520
306 1 521 1
307 }; 522 };
308 523
309 $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
310 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),
311 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 528
529 # level
530 (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); 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
313 $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,
314 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 ;
315 547
316 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
317 } 549 }
318 }
319 550
320 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
323 } 552 }
324}
325 553
326sub macro_send { 554 for (@order) {
327 my ($self, $macro) = @_; 555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
328 557
329 for my $cmd (@{ $macro->{action} }) { 558 next if $prev->{$idx}[1] eq $val->[1];
330 $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);
331 } 567 }
332} 568}
333 569
334sub user_send { 570sub user_send {
335 my ($self, $command) = @_; 571 my ($self, $command) = @_;
337 $self->{record}->($command) 573 $self->{record}->($command)
338 if $self->{record}; 574 if $self->{record};
339 575
340 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
341 $self->send_command ($command); 577 $self->send_command ($command);
342 ::status ($command);
343} 578}
344 579
345sub record { 580sub record {
346 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
347 582
355} 590}
356 591
357sub feed_map1a { 592sub feed_map1a {
358 my ($self, $data) = @_; 593 my ($self, $data) = @_;
359 594
360 $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 {
361 $self->{map_widget}->update; 624 $self->{map_widget}->update;
625 }
362} 626}
363 627
364sub magicmap { 628sub magicmap {
365 my ($self, $w, $h, $x, $y, $data) = @_; 629 my ($self, $w, $h, $x, $y, $data) = @_;
366 630
373 my $map_info = delete $self->{map_info} 637 my $map_info = delete $self->{map_info}
374 or return; 638 or return;
375 639
376 my ($hash, $x, $y, $w, $h) = @$map_info; 640 my ($hash, $x, $y, $w, $h) = @$map_info;
377 641
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 643 $self->{map_cache_new}{$hash} = \$data;
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
381} 645}
382 646
383sub map_clear { 647sub map_clear {
384 my ($self) = @_; 648 my ($self) = @_;
385 649
388 652
389 $self->{map}->clear; 653 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 654 delete $self->{map_widget}{magicmap};
391} 655}
392 656
657sub bg_fetch {
658 my ($self) = @_;
659
660 my $tile;
661
662 do {
663 $tile = pop @{$self->{bg_fetch}}
664 or return;
665 } while $self->{texture}[$tile];
666
667 CFPlus::DB::get tilecache => $tile, sub {
668 my ($data) = @_;
669
670 return unless $self->{map}; # stop when destroyed
671
672 if (defined $data) {
673 $self->have_tile ($tile, $data);
674 $self->{texture}[$tile]->upload;
675 }
676
677 $self->bg_fetch;
678 };
679}
393 680
394sub load_map($$$) { 681sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 682 my ($self, $hash, $x, $y) = @_;
396 683
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 684 my $gen = $self->{map_change_gen};
685
686 my $cb = sub {
687 return unless $gen == $self->{map_change_gen};
688
689 my ($data) = @_;
690
691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
398 $data = Compress::LZF::decompress $data; 694 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 695
404 $self->set_texture ($id => $data); 696 my $inprogress = @{ $self->{bg_fetch} || [] };
697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
698 $self->bg_fetch unless $inprogress;
405 } 699 }
700 };
701
702 if (my $rdata = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata);
704 } else {
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
406 } 706 }
407} 707}
408 708
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 709# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 710# (server resource,s latency, bandwidth), so this hack is warranted.
475 775
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 776 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 777 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 778
479 } else { 779 } else {
780 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 781 $self->send_mapinfo ("spatial $path$tile", sub {
782 return unless $gen == $self->{map_change_gen};
783
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 784 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 785
483 return if $mode ne "spatial"; 786 return if $mode ne "spatial";
484 787
485 $x += $self->{map}->ox; 788 $x += $self->{map}->ox;
499 802
500sub map_change { 803sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 805
503 $self->flush_map; 806 $self->flush_map;
807
808 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new};
504 810
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 812
507 my $mapmapw = $self->{mapmap}->{w}; 813 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 814 my $mapmaph = $self->{mapmap}->{h};
525 $self->load_map ($hash, $x, $y); 831 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 832 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 833}
528 834
529sub face_find { 835sub face_find {
530 my ($self, $facenum, $face) = @_; 836 my ($self, $facenum, $face, $cb) = @_;
531 837
532 my $hash = "$face->{chksum},$face->{name}"; 838 if ($face->{type} == 0) { # FT_FACE
839 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533 840
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; 841 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id); 842 $self->{map}->set_tileid ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d#
561 843
562 my $face = $self->{tilecache}->get ($id); 844 CFPlus::DB::get tilecache => $id, $cb;
563 845
564 if ($face) { 846 } elsif ($face->{type} & 1) { # with metadata
565 #$self->face_prefetch; 847 CFPlus::DB::get res_meta => $face->{name}, $cb;
566 $face 848
567 } else { 849 } else { # no metadata
568 my $tex = $self->{noface}; 850 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 }; 851 }
572} 852}
573 853
574sub face_update { 854sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 855 my ($self, $facenum, $face, $changed) = @_;
576 856
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 857 if ($face->{type} == 0) {
858 # image, FT_FACE
859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
860 if $changed;
578 861
579 $self->set_texture ($face->{id} => delete $face->{image}); 862 $self->have_tile ($face->{id}, delete $face->{data});
580}
581 863
582sub set_texture { 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 }
895}
896
897sub smooth_update {
898 my ($self, $facenum, $face) = @_;
899
900 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
901}
902
903sub have_tile {
583 my ($self, $id, $data) = @_; 904 my ($self, $tile, $data) = @_;
584 905
585 $self->{texture}[$id] ||= do { 906 return unless $self->{map};
586 my $tex = 907
908 my $tex = $self->{texture}[$tile] ||=
587 new_from_image CFPlus::Texture 909 new CFPlus::Texture
910 tile => $tile,
911 image => $data, delete_image => 1,
588 $data, minify => 1, mipmap => 1; 912 minify => 1, mipmap => 1;
589 913
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 914 if (my $cbs = delete $self->{tile_cb}{$tile}) {
591 $self->{map_widget}->update; 915 $_->($tex) for @$cbs;
592
593 $tex
594 }; 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)
595} 948}
596 949
597sub sound_play { 950sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 951 my ($self, $type, $face, $dx, $dy, $vol) = @_;
599 952
600 $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
601} 955}
602 956
603my $LAST_QUERY; # server is stupid, stupid, stupid 957my $LAST_QUERY; # server is stupid, stupid, stupid
604 958
605sub query { 959sub query {
609 $LAST_QUERY = $prompt; 963 $LAST_QUERY = $prompt;
610 964
611 $self->{query}-> ($self, $flags, $prompt); 965 $self->{query}-> ($self, $flags, $prompt);
612} 966}
613 967
614sub drawinfo { 968sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 969 local $_ = shift;
616 970
617 my @color = ( 971 # we now weed out all tags we do not support
972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
977 # now all entities
978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
979
980 # handle some elements
981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
982 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
983
984 $_
985}
986
987our %NAME_TO_COLOR = (
988 black => 0,
989 white => 1,
990 darkblue => 2,
991 red => 3,
992 orange => 4,
993 lightblue => 5,
994 darkorange => 6,
995 green => 7,
996 darkgreen => 8,
997 grey => 9,
998 brown => 10,
999 yellow => 11,
1000 tan => 12,
1001);
1002
1003our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1004 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 1005 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1006 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 1007 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 1008 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 1009 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 1010 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 1011 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 1012 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 1013 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 1014 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 1015 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 1016 [0.74, 0.65, 0.41],
631 ); 1017);
632 1018
633 my $fg = $color[$color % @color]; 1019sub msg {
1020 my ($self, $color, $type, $text, @extra) = @_;
634 1021
1022 $text = sanitise_xml $text;
1023
1024 if (my $cb = $self->{cb_msg}{$type}) {
1025 $_->($self, $color, $type, $text, @extra) for values %$cb;
1026 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1027 $type =~ s/-/_/g;
1028 $self->{$type} = $text;
1029 } else {
635 $self->logprint ("info: ", $text); 1030 $self->logprint ("msg: ", $text);
1031 return if $color < 0; # negative color == ignore if not understood
636 1032
1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1034
637 # 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
1036 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 1038
640 $text = CFPlus::asxml $text;
641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643
644 ::message ({ fg => $fg, markup => $_ })
645 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 });
646 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 }
1054
647 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
648 group => $text, 1056 group => $text,
649 fg => $fg, 1057 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
652 ); 1060 ) if $type eq "info";
653} 1061 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 1062}
660 1063
661sub spell_add { 1064sub spell_add {
662 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
663 1066
679} 1082}
680 1083
681sub setup { 1084sub setup {
682 my ($self, $setup) = @_; 1085 my ($self, $setup) = @_;
683 1086
1087 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 1088 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 1089}
686 1090
687sub addme_success { 1091sub addme_success {
688 my ($self) = @_; 1092 my ($self) = @_;
710 $self->{map_widget}->clr_commands; 1114 $self->{map_widget}->clr_commands;
711 1115
712 ::stop_game (); 1116 ::stop_game ();
713} 1117}
714 1118
715sub image_info {
716 my ($self, $numfaces) = @_;
717
718 $self->{num_faces} = $numfaces;
719 $self->{face_prefetch} = [1 .. $numfaces];
720 $self->face_prefetch;
721}
722
723sub face_prefetch {
724 my ($self) = @_;
725
726 return unless $::CFG->{face_prefetch};
727
728 if ($self->{num_faces}) {
729 return if @{ $self->{send_queue} || [] };
730 my $todo = @{ $self->{face_prefetch} }
731 or return;
732
733 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
734
735 $self->send ("requestinfo image_sums $face $face");
736
737 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
738 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
739 } elsif (!exists $self->{num_faces}) {
740 $self->send ("requestinfo image_info");
741
742 $self->{num_faces} = 0;
743
744 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
745 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
746 }
747}
748
749sub update_floorbox { 1119sub update_floorbox {
750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751 return unless $::CONN; 1121 return unless $::CONN;
752 1122
753 $::FLOORBOX->clear; 1123 $::FLOORBOX->clear;
1124
1125 my @add;
754 1126
755 my $row; 1127 my $row;
756 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} }) {
757 if ($row < 6) { 1129 if ($row < 6) {
758 local $_->{face_widget}; # hack to force recreation of widget 1130 local $_->{face_widget}; # hack to force recreation of widget
759 local $_->{desc_widget}; # hack to force recreation of widget 1131 local $_->{desc_widget}; # hack to force recreation of widget
760 CFPlus::Item::update_widgets $_; 1132 CFPlus::Item::update_widgets $_;
761 1133
1134 push @add,
762 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1135 0, $row, $_->{face_widget},
763 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1136 1, $row, $_->{desc_widget};
764 1137
765 $row++; 1138 $row++;
766 } else { 1139 } else {
767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1140 push @add, 1, $row, new CFPlus::UI::Button
768 text => "More...", 1141 text => "More...",
769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770 ); 1143 ;
771 last; 1144 last;
772 } 1145 }
773 } 1146 }
774 if ($::CONN->{open_container}) { 1147 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1148 push @add, 1, $row++, new CFPlus::UI::Button
776 text => "Close container", 1149 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 ); 1151 ;
779 } 1152 }
1153
1154 $::FLOORBOX->add_at (@add);
780 }); 1155 });
781 1156
782 $::WANT_REFRESH++; 1157 $::WANT_REFRESH->start;
783} 1158}
784 1159
785sub set_opencont { 1160sub set_opencont {
786 my ($conn, $tag, $name) = @_; 1161 my ($conn, $tag, $name) = @_;
787 $conn->{open_container} = $tag; 1162 $conn->{open_container} = $tag;
788 update_floorbox; 1163 update_floorbox;
789 1164
790 $::INV_RIGHT_HB->clear (); 1165 $::INVR_HB->clear ();
791 $::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);
792 1167
793 if ($tag != 0) { # Floor isn't closable, is it? 1168 if ($tag != 0) { # Floor isn't closable, is it?
794 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1169 $::INVR_HB->add (new CFPlus::UI::Button
795 text => "Close container", 1170 text => "Close container",
796 tooltip => "Close the currently open container (if one is open)", 1171 tooltip => "Close the currently open container (if one is open)",
797 on_activate => sub { 1172 on_activate => sub {
798 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
799 if $tag != 0; 1174 if $tag != 0;
800 #if $CONN->{open_container} != 0;
801 0 1175 0
802 }, 1176 },
803 ); 1177 );
804 } 1178 }
805 1179
895 $::SERVER_INFO->set_markup ( 1269 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1270 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1271 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1272 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1273 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1274 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1275 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1276 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1277 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1280 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1281 );
906 1282
907 ::setup_build_button ($self->{editor_support}->{builder_ui});
908} 1283}
909 1284
910sub logged_in { 1285sub logged_in {
911 my ($self) = @_; 1286 my ($self) = @_;
912 1287
913 $self->send_ext_req (cfplus_support => version => 1, sub { 1288 $self->send_ext_req (cfplus_support => version => 2, sub {
1289 my (%msg) = @_;
1290
914 $self->{cfplus_ext} = $_[0]{version}; 1291 $self->{cfplus_ext} = $msg{version};
915 $self->update_server_info; 1292 $self->update_server_info;
916 1293
917 if ($self->{cfplus_ext} >= 2) { 1294 if ($self->{cfplus_ext} >= 2) {
918 $self->send_ext_req ("editor_support", sub { 1295 $self->send_ext_req ("editor_support", sub {
919 $self->{editor_support} = $_[0]; 1296 $self->{editor_support} = { @_ };
920 $self->update_server_info; 1297 $self->update_server_info;
921 1298
922 0 1299 0
923 }); 1300 });
924 } 1301 }
926 0 1303 0
927 }); 1304 });
928 1305
929 $self->update_server_info; 1306 $self->update_server_info;
930 1307
931 $self->send_command ("output-sync $::CFG->{output_sync}");
932 $self->send_command ("output-count $::CFG->{output_count}");
933 $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;
934 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
935} 1310}
936 1311
937sub buildat {
938 my ($self, $builditem, $x, $y) = @_;
939
940 if ($self->{cfplus_ext}) {
941 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
942 }
943}
944
945sub lookat { 1312sub lookat {
946 my ($self, $x, $y) = @_; 1313 my ($self, $x, $y) = @_;
947 1314
948 if ($self->{cfplus_ext}) { 1315 if ($self->{cfplus_ext}) {
949 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1316 $self->send_ext_req (lookat => $x, $y, sub {
950 my ($msg) = @_; 1317 my (%msg) = @_;
951 1318
952 if (exists $msg->{npc_dialog}) { 1319 if (exists $msg{npc_dialog}) {
953 # start npc chat dialog 1320 # start npc chat dialog
954 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1321 $self->{npc_dialog} = new CFPlus::NPCDialog::
955 dx => $x, 1322 token => $msg{npc_dialog},
956 dy => $y,
957 title => "$msg->{npc_dialog} (NPC)", 1323 title => "$msg{npc_dialog}[0] (NPC)",
958 conn => $self, 1324 conn => $self,
959 ; 1325 ;
960 } 1326 }
961 }); 1327 });
962 } 1328 }
969 1335
970 (delete $self->{npc_dialog})->destroy 1336 (delete $self->{npc_dialog})->destroy
971 if $self->{npc_dialog}; 1337 if $self->{npc_dialog};
972 1338
973 $self->SUPER::destroy; 1339 $self->SUPER::destroy;
1340
1341 %$self = ();
974} 1342}
975 1343
976package CFPlus::NPCDialog; 1344package CFPlus::NPCDialog;
977 1345
978our @ISA = 'CFPlus::UI::Toplevel'; 1346our @ISA = 'CFPlus::UI::Toplevel';
1025 on_activate => sub { $this->destroy; 1 }, 1393 on_activate => sub { $this->destroy; 1 },
1026 ; 1394 ;
1027 1395
1028 $self->update_options; 1396 $self->update_options;
1029 1397
1030 $self->{id} = $self->{conn}->send_ext_req ( 1398 $self->{id} = "npc-channel-" . $self->{conn}->token;
1031 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1399 $self->{conn}->connect_ext ($self->{id} => sub {
1032 sub { $this && $this->feed (@_) } 1400 $this->feed (@_) if $this;
1033 ); 1401 });
1402
1403 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1034 1404
1035 $self->{entry}->grab_focus; 1405 $self->{entry}->grab_focus;
1036 1406
1037 $self->{textview}->add_paragraph ({ 1407 $self->{textview}->add_paragraph ({
1038 fg => [1, 1, 0, 1], 1408 fg => [1, 1, 0, 1],
1061 ); 1431 );
1062 } 1432 }
1063} 1433}
1064 1434
1065sub feed { 1435sub feed {
1066 my ($self, $msg) = @_; 1436 my ($self, $type, @arg) = @_;
1067 1437
1068 CFPlus::weaken $self; 1438 CFPlus::weaken $self;
1069 1439
1070 if ($msg->{msgtype} eq "reply") { 1440 if ($type eq "update") {
1441 my (%info) = @arg;
1442
1071 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1072 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1073
1074 my $text = "\n" . CFPlus::asxml $msg->{msg};
1075 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1076 my @link;
1077 $text =~ s{
1078 ($match)
1079 }{
1080 my $kw = $1;
1081
1082 push @link, new CFPlus::UI::Label
1083 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1084 can_hover => 1,
1085 can_events => 1,
1086 padding_x => 0,
1087 padding_y => 0,
1088 on_button_up => sub {
1089 $self->send ($kw);
1090 };
1091
1092 "\x{fffc}"
1093 }giex;
1094 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
1095 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1468 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1096 $self->{textview}->scroll_to_bottom; 1469 $self->{textview}->scroll_to_bottom;
1470 }
1471
1097 $self->update_options; 1472 $self->update_options;
1098 } else { 1473 } else {
1099 $self->destroy; 1474 $self->destroy;
1100 } 1475 }
1101 1476
1106 my ($self, $msg) = @_; 1481 my ($self, $msg) = @_;
1107 1482
1108 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1109 $self->{textview}->scroll_to_bottom; 1484 $self->{textview}->scroll_to_bottom;
1110 1485
1111 $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);
1112} 1487}
1113 1488
1114sub destroy { 1489sub destroy {
1115 my ($self) = @_; 1490 my ($self) = @_;
1116 1491
1117 #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
1118 1493
1119 if ($self->{conn}) { 1494 if ($self->{conn}) {
1120 $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};
1121 delete $self->{conn}{npc_dialog}; 1496 delete $self->{conn}{npc_dialog};
1122 $self->{conn}->disconnect_ext ($self->{id}); 1497 $self->{conn}->disconnect_ext ($self->{id});
1123 } 1498 }
1124 1499
1125 $self->SUPER::destroy; 1500 $self->SUPER::destroy;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines