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

Diff Legend

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