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.139 by root, Sun Jul 29 18:22:34 2007 UTC vs.
Revision 1.214 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

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