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.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.201 by root, Wed Sep 3 06:35:55 2008 UTC

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

Diff Legend

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