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.168 by root, Thu Aug 30 07:08:17 2007 UTC vs.
Revision 1.228 by root, Wed Nov 21 13:23:10 2012 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
5use Guard ();
6
6use Crossfire::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use CFPlus; 9use DC;
9use CFPlus::DB; 10use DC::DB;
10use CFPlus::UI; 11use DC::UI;
11use CFPlus::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';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1, wrap => 1;
22
23sub MIN_TEXTURE_UNUSED() { 1 }#d#
18 24
19sub new { 25sub new {
20 my ($class, %arg) = @_; 26 my ($class, %arg) = @_;
21 27
22 my $self = $class->SUPER::new (%arg, 28 my $self = $class->SUPER::new (%arg,
23 setup_req => { 29 setup_req => {
24 extmap => 1, 30 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d# 31 widget => 2,
27 %{$arg{setup_req} || {}}, 32 %{$arg{setup_req} || {}},
28 }, 33 },
29 ); 34 );
30 35
31 $self->{map_widget}->clr_commands; 36 $self->update_fx_want;
32 37
33 my @cmd_help = map { 38 my $exp_guard = $self->addme_guard;
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 39 my $skl_guard = $self->addme_guard;
35 or die "unparseable command help: $_->{kw}[0]"; 40 my $spl_guard = $self->addme_guard;
41 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
42 my ($exp, $skl, $spl) = @_;
36 43
37 my $cmd = $1; 44 $self->register_face_handler ($exp, sub {
38 my @args = split /\|/, $2; 45 my ($face) = @_;
39 @args = (".*") unless @args;
40 46
41 my (undef, @par) = CFPlus::Pod::section_of $_; 47 undef $exp_guard;
42 my $text = CFPlus::Pod::as_label @par; 48 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
49 $_->() for values %{ $self->{on_exp_update} };
50 });
43 51
44 $_ = $_ eq ".*" ? "" : " $_" 52 $self->register_face_handler ($skl, sub {
45 for @args; 53 my ($face) = @_;
46 54
47 map ["$cmd$_", $text], 55 undef $skl_guard;
48 sort { (length $a) <=> (length $b) } 56 my $info = $self->{json_coder}->decode (delete $face->{data});
49 @args 57 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
50 } sort { $a->{par} <=> $b->{par} } 58 });
51 CFPlus::Pod::find command => "*"; 59
60 $self->register_face_handler ($spl, sub {
61 my ($face) = @_;
62
63 undef $spl_guard;
64 my $info = $self->{json_coder}->decode (delete $face->{data});
65 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
66 });
67
68 ()
69 });
70
71 $::COMPLETER->reset;
52 72
53 $self->{json_coder} 73 $self->{json_coder}
54 ->convert_blessed 74 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub { 75 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]} 76 $self->{widget}{$_[0]}
77 })
78 ->filter_json_single_key_object ("\fc" => sub {
79 my ($id) = @_;
80 sub {
81 $self->send_exti_msg (w_e => $id, @_);
82 }
57 }); 83 });
58 84
59 # destroy widgets on logout 85 # destroy widgets on logout
60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 86 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
61 for my $ws (values %{delete $self->{widgetset} || {}}) { 87 for my $ws (values %{delete $self->{widgetset} || {}}) {
62 $_->destroy 88 $_->destroy
63 for values %{delete $ws->{w} || {}}; 89 for values %{delete $ws->{w} || {}};
64 } 90 }
91
92 delete $self->{items};
93 $::INV->clear;
94 $::INVR->clear;
95 $::INVR_HB->clear;
96 $::FLOORBOX->clear;
65 }); 97 });
66 98
67 $self->{map_widget}->add_command (@$_)
68 for @cmd_help;
69
70 { 99 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 100 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 101 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 } 102 }
75 103
76 { 104 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture 105 $self->{noface} = my $tex = $TEX_NOFACE;
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 106 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 } 107 }
108
109# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
110# $self->{expire_w} = AE::timer 1, 1, sub {
111# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
112#
113# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
114# warn DC::SvREFCNT $self->{texture}[$_];
115# $self->{texture}[$_]->unload;
116# warn "expire texture $_\n";#d#
117# }
118#
119# ($self->{expire_count} += $count) < @{ $self->{texture} }
120# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
121# warn "count is $count\n";#d#
122# };
81 123
82 $self->{open_container} = 0; 124 $self->{open_container} = 0;
83 125
84 # per server 126 # per server
85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 127 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
86 128
87 $self 129 $self
88} 130}
131
132 #$self->send_exti_req (nickmon => 1, sub { use Data::Dump; ddx \@_ });#d#
133#sub ext_nicklist { shift; use Data::Dump; ddx \@_; } #d#
89 134
90sub update_fx_want { 135sub update_fx_want {
91 my ($self) = @_; 136 my ($self) = @_;
92 137
93 $self->send_exti_msg (fx_want => { 138 $self->send_exti_msg (fx_want => {
98} 143}
99 144
100sub ext_capabilities { 145sub ext_capabilities {
101 my ($self, %cap) = @_; 146 my ($self, %cap) = @_;
102 147
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) { 148 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) { 149 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default; 150 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3]; 151 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]); 152 $self->setup_req (tileset => $default->[0]);
133sub ext_ambient_music { 162sub ext_ambient_music {
134 my ($self, $songs) = @_; 163 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs); 164 &::audio_music_set_ambient ($songs);
136} 165}
137 166
167sub ext_command_list {
168 my ($self, @faces) = @_;
169
170 my $handler = $self->{command_facehandler} = {};
171 my $commands = $::COMPLETER->{command_list} = {};
172
173 for my $idx (@faces) {
174 $handler->{$idx} = $self->register_face_handler ($idx, sub {
175 my ($face) = @_;
176
177 $commands->{$idx} =
178 $face->{cache} ||= $self->{json_coder}->decode ($face->{data});
179 });
180 }
181}
182
138############################################################################# 183#############################################################################
139 184
140sub widget_associate { 185sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_; 186 my ($self, $ws, $id, $widget) = @_;
142 187
143 if ($widget) { 188 $widget ||= new DC::UI::Bin;
189
144 $widget->{s_id} = $id; 190 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget; 191 $self->{widget}{$id} = $widget;
146 192
147 if ($ws) { 193 if ($ws) {
148 $widget->{s_ws} = $ws; 194 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget; 195 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 } 196 }
151 197
152 $widget->connect (on_destroy => sub { 198 $widget->connect (on_destroy => sub {
153 my ($widget) = @_; 199 my ($widget) = @_;
154 200
155 delete $self->{widget}{$widget->{s_id}}; 201 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} 202 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws}; 203 if exists $widget->{s_ws};
158 }); 204 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166} 205}
167 206
168# widgetset new 207# widgetset new
169sub ext_ws_n { 208sub ext_ws_n {
170 my ($self, $id) = @_; 209 my ($self, $id) = @_;
187 226
188# widgetset create 227# widgetset create
189sub ext_ws_c { 228sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_; 229 my ($self, $ws, $id, $class, $args) = @_;
191 230
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate ( 231 $self->widget_associate (
203 $ws, $id => scalar eval { 232 $ws, $id => scalar eval {
204 local $SIG{__DIE__}; 233 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args) 234 "DC::UI::$class"->new (%$args)
235 }
236 );
237}
238
239# widgetset create template
240sub ext_ws_ct {
241 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
242
243 $done_cb ||= sub { };
244
245 my $parse_list; $parse_list = sub {
246 my ($list) = @_;
247 my @w;
248
249 while (@$list) {
250 my ($class, $args) = splice @$list, 0, 2;
251 my $name = delete $args->{s_id};
252 my $cl = delete $args->{s_cl};
253 my $cfg = delete $cfg->{$name};
254 my $id = delete $cfg->{id};
255 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
256 or next;
257
258 $self->widget_associate ($ws, $id, $w)
259 if $id;
260
261 $w->add ($parse_list->($cl))
262 if $cl;
263
264 push @w, $w;
265 }
266
267 @w
268 };
269
270 # either array reference, or face #
271 if ($type eq "inline") {
272 $done_cb->();
273 $parse_list->($template);
274 } elsif ($type eq "face") {
275 my $handler; $handler = $self->register_face_handler ($template, sub {
276 my ($face) = @_;
277
278 undef $handler;
279 $done_cb->();
280 $parse_list->($self->{json_coder}->decode ($face->{data}));
206 } 281 });
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 282 } else {
283 $done_cb->(0);
284 }
208} 285}
209 286
210# widgetset associate 287# widgetset associate
211sub ext_ws_a { 288sub ext_ws_a {
212 my ($self, %ass) = @_; 289 my ($self, %ass) = @_;
213 290
214 # everything that has a name, wether conceivably useful or not 291 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 292 my %wkw = (
216 root => $CFPlus::UI::ROOT, 293 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 294 tooltip => $DC::UI::TOOLTIP,
218 295
219 mapwidget => $::MAPWIDGET, 296 mapwidget => $::MAPWIDGET,
297 menubar => $::MENUBAR,
298 menupopup => $::MENUPOPUP,
299 pickup_enable => $::PICKUP_ENABLE,
220 buttonbar => $::BUTTONBAR, 300 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 301 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 302 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON, 303 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG, 304 quit_dialog => $::QUIT_DIALOG,
240 spell_list => $::SPELL_LIST, 320 spell_list => $::SPELL_LIST,
241 321
242 floorbox => $::FLOORBOX, 322 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW, 323 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW, 324 message_window => $::MESSAGE_WINDOW,
325 message_dist => $::MESSAGE_DIST,
245 statusbox => $::SDTATUSBOX, 326 statusbox => $::STATUSBOX,
246 327
247 inv => $::INV, 328 inv => $::INV,
248 invr => $::INVR, 329 invr => $::INVR,
249 invr_hb => $::INVR_HB, 330 invr_hb => $::INVR_HB,
250 ); 331 );
251 332
252 while (my ($id, $name) = each %ass) { 333 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 334 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 335 }
256} 336}
257 337
258# widget call 338# widget call
259sub ext_w_c { 339sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_; 340 my ($self, $id, $rcb, $method, @args) = @_;
261 341
262 my $w = $self->{widget}{$id} 342 my $w = $self->{widget}{$id}
263 or return; 343 or return;
264 344
265 if ($rid) { 345 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 346 $rcb->($w->$method (@args));
267 } else { 347 } else {
268 $w->$method (@args); 348 $w->$method (@args);
269 } 349 }
270} 350}
271 351
287 } 367 }
288} 368}
289 369
290# widget get 370# widget get
291sub ext_w_g { 371sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_; 372 my ($self, $id, $rid, @attr) = @_;
293 373
294 my $w = $self->{widget}{$id} 374 my $w = $self->{widget}{$id}
295 or return; 375 or return;
296 376
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 377 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298} 378}
299 379
300# message window 380# message window
301sub ext_channel_info { 381sub ext_channel_info {
302 my ($self, $info) = @_; 382 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info; 383 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info); 384 $::MESSAGE_DIST->add_channel ($info);
305} 385}
306 386
307############################################################################# 387#############################################################################
308 388
309sub logprint { 389sub logprint {
310 my ($self, @a) = @_; 390 my ($self, @a) = @_;
311 391
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 392 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 393}
314 394
315sub _stat_numdiff { 395sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 396 my ($self, $name, $old, $new) = @_;
317 397
335 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 415 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
336 : () 416 : ()
337 } 417 }
338 sort { $a <=> $b } keys %{$self->{spell_paths}}; 418 sort { $a <=> $b } keys %{$self->{spell_paths}};
339 419
340 join "", @diff 420 "\u$name: " . (join ", ", @diff)
341} 421}
342 422
343# all stats that are chacked against changes 423# all stats that are chacked against changes
344my @statchange = ( 424my @statchange = (
345 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 425 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
388 468
389 if (my @diffs = 469 if (my @diffs =
390 ( 470 (
391 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 471 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
392 map { 472 map {
393 $stats->{$_} && $prev->{$_} 473 $stats->{$_} && $prev->{$_}
394 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 474 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
395 } sort { $a <=> $b } keys %{$self->{skill_info}} 475 } sort { $a <=> $b } keys %{$self->{skill_info}}
396 ) 476 )
397 ) { 477 ) {
398 my $msg = join " ", @diffs; 478 my $msg = join " ", @diffs;
400 } 480 }
401 481
402 if ( 482 if (
403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 483 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
404 ) { 484 ) {
405 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 485 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 486 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
407 } 487 }
408 488
409 $self->update_stats_window ($stats, $prev); 489 $self->update_stats_window ($stats, $prev);
410 490
448 528
449 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 529 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
450 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 530 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
451 $::GAUGES->{food} ->set_value ($fo, $fo_m); 531 $::GAUGES->{food} ->set_value ($fo, $fo_m);
452 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 532 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 533 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 534 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 535 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 536 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
457 my $title = $stats->{+CS_STAT_TITLE}; 537 my $title = $stats->{+CS_STAT_TITLE};
458 $title =~ s/^Player: //; 538 $title =~ s/^Player: //;
459 $::STATWIDS->{title} ->set_text ("Title: " . $title); 539 $::STATWIDS->{title} ->set_text ("Title: " . $title);
460 540
472 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 552 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
473 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 553 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
474 554
475 $self->update_weight; 555 $self->update_weight;
476 556
477 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 557 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
478 for keys %RES_TBL; 558 for keys %RES_TBL;
479 559
480 my $sktbl = $::STATWIDS->{skill_tbl}; 560 my $sktbl = $::STATWIDS->{skill_tbl};
481 my @skills = keys %{ $self->{skill_info} }; 561 my @skills = keys %{ $self->{skill_info} };
482 562
489 $self->{stat_order} = join ",", map $_->[0], @order; 569 $self->{stat_order} = join ",", map $_->[0], @order;
490 570
491 $sktbl->clear; 571 $sktbl->clear;
492 572
493 my $sw = $self->{skillwid}{""} ||= [ 573 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 574 0, 0, (new DC::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 575 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 576 2, 0, (new DC::UI::Label text => "Progress"),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 577 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 578 4, 0, (new DC::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 579 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 580 6, 0, (new DC::UI::Label text => "Progress"),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 581 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
502 ]; 582 ];
503 583
504 my @add = @$sw; 584 my @add = @$sw;
505 585
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 586 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
507 587
508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 588 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
509 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 589 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
510 590
511 my ($x, $y) = (0, 1); 591 my ($x, $y) = (0, 1);
518 if ($ev->{button} == 1) { 598 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name"); 599 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) { 600 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name"); 601 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) { 602 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14; 603 my $shortname = DC::shorten $name, 14;
524 (new CFPlus::UI::Menu 604 (new DC::UI::Menu
525 items => [ 605 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 606 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 607 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
528 ], 608 ],
529 )->popup ($ev); 609 )->popup ($ev);
530 } else { 610 } else {
531 return 0; 611 return 0;
532 } 612 }
534 1 614 1
535 }; 615 };
536 616
537 my $sw = $self->{skillwid}{$idx} ||= [ 617 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp 618 # exp
539 (new CFPlus::UI::Label 619 (new DC::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 620 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541 621
542 # level 622 # level
543 (new CFPlus::UI::Label 623 (new DC::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 624 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545 625
546 # progress 626 # progress
547 (new CFPlus::UI::ExperienceProgress), 627 (new DC::UI::ExperienceProgress),
548 628
549 # label 629 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 630 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 631 can_events => 1, can_hover => 1, tooltip => "#(skill/$name)$TOOLTIP_ALL"),
552 ]; 632 ];
553 633
554 push @add, 634 push @add,
555 $x * 4 + 0, $y, $sw->[0], 635 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1], 636 $x * 4 + 1, $y, $sw->[1],
573 my $sw = $self->{skillwid}{$idx}; 653 my $sw = $self->{skillwid}{$idx};
574 $sw->[0]->set_text (::formsep ($val->[1])); 654 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1); 655 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val); 656 $sw->[2]->set_value (@$val);
577 657
578 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 658 $::GAUGES->{skillexp}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val); 659 $::GAUGES->{skillexp}->set_value (@$val);
580 } 660 }
581} 661}
582 662
583sub user_send { 663sub user_send {
584 my ($self, $command) = @_; 664 my ($self, $command) = @_;
597} 677}
598 678
599sub map_scroll { 679sub map_scroll {
600 my ($self, $dx, $dy) = @_; 680 my ($self, $dx, $dy) = @_;
601 681
602 $self->{map}->scroll ($dx, $dy); 682 $self->{map_widget}->scroll ($dx, $dy);
603} 683}
604 684
605sub feed_map1a { 685sub feed_map1a {
606 my ($self, $data) = @_; 686 my ($self, $data) = @_;
607 687
608 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 688 my $missing = $self->{map}->map1a_update ($data);
609 my $delay; 689 my $delay;
610 690
611 for my $tile (@$missing) { 691 for my $tile (@$missing) {
612 next if $self->{delay}{$tile}; 692 next if $self->{delay}{$tile};
613 693
614 $delay = 1; 694 $delay = 1;
615 695
616 if (my $tex = $::CONN->{texture}[$tile]) { 696 if (my $tex = $self->{texture}[$tile]) {
617 $tex->upload; 697 $tex->upload;
618 } else { 698 } else {
619 $self->{delay}{$tile} = 1; 699 $self->{delay}{$tile} = 1;
620 700
621 # we assume the face is in-flight and will eventually come 701 # we assume the face is in-flight and will eventually arrive
622 push @{$self->{tile_cb}{$tile}}, sub { 702 push @{$self->{tile_cb}{$tile}}, sub {
623 delete $self->{delay}{$tile}; 703 delete $self->{delay}{$tile};
624 $_[0]->upload; 704 $_[0]->upload;
625 }; 705 };
626 } 706 }
627 } 707 }
628 708
629 if ($delay) { 709 if ($delay) {
630 # delay the map drawing a tiny bit in the hope of getting the missing fetched 710 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
631 Event->timer (after => 0.03, cb => sub { 711 EV::once undef, 0, 0.03, sub {
632 $_[0]->w->cancel;
633 $self->{map_widget}->update 712 $self->{map_widget}->update
634 if $self->{map_widget}; 713 if $self->{map_widget};
635 }); 714 };
636 } else { 715 } else {
637 $self->{map_widget}->update; 716 $self->{map_widget}->update;
638 } 717 }
639} 718}
640 719
645} 724}
646 725
647sub flush_map { 726sub flush_map {
648 my ($self) = @_; 727 my ($self) = @_;
649 728
650 my $map_info = delete $self->{map_info} 729 return unless $self->{map_info};
651 or return;
652 730
731 for my $map_info (values %{ $self->{map_cache} || {} }) {
653 my ($hash, $x, $y, $w, $h) = @$map_info; 732 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
654 733
655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 734 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
656 $self->{map_cache_new}{$hash} = \$data; 735
736 if ($data ne $$rdata) {
737 $map_info->[1] = \$data;
738 my $cdata = Compress::LZF::compress $data;
657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 739 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
740 }
741 }
658} 742}
659 743
660sub map_clear { 744sub map_clear {
661 my ($self) = @_; 745 my ($self) = @_;
662 746
663 $self->flush_map; 747 $self->flush_map;
748 delete $self->{map_info};
664 delete $self->{neigh_map}; 749 delete $self->{neigh_map};
665 750
666 $self->{map}->clear; 751 $self->{map}->clear;
667 delete $self->{map_widget}{magicmap}; 752 delete $self->{map_widget}{magicmap};
668} 753}
675 do { 760 do {
676 $tile = pop @{$self->{bg_fetch}} 761 $tile = pop @{$self->{bg_fetch}}
677 or return; 762 or return;
678 } while $self->{texture}[$tile]; 763 } while $self->{texture}[$tile];
679 764
680 CFPlus::DB::get tilecache => $tile, sub { 765 DC::DB::get tilecache => $tile, sub {
681 my ($data) = @_; 766 my ($data) = @_;
682 767
683 return unless $self->{map}; # stop when destroyed 768 return unless $self->{map}; # stop when destroyed
684 769
685 if (defined $data) { 770 if (defined $data) {
689 774
690 $self->bg_fetch; 775 $self->bg_fetch;
691 }; 776 };
692} 777}
693 778
694sub load_map($$$) { 779sub load_map($$$$$$) {
695 my ($self, $hash, $x, $y) = @_; 780 my ($self, $hash, $x, $y, $w, $h) = @_;
696 781
697 my $gen = $self->{map_change_gen}; 782 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
698 783
699 my $cb = sub { 784 my $cb = sub {
700 return unless $gen == $self->{map_change_gen}; 785 $map_info->[1] = \$_[0];
701 786
702 my ($data) = @_;
703
704 if (defined $data) {
705 $self->{map_cache_new}{$hash} = \$data;
706
707 my $data = Compress::LZF::decompress $data;
708
709 my $inprogress = @{ $self->{bg_fetch} || [] }; 787 my $inprogress = @{ $self->{bg_fetch} || [] };
710 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 788 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
711 $self->bg_fetch unless $inprogress; 789 $self->bg_fetch unless $inprogress;
712 }
713 }; 790 };
714 791
715 if (my $rdata = $self->{map_cache_old}{$hash}) { 792 if (my $map_info = $self->{map_cache_old}{$hash}) {
716 $cb->($$rdata); 793 $cb->(${ $map_info->[1] });
717 } else { 794 } else {
795 my $gen = $self->{map_change_gen};
796
718 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 797 DC::DB::get $self->{mapcache} => $hash, sub {
798 return unless $gen == $self->{map_change_gen};
799 return unless defined $_[0];
800 $cb->(Compress::LZF::decompress $_[0]);
801 };
719 } 802 }
720} 803}
721 804
722# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 805# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
723# (server resource,s latency, bandwidth), so this hack is warranted. 806# (server resources, latency, bandwidth), so this hack is warranted.
724# the right fix is to make real tiled maps with an overview file 807# the right fix is to make real tiled maps with an overview file
725sub send_mapinfo { 808sub send_mapinfo {
726 my ($self, $data, $cb) = @_; 809 my ($self, $data, $cb) = @_;
727 810
728 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 811 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
753} 836}
754 837
755# this method does a "flood fill" into every tile direction 838# this method does a "flood fill" into every tile direction
756# it assumes that tiles are arranged in a rectangular grid, 839# it assumes that tiles are arranged in a rectangular grid,
757# i.e. a map is the same as the left of the right map etc. 840# i.e. a map is the same as the left of the right map etc.
758# failure to comply are harmless and result in display errors 841# failure to comply is harmless and results in display errors
759# at worst. 842# at worst.
760sub flood_fill { 843sub flood_fill {
761 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 844 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
762 845
763 # the server does not allow map paths > 6 846 # the server does not allow map paths > 6
799 return if $mode ne "spatial"; 882 return if $mode ne "spatial";
800 883
801 $x += $self->{map}->ox; 884 $x += $self->{map}->ox;
802 $y += $self->{map}->oy; 885 $y += $self->{map}->oy;
803 886
804 $self->load_map ($hash, $x, $y) 887 $self->load_map ($hash, $x, $y, $w, $h)
805 unless $self->{neigh_map}{$hash}[5]++;#d# 888 unless $self->{neigh_map}{$hash}[5]++;#d#
806 889
807 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 890 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
808 891
809 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 892 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 900 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
818 901
819 $self->flush_map; 902 $self->flush_map;
820 903
821 ++$self->{map_change_gen}; 904 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new}; 905 $self->{map_cache_old} = delete $self->{map_cache};
823 906
824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 907 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
825 908
826 my $mapmapw = $self->{mapmap}->{w}; 909 my $mapmapw = $self->{mapmap}->{w};
827 my $mapmaph = $self->{mapmap}->{h}; 910 my $mapmaph = $self->{mapmap}->{h};
839 $self->{map_info} = [$hash, $x, $y, $w, $h]; 922 $self->{map_info} = [$hash, $x, $y, $w, $h];
840 923
841 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 924 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
842 $::STATWIDS->{map}->set_text ("Map: " . $map); 925 $::STATWIDS->{map}->set_text ("Map: " . $map);
843 926
844 $self->load_map ($hash, $x, $y); 927 $self->load_map ($hash, $x, $y, $w, $h);
845 $self->flood_fill (0, 0, 0, "", $hash, $flags); 928 $self->flood_fill (0, 0, 0, "", $hash, $flags);
846} 929}
847 930
848sub face_find { 931sub face_find {
849 my ($self, $facenum, $face, $cb) = @_; 932 my ($self, $facenum, $face, $cb) = @_;
850 933
851 if ($face->{type} == 0) { # FT_FACE 934 if ($face->{type} == 0) { # FT_FACE
852 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 935 my $id = DC::DB::get_tile_id_sync $face->{name};
853 936
854 $face->{id} = $id; 937 $face->{id} = $id;
855 $self->{map}->set_tileid ($facenum => $id); 938 $self->{map}->set_tileid ($facenum => $id);
856 939
857 CFPlus::DB::get tilecache => $id, $cb; 940 DC::DB::get tilecache => $id, $cb;
858 941
859 } elsif ($face->{type} & 1) { # with metadata 942 } elsif ($face->{type} & 1) { # with metadata
860 CFPlus::DB::get res_meta => $face->{name}, $cb; 943 DC::DB::get res_meta => $face->{name}, $cb;
861 944
862 } else { # no metadata 945 } else { # no metadata
863 CFPlus::DB::get res_data => $face->{name}, $cb; 946 DC::DB::get res_data => $face->{name}, $cb;
864 } 947 }
865} 948}
866 949
867sub face_update { 950sub face_update {
868 my ($self, $facenum, $face, $changed) = @_; 951 my ($self, $facenum, $face, $changed) = @_;
869 952
870 if ($face->{type} == 0) { 953 if ($face->{type} == 0) {
871 # image, FT_FACE 954 # image, FT_FACE
872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 955 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
873 if $changed; 956 if $changed;
874 957
875 $self->have_tile ($face->{id}, delete $face->{data}); 958 $self->have_tile ($face->{id}, delete $face->{data});
876 959
877 } elsif ($face->{type} & 1) { 960 } elsif ($face->{type} & 1) {
879 if ($changed) { # new data 962 if ($changed) { # new data
880 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 963 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
881 $face->{data} = $meta; 964 $face->{data} = $meta;
882 965
883 # rely on strict ordering here and also on later fetch 966 # rely on strict ordering here and also on later fetch
884 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 967 DC::DB::put res_data => $face->{name} => $data, sub { };
885 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 968 DC::DB::put res_meta => $face->{name} => $meta, sub { };
886 } 969 }
887 970
888 $face->{data} = $self->{json_coder}->decode ($face->{data}); 971 $face->{data} = $self->{json_coder}->decode ($face->{data});
889 ::add_license ($face); 972 ::add_license ($face);
890 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 973 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
891 if $changed; 974 if $changed;
892 975
893 if ($face->{type} == 3) { # FT_MUSIC 976 if ($face->{type} == 3) { # FT_MUSIC
894 &::audio_music_push ($facenum); 977 &::audio_music_push ($facenum);
895 } elsif ($face->{type} == 5) { # FT_SOUND 978 } elsif ($face->{type} == 5) { # FT_SOUND
896 &::audio_sound_push ($facenum); 979 &::audio_sound_push ($facenum);
897 } 980 }
898 981
899 } else { 982 } else {
900 # flat resource case, FT_RSRC 983 # flat resource case, FT_RSRC
901 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 984 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
902 if $changed; 985 if $changed;
903 } 986 }
904 987
905 if (my $cbs = $self->{face_cb}{$facenum}) { 988 if (my $cbs = $self->{face_cb}{$facenum}) {
906 $_->($face, $changed) for @$cbs; 989 $_->($face, $changed) for @$cbs;
917 my ($self, $tile, $data) = @_; 1000 my ($self, $tile, $data) = @_;
918 1001
919 return unless $self->{map}; 1002 return unless $self->{map};
920 1003
921 my $tex = $self->{texture}[$tile] ||= 1004 my $tex = $self->{texture}[$tile] ||=
922 new CFPlus::Texture 1005 new DC::Texture
923 tile => $tile, 1006 tile => $tile,
924 image => $data, delete_image => 1, 1007 image => $data, delete_image => 1,
925 minify => 1, mipmap => 1; 1008 minify => 1;
926 1009
927 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1010 if (my $cbs = delete $self->{tile_cb}{$tile}) {
928 $_->($tex) for @$cbs; 1011 $_->($tex) for @$cbs;
929 } 1012 }
930} 1013}
935 my ($self, $num, $cb) = @_; 1018 my ($self, $num, $cb) = @_;
936 1019
937 push @{$self->{face_cb}{$num}}, $cb; 1020 push @{$self->{face_cb}{$num}}, $cb;
938 1021
939 defined wantarray 1022 defined wantarray
940 ? CFPlus::guard { 1023 ? Guard::guard {
941 @{$self->{face_cb}{$num}} 1024 @{$self->{face_cb}{$num}}
942 = grep $_ != $cb, 1025 = grep $_ != $cb,
943 @{$self->{face_cb}{$num}}; 1026 @{$self->{face_cb}{$num}};
944 } 1027 }
945 : () 1028 : ()
973 my ($self, $flags, $prompt) = @_; 1056 my ($self, $flags, $prompt) = @_;
974 1057
975 $prompt = $LAST_QUERY unless length $prompt; 1058 $prompt = $LAST_QUERY unless length $prompt;
976 $LAST_QUERY = $prompt; 1059 $LAST_QUERY = $prompt;
977 1060
978 $self->{query}-> ($self, $flags, $prompt); 1061 $self->{query}->($self, $flags, $prompt);
979}
980
981sub sanitise_xml($) {
982 local $_ = shift;
983
984 # we now weed out all tags we do not support
985 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
986 # now all entities
987 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
988
989 # handle some elements
990 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
991 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
992
993 $_
994} 1062}
995 1063
996our %NAME_TO_COLOR = ( 1064our %NAME_TO_COLOR = (
997 black => 0, 1065 black => 0,
998 white => 1, 1066 white => 1,
1009 tan => 12, 1077 tan => 12,
1010); 1078);
1011 1079
1012our @CF_COLOR = ( 1080our @CF_COLOR = (
1013 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1081 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1014 [1.00, 1.00, 1.00], 1082 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1015 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1083 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
1016 [1.00, 0.00, 0.00], 1084 [1.00, 0.00, 0.00],
1017 [1.00, 0.54, 0.00], 1085 [1.00, 0.54, 0.00],
1018 [0.11, 0.56, 1.00], 1086 [0.11, 0.56, 1.00],
1019 [0.93, 0.46, 0.00], 1087 [0.93, 0.46, 0.00],
1020 [0.18, 0.54, 0.34], 1088 [0.18, 0.54, 0.34],
1026); 1094);
1027 1095
1028sub msg { 1096sub msg {
1029 my ($self, $color, $type, $text, @extra) = @_; 1097 my ($self, $color, $type, $text, @extra) = @_;
1030 1098
1031 $text = sanitise_xml $text; 1099 $text = DC::sanitise_cfxml $text;
1032 1100
1033 if (my $cb = $self->{cb_msg}{$type}) { 1101 if (my $cb = $self->{cb_msg}{$type}) {
1034 $_->($self, $color, $type, $text, @extra) for values %$cb; 1102 $_->($self, $color, $type, $text, @extra) for values %$cb;
1035 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1103 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1036 $type =~ s/-/_/g; 1104 $type =~ s/-/_/g;
1039 $self->logprint ("msg: ", $text); 1107 $self->logprint ("msg: ", $text);
1040 return if $color < 0; # negative color == ignore if not understood 1108 return if $color < 0; # negative color == ignore if not understood
1041 1109
1042 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1110 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1043 1111
1044 ## try to create single paragraphs of multiple lines sent by the server
1045 # no longer neecssary with TRT servers
1046 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1047
1048 ::message ({ 1112 ::message ({
1049 fg => $fg, 1113 fg => $fg,
1050 markup => $_, 1114 markup => $text,
1051 type => $type, 1115 type => $type,
1052 extra => [@extra], 1116 extra => [@extra],
1053 color_flags => $color 1117 color_flags => $color, #d# ugly, kill
1054 }) for split /\n/, $text; 1118 });
1119
1120# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1121# # actually, this is an ugly design. _we_ should control the channels,
1122# # not some random other widget, as the channels are clearly protocol-specific.
1123# # then we could also react to flags such as CLEAR without resorting to
1124# # hacks such as color_flags, above.
1055 1125
1056 $self->{statusbox}->add ($text, 1126 $self->{statusbox}->add ($text,
1057 group => $text, 1127 group => $text,
1058 fg => $fg, 1128 fg => $fg,
1059 timeout => $color >= 2 ? 180 : 10, 1129 timeout => $color >= 2 ? 180 : 10,
1060 tooltip_font => $::FONT_FIXED, 1130 tooltip_font => $::FONT_FIXED,
1061 ); 1131 ) if $type eq "info";
1062 } 1132 }
1063} 1133}
1064 1134
1065sub spell_add { 1135sub spell_add {
1066 my ($self, $spell) = @_; 1136 my ($self, $spell) = @_;
1067 1137
1068 # try to create single paragraphs out of the multiple lines sent by the server
1069 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
1070 $spell->{message} =~ s/\n+$//;
1071 $spell->{message} ||= "Server did not provide a description for this spell.";
1072
1073 $::SPELL_LIST->add_spell ($spell); 1138 $::SPELL_LIST->add_spell ($spell);
1074 1139 delete $::COMPLETER->{command_list}{spells};
1075 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
1076 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
1077} 1140}
1078 1141
1079sub spell_delete { 1142sub spell_delete {
1080 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
1081 1144
1082 $::SPELL_LIST->remove_spell ($spell); 1145 $::SPELL_LIST->remove_spell ($spell);
1146 delete $::COMPLETER->{command_list}{spells};
1083} 1147}
1084 1148
1085sub setup { 1149sub setup {
1086 my ($self, $setup) = @_; 1150 my ($self, $setup) = @_;
1087 1151
1088 $self->{map_widget}->set_tilesize ($self->{tilesize}); 1152 $self->{map_widget}->set_tilesize ($self->{tilesize});
1089 $::MAP->resize ($self->{mapw}, $self->{maph}); 1153 $::MAP->resize ($self->{mapw}, $self->{maph});
1090} 1154}
1091 1155
1092sub addme_success {
1093 my ($self) = @_;
1094
1095 my %skill_help;
1096
1097 for my $node (CFPlus::Pod::find skill_description => "*") {
1098 my (undef, @par) = CFPlus::Pod::section_of $node;
1099 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
1100 };
1101
1102 for my $skill (values %{$self->{skill_info}}) {
1103 $self->{map_widget}->add_command ("ready_skill $skill",
1104 (CFPlus::asxml "Ready the skill '$skill'\n\n")
1105 . $skill_help{$skill});
1106 $self->{map_widget}->add_command ("use_skill $skill",
1107 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
1108 . $skill_help{$skill});
1109 }
1110}
1111
1112sub eof { 1156sub eof {
1113 my ($self) = @_; 1157 my ($self) = @_;
1114 1158
1115 $self->{map_widget}->clr_commands; 1159 $::COMPLETER->reset;
1116 1160
1117 ::stop_game (); 1161 ::stop_game ();
1118} 1162}
1119 1163
1120sub update_floorbox { 1164sub update_floorbox {
1121 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1165 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1122 return unless $::CONN; 1166 return unless $::CONN;
1123 1167
1124 $::FLOORBOX->clear; 1168 $::FLOORBOX->clear;
1125 1169
1126 my @add; 1170 my @add;
1127 1171
1128 my $row; 1172 my $row;
1129 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1173 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1174 next if $_->{tag} & 0x80000000;
1130 if ($row < 6) { 1175 if ($row < 6) {
1131 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
1132 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
1133 CFPlus::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
1134 1179
1135 push @add, 1180 push @add,
1136 0, $row, $_->{face_widget}, 1181 0, $row, $_->{face_widget},
1137 1, $row, $_->{desc_widget}; 1182 1, $row, $_->{desc_widget};
1138 1183
1139 $row++; 1184 $row++;
1140 } else { 1185 } else {
1141 push @add, 1, $row, new CFPlus::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
1142 text => "More...", 1187 text => "More...",
1143 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1144 ; 1189 ;
1145 last; 1190 last;
1146 } 1191 }
1147 } 1192 }
1148 if ($::CONN->{open_container}) { 1193 if ($::CONN->{open_container}) {
1149 push @add, 1, $row++, new CFPlus::UI::Button 1194 push @add, 1, $row++, new DC::UI::Button
1150 text => "Close container", 1195 text => "Close container",
1151 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1152 ; 1197 ;
1153 } 1198 }
1154 1199
1155 $::FLOORBOX->add_at (@add); 1200 $::FLOORBOX->add_at (@add);
1156 }); 1201 });
1157 1202
1158 $::WANT_REFRESH->start; 1203 $::WANT_REFRESH = 1;
1159} 1204}
1160 1205
1161sub set_opencont { 1206sub set_opencont {
1162 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
1163 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
1164 update_floorbox; 1209 update_floorbox;
1165 1210
1166 $::INVR_HB->clear (); 1211 $::INVR_HB->clear;
1167 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1212 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1168 1213
1169 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
1170 $::INVR_HB->add (new CFPlus::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
1171 text => "Close container", 1216 text => "Close container",
1172 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
1173 on_activate => sub { 1218 on_activate => sub {
1174 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1175 if $tag != 0; 1220 if $tag != 0;
1182} 1227}
1183 1228
1184sub update_containers { 1229sub update_containers {
1185 my ($self) = @_; 1230 my ($self) = @_;
1186 1231
1187 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1188 my $todo = delete $self->{update_container} 1233 my $todo = delete $self->{update_container}
1189 or return; 1234 or return;
1190 1235
1191 for my $tag (keys %$todo) { 1236 for my $tag (keys %$todo) {
1192 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1227} 1272}
1228 1273
1229sub item_update { 1274sub item_update {
1230 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
1231 1276
1232 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1277 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1233 1278
1234 CFPlus::Item::update_widgets $item; 1279 DC::Item::update_widgets $item;
1235 1280
1236 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1237 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
1238 1283
1239 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
1240 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1241 1286
1242 } else { 1287 } else {
1243 $self->{update_container}{$item->{container}}++; 1288 $self->{update_container}{$item->{container}}++;
1244 $self->update_containers; 1289 $self->update_containers;
1245 } 1290 }
1256 1301
1257 my $weight = .001 * $self->{player}{weight}; 1302 my $weight = .001 * $self->{player}{weight};
1258 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1259 1304
1260 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1261 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1306 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1262 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1263} 1308}
1264 1309
1265sub update_server_info { 1310sub update_server_info {
1266 my ($self) = @_; 1311 my ($self) = @_;
1267 1312
1268 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1313 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1269 1314
1315 my $version = JSON::XS->new->encode ($self->{s_version});
1316
1270 $::SERVER_INFO->set_markup ( 1317 $::SERVER_INFO->set_markup (
1271 "server <tt>$self->{host}:$self->{port}</tt>\n" 1318 "server <tt>$self->{host}:$self->{port}</tt>\n"
1272 . "protocol version <tt>$self->{version}</tt>\n" 1319 . "protocol version <tt>$version</tt>\n"
1273 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1274 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1275 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1276 . "editing support $yesno[!!$self->{editor_support}]\n" 1320 . "editing support $yesno[!!$self->{editor_support}]\n"
1277 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1278 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1279 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1321 . "client support $yesno[$self->{cfplus_ext} > 0]"
1280 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1322 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1281 . "map size $self->{mapw}×$self->{maph}\n" 1323 . "map size $self->{mapw}×$self->{maph}\n"
1282 ); 1324 );
1283 1325
1284} 1326}
1304 0 1346 0
1305 }); 1347 });
1306 1348
1307 $self->update_server_info; 1349 $self->update_server_info;
1308 1350
1309 $self->send_command ("output-sync $::CFG->{output_sync}");
1310 $self->send_command ("output-count $::CFG->{output_count}");
1311 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1351 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1312 $self->send_command ("pickup $::CFG->{pickup}"); 1352 $self->send_pickup ($::CFG->{pickup});
1313} 1353}
1314 1354
1315sub lookat { 1355sub lookat {
1316 my ($self, $x, $y) = @_; 1356 my ($self, $x, $y) = @_;
1317 1357
1319 $self->send_ext_req (lookat => $x, $y, sub { 1359 $self->send_ext_req (lookat => $x, $y, sub {
1320 my (%msg) = @_; 1360 my (%msg) = @_;
1321 1361
1322 if (exists $msg{npc_dialog}) { 1362 if (exists $msg{npc_dialog}) {
1323 # start npc chat dialog 1363 # start npc chat dialog
1324 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1364 $self->{w}{npc_dialog} = new DC::NPCDialog::
1325 token => $msg{npc_dialog}, 1365 token => $msg{npc_dialog},
1326 title => "$msg{npc_dialog}[0] (NPC)", 1366 title => "$msg{npc_dialog}[0] (NPC)",
1327 conn => $self, 1367 conn => $self,
1328 ; 1368 ;
1329 } 1369 }
1334} 1374}
1335 1375
1336sub destroy { 1376sub destroy {
1337 my ($self) = @_; 1377 my ($self) = @_;
1338 1378
1339 (delete $self->{npc_dialog})->destroy 1379 $_->destroy
1340 if $self->{npc_dialog}; 1380 for values %{ $self->{w} };
1341 1381
1342 $self->SUPER::destroy; 1382 $self->SUPER::destroy;
1343 1383
1344 %$self = (); 1384 %$self = ();
1345} 1385}
1346 1386
1347package CFPlus::NPCDialog; 1387package DC::NPCDialog;
1348 1388
1349our @ISA = 'CFPlus::UI::Toplevel'; 1389our @ISA = 'DC::UI::Toplevel';
1350 1390
1351sub new { 1391sub new {
1352 my $class = shift; 1392 my $class = shift;
1353 1393
1354 my $self = $class->SUPER::new ( 1394 my $self = $class->SUPER::new (
1361 kw => { hi => 0, yes => 0, no => 0 }, 1401 kw => { hi => 0, yes => 0, no => 0 },
1362 has_close_button => 1, 1402 has_close_button => 1,
1363 @_, 1403 @_,
1364 ); 1404 );
1365 1405
1366 CFPlus::weaken (my $this = $self); 1406 DC::weaken (my $this = $self);
1367 1407
1368 $self->connect (delete => sub { $this->destroy; 1 }); 1408 $self->connect (delete => sub { $this->destroy; 1 });
1369 1409
1370 # better use a pane... 1410 # better use a pane...
1371 $self->add (my $hbox = new CFPlus::UI::HBox); 1411 $self->add (my $hbox = new DC::UI::HBox);
1372 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1412 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1373 1413
1374 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1414 $hbox->add (my $vbox = new DC::UI::VBox);
1375 1415
1376 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1416 $vbox->add (new DC::UI::Label text => "Message Entry:");
1377 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1417 $vbox->add ($self->{entry} = new DC::UI::Entry
1378 tooltip => "#npc_message_entry", 1418 tooltip => "#npc_message_entry",
1379 on_activate => sub { 1419 on_activate => sub {
1380 my ($entry, $text) = @_; 1420 my ($entry, $text) = @_;
1381 1421
1382 return unless $text =~ /\S/; 1422 return unless $text =~ /\S/;
1386 1426
1387 0 1427 0
1388 }, 1428 },
1389 ); 1429 );
1390 1430
1391 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1431 $vbox->add ($self->{options} = new DC::UI::VBox);
1392 1432
1393 $self->{bye_button} = new CFPlus::UI::Button 1433 $self->{bye_button} = new DC::UI::Button
1394 text => "Bye (close)", 1434 text => "Bye (close)",
1395 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1435 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1396 on_activate => sub { $this->destroy; 1 }, 1436 on_activate => sub { $this->destroy; 1 },
1397 ; 1437 ;
1398 1438
1417}; 1457};
1418 1458
1419sub update_options { 1459sub update_options {
1420 my ($self) = @_; 1460 my ($self) = @_;
1421 1461
1422 CFPlus::weaken $self; 1462 DC::weaken $self;
1423 1463
1424 $self->{options}->clear; 1464 $self->{options}->clear;
1425 $self->{options}->add ($self->{bye_button}); 1465 $self->{options}->add ($self->{bye_button});
1426 1466
1427 for my $kw (sort keys %{ $self->{kw} }) { 1467 for my $kw (sort keys %{ $self->{kw} }) {
1428 $self->{options}->add (new CFPlus::UI::Button 1468 $self->{options}->add (new DC::UI::Button
1429 text => $kw, 1469 text => $kw,
1430 on_activate => sub { 1470 on_activate => sub {
1431 $self->send ($kw); 1471 $self->send ($kw);
1432 0 1472 0
1433 }, 1473 },
1436} 1476}
1437 1477
1438sub feed { 1478sub feed {
1439 my ($self, $type, @arg) = @_; 1479 my ($self, $type, @arg) = @_;
1440 1480
1441 CFPlus::weaken $self; 1481 DC::weaken $self;
1442 1482
1443 if ($type eq "update") { 1483 if ($type eq "update") {
1444 my (%info) = @arg; 1484 my (%info) = @arg;
1445 1485
1446 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1486 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1447 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1487 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1448 1488
1449 if (exists $info{msg}) { 1489 if (exists $info{msg}) {
1450 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1490 my $text = "\n" . DC::sanitise_cfxml $info{msg};
1451 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1491 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1452 my @link; 1492 my @link;
1453 $text =~ s{ 1493 $text =~ s{
1454 ($match) 1494 ($match)
1455 }{ 1495 }{
1456 my $kw = $1; 1496 my $kw = $1;
1457 1497
1458 push @link, new CFPlus::UI::Label 1498 push @link, new DC::UI::Label
1459 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1499 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1460 can_hover => 1, 1500 can_hover => 1,
1461 can_events => 1, 1501 can_events => 1,
1462 padding_x => 0, 1502 padding_x => 0,
1463 padding_y => 0, 1503 padding_y => 0,
1481} 1521}
1482 1522
1483sub send { 1523sub send {
1484 my ($self, $msg) = @_; 1524 my ($self, $msg) = @_;
1485 1525
1486 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1526 $self->{textview}->add_paragraph ({
1527 markup =>
1528 "\n<span foreground='#ffff00'><b>"
1529 . (DC::asxml $msg)
1530 . "</b></span>"
1531 });
1487 $self->{textview}->scroll_to_bottom; 1532 $self->{textview}->scroll_to_bottom;
1488 1533
1489 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1534 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1490} 1535}
1491 1536
1494 1539
1495 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1540 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1496 1541
1497 if ($self->{conn}) { 1542 if ($self->{conn}) {
1498 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1543 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1499 delete $self->{conn}{npc_dialog}; 1544 delete $self->{conn}{w}{npc_dialog};
1500 $self->{conn}->disconnect_ext ($self->{id}); 1545 $self->{conn}->disconnect_ext ($self->{id});
1501 } 1546 }
1502 1547
1503 $self->SUPER::destroy; 1548 $self->SUPER::destroy;
1504} 1549}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines