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.197 by root, Tue May 20 02:47:21 2008 UTC

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

Diff Legend

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