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

Diff Legend

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