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

Diff Legend

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