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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
10use CFClient::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 = CFClient::Pod::load CFClient::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 = CFClient::Pod::as_xml $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 CFClient::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
52
53 $self->{open_container} = 0;
54
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server
60 $self->{mapcache} = CFClient::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 CFClient::UI::Label text => "Experience", align => 1); 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260 $sktbl->add (1, 0, new CFClient::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 CFClient::UI::Label text => "Skill", expand => 1); 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263 $sktbl->add (4, 0, new CFClient::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 CFClient::UI::Label text => "Skill", expand => 1); 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
502 ];
503
504 my @add = @$sw;
505
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
507
508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the 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);
265 510
266 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
267 for ( 512 for (@order) {
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_},
271 @skills
272 ) {
273 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
274 514
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 515 my $spell_cb = sub {
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 516 my ($widget, $ev) = @_;
277 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 517
518 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14;
524 (new CFPlus::UI::Menu
525 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
528 ],
529 )->popup ($ev);
530 } else {
531 return 0;
532 }
533
534 1
535 };
536
537 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp
539 (new CFPlus::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541
542 # level
543 (new CFPlus::UI::Label
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 545
546 # progress
547 (new CFPlus::UI::ExperienceProgress),
548
549 # label
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 ;
280 560
281 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
282 } 562 }
283 }
284 563
285 for (grep exists $stats->{$_}, @skills) { 564 $sktbl->add_at (@add);
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 565 }
287 $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);
288 } 580 }
289} 581}
290 582
291sub user_send { 583sub user_send {
292 my ($self, $command) = @_; 584 my ($self, $command) = @_;
293 585
586 $self->{record}->($command)
294 if ($self->{record}) { 587 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 588
298 $self->logprint ("send: ", $command); 589 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 590 $self->send_command ($command);
300 ::status ($command);
301} 591}
302 592
303sub start_record { 593sub record {
304 my ($self) = @_; 594 my ($self, $cb) = @_;
305 595
306 $self->{record} = []; 596 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 597}
313 598
314sub map_scroll { 599sub map_scroll {
315 my ($self, $dx, $dy) = @_; 600 my ($self, $dx, $dy) = @_;
316 601
… …
318} 603}
319 604
320sub feed_map1a { 605sub feed_map1a {
321 my ($self, $data) = @_; 606 my ($self, $data) = @_;
322 607
323 $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 {
324 $self->{map_widget}->update; 637 $self->{map_widget}->update;
638 }
325} 639}
326 640
327sub magicmap { 641sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 642 my ($self, $w, $h, $x, $y, $data) = @_;
329 643
… …
336 my $map_info = delete $self->{map_info} 650 my $map_info = delete $self->{map_info}
337 or return; 651 or return;
338 652
339 my ($hash, $x, $y, $w, $h) = @$map_info; 653 my ($hash, $x, $y, $w, $h) = @$map_info;
340 654
341 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
342 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 656 $self->{map_cache_new}{$hash} = \$data;
343 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
344} 658}
345 659
346sub map_clear { 660sub map_clear {
347 my ($self) = @_; 661 my ($self) = @_;
348 662
… …
351 665
352 $self->{map}->clear; 666 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap}; 667 delete $self->{map_widget}{magicmap};
354} 668}
355 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}
356 693
357sub load_map($$$) { 694sub load_map($$$) {
358 my ($self, $hash, $x, $y) = @_; 695 my ($self, $hash, $x, $y) = @_;
359 696
360 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
361 $data = Compress::LZF::decompress $data; 707 my $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
363 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
364 my $data = $self->{tilecache}->get ($id)
365 or next;
366 708
367 $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;
368 } 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;
369 } 719 }
370} 720}
371 721
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 722# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 723# (server resource,s latency, bandwidth), so this hack is warranted.
… …
438 788
439 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 789 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
440 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 790 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
441 791
442 } else { 792 } else {
793 my $gen = $self->{map_change_gen};
443 $self->send_mapinfo ("spatial $path$tile", sub { 794 $self->send_mapinfo ("spatial $path$tile", sub {
795 return unless $gen == $self->{map_change_gen};
796
444 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 797 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
445 798
446 return if $mode ne "spatial"; 799 return if $mode ne "spatial";
447 800
448 $x += $self->{map}->ox; 801 $x += $self->{map}->ox;
… …
462 815
463sub map_change { 816sub map_change {
464 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 818
466 $self->flush_map; 819 $self->flush_map;
820
821 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new};
467 823
468 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
469 825
470 my $mapmapw = $self->{mapmap}->{w}; 826 my $mapmapw = $self->{mapmap}->{w};
471 my $mapmaph = $self->{mapmap}->{h}; 827 my $mapmaph = $self->{mapmap}->{h};
… …
488 $self->load_map ($hash, $x, $y); 844 $self->load_map ($hash, $x, $y);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 845 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 846}
491 847
492sub face_find { 848sub face_find {
493 my ($self, $facenum, $face) = @_; 849 my ($self, $facenum, $face, $cb) = @_;
494 850
495 my $hash = "$face->{chksum},$face->{name}"; 851 if ($face->{type} == 0) { # FT_FACE
852 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
496 853
497 my $id = $self->{facemap}->get ($hash);
498
499 unless ($id) {
500 # create new id for face
501 # I love transactions
502 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) {
509 $txn->txn_commit;
510
511 goto gotid;
512 }
513 }
514 $txn->txn_abort;
515 }
516
517 CFClient::fatal "maximum number of transaction retries reached - database problems?";
518 }
519
520gotid:
521 $face->{id} = $id; 854 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id); 855 $self->{map}->set_tileid ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d#
524 856
525 my $face = $self->{tilecache}->get ($id); 857 CFPlus::DB::get tilecache => $id, $cb;
526 858
527 if ($face) { 859 } elsif ($face->{type} & 1) { # with metadata
528 #$self->face_prefetch; 860 CFPlus::DB::get res_meta => $face->{name}, $cb;
529 $face 861
530 } else { 862 } else { # no metadata
531 my $tex = $self->{noface}; 863 CFPlus::DB::get res_data => $face->{name}, $cb;
532 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
533 undef
534 }; 864 }
535} 865}
536 866
537sub face_update { 867sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 868 my ($self, $facenum, $face, $changed) = @_;
539 869
540 $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;
541 874
542 $self->set_texture ($face->{id} => delete $face->{image}); 875 $self->have_tile ($face->{id}, delete $face->{data});
543}
544 876
545sub 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 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
884 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
885 }
886
887 $face->{data} = $self->{json_coder}->decode ($face->{data});
888
889 ::add_license ($face);
890
891 if ($face->{type} == 3) { # FT_MUSIC
892 ::message ({ markup => "downloaded song #$facenum" })
893 if $changed;
894
895 &::audio_music_push ($facenum);
896 } elsif ($face->{type} == 5) { # FT_SOUND
897 ::message ({ markup => "downloaded sound #$facenum" })
898 if $changed;
899
900 &::audio_sound_push ($facenum);
901 }
902
903 } else {
904 # flat resource case, FT_RSRC
905 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
906 if $changed;
907 }
908
909 if (my $cbs = $self->{face_cb}{$facenum}) {
910 $_->($face, $changed) for @$cbs;
911 }
912}
913
914sub smooth_update {
915 my ($self, $facenum, $face) = @_;
916
917 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
918}
919
920sub have_tile {
546 my ($self, $id, $data) = @_; 921 my ($self, $tile, $data) = @_;
547 922
548 $self->{texture}[$id] ||= do { 923 return unless $self->{map};
549 my $tex = 924
550 new_from_image CFClient::Texture 925 my $tex = $self->{texture}[$tile] ||=
926 new CFPlus::Texture
927 tile => $tile,
928 image => $data, delete_image => 1,
551 $data, minify => 1, mipmap => 1; 929 minify => 1, mipmap => 1;
552 930
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 931 if (my $cbs = delete $self->{tile_cb}{$tile}) {
554 $self->{map_widget}->update; 932 $_->($tex) for @$cbs;
555
556 $tex
557 }; 933 }
934}
935
936# call in non-void context registers a temporary
937# hook with handle, otherwise its permanent
938sub on_face_change {
939 my ($self, $num, $cb) = @_;
940
941 push @{$self->{face_cb}{$num}}, $cb;
942
943 defined wantarray
944 ? CFPlus::guard {
945 @{$self->{face_cb}{$num}}
946 = grep $_ != $cb,
947 @{$self->{face_cb}{$num}};
948 }
949 : ()
950}
951
952# call in non-void context registers a temporary
953# hook with handle, otherwise its permanent
954sub register_face_handler {
955 my ($self, $num, $cb) = @_;
956
957 return unless $num;
958
959 # invoke if available right now
960 $cb->($self->{face}[$num], 0)
961 unless exists $self->{face}[$num]{loading};
962
963 # future changes
964 $self->on_face_change ($num => $cb)
558} 965}
559 966
560sub sound_play { 967sub sound_play {
561 my ($self, $x, $y, $soundnum, $type) = @_; 968 my ($self, $type, $face, $dx, $dy, $vol) = @_;
562 969
563 $self->{sound_play}->($x, $y, $soundnum, $type); 970 &::audio_sound_play ($face, $dx, $dy, $vol)
971 unless $type & 1; # odd types are silent for future expansion
564} 972}
565 973
566my $LAST_QUERY; # server is stupid, stupid, stupid 974my $LAST_QUERY; # server is stupid, stupid, stupid
567 975
568sub query { 976sub query {
… …
572 $LAST_QUERY = $prompt; 980 $LAST_QUERY = $prompt;
573 981
574 $self->{query}-> ($self, $flags, $prompt); 982 $self->{query}-> ($self, $flags, $prompt);
575} 983}
576 984
577sub drawinfo { 985sub sanitise_xml($) {
578 my ($self, $color, $text) = @_; 986 local $_ = shift;
579 987
580 my @color = ( 988 # we now weed out all tags we do not support
989 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
990 # now all entities
991 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
992
993 # handle some elements
994 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
995 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
996
997 $_
998}
999
1000our %NAME_TO_COLOR = (
1001 black => 0,
1002 white => 1,
1003 darkblue => 2,
1004 red => 3,
1005 orange => 4,
1006 lightblue => 5,
1007 darkorange => 6,
1008 green => 7,
1009 darkgreen => 8,
1010 grey => 9,
1011 brown => 10,
1012 yellow => 11,
1013 tan => 12,
1014);
1015
1016our @CF_COLOR = (
581 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1017 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
582 [1.00, 1.00, 1.00], 1018 [1.00, 1.00, 1.00],
583 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1019 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
584 [1.00, 0.00, 0.00], 1020 [1.00, 0.00, 0.00],
585 [1.00, 0.54, 0.00], 1021 [1.00, 0.54, 0.00],
586 [0.11, 0.56, 1.00], 1022 [0.11, 0.56, 1.00],
587 [0.93, 0.46, 0.00], 1023 [0.93, 0.46, 0.00],
588 [0.18, 0.54, 0.34], 1024 [0.18, 0.54, 0.34],
589 [0.56, 0.73, 0.56], 1025 [0.56, 0.73, 0.56],
590 [0.80, 0.80, 0.80], 1026 [0.80, 0.80, 0.80],
591 [0.75, 0.61, 0.20], 1027 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 1028 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 1029 [0.74, 0.65, 0.41],
594 ); 1030);
595 1031
1032sub msg {
1033 my ($self, $color, $type, $text, @extra) = @_;
1034
1035 $text = sanitise_xml $text;
1036
1037 if (my $cb = $self->{cb_msg}{$type}) {
1038 $_->($self, $color, $type, $text, @extra) for values %$cb;
1039 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1040 $type =~ s/-/_/g;
1041 $self->{$type} = $text;
1042 } else {
596 $self->logprint ("info: ", $text); 1043 $self->logprint ("msg: ", $text);
1044 return if $color < 0; # negative color == ignore if not understood
597 1045
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1046 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
599 1047
600 # try to create single paragraphs of multiple lines sent by the server 1048 ## try to create single paragraphs of multiple lines sent by the server
1049 # no longer neecssary with TRT servers
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1050 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
602 1051
603 $text = CFClient::asxml $text; 1052 ::message ({
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1053 fg => $fg,
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1054 markup => $_,
1055 type => $type,
1056 extra => [@extra],
1057 color_flags => $color
1058 }) for split /\n/, $text;
606 1059
607 $self->{logview}->add_paragraph ($color[$color], $_)
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
610
611 $self->{statusbox}->add ($text, 1060 $self->{statusbox}->add ($text,
612 group => $text, 1061 group => $text,
613 fg => $color[$color], 1062 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 1063 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 1064 tooltip_font => $::FONT_FIXED,
616 ); 1065 );
617} 1066 }
618
619sub drawextinfo {
620 my ($self, $color, $type, $subtype, $message) = @_;
621
622 $self->drawinfo ($color, $message);
623} 1067}
624 1068
625sub spell_add { 1069sub spell_add {
626 my ($self, $spell) = @_; 1070 my ($self, $spell) = @_;
627 1071
628 # try to create single paragraphs of multiple lines sent by the server 1072 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1073 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 1074 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 1075 $spell->{message} ||= "Server did not provide a description for this spell.";
632 1076
633 $::SPELL_PAGE->add_spell ($spell); 1077 $::SPELL_LIST->add_spell ($spell);
634 1078
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 1079 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
636 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 1080 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 1081}
638 1082
639sub spell_delete { 1083sub spell_delete {
640 my ($self, $spell) = @_; 1084 my ($self, $spell) = @_;
641 1085
642 $::SPELL_PAGE->remove_spell ($spell); 1086 $::SPELL_LIST->remove_spell ($spell);
1087}
1088
1089sub setup {
1090 my ($self, $setup) = @_;
1091
1092 $self->{map_widget}->set_tilesize ($self->{tilesize});
1093 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 1094}
644 1095
645sub addme_success { 1096sub addme_success {
646 my ($self) = @_; 1097 my ($self) = @_;
647 1098
648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
649 my ($pom) = @_;
650
651 my %skill_help; 1099 my %skill_help;
652 1100
653 for my $head2 ($pom->head1->[3]->head2) { 1101 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 1102 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 1103 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 1104 };
659 1105
660 for my $skill (values %{$self->{skill_info}}) { 1106 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 1107 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 1108 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 1109 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 1110 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 1111 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 1112 . $skill_help{$skill});
667 } 1113 }
668} 1114}
669 1115
670sub eof { 1116sub eof {
671 my ($self) = @_; 1117 my ($self) = @_;
… …
673 $self->{map_widget}->clr_commands; 1119 $self->{map_widget}->clr_commands;
674 1120
675 ::stop_game (); 1121 ::stop_game ();
676} 1122}
677 1123
678sub image_info {
679 my ($self, $numfaces) = @_;
680
681 $self->{num_faces} = $numfaces;
682 $self->{face_prefetch} = [1 .. $numfaces];
683 $self->face_prefetch;
684}
685
686sub face_prefetch {
687 my ($self) = @_;
688
689 return unless $::CFG->{face_prefetch};
690
691 if ($self->{num_faces}) {
692 return if @{ $self->{send_queue} || [] };
693 my $todo = @{ $self->{face_prefetch} }
694 or return;
695
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697
698 $self->send ("requestinfo image_sums $face $face");
699
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info");
704
705 $self->{num_faces} = 0;
706
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 }
710}
711
712sub update_floorbox { 1124sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1125 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 1126 return unless $::CONN;
715 1127
716 $::FLOORBOX->clear; 1128 $::FLOORBOX->clear;
1129
1130 my @add;
717 1131
718 my $row; 1132 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1133 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 1134 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 1135 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 1136 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 1137 CFPlus::Item::update_widgets $_;
724 1138
1139 push @add,
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1140 0, $row, $_->{face_widget},
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1141 1, $row, $_->{desc_widget};
727 1142
728 $row++; 1143 $row++;
729 } else { 1144 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1145 push @add, 1, $row, new CFPlus::UI::Button
731 text => "More...", 1146 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1147 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 1148 ;
734 last; 1149 last;
735 } 1150 }
736 } 1151 }
737 if ($::CONN->{open_container}) { 1152 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1153 push @add, 1, $row++, new CFPlus::UI::Button
739 text => "Close container", 1154 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1155 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 1156 ;
742 } 1157 }
1158
1159 $::FLOORBOX->add_at (@add);
743 }); 1160 });
744 1161
745 $::WANT_REFRESH++; 1162 $::WANT_REFRESH->start;
746} 1163}
747 1164
748sub set_opencont { 1165sub set_opencont {
749 my ($conn, $tag, $name) = @_; 1166 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 1167 $conn->{open_container} = $tag;
751 update_floorbox; 1168 update_floorbox;
752 1169
753 $::INV_RIGHT_HB->clear (); 1170 $::INVR_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1171 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 1172
756 if ($tag != 0) { # Floor isn't closable, is it? 1173 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1174 $::INVR_HB->add (new CFPlus::UI::Button
758 text => "Close container", 1175 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 1176 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 1177 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1178 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 1179 if $tag != 0;
763 #if $CONN->{open_container} != 0;
764 0 1180 0
765 }, 1181 },
766 ); 1182 );
767 } 1183 }
768 1184
… …
770} 1186}
771 1187
772sub update_containers { 1188sub update_containers {
773 my ($self) = @_; 1189 my ($self) = @_;
774 1190
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1191 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 1192 my $todo = delete $self->{update_container}
777 or return; 1193 or return;
778 1194
779 for my $tag (keys %$todo) { 1195 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1196 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 1233sub item_update {
818 my ($self, $item) = @_; 1234 my ($self, $item) = @_;
819 1235
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1236 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 1237
822 CFClient::Item::update_widgets $item; 1238 CFPlus::Item::update_widgets $item;
823 1239
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1240 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 1241 set_opencont ($::CONN, 0, "Floor");
826 1242
827 } elsif ($item->{flags} & F_OPEN) { 1243 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1244 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 1245
830 } else { 1246 } else {
831 $self->{update_container}{$item->{container}}++; 1247 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 1248 $self->update_containers;
833 } 1249 }
… …
858 $::SERVER_INFO->set_markup ( 1274 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 1275 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 1276 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1277 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1278 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1279 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1280 . "editing support $yesno[!!$self->{editor_support}]\n"
1281 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1282 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1283 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1284 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 1285 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 1286 );
1287
867} 1288}
868 1289
869sub logged_in { 1290sub logged_in {
870 my ($self) = @_; 1291 my ($self) = @_;
871 1292
872 $self->send_ext_req (cfplus_support => "1", sub { 1293 $self->send_ext_req (cfplus_support => version => 2, sub {
1294 my (%msg) = @_;
1295
873 $self->{cfplus_ext} = $_[0]; 1296 $self->{cfplus_ext} = $msg{version};
874 $self->update_server_info; 1297 $self->update_server_info;
1298
1299 if ($self->{cfplus_ext} >= 2) {
1300 $self->send_ext_req ("editor_support", sub {
1301 $self->{editor_support} = { @_ };
1302 $self->update_server_info;
1303
1304 0
1305 });
1306 }
1307
1308 0
875 }); 1309 });
876 1310
877 $self->update_server_info; 1311 $self->update_server_info;
878 1312
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 1313 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 1314 $self->send_command ("output-count $::CFG->{output_count}");
1315 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
881 $self->send_command ("pickup $::CFG->{pickup}"); 1316 $self->send_command ("pickup $::CFG->{pickup}");
882} 1317}
883 1318
884sub lookat { 1319sub lookat {
885 my ($self, $x, $y) = @_; 1320 my ($self, $x, $y) = @_;
886 1321
887 if ($self->{cfplus_ext}) { 1322 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 1323 $self->send_ext_req (lookat => $x, $y, sub {
889 my %res = split /\x00/, $_[0]; 1324 my (%msg) = @_;
890 1325
891 if (exists $res{npc_dialog}) { 1326 if (exists $msg{npc_dialog}) {
892 # start npc chat dialog 1327 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 1328 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 1329 token => $msg{npc_dialog},
895 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 1330 title => "$msg{npc_dialog}[0] (NPC)",
897 conn => $self, 1331 conn => $self,
898 ; 1332 ;
899 } 1333 }
900 }); 1334 });
901 } 1335 }
… …
904} 1338}
905 1339
906sub destroy { 1340sub destroy {
907 my ($self) = @_; 1341 my ($self) = @_;
908 1342
909 $self->{npc_dialog}->destroy 1343 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 1344 if $self->{npc_dialog};
911 1345
912 $self->SUPER::destroy; 1346 $self->SUPER::destroy;
913}
914 1347
1348 %$self = ();
1349}
1350
915package CFClient::NPCDialog; 1351package CFPlus::NPCDialog;
916 1352
917our @ISA = 'CFClient::UI::FancyFrame'; 1353our @ISA = 'CFPlus::UI::Toplevel';
918 1354
919sub new { 1355sub new {
920 my $class = shift; 1356 my $class = shift;
921 1357
922 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 1365 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 1366 has_close_button => 1,
931 @_, 1367 @_,
932 ); 1368 );
933 1369
934 Scalar::Util::weaken (my $this = $self); 1370 CFPlus::weaken (my $this = $self);
935 1371
936 $self->connect (delete => sub { $this->destroy; 1 }); 1372 $self->connect (delete => sub { $this->destroy; 1 });
937 1373
938 # better use a pane... 1374 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 1375 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1376 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 1377
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1378 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 1379
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1380 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1381 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1382 tooltip => "#npc_message_entry",
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub { 1383 on_activate => sub {
952 my ($entry, $text) = @_; 1384 my ($entry, $text) = @_;
953 1385
954 return unless $text =~ /\S/; 1386 return unless $text =~ /\S/;
955 1387
… …
958 1390
959 0 1391 0
960 }, 1392 },
961 ); 1393 );
962 1394
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1395 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1396
965 $self->{bye_button} = new CFClient::UI::Button 1397 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1398 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1399 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1400 on_activate => sub { $this->destroy; 1 },
969 ; 1401 ;
970 1402
971 $self->update_options; 1403 $self->update_options;
972 1404
973 $self->{token} = $self->{conn}->ext_token; 1405 $self->{id} = "npc-channel-" . $self->{conn}->token;
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1406 $self->{conn}->connect_ext ($self->{id} => sub {
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1407 $this->feed (@_) if $this;
1408 });
1409
1410 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
976 1411
977 $self->{entry}->grab_focus; 1412 $self->{entry}->grab_focus;
978 1413
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1414 $self->{textview}->add_paragraph ({
1415 fg => [1, 1, 0, 1],
1416 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1417 });
980 1418
981 $self->show; 1419 $self->show;
982 $self 1420 $self
983}; 1421};
984 1422
985sub update_options { 1423sub update_options {
986 my ($self) = @_; 1424 my ($self) = @_;
987 1425
988 Scalar::Util::weaken $self; 1426 CFPlus::weaken $self;
989 1427
990 $self->{options}->clear; 1428 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1429 $self->{options}->add ($self->{bye_button});
992 1430
993 for my $kw (sort keys %{ $self->{kw} }) { 1431 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1432 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1433 text => $kw,
996 on_activate => sub { 1434 on_activate => sub {
997 $self->send ($kw); 1435 $self->send ($kw);
998 0 1436 0
999 }, 1437 },
1000 ); 1438 );
1001 } 1439 }
1002} 1440}
1003 1441
1004sub feed { 1442sub feed {
1005 my ($self, $data) = @_; 1443 my ($self, $type, @arg) = @_;
1006 1444
1007 Scalar::Util::weaken $self; 1445 CFPlus::weaken $self;
1008 1446
1009 my ($type, $msg) = split / /, $data, 2;
1010
1011 if ($type eq "msg") { 1447 if ($type eq "update") {
1012 my ($msg, @kw) = split /\x00/, $msg; 1448 my (%info) = @arg;
1013 1449
1014 utf8::decode $_ for ($msg, @kw); 1450 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1451 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1015 1452
1016 $self->{kw}{$_} = 1 for @kw; 1453 if (exists $info{msg}) {
1017 1454 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1018 $msg = "\n" . CFClient::UI::asxml $msg;
1019 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1455 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1020 my @link; 1456 my @link;
1021 $msg =~ s{ 1457 $text =~ s{
1022 ($match) 1458 ($match)
1023 }{ 1459 }{
1024 my $kw = $1; 1460 my $kw = $1;
1025 1461
1026 push @link, new CFClient::UI::Label 1462 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1463 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1464 can_hover => 1,
1029 can_events => 1, 1465 can_events => 1,
1030 padding_x => 0, 1466 padding_x => 0,
1031 padding_y => 0, 1467 padding_y => 0,
1032 on_button_up => sub { 1468 on_button_up => sub {
1033 $self->send ($kw); 1469 $self->send ($kw);
1034 }; 1470 };
1035 1471
1036 chr 0xfffc 1472 "\x{fffc}"
1037 }giex; 1473 }giex;
1038 1474
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1475 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1476 $self->{textview}->scroll_to_bottom;
1477 }
1478
1041 $self->update_options; 1479 $self->update_options;
1042 } else { 1480 } else {
1043 $self->destroy; 1481 $self->destroy;
1044 } 1482 }
1045 1483
… …
1047} 1485}
1048 1486
1049sub send { 1487sub send {
1050 my ($self, $msg) = @_; 1488 my ($self, $msg) = @_;
1051 1489
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1490 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1491 $self->{textview}->scroll_to_bottom;
1054 1492
1055 utf8::encode $msg;
1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1493 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1057} 1494}
1058 1495
1059sub destroy { 1496sub destroy {
1060 my ($self) = @_; 1497 my ($self) = @_;
1061 1498
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1499 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063 1500
1501 if ($self->{conn}) {
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1502 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1065 delete $self->{conn}{npc_dialog}; 1503 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1504 $self->{conn}->disconnect_ext ($self->{id});
1505 }
1067 1506
1068 $self->SUPER::destroy; 1507 $self->SUPER::destroy;
1069} 1508}
1070 1509
10711; 15101
1511

Diff Legend

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