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.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.168 by root, Thu Aug 30 07:08:17 2007 UTC

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

Diff Legend

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