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.124 by root, Fri Jul 20 16:32:04 2007 UTC vs.
Revision 1.187 by root, Sat Dec 29 13:44:30 2007 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 CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 ywidget => 1, 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123 50
124 $self->{json_coder} 51 $self->{json_coder}
125 ->convert_blessed 52 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
127 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
128 }); 61 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226 62
227 # destroy widgets on logout 63 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy 66 $_->destroy
… …
234 70
235 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
236 for @cmd_help; 72 for @cmd_help;
237 73
238 { 74 {
239 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
240 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
241 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
242 } 78 }
243 79
244 { 80 {
245 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
246 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
247 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
248 } 84 }
249 85
250 $self->{open_container} = 0; 86 $self->{open_container} = 0;
251 87
… …
253 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
254 90
255 $self 91 $self
256} 92}
257 93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
171 };
172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
239 });
240 } else {
241 $done_cb->(0);
242 }
243}
244
245# widgetset associate
246sub ext_ws_a {
247 my ($self, %ass) = @_;
248
249 # everything that has a name, wether conceivably useful or not
250 my %wkw = (
251 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP,
253
254 mapwidget => $::MAPWIDGET,
255 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG,
260 host_entry => $::HOST_ENTRY,
261 metaserver => $::METASERVER,
262 server_info => $::SERVER_INFO,
263
264 setup_dialog => $::SETUP_DIALOG,
265 setup_notebook => $::SETUP_NOTEBOOK,
266 setup_server => $::SETUP_SERVER,
267 setup_keyboard => $::SETUP_KEYBOARD,
268
269 pl_notebook => $::PL_NOTEBOOK,
270 pl_window => $::PL_WINDOW,
271 inventory_page => $::INVENTORY_PAGE,
272 stats_page => $::STATS_PAGE,
273 skill_page => $::SKILL_PAGE,
274 spell_page => $::SPELL_PAGE,
275 spell_list => $::SPELL_LIST,
276
277 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW,
280 statusbox => $::SDTATUSBOX,
281
282 inv => $::INV,
283 invr => $::INVR,
284 invr_hb => $::INVR_HB,
285 );
286
287 while (my ($id, $name) = each %ass) {
288 $self->widget_associate (undef, $id => $wkw{$name});
289 }
290}
291
292# widget call
293sub ext_w_c {
294 my ($self, $id, $rcb, $method, @args) = @_;
295
296 my $w = $self->{widget}{$id}
297 or return;
298
299 if ($rcb) {
300 $rcb->($w->$method (@args));
301 } else {
302 $w->$method (@args);
303 }
304}
305
306# widget set
307sub ext_w_s {
308 my ($self, $id, $attr) = @_;
309
310 my $w = $self->{widget}{$id}
311 or return;
312
313 for (my $i = 0; $i < $#$attr; $i += 2) {
314 my ($member, $value) = @$attr[$i, $i+1];
315 if (defined $value) {
316 $w->{$member} = $value;
317 } else {
318 delete $w->{$member};
319 }
320 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
321 }
322}
323
324# widget get
325sub ext_w_g {
326 my ($self, $id, $rid, @attr) = @_;
327
328 my $w = $self->{widget}{$id}
329 or return;
330
331 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
332}
333
334# message window
335sub ext_channel_info {
336 my ($self, $info) = @_;
337 $self->{channels}->{$info->{id}} = $info;
338 $::MESSAGE_WINDOW->add_channel ($info);
339}
340
341#############################################################################
342
258sub logprint { 343sub logprint {
259 my ($self, @a) = @_; 344 my ($self, @a) = @_;
260 345
261 $self->{log_fh} ||= do { 346 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
262 my $path = "$Crossfire::VARDIR/log.$self->{host}";
263
264 open my $fh, ">>:utf8", $path
265 or die "Couldn't open logfile $path: $!";
266
267 $fh->autoflush (1);
268
269 $fh;
270 };
271
272 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
273
274 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
275 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
276
277 print {$self->{log_fh}} "$ts ", @a, "\n";
278} 347}
279 348
280sub _stat_numdiff { 349sub _stat_numdiff {
281 my ($self, $name, $old, $new) = @_; 350 my ($self, $name, $old, $new) = @_;
282 351
… …
366 435
367 if ( 436 if (
368 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 437 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
369 ) { 438 ) {
370 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 439 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
371 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 440 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
372 } 441 }
373 442
374 $self->update_stats_window ($stats, $prev); 443 $self->update_stats_window ($stats, $prev);
375 444
376 $self->{prev_stats} = { %$stats }; 445 $self->{prev_stats} = { %$stats };
… …
415 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 484 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
416 $::GAUGES->{food} ->set_value ($fo, $fo_m); 485 $::GAUGES->{food} ->set_value ($fo, $fo_m);
417 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 486 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 487 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 488 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
489 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 490 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
421 my $title = $stats->{+CS_STAT_TITLE}; 491 my $title = $stats->{+CS_STAT_TITLE};
422 $title =~ s/^Player: //; 492 $title =~ s/^Player: //;
423 $::STATWIDS->{title} ->set_text ("Title: " . $title); 493 $::STATWIDS->{title} ->set_text ("Title: " . $title);
424 494
… …
442 for keys %RES_TBL; 512 for keys %RES_TBL;
443 513
444 my $sktbl = $::STATWIDS->{skill_tbl}; 514 my $sktbl = $::STATWIDS->{skill_tbl};
445 my @skills = keys %{ $self->{skill_info} }; 515 my @skills = keys %{ $self->{skill_info} };
446 516
447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 517 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
518 map [$_, $self->{skill_info}{$_}],
519 grep exists $stats->{$_},
520 @skills;
521
522 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
523 $self->{stat_order} = join ",", map $_->[0], @order;
524
448 $sktbl->clear; 525 $sktbl->clear;
449 526
450 my @add; 527 my $sw = $self->{skillwid}{""} ||= [
451
452 push @add,
453 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 528 0, 0, (new DC::UI::Label text => "Experience", align => 1),
454 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 529 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
530 2, 0, (new DC::UI::Label text => "Progress"),
455 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 531 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
456 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 532 4, 0, (new DC::UI::Label text => "Experience", align => 1),
457 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 533 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
534 6, 0, (new DC::UI::Label text => "Progress"),
458 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 535 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
459 ; 536 ];
537
538 my @add = @$sw;
460 539
461 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 540 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
462 541
463 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 542 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
464 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 543 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
465 544
466 my ($x, $y) = (0, 1); 545 my ($x, $y) = (0, 1);
467 for ( 546 for (@order) {
468 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
469 map [$_, $self->{skill_info}{$_}],
470 grep exists $stats->{$_},
471 @skills
472 ) {
473 my ($idx, $name) = @$_; 547 my ($idx, $name) = @$_;
474 548
475 my $spell_cb = sub { 549 my $spell_cb = sub {
476 my ($widget, $ev) = @_; 550 my ($widget, $ev) = @_;
477 551
478 if ($ev->{button} == 1) { 552 if ($ev->{button} == 1) {
479 $::CONN->user_send ("ready_skill $name"); 553 $::CONN->user_send ("ready_skill $name");
480 } elsif ($ev->{button} == 2) { 554 } elsif ($ev->{button} == 2) {
481 $::CONN->user_send ("use_skill $name"); 555 $::CONN->user_send ("use_skill $name");
482 } elsif ($ev->{button} == 3) { 556 } elsif ($ev->{button} == 3) {
483 my $shortname = CFPlus::shorten $name, 14; 557 my $shortname = DC::shorten $name, 14;
484 (new CFPlus::UI::Menu 558 (new DC::UI::Menu
485 items => [ 559 items => [
486 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 560 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
487 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 561 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
488 ], 562 ],
489 )->popup ($ev); 563 )->popup ($ev);
490 } else { 564 } else {
491 return 0; 565 return 0;
492 } 566 }
493 567
494 1 568 1
495 }; 569 };
496 570
571 my $sw = $self->{skillwid}{$idx} ||= [
572 # exp
573 (new DC::UI::Label
574 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
575
576 # level
577 (new DC::UI::Label
578 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
579
580 # progress
581 (new DC::UI::ExperienceProgress),
582
583 # label
584 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
585 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
586 ];
587
497 push @add, 588 push @add,
498 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 589 $x * 4 + 0, $y, $sw->[0],
499 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 590 $x * 4 + 1, $y, $sw->[1],
500 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 591 $x * 4 + 2, $y, $sw->[2],
501 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 592 $x * 4 + 3, $y, $sw->[3],
502 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
503 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
504 ; 593 ;
505 594
506 $x++ and ($x, $y) = (0, $y + 1); 595 $x++ and ($x, $y) = (0, $y + 1);
507 } 596 }
508 597
509 $sktbl->add_at (@add); 598 $sktbl->add_at (@add);
510 } 599 }
511 600
512 for (grep exists $stats->{$_}, @skills) { 601 for (@order) {
513 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 602 my ($idx, $name) = @$_;
514 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 603 my $val = $stats->{$idx};
515 }
516}
517 604
518sub macro_send { 605 next if $prev->{$idx}[1] eq $val->[1];
519 my ($self, $macro) = @_;
520 606
521 for my $cmd (@{ $macro->{action} }) { 607 my $sw = $self->{skillwid}{$idx};
522 $self->send_command ($cmd); 608 $sw->[0]->set_text (::formsep ($val->[1]));
609 $sw->[1]->set_text ($val->[0] * 1);
610 $sw->[2]->set_value (@$val);
611
612 $::GAUGES->{sklprg}->set_label ("$name %d%%");
613 $::GAUGES->{sklprg}->set_value (@$val);
523 } 614 }
524} 615}
525 616
526sub user_send { 617sub user_send {
527 my ($self, $command) = @_; 618 my ($self, $command) = @_;
… …
529 $self->{record}->($command) 620 $self->{record}->($command)
530 if $self->{record}; 621 if $self->{record};
531 622
532 $self->logprint ("send: ", $command); 623 $self->logprint ("send: ", $command);
533 $self->send_command ($command); 624 $self->send_command ($command);
534 ::status ($command);
535} 625}
536 626
537sub record { 627sub record {
538 my ($self, $cb) = @_; 628 my ($self, $cb) = @_;
539 629
… …
547} 637}
548 638
549sub feed_map1a { 639sub feed_map1a {
550 my ($self, $data) = @_; 640 my ($self, $data) = @_;
551 641
552 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 642 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
643 my $delay;
644
645 for my $tile (@$missing) {
646 next if $self->{delay}{$tile};
647
648 $delay = 1;
649
650 if (my $tex = $::CONN->{texture}[$tile]) {
651 $tex->upload;
652 } else {
653 $self->{delay}{$tile} = 1;
654
655 # we assume the face is in-flight and will eventually come
656 push @{$self->{tile_cb}{$tile}}, sub {
657 delete $self->{delay}{$tile};
658 $_[0]->upload;
659 };
660 }
661 }
662
663 if ($delay) {
664 # delay the map drawing a tiny bit in the hope of getting the missing fetched
665 EV::once undef, 0, 0.03, sub {
666 $self->{map_widget}->update
667 if $self->{map_widget};
668 };
669 } else {
553 $self->{map_widget}->update; 670 $self->{map_widget}->update;
671 }
554} 672}
555 673
556sub magicmap { 674sub magicmap {
557 my ($self, $w, $h, $x, $y, $data) = @_; 675 my ($self, $w, $h, $x, $y, $data) = @_;
558 676
… …
565 my $map_info = delete $self->{map_info} 683 my $map_info = delete $self->{map_info}
566 or return; 684 or return;
567 685
568 my ($hash, $x, $y, $w, $h) = @$map_info; 686 my ($hash, $x, $y, $w, $h) = @$map_info;
569 687
570 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 688 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
689 $self->{map_cache_new}{$hash} = \$data;
571 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 690 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
572 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
573} 691}
574 692
575sub map_clear { 693sub map_clear {
576 my ($self) = @_; 694 my ($self) = @_;
577 695
… …
583} 701}
584 702
585sub bg_fetch { 703sub bg_fetch {
586 my ($self) = @_; 704 my ($self) = @_;
587 705
588 my $id; 706 my $tile;
589 707
590 do { 708 do {
591 $id = pop @{$self->{bg_fetch}} 709 $tile = pop @{$self->{bg_fetch}}
592 or return; 710 or return;
593 } while $self->{texture}[$id]; 711 } while $self->{texture}[$tile];
594 712
595 CFPlus::DB::get tilecache => $id, sub { 713 DC::DB::get tilecache => $tile, sub {
596 my ($data) = @_; 714 my ($data) = @_;
597 715
598 return unless $self->{map}; # stop when destroyed 716 return unless $self->{map}; # stop when destroyed
599 717
600 $self->set_texture ($id => $data)
601 if defined $data; 718 if (defined $data) {
719 $self->have_tile ($tile, $data);
720 $self->{texture}[$tile]->upload;
721 }
602 722
603 $self->bg_fetch; 723 $self->bg_fetch;
604 }; 724 };
605} 725}
606 726
607sub load_map($$$) { 727sub load_map($$$) {
608 my ($self, $hash, $x, $y) = @_; 728 my ($self, $hash, $x, $y) = @_;
609 729
610 my $gen = $self->{map_change_gen}; 730 my $gen = $self->{map_change_gen};
611 731
612 CFPlus::DB::get $self->{mapcache} => $hash, sub { 732 my $cb = sub {
613 return unless $gen == $self->{map_change_gen}; 733 return unless $gen == $self->{map_change_gen};
614 734
615 my ($data) = @_; 735 my ($data) = @_;
616 736
617 if (defined $data) { 737 if (defined $data) {
738 $self->{map_cache_new}{$hash} = \$data;
739
618 $data = Compress::LZF::decompress $data; 740 my $data = Compress::LZF::decompress $data;
619 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
620 741
621 my $inprogress = @{ $self->{bg_fetch} || [] }; 742 my $inprogress = @{ $self->{bg_fetch} || [] };
622 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 743 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
623 $self->bg_fetch unless $inprogress; 744 $self->bg_fetch unless $inprogress;
624 } 745 }
625 }; 746 };
747
748 if (my $rdata = $self->{map_cache_old}{$hash}) {
749 $cb->($$rdata);
750 } else {
751 DC::DB::get $self->{mapcache} => $hash, $cb;
752 }
626} 753}
627 754
628# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 755# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
629# (server resource,s latency, bandwidth), so this hack is warranted. 756# (server resource,s latency, bandwidth), so this hack is warranted.
630# the right fix is to make real tiled maps with an overview file 757# the right fix is to make real tiled maps with an overview file
… …
723 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 850 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
724 851
725 $self->flush_map; 852 $self->flush_map;
726 853
727 ++$self->{map_change_gen}; 854 ++$self->{map_change_gen};
855 $self->{map_cache_old} = delete $self->{map_cache_new};
728 856
729 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 857 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
730 858
731 my $mapmapw = $self->{mapmap}->{w}; 859 my $mapmapw = $self->{mapmap}->{w};
732 my $mapmaph = $self->{mapmap}->{h}; 860 my $mapmaph = $self->{mapmap}->{h};
… …
751} 879}
752 880
753sub face_find { 881sub face_find {
754 my ($self, $facenum, $face, $cb) = @_; 882 my ($self, $facenum, $face, $cb) = @_;
755 883
756 my $hash = "$face->{chksum},$face->{name}"; 884 if ($face->{type} == 0) { # FT_FACE
757
758 my $id = CFPlus::DB::get_tile_id_sync $hash; 885 my $id = DC::DB::get_tile_id_sync $face->{name};
759 886
760 $face->{id} = $id; 887 $face->{id} = $id;
761 $self->{faceid}[$facenum] = $id;
762
763 $self->{map}->set_tileid ($facenum => $id); 888 $self->{map}->set_tileid ($facenum => $id);
764 889
765 CFPlus::DB::get tilecache => $id, $cb; 890 DC::DB::get tilecache => $id, $cb;
891
892 } elsif ($face->{type} & 1) { # with metadata
893 DC::DB::get res_meta => $face->{name}, $cb;
894
895 } else { # no metadata
896 DC::DB::get res_data => $face->{name}, $cb;
897 }
766} 898}
767 899
768sub face_update { 900sub face_update {
769 my ($self, $facenum, $face, $changed) = @_; 901 my ($self, $facenum, $face, $changed) = @_;
770 902
903 if ($face->{type} == 0) {
904 # image, FT_FACE
771 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 905 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
772 if $changed; 906 if $changed;
773 907
774 $self->set_texture ($face->{id} => delete $face->{image}); 908 $self->have_tile ($face->{id}, delete $face->{data});
909
910 } elsif ($face->{type} & 1) {
911 # split metadata case, FT_MUSIC, FT_SOUND
912 if ($changed) { # new data
913 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
914 $face->{data} = $meta;
915
916 # rely on strict ordering here and also on later fetch
917 DC::DB::put res_data => $face->{name} => $data, sub { };
918 DC::DB::put res_meta => $face->{name} => $meta, sub { };
919 }
920
921 $face->{data} = $self->{json_coder}->decode ($face->{data});
922 ::add_license ($face);
923 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
924 if $changed;
925
926 if ($face->{type} == 3) { # FT_MUSIC
927 &::audio_music_push ($facenum);
928 } elsif ($face->{type} == 5) { # FT_SOUND
929 &::audio_sound_push ($facenum);
930 }
931
932 } else {
933 # flat resource case, FT_RSRC
934 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
935 if $changed;
936 }
937
938 if (my $cbs = $self->{face_cb}{$facenum}) {
939 $_->($face, $changed) for @$cbs;
940 }
775} 941}
776 942
777sub smooth_update { 943sub smooth_update {
778 my ($self, $facenum, $face) = @_; 944 my ($self, $facenum, $face) = @_;
779 945
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 946 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781} 947}
782 948
783sub set_texture { 949sub have_tile {
784 my ($self, $id, $data) = @_; 950 my ($self, $tile, $data) = @_;
785 951
786 return unless $self->{map}; 952 return unless $self->{map};
787 953
788 $self->{texture}[$id] = my $tex = 954 my $tex = $self->{texture}[$tile] ||=
789 new_from_image CFPlus::Texture 955 new DC::Texture
956 tile => $tile,
957 image => $data, delete_image => 1,
790 $data, minify => 1, mipmap => 1; 958 minify => 1, mipmap => 1;
791 959
792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 960 if (my $cbs = delete $self->{tile_cb}{$tile}) {
793 $self->{map_widget}->update; 961 $_->($tex) for @$cbs;
794 962 }
795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796} 963}
797 964
798sub connect_face_update { 965# call in non-void context registers a temporary
966# hook with handle, otherwise its permanent
967sub on_face_change {
799 my ($self, $id, $cb) = @_; 968 my ($self, $num, $cb) = @_;
800 969
801 push @{$self->{face_cb}{$id}}, $cb; 970 push @{$self->{face_cb}{$num}}, $cb;
802 971
803 CFPlus::guard { 972 defined wantarray
973 ? DC::guard {
804 @{$self->{face_cb}{$id}} 974 @{$self->{face_cb}{$num}}
805 = grep $_ != $cb, 975 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}}; 976 @{$self->{face_cb}{$num}};
807 } 977 }
978 : ()
979}
980
981# call in non-void context registers a temporary
982# hook with handle, otherwise its permanent
983sub register_face_handler {
984 my ($self, $num, $cb) = @_;
985
986 return unless $num;
987
988 # invoke if available right now
989 $cb->($self->{face}[$num], 0)
990 unless exists $self->{face}[$num]{loading};
991
992 # future changes
993 $self->on_face_change ($num => $cb)
808} 994}
809 995
810sub sound_play { 996sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 997 my ($self, $type, $face, $dx, $dy, $vol) = @_;
812 998
813 $self->{sound_play}->($x, $y, $soundnum, $type); 999 &::audio_sound_play ($face, $dx, $dy, $vol)
1000 unless $type & 1; # odd types are silent for future expansion
814} 1001}
815 1002
816my $LAST_QUERY; # server is stupid, stupid, stupid 1003my $LAST_QUERY; # server is stupid, stupid, stupid
817 1004
818sub query { 1005sub query {
… …
826 1013
827sub sanitise_xml($) { 1014sub sanitise_xml($) {
828 local $_ = shift; 1015 local $_ = shift;
829 1016
830 # we now weed out all tags we do not support 1017 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1018 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1019 }{
1020 "&lt;"
1021 }gex;
1022
832 # now all entities 1023 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1024 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834 1025
835 # handle some elements 1026 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1027 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
883 $self->{$type} = $text; 1074 $self->{$type} = $text;
884 } else { 1075 } else {
885 $self->logprint ("msg: ", $text); 1076 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 1077 return if $color < 0; # negative color == ignore if not understood
887 1078
888 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1079 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
889 1080
890 ## try to create single paragraphs of multiple lines sent by the server 1081 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers 1082 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1083 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 1084
894 ::message ({ fg => $fg, markup => $_ })
895 for split /\n/, $text; 1085 for (split /\n/, $text) {
1086 ::message ({
1087 fg => $fg,
1088 markup => $_,
1089 type => $type,
1090 extra => [@extra],
1091 color_flags => $color, #d# ugly, kill
1092 });
1093
1094 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1095 # actually, this is an ugly design. _we_ should control the channels,
1096 # not some random other widget, as the channels are clearly protocol-specific.
1097 # then we could also react to flags such as CLEAR without resorting to
1098 # hacks such as color_flags, above.
1099 }
896 1100
897 $self->{statusbox}->add ($text, 1101 $self->{statusbox}->add ($text,
898 group => $text, 1102 group => $text,
899 fg => $fg, 1103 fg => $fg,
900 timeout => $color >= 2 ? 180 : 10, 1104 timeout => $color >= 2 ? 180 : 10,
901 tooltip_font => $::FONT_FIXED, 1105 tooltip_font => $::FONT_FIXED,
902 ); 1106 ) if $type eq "info";
903 } 1107 }
904} 1108}
905 1109
906sub spell_add { 1110sub spell_add {
907 my ($self, $spell) = @_; 1111 my ($self, $spell) = @_;
… …
911 $spell->{message} =~ s/\n+$//; 1115 $spell->{message} =~ s/\n+$//;
912 $spell->{message} ||= "Server did not provide a description for this spell."; 1116 $spell->{message} ||= "Server did not provide a description for this spell.";
913 1117
914 $::SPELL_LIST->add_spell ($spell); 1118 $::SPELL_LIST->add_spell ($spell);
915 1119
916 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1120 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
917 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1121 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
918} 1122}
919 1123
920sub spell_delete { 1124sub spell_delete {
921 my ($self, $spell) = @_; 1125 my ($self, $spell) = @_;
922 1126
… …
933sub addme_success { 1137sub addme_success {
934 my ($self) = @_; 1138 my ($self) = @_;
935 1139
936 my %skill_help; 1140 my %skill_help;
937 1141
938 for my $node (CFPlus::Pod::find skill_description => "*") { 1142 for my $node (DC::Pod::find skill_description => "*") {
939 my (undef, @par) = CFPlus::Pod::section_of $node; 1143 my (undef, @par) = DC::Pod::section_of $node;
940 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1144 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
941 }; 1145 };
942 1146
943 for my $skill (values %{$self->{skill_info}}) { 1147 for my $skill (values %{$self->{skill_info}}) {
944 $self->{map_widget}->add_command ("ready_skill $skill", 1148 $self->{map_widget}->add_command ("ready_skill $skill",
945 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1149 (DC::asxml "Ready the skill '$skill'\n\n")
946 . $skill_help{$skill}); 1150 . $skill_help{$skill});
947 $self->{map_widget}->add_command ("use_skill $skill", 1151 $self->{map_widget}->add_command ("use_skill $skill",
948 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1152 (DC::asxml "Immediately use the skill '$skill'\n\n")
949 . $skill_help{$skill}); 1153 . $skill_help{$skill});
950 } 1154 }
951} 1155}
952 1156
953sub eof { 1157sub eof {
… …
956 $self->{map_widget}->clr_commands; 1160 $self->{map_widget}->clr_commands;
957 1161
958 ::stop_game (); 1162 ::stop_game ();
959} 1163}
960 1164
961sub image_info {
962 my ($self, $numfaces) = @_;
963
964 $self->{num_faces} = $numfaces;
965 $self->{face_prefetch} = [1 .. $numfaces];
966 $self->face_prefetch;
967}
968
969sub face_prefetch {
970 my ($self) = @_;
971
972 return unless $::CFG->{face_prefetch};
973
974 if ($self->{num_faces}) {
975 return if @{ $self->{send_queue} || [] };
976 my $todo = @{ $self->{face_prefetch} }
977 or return;
978
979 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981 $self->send ("requestinfo image_sums $face $face");
982
983 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985 } elsif (!exists $self->{num_faces}) {
986 $self->send ("requestinfo image_info");
987
988 $self->{num_faces} = 0;
989
990 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 }
993}
994
995sub update_floorbox { 1165sub update_floorbox {
996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1166 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997 return unless $::CONN; 1167 return unless $::CONN;
998 1168
999 $::FLOORBOX->clear; 1169 $::FLOORBOX->clear;
1000 1170
1001 my @add; 1171 my @add;
… …
1003 my $row; 1173 my $row;
1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1174 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1005 if ($row < 6) { 1175 if ($row < 6) {
1006 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
1007 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
1008 CFPlus::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
1009 1179
1010 push @add, 1180 push @add,
1011 0, $row, $_->{face_widget}, 1181 0, $row, $_->{face_widget},
1012 1, $row, $_->{desc_widget}; 1182 1, $row, $_->{desc_widget};
1013 1183
1014 $row++; 1184 $row++;
1015 } else { 1185 } else {
1016 push @add, 1, $row, new CFPlus::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
1017 text => "More...", 1187 text => "More...",
1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1019 ; 1189 ;
1020 last; 1190 last;
1021 } 1191 }
1022 } 1192 }
1023 if ($::CONN->{open_container}) { 1193 if ($::CONN->{open_container}) {
1024 push @add, 1, $row++, new CFPlus::UI::Button 1194 push @add, 1, $row++, new DC::UI::Button
1025 text => "Close container", 1195 text => "Close container",
1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1027 ; 1197 ;
1028 } 1198 }
1029 1199
1030 $::FLOORBOX->add_at (@add); 1200 $::FLOORBOX->add_at (@add);
1031 }); 1201 });
1032 1202
1033 $::WANT_REFRESH++; 1203 $::WANT_REFRESH = 1;
1034} 1204}
1035 1205
1036sub set_opencont { 1206sub set_opencont {
1037 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
1038 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
1039 update_floorbox; 1209 update_floorbox;
1040 1210
1041 $::INV_RIGHT_HB->clear (); 1211 $::INVR_HB->clear ();
1042 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1212 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1043 1213
1044 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
1045 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
1046 text => "Close container", 1216 text => "Close container",
1047 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
1048 on_activate => sub { 1218 on_activate => sub {
1049 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1050 if $tag != 0; 1220 if $tag != 0;
1051 #if $CONN->{open_container} != 0;
1052 0 1221 0
1053 }, 1222 },
1054 ); 1223 );
1055 } 1224 }
1056 1225
… …
1058} 1227}
1059 1228
1060sub update_containers { 1229sub update_containers {
1061 my ($self) = @_; 1230 my ($self) = @_;
1062 1231
1063 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1064 my $todo = delete $self->{update_container} 1233 my $todo = delete $self->{update_container}
1065 or return; 1234 or return;
1066 1235
1067 for my $tag (keys %$todo) { 1236 for my $tag (keys %$todo) {
1068 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1105sub item_update { 1274sub item_update {
1106 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
1107 1276
1108 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1277 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1109 1278
1110 CFPlus::Item::update_widgets $item; 1279 DC::Item::update_widgets $item;
1111 1280
1112 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1113 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
1114 1283
1115 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
1116 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1117 1286
1118 } else { 1287 } else {
1119 $self->{update_container}{$item->{container}}++; 1288 $self->{update_container}{$item->{container}}++;
1120 $self->update_containers; 1289 $self->update_containers;
1121 } 1290 }
… …
1132 1301
1133 my $weight = .001 * $self->{player}{weight}; 1302 my $weight = .001 * $self->{player}{weight};
1134 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1135 1304
1136 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1137 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1306 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1138 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1139} 1308}
1140 1309
1141sub update_server_info { 1310sub update_server_info {
1142 my ($self) = @_; 1311 my ($self) = @_;
… …
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1324 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1325 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1326 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1327 );
1159 1328
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1329}
1162 1330
1163sub logged_in { 1331sub logged_in {
1164 my ($self) = @_; 1332 my ($self) = @_;
1165 1333
1166 $self->send_ext_req (cfplus_support => version => 1, sub { 1334 $self->send_ext_req (cfplus_support => version => 2, sub {
1335 my (%msg) = @_;
1336
1167 $self->{cfplus_ext} = $_[0]{version}; 1337 $self->{cfplus_ext} = $msg{version};
1168 $self->update_server_info; 1338 $self->update_server_info;
1169 1339
1170 if ($self->{cfplus_ext} >= 2) { 1340 if ($self->{cfplus_ext} >= 2) {
1171 $self->send_ext_req ("editor_support", sub { 1341 $self->send_ext_req ("editor_support", sub {
1172 $self->{editor_support} = $_[0]; 1342 $self->{editor_support} = { @_ };
1173 $self->update_server_info; 1343 $self->update_server_info;
1174 1344
1175 0 1345 0
1176 }); 1346 });
1177 } 1347 }
… …
1179 0 1349 0
1180 }); 1350 });
1181 1351
1182 $self->update_server_info; 1352 $self->update_server_info;
1183 1353
1184 $self->send_command ("output-sync $::CFG->{output_sync}");
1185 $self->send_command ("output-count $::CFG->{output_count}");
1186 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1354 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1187 $self->send_command ("pickup $::CFG->{pickup}"); 1355 $self->send_command ("pickup $::CFG->{pickup}");
1188} 1356}
1189 1357
1190sub buildat {
1191 my ($self, $builditem, $x, $y) = @_;
1192
1193 if ($self->{cfplus_ext}) {
1194 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1195 }
1196}
1197
1198sub lookat { 1358sub lookat {
1199 my ($self, $x, $y) = @_; 1359 my ($self, $x, $y) = @_;
1200 1360
1201 if ($self->{cfplus_ext}) { 1361 if ($self->{cfplus_ext}) {
1202 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1362 $self->send_ext_req (lookat => $x, $y, sub {
1203 my ($msg) = @_; 1363 my (%msg) = @_;
1204 1364
1205 if (exists $msg->{npc_dialog}) { 1365 if (exists $msg{npc_dialog}) {
1206 # start npc chat dialog 1366 # start npc chat dialog
1207 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1367 $self->{npc_dialog} = new DC::NPCDialog::
1208 dx => $x, 1368 token => $msg{npc_dialog},
1209 dy => $y,
1210 title => "$msg->{npc_dialog} (NPC)", 1369 title => "$msg{npc_dialog}[0] (NPC)",
1211 conn => $self, 1370 conn => $self,
1212 ; 1371 ;
1213 } 1372 }
1214 }); 1373 });
1215 } 1374 }
… …
1226 $self->SUPER::destroy; 1385 $self->SUPER::destroy;
1227 1386
1228 %$self = (); 1387 %$self = ();
1229} 1388}
1230 1389
1231package CFPlus::NPCDialog; 1390package DC::NPCDialog;
1232 1391
1233our @ISA = 'CFPlus::UI::Toplevel'; 1392our @ISA = 'DC::UI::Toplevel';
1234 1393
1235sub new { 1394sub new {
1236 my $class = shift; 1395 my $class = shift;
1237 1396
1238 my $self = $class->SUPER::new ( 1397 my $self = $class->SUPER::new (
… …
1245 kw => { hi => 0, yes => 0, no => 0 }, 1404 kw => { hi => 0, yes => 0, no => 0 },
1246 has_close_button => 1, 1405 has_close_button => 1,
1247 @_, 1406 @_,
1248 ); 1407 );
1249 1408
1250 CFPlus::weaken (my $this = $self); 1409 DC::weaken (my $this = $self);
1251 1410
1252 $self->connect (delete => sub { $this->destroy; 1 }); 1411 $self->connect (delete => sub { $this->destroy; 1 });
1253 1412
1254 # better use a pane... 1413 # better use a pane...
1255 $self->add (my $hbox = new CFPlus::UI::HBox); 1414 $self->add (my $hbox = new DC::UI::HBox);
1256 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1415 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1257 1416
1258 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1417 $hbox->add (my $vbox = new DC::UI::VBox);
1259 1418
1260 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1419 $vbox->add (new DC::UI::Label text => "Message Entry:");
1261 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1420 $vbox->add ($self->{entry} = new DC::UI::Entry
1262 tooltip => "#npc_message_entry", 1421 tooltip => "#npc_message_entry",
1263 on_activate => sub { 1422 on_activate => sub {
1264 my ($entry, $text) = @_; 1423 my ($entry, $text) = @_;
1265 1424
1266 return unless $text =~ /\S/; 1425 return unless $text =~ /\S/;
… …
1270 1429
1271 0 1430 0
1272 }, 1431 },
1273 ); 1432 );
1274 1433
1275 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1434 $vbox->add ($self->{options} = new DC::UI::VBox);
1276 1435
1277 $self->{bye_button} = new CFPlus::UI::Button 1436 $self->{bye_button} = new DC::UI::Button
1278 text => "Bye (close)", 1437 text => "Bye (close)",
1279 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1438 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1280 on_activate => sub { $this->destroy; 1 }, 1439 on_activate => sub { $this->destroy; 1 },
1281 ; 1440 ;
1282 1441
1283 $self->update_options; 1442 $self->update_options;
1284 1443
1285 $self->{id} = $self->{conn}->send_ext_req ( 1444 $self->{id} = "npc-channel-" . $self->{conn}->token;
1286 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1445 $self->{conn}->connect_ext ($self->{id} => sub {
1287 sub { $this && $this->feed (@_) } 1446 $this->feed (@_) if $this;
1288 ); 1447 });
1448
1449 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1289 1450
1290 $self->{entry}->grab_focus; 1451 $self->{entry}->grab_focus;
1291 1452
1292 $self->{textview}->add_paragraph ({ 1453 $self->{textview}->add_paragraph ({
1293 fg => [1, 1, 0, 1], 1454 fg => [1, 1, 0, 1],
… …
1299}; 1460};
1300 1461
1301sub update_options { 1462sub update_options {
1302 my ($self) = @_; 1463 my ($self) = @_;
1303 1464
1304 CFPlus::weaken $self; 1465 DC::weaken $self;
1305 1466
1306 $self->{options}->clear; 1467 $self->{options}->clear;
1307 $self->{options}->add ($self->{bye_button}); 1468 $self->{options}->add ($self->{bye_button});
1308 1469
1309 for my $kw (sort keys %{ $self->{kw} }) { 1470 for my $kw (sort keys %{ $self->{kw} }) {
1310 $self->{options}->add (new CFPlus::UI::Button 1471 $self->{options}->add (new DC::UI::Button
1311 text => $kw, 1472 text => $kw,
1312 on_activate => sub { 1473 on_activate => sub {
1313 $self->send ($kw); 1474 $self->send ($kw);
1314 0 1475 0
1315 }, 1476 },
1316 ); 1477 );
1317 } 1478 }
1318} 1479}
1319 1480
1320sub feed { 1481sub feed {
1321 my ($self, $msg) = @_; 1482 my ($self, $type, @arg) = @_;
1322 1483
1323 CFPlus::weaken $self; 1484 DC::weaken $self;
1324 1485
1325 if ($msg->{msgtype} eq "reply") { 1486 if ($type eq "update") {
1487 my (%info) = @arg;
1488
1326 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1489 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1327 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1490 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1328
1329 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1330 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1331 my @link;
1332 $text =~ s{
1333 ($match)
1334 }{
1335 my $kw = $1;
1336
1337 push @link, new CFPlus::UI::Label
1338 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1339 can_hover => 1,
1340 can_events => 1,
1341 padding_x => 0,
1342 padding_y => 0,
1343 on_button_up => sub {
1344 $self->send ($kw);
1345 };
1346
1347 "\x{fffc}"
1348 }giex;
1349 1491
1492 if (exists $info{msg}) {
1493 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1494 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1495 my @link;
1496 $text =~ s{
1497 ($match)
1498 }{
1499 my $kw = $1;
1500
1501 push @link, new DC::UI::Label
1502 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1503 can_hover => 1,
1504 can_events => 1,
1505 padding_x => 0,
1506 padding_y => 0,
1507 on_button_up => sub {
1508 $self->send ($kw);
1509 };
1510
1511 "\x{fffc}"
1512 }giex;
1513
1350 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1514 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1351 $self->{textview}->scroll_to_bottom; 1515 $self->{textview}->scroll_to_bottom;
1516 }
1517
1352 $self->update_options; 1518 $self->update_options;
1353 } else { 1519 } else {
1354 $self->destroy; 1520 $self->destroy;
1355 } 1521 }
1356 1522
… …
1358} 1524}
1359 1525
1360sub send { 1526sub send {
1361 my ($self, $msg) = @_; 1527 my ($self, $msg) = @_;
1362 1528
1363 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1529 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1364 $self->{textview}->scroll_to_bottom; 1530 $self->{textview}->scroll_to_bottom;
1365 1531
1366 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1532 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1367} 1533}
1368 1534
1369sub destroy { 1535sub destroy {
1370 my ($self) = @_; 1536 my ($self) = @_;
1371 1537
1372 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1538 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1373 1539
1374 if ($self->{conn}) { 1540 if ($self->{conn}) {
1375 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1541 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1376 delete $self->{conn}{npc_dialog}; 1542 delete $self->{conn}{npc_dialog};
1377 $self->{conn}->disconnect_ext ($self->{id}); 1543 $self->{conn}->disconnect_ext ($self->{id});
1378 } 1544 }
1379 1545
1380 $self->SUPER::destroy; 1546 $self->SUPER::destroy;

Diff Legend

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