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.176 by root, Sun Oct 14 15:33:30 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 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#
16 24
17sub new { 25sub new {
18 my ($class, %arg) = @_; 26 my ($class, %arg) = @_;
19 27
20 my $self = $class->SUPER::new (%arg, 28 my $self = $class->SUPER::new (%arg,
21 setup_req => { 29 setup_req => {
22 extmap => 1, 30 extmap => 1,
23 excmd => 1,
24 xwidget2 => 1,#d# 31 widget => 2,
25 %{$arg{setup_req} || {}}, 32 %{$arg{setup_req} || {}},
26 }, 33 },
27 ); 34 );
28 35
29 $self->{map_widget}->clr_commands; 36 $self->update_fx_want;
30 37
31 my @cmd_help = map { 38 my $exp_guard = $self->addme_guard;
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 39 my $skl_guard = $self->addme_guard;
33 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) = @_;
34 43
35 my $cmd = $1; 44 $self->register_face_handler ($exp, sub {
36 my @args = split /\|/, $2; 45 my ($face) = @_;
37 @args = (".*") unless @args;
38 46
39 my (undef, @par) = CFPlus::Pod::section_of $_; 47 undef $exp_guard;
40 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 });
41 51
42 $_ = $_ eq ".*" ? "" : " $_" 52 $self->register_face_handler ($skl, sub {
43 for @args; 53 my ($face) = @_;
44 54
45 map ["$cmd$_", $text], 55 undef $skl_guard;
46 sort { (length $a) <=> (length $b) } 56 my $info = $self->{json_coder}->decode (delete $face->{data});
47 @args 57 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
48 } sort { $a->{par} <=> $b->{par} } 58 });
49 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;
50 72
51 $self->{json_coder} 73 $self->{json_coder}
52 ->convert_blessed 74 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 75 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]} 76 $self->{widget}{$_[0]}
… …
64 $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 {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 87 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 88 $_->destroy
67 for values %{delete $ws->{w} || {}}; 89 for values %{delete $ws->{w} || {}};
68 } 90 }
91
92 delete $self->{items};
93 $::INV->clear;
94 $::INVR->clear;
95 $::INVR_HB->clear;
96 $::FLOORBOX->clear;
69 }); 97 });
70 98
71 $self->{map_widget}->add_command (@$_)
72 for @cmd_help;
73
74 { 99 {
75 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 100 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
76 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $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}});
78 } 102 }
79 103
80 { 104 {
81 $self->{noface} = my $tex = new_from_file CFPlus::Texture 105 $self->{noface} = my $tex = $TEX_NOFACE;
82 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $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}});
84 } 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# };
85 123
86 $self->{open_container} = 0; 124 $self->{open_container} = 0;
87 125
88 # per server 126 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 127 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
90 128
91 $self 129 $self
92} 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#
93 134
94sub update_fx_want { 135sub update_fx_want {
95 my ($self) = @_; 136 my ($self) = @_;
96 137
97 $self->send_exti_msg (fx_want => { 138 $self->send_exti_msg (fx_want => {
… …
102} 143}
103 144
104sub ext_capabilities { 145sub ext_capabilities {
105 my ($self, %cap) = @_; 146 my ($self, %cap) = @_;
106 147
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) { 148 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) { 149 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default; 150 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3]; 151 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]); 152 $self->setup_req (tileset => $default->[0]);
… …
137sub ext_ambient_music { 162sub ext_ambient_music {
138 my ($self, $songs) = @_; 163 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs); 164 &::audio_music_set_ambient ($songs);
140} 165}
141 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
142############################################################################# 183#############################################################################
143 184
144sub widget_associate { 185sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_; 186 my ($self, $ws, $id, $widget) = @_;
146 187
147 $widget ||= new CFPlus::UI::Bin; 188 $widget ||= new DC::UI::Bin;
148 189
149 $widget->{s_id} = $id; 190 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget; 191 $self->{widget}{$id} = $widget;
151 192
152 if ($ws) { 193 if ($ws) {
… …
188 my ($self, $ws, $id, $class, $args) = @_; 229 my ($self, $ws, $id, $class, $args) = @_;
189 230
190 $self->widget_associate ( 231 $self->widget_associate (
191 $ws, $id => scalar eval { 232 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 233 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args) 234 "DC::UI::$class"->new (%$args)
194 } 235 }
195 ); 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}));
281 });
282 } else {
283 $done_cb->(0);
284 }
196} 285}
197 286
198# widgetset associate 287# widgetset associate
199sub ext_ws_a { 288sub ext_ws_a {
200 my ($self, %ass) = @_; 289 my ($self, %ass) = @_;
201 290
202 # everything that has a name, wether conceivably useful or not 291 # everything that has a name, wether conceivably useful or not
203 my %wkw = ( 292 my %wkw = (
204 root => $CFPlus::UI::ROOT, 293 root => $DC::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP, 294 tooltip => $DC::UI::TOOLTIP,
206 295
207 mapwidget => $::MAPWIDGET, 296 mapwidget => $::MAPWIDGET,
297 menubar => $::MENUBAR,
298 menupopup => $::MENUPOPUP,
299 pickup_enable => $::PICKUP_ENABLE,
208 buttonbar => $::BUTTONBAR, 300 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER, 301 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR, 302 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON, 303 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG, 304 quit_dialog => $::QUIT_DIALOG,
… …
228 spell_list => $::SPELL_LIST, 320 spell_list => $::SPELL_LIST,
229 321
230 floorbox => $::FLOORBOX, 322 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW, 323 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW, 324 message_window => $::MESSAGE_WINDOW,
325 message_dist => $::MESSAGE_DIST,
233 statusbox => $::SDTATUSBOX, 326 statusbox => $::STATUSBOX,
234 327
235 inv => $::INV, 328 inv => $::INV,
236 invr => $::INVR, 329 invr => $::INVR,
237 invr_hb => $::INVR_HB, 330 invr_hb => $::INVR_HB,
238 ); 331 );
… …
286 379
287# message window 380# message window
288sub ext_channel_info { 381sub ext_channel_info {
289 my ($self, $info) = @_; 382 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info; 383 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info); 384 $::MESSAGE_DIST->add_channel ($info);
292} 385}
293 386
294############################################################################# 387#############################################################################
295 388
296sub logprint { 389sub logprint {
297 my ($self, @a) = @_; 390 my ($self, @a) = @_;
298 391
299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 392 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 393}
301 394
302sub _stat_numdiff { 395sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 396 my ($self, $name, $old, $new) = @_;
304 397
… …
322 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 415 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
323 : () 416 : ()
324 } 417 }
325 sort { $a <=> $b } keys %{$self->{spell_paths}}; 418 sort { $a <=> $b } keys %{$self->{spell_paths}};
326 419
327 join "", @diff 420 "\u$name: " . (join ", ", @diff)
328} 421}
329 422
330# all stats that are chacked against changes 423# all stats that are chacked against changes
331my @statchange = ( 424my @statchange = (
332 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 425 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
375 468
376 if (my @diffs = 469 if (my @diffs =
377 ( 470 (
378 ($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" : ()),
379 map { 472 map {
380 $stats->{$_} && $prev->{$_} 473 $stats->{$_} && $prev->{$_}
381 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 474 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
382 } sort { $a <=> $b } keys %{$self->{skill_info}} 475 } sort { $a <=> $b } keys %{$self->{skill_info}}
383 ) 476 )
384 ) { 477 ) {
385 my $msg = join " ", @diffs; 478 my $msg = join " ", @diffs;
… …
387 } 480 }
388 481
389 if ( 482 if (
390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 483 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
391 ) { 484 ) {
392 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 485 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
393 $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);
394 } 487 }
395 488
396 $self->update_stats_window ($stats, $prev); 489 $self->update_stats_window ($stats, $prev);
397 490
… …
435 528
436 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 529 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
437 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 530 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
438 $::GAUGES->{food} ->set_value ($fo, $fo_m); 531 $::GAUGES->{food} ->set_value ($fo, $fo_m);
439 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 532 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 533 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 534 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::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});
443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 536 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
444 my $title = $stats->{+CS_STAT_TITLE}; 537 my $title = $stats->{+CS_STAT_TITLE};
445 $title =~ s/^Player: //; 538 $title =~ s/^Player: //;
446 $::STATWIDS->{title} ->set_text ("Title: " . $title); 539 $::STATWIDS->{title} ->set_text ("Title: " . $title);
447 540
… …
459 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 552 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
460 $::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});
461 554
462 $self->update_weight; 555 $self->update_weight;
463 556
464 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 557 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
465 for keys %RES_TBL; 558 for keys %RES_TBL;
466 559
467 my $sktbl = $::STATWIDS->{skill_tbl}; 560 my $sktbl = $::STATWIDS->{skill_tbl};
468 my @skills = keys %{ $self->{skill_info} }; 561 my @skills = keys %{ $self->{skill_info} };
469 562
… …
476 $self->{stat_order} = join ",", map $_->[0], @order; 569 $self->{stat_order} = join ",", map $_->[0], @order;
477 570
478 $sktbl->clear; 571 $sktbl->clear;
479 572
480 my $sw = $self->{skillwid}{""} ||= [ 573 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 574 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 575 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 576 2, 0, (new DC::UI::Label text => "Progress"),
484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 577 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 578 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 579 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 580 6, 0, (new DC::UI::Label text => "Progress"),
488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 581 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 ]; 582 ];
490 583
491 my @add = @$sw; 584 my @add = @$sw;
492 585
493 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>";
494 587
495 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);
496 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);
497 590
498 my ($x, $y) = (0, 1); 591 my ($x, $y) = (0, 1);
… …
505 if ($ev->{button} == 1) { 598 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 599 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 600 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 601 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 602 } elsif ($ev->{button} == 3) {
510 my $shortname = CFPlus::shorten $name, 14; 603 my $shortname = DC::shorten $name, 14;
511 (new CFPlus::UI::Menu 604 (new DC::UI::Menu
512 items => [ 605 items => [
513 ["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"] }],
514 ["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"] }],
515 ], 608 ],
516 )->popup ($ev); 609 )->popup ($ev);
517 } else { 610 } else {
518 return 0; 611 return 0;
519 } 612 }
… …
521 1 614 1
522 }; 615 };
523 616
524 my $sw = $self->{skillwid}{$idx} ||= [ 617 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 618 # exp
526 (new CFPlus::UI::Label 619 (new DC::UI::Label
527 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),
528 621
529 # level 622 # level
530 (new CFPlus::UI::Label 623 (new DC::UI::Label
531 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),
532 625
533 # progress 626 # progress
534 (new CFPlus::UI::ExperienceProgress), 627 (new DC::UI::ExperienceProgress),
535 628
536 # label 629 # label
537 (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,
538 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"),
539 ]; 632 ];
540 633
541 push @add, 634 push @add,
542 $x * 4 + 0, $y, $sw->[0], 635 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 636 $x * 4 + 1, $y, $sw->[1],
… …
560 my $sw = $self->{skillwid}{$idx}; 653 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1])); 654 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1); 655 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val); 656 $sw->[2]->set_value (@$val);
564 657
565 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 658 $::GAUGES->{skillexp}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val); 659 $::GAUGES->{skillexp}->set_value (@$val);
567 } 660 }
568} 661}
569 662
570sub user_send { 663sub user_send {
571 my ($self, $command) = @_; 664 my ($self, $command) = @_;
… …
584} 677}
585 678
586sub map_scroll { 679sub map_scroll {
587 my ($self, $dx, $dy) = @_; 680 my ($self, $dx, $dy) = @_;
588 681
589 $self->{map}->scroll ($dx, $dy); 682 $self->{map_widget}->scroll ($dx, $dy);
590} 683}
591 684
592sub feed_map1a { 685sub feed_map1a {
593 my ($self, $data) = @_; 686 my ($self, $data) = @_;
594 687
595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 688 my $missing = $self->{map}->map1a_update ($data);
596 my $delay; 689 my $delay;
597 690
598 for my $tile (@$missing) { 691 for my $tile (@$missing) {
599 next if $self->{delay}{$tile}; 692 next if $self->{delay}{$tile};
600 693
601 $delay = 1; 694 $delay = 1;
602 695
603 if (my $tex = $::CONN->{texture}[$tile]) { 696 if (my $tex = $self->{texture}[$tile]) {
604 $tex->upload; 697 $tex->upload;
605 } else { 698 } else {
606 $self->{delay}{$tile} = 1; 699 $self->{delay}{$tile} = 1;
607 700
608 # we assume the face is in-flight and will eventually come 701 # we assume the face is in-flight and will eventually arrive
609 push @{$self->{tile_cb}{$tile}}, sub { 702 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile}; 703 delete $self->{delay}{$tile};
611 $_[0]->upload; 704 $_[0]->upload;
612 }; 705 };
613 } 706 }
614 } 707 }
615 708
616 if ($delay) { 709 if ($delay) {
617 # 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
618 Event->timer (after => 0.03, cb => sub { 711 EV::once undef, 0, 0.03, sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update 712 $self->{map_widget}->update
621 if $self->{map_widget}; 713 if $self->{map_widget};
622 }); 714 };
623 } else { 715 } else {
624 $self->{map_widget}->update; 716 $self->{map_widget}->update;
625 } 717 }
626} 718}
627 719
… …
632} 724}
633 725
634sub flush_map { 726sub flush_map {
635 my ($self) = @_; 727 my ($self) = @_;
636 728
637 my $map_info = delete $self->{map_info} 729 return unless $self->{map_info};
638 or return;
639 730
731 for my $map_info (values %{ $self->{map_cache} || {} }) {
640 my ($hash, $x, $y, $w, $h) = @$map_info; 732 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
641 733
642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 734 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
643 $self->{map_cache_new}{$hash} = \$data; 735
736 if ($data ne $$rdata) {
737 $map_info->[1] = \$data;
738 my $cdata = Compress::LZF::compress $data;
644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 739 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
740 }
741 }
645} 742}
646 743
647sub map_clear { 744sub map_clear {
648 my ($self) = @_; 745 my ($self) = @_;
649 746
650 $self->flush_map; 747 $self->flush_map;
748 delete $self->{map_info};
651 delete $self->{neigh_map}; 749 delete $self->{neigh_map};
652 750
653 $self->{map}->clear; 751 $self->{map}->clear;
654 delete $self->{map_widget}{magicmap}; 752 delete $self->{map_widget}{magicmap};
655} 753}
… …
662 do { 760 do {
663 $tile = pop @{$self->{bg_fetch}} 761 $tile = pop @{$self->{bg_fetch}}
664 or return; 762 or return;
665 } while $self->{texture}[$tile]; 763 } while $self->{texture}[$tile];
666 764
667 CFPlus::DB::get tilecache => $tile, sub { 765 DC::DB::get tilecache => $tile, sub {
668 my ($data) = @_; 766 my ($data) = @_;
669 767
670 return unless $self->{map}; # stop when destroyed 768 return unless $self->{map}; # stop when destroyed
671 769
672 if (defined $data) { 770 if (defined $data) {
… …
676 774
677 $self->bg_fetch; 775 $self->bg_fetch;
678 }; 776 };
679} 777}
680 778
681sub load_map($$$) { 779sub load_map($$$$$$) {
682 my ($self, $hash, $x, $y) = @_; 780 my ($self, $hash, $x, $y, $w, $h) = @_;
683 781
684 my $gen = $self->{map_change_gen}; 782 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
685 783
686 my $cb = sub { 784 my $cb = sub {
687 return unless $gen == $self->{map_change_gen}; 785 $map_info->[1] = \$_[0];
688 786
689 my ($data) = @_;
690
691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
694 my $data = Compress::LZF::decompress $data;
695
696 my $inprogress = @{ $self->{bg_fetch} || [] }; 787 my $inprogress = @{ $self->{bg_fetch} || [] };
697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 788 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
698 $self->bg_fetch unless $inprogress; 789 $self->bg_fetch unless $inprogress;
699 }
700 }; 790 };
701 791
702 if (my $rdata = $self->{map_cache_old}{$hash}) { 792 if (my $map_info = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata); 793 $cb->(${ $map_info->[1] });
704 } else { 794 } else {
795 my $gen = $self->{map_change_gen};
796
705 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 };
706 } 802 }
707} 803}
708 804
709# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 805# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
710# (server resource,s latency, bandwidth), so this hack is warranted. 806# (server resources, latency, bandwidth), so this hack is warranted.
711# 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
712sub send_mapinfo { 808sub send_mapinfo {
713 my ($self, $data, $cb) = @_; 809 my ($self, $data, $cb) = @_;
714 810
715 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)$%) {
… …
740} 836}
741 837
742# this method does a "flood fill" into every tile direction 838# this method does a "flood fill" into every tile direction
743# it assumes that tiles are arranged in a rectangular grid, 839# it assumes that tiles are arranged in a rectangular grid,
744# 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.
745# failure to comply are harmless and result in display errors 841# failure to comply is harmless and results in display errors
746# at worst. 842# at worst.
747sub flood_fill { 843sub flood_fill {
748 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 844 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
749 845
750 # the server does not allow map paths > 6 846 # the server does not allow map paths > 6
… …
786 return if $mode ne "spatial"; 882 return if $mode ne "spatial";
787 883
788 $x += $self->{map}->ox; 884 $x += $self->{map}->ox;
789 $y += $self->{map}->oy; 885 $y += $self->{map}->oy;
790 886
791 $self->load_map ($hash, $x, $y) 887 $self->load_map ($hash, $x, $y, $w, $h)
792 unless $self->{neigh_map}{$hash}[5]++;#d# 888 unless $self->{neigh_map}{$hash}[5]++;#d#
793 889
794 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 890 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
795 891
796 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 892 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 900 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
805 901
806 $self->flush_map; 902 $self->flush_map;
807 903
808 ++$self->{map_change_gen}; 904 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new}; 905 $self->{map_cache_old} = delete $self->{map_cache};
810 906
811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 907 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
812 908
813 my $mapmapw = $self->{mapmap}->{w}; 909 my $mapmapw = $self->{mapmap}->{w};
814 my $mapmaph = $self->{mapmap}->{h}; 910 my $mapmaph = $self->{mapmap}->{h};
… …
826 $self->{map_info} = [$hash, $x, $y, $w, $h]; 922 $self->{map_info} = [$hash, $x, $y, $w, $h];
827 923
828 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 924 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
829 $::STATWIDS->{map}->set_text ("Map: " . $map); 925 $::STATWIDS->{map}->set_text ("Map: " . $map);
830 926
831 $self->load_map ($hash, $x, $y); 927 $self->load_map ($hash, $x, $y, $w, $h);
832 $self->flood_fill (0, 0, 0, "", $hash, $flags); 928 $self->flood_fill (0, 0, 0, "", $hash, $flags);
833} 929}
834 930
835sub face_find { 931sub face_find {
836 my ($self, $facenum, $face, $cb) = @_; 932 my ($self, $facenum, $face, $cb) = @_;
837 933
838 if ($face->{type} == 0) { # FT_FACE 934 if ($face->{type} == 0) { # FT_FACE
839 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 935 my $id = DC::DB::get_tile_id_sync $face->{name};
840 936
841 $face->{id} = $id; 937 $face->{id} = $id;
842 $self->{map}->set_tileid ($facenum => $id); 938 $self->{map}->set_tileid ($facenum => $id);
843 939
844 CFPlus::DB::get tilecache => $id, $cb; 940 DC::DB::get tilecache => $id, $cb;
845 941
846 } elsif ($face->{type} & 1) { # with metadata 942 } elsif ($face->{type} & 1) { # with metadata
847 CFPlus::DB::get res_meta => $face->{name}, $cb; 943 DC::DB::get res_meta => $face->{name}, $cb;
848 944
849 } else { # no metadata 945 } else { # no metadata
850 CFPlus::DB::get res_data => $face->{name}, $cb; 946 DC::DB::get res_data => $face->{name}, $cb;
851 } 947 }
852} 948}
853 949
854sub face_update { 950sub face_update {
855 my ($self, $facenum, $face, $changed) = @_; 951 my ($self, $facenum, $face, $changed) = @_;
856 952
857 if ($face->{type} == 0) { 953 if ($face->{type} == 0) {
858 # image, FT_FACE 954 # image, FT_FACE
859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 955 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
860 if $changed; 956 if $changed;
861 957
862 $self->have_tile ($face->{id}, delete $face->{data}); 958 $self->have_tile ($face->{id}, delete $face->{data});
863 959
864 } elsif ($face->{type} & 1) { 960 } elsif ($face->{type} & 1) {
… …
866 if ($changed) { # new data 962 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 963 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta; 964 $face->{data} = $meta;
869 965
870 # rely on strict ordering here and also on later fetch 966 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 967 DC::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 968 DC::DB::put res_meta => $face->{name} => $meta, sub { };
873 } 969 }
874 970
875 $face->{data} = $self->{json_coder}->decode ($face->{data}); 971 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face); 972 ::add_license ($face);
877 ::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}." })
878 if $changed; 974 if $changed;
879 975
880 if ($face->{type} == 3) { # FT_MUSIC 976 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum); 977 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND 978 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum); 979 &::audio_sound_push ($facenum);
884 } 980 }
885 981
886 } else { 982 } else {
887 # flat resource case, FT_RSRC 983 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 984 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed; 985 if $changed;
890 } 986 }
891 987
892 if (my $cbs = $self->{face_cb}{$facenum}) { 988 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs; 989 $_->($face, $changed) for @$cbs;
… …
904 my ($self, $tile, $data) = @_; 1000 my ($self, $tile, $data) = @_;
905 1001
906 return unless $self->{map}; 1002 return unless $self->{map};
907 1003
908 my $tex = $self->{texture}[$tile] ||= 1004 my $tex = $self->{texture}[$tile] ||=
909 new CFPlus::Texture 1005 new DC::Texture
910 tile => $tile, 1006 tile => $tile,
911 image => $data, delete_image => 1, 1007 image => $data, delete_image => 1,
912 minify => 1, mipmap => 1; 1008 minify => 1;
913 1009
914 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1010 if (my $cbs = delete $self->{tile_cb}{$tile}) {
915 $_->($tex) for @$cbs; 1011 $_->($tex) for @$cbs;
916 } 1012 }
917} 1013}
… …
922 my ($self, $num, $cb) = @_; 1018 my ($self, $num, $cb) = @_;
923 1019
924 push @{$self->{face_cb}{$num}}, $cb; 1020 push @{$self->{face_cb}{$num}}, $cb;
925 1021
926 defined wantarray 1022 defined wantarray
927 ? CFPlus::guard { 1023 ? Guard::guard {
928 @{$self->{face_cb}{$num}} 1024 @{$self->{face_cb}{$num}}
929 = grep $_ != $cb, 1025 = grep $_ != $cb,
930 @{$self->{face_cb}{$num}}; 1026 @{$self->{face_cb}{$num}};
931 } 1027 }
932 : () 1028 : ()
… …
960 my ($self, $flags, $prompt) = @_; 1056 my ($self, $flags, $prompt) = @_;
961 1057
962 $prompt = $LAST_QUERY unless length $prompt; 1058 $prompt = $LAST_QUERY unless length $prompt;
963 $LAST_QUERY = $prompt; 1059 $LAST_QUERY = $prompt;
964 1060
965 $self->{query}-> ($self, $flags, $prompt); 1061 $self->{query}->($self, $flags, $prompt);
966}
967
968sub sanitise_xml($) {
969 local $_ = shift;
970
971 # we now weed out all tags we do not support
972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
977 # now all entities
978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
979
980 # handle some elements
981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
982 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
983
984 $_
985} 1062}
986 1063
987our %NAME_TO_COLOR = ( 1064our %NAME_TO_COLOR = (
988 black => 0, 1065 black => 0,
989 white => 1, 1066 white => 1,
… …
1000 tan => 12, 1077 tan => 12,
1001); 1078);
1002 1079
1003our @CF_COLOR = ( 1080our @CF_COLOR = (
1004 [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],
1005 [1.00, 1.00, 1.00], 1082 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1006 [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],
1007 [1.00, 0.00, 0.00], 1084 [1.00, 0.00, 0.00],
1008 [1.00, 0.54, 0.00], 1085 [1.00, 0.54, 0.00],
1009 [0.11, 0.56, 1.00], 1086 [0.11, 0.56, 1.00],
1010 [0.93, 0.46, 0.00], 1087 [0.93, 0.46, 0.00],
1011 [0.18, 0.54, 0.34], 1088 [0.18, 0.54, 0.34],
… …
1017); 1094);
1018 1095
1019sub msg { 1096sub msg {
1020 my ($self, $color, $type, $text, @extra) = @_; 1097 my ($self, $color, $type, $text, @extra) = @_;
1021 1098
1022 $text = sanitise_xml $text; 1099 $text = DC::sanitise_cfxml $text;
1023 1100
1024 if (my $cb = $self->{cb_msg}{$type}) { 1101 if (my $cb = $self->{cb_msg}{$type}) {
1025 $_->($self, $color, $type, $text, @extra) for values %$cb; 1102 $_->($self, $color, $type, $text, @extra) for values %$cb;
1026 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1103 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1027 $type =~ s/-/_/g; 1104 $type =~ s/-/_/g;
… …
1030 $self->logprint ("msg: ", $text); 1107 $self->logprint ("msg: ", $text);
1031 return if $color < 0; # negative color == ignore if not understood 1108 return if $color < 0; # negative color == ignore if not understood
1032 1109
1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1110 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1034 1111
1035 ## try to create single paragraphs of multiple lines sent by the server
1036 # no longer neecssary with TRT servers
1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1038
1039 for (split /\n/, $text) {
1040 ::message ({ 1112 ::message ({
1041 fg => $fg, 1113 fg => $fg,
1042 markup => $_, 1114 markup => $text,
1043 type => $type, 1115 type => $type,
1044 extra => [@extra], 1116 extra => [@extra],
1045 color_flags => $color, #d# ugly, kill 1117 color_flags => $color, #d# ugly, kill
1046 }); 1118 });
1047 1119
1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1120# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1049 # actually, this is an ugly design. _we_ should control the channels, 1121# # actually, this is an ugly design. _we_ should control the channels,
1050 # not some random other widget, as the channels are clearly protocol-specific. 1122# # not some random other widget, as the channels are clearly protocol-specific.
1051 # then we could also react to flags such as CLEAR without resorting to 1123# # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above. 1124# # hacks such as color_flags, above.
1053 }
1054 1125
1055 $self->{statusbox}->add ($text, 1126 $self->{statusbox}->add ($text,
1056 group => $text, 1127 group => $text,
1057 fg => $fg, 1128 fg => $fg,
1058 timeout => $color >= 2 ? 180 : 10, 1129 timeout => $color >= 2 ? 180 : 10,
… …
1062} 1133}
1063 1134
1064sub spell_add { 1135sub spell_add {
1065 my ($self, $spell) = @_; 1136 my ($self, $spell) = @_;
1066 1137
1067 # try to create single paragraphs out of the multiple lines sent by the server
1068 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
1069 $spell->{message} =~ s/\n+$//;
1070 $spell->{message} ||= "Server did not provide a description for this spell.";
1071
1072 $::SPELL_LIST->add_spell ($spell); 1138 $::SPELL_LIST->add_spell ($spell);
1073 1139 delete $::COMPLETER->{command_list}{spells};
1074 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
1075 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
1076} 1140}
1077 1141
1078sub spell_delete { 1142sub spell_delete {
1079 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
1080 1144
1081 $::SPELL_LIST->remove_spell ($spell); 1145 $::SPELL_LIST->remove_spell ($spell);
1146 delete $::COMPLETER->{command_list}{spells};
1082} 1147}
1083 1148
1084sub setup { 1149sub setup {
1085 my ($self, $setup) = @_; 1150 my ($self, $setup) = @_;
1086 1151
1087 $self->{map_widget}->set_tilesize ($self->{tilesize}); 1152 $self->{map_widget}->set_tilesize ($self->{tilesize});
1088 $::MAP->resize ($self->{mapw}, $self->{maph}); 1153 $::MAP->resize ($self->{mapw}, $self->{maph});
1089} 1154}
1090 1155
1091sub addme_success {
1092 my ($self) = @_;
1093
1094 my %skill_help;
1095
1096 for my $node (CFPlus::Pod::find skill_description => "*") {
1097 my (undef, @par) = CFPlus::Pod::section_of $node;
1098 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
1099 };
1100
1101 for my $skill (values %{$self->{skill_info}}) {
1102 $self->{map_widget}->add_command ("ready_skill $skill",
1103 (CFPlus::asxml "Ready the skill '$skill'\n\n")
1104 . $skill_help{$skill});
1105 $self->{map_widget}->add_command ("use_skill $skill",
1106 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
1107 . $skill_help{$skill});
1108 }
1109}
1110
1111sub eof { 1156sub eof {
1112 my ($self) = @_; 1157 my ($self) = @_;
1113 1158
1114 $self->{map_widget}->clr_commands; 1159 $::COMPLETER->reset;
1115 1160
1116 ::stop_game (); 1161 ::stop_game ();
1117} 1162}
1118 1163
1119sub update_floorbox { 1164sub update_floorbox {
1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1165 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1121 return unless $::CONN; 1166 return unless $::CONN;
1122 1167
1123 $::FLOORBOX->clear; 1168 $::FLOORBOX->clear;
1124 1169
1125 my @add; 1170 my @add;
1126 1171
1127 my $row; 1172 my $row;
1128 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;
1129 if ($row < 6) { 1175 if ($row < 6) {
1130 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
1131 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
1132 CFPlus::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
1133 1179
1134 push @add, 1180 push @add,
1135 0, $row, $_->{face_widget}, 1181 0, $row, $_->{face_widget},
1136 1, $row, $_->{desc_widget}; 1182 1, $row, $_->{desc_widget};
1137 1183
1138 $row++; 1184 $row++;
1139 } else { 1185 } else {
1140 push @add, 1, $row, new CFPlus::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
1141 text => "More...", 1187 text => "More...",
1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1143 ; 1189 ;
1144 last; 1190 last;
1145 } 1191 }
1146 } 1192 }
1147 if ($::CONN->{open_container}) { 1193 if ($::CONN->{open_container}) {
1148 push @add, 1, $row++, new CFPlus::UI::Button 1194 push @add, 1, $row++, new DC::UI::Button
1149 text => "Close container", 1195 text => "Close container",
1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1151 ; 1197 ;
1152 } 1198 }
1153 1199
1154 $::FLOORBOX->add_at (@add); 1200 $::FLOORBOX->add_at (@add);
1155 }); 1201 });
1156 1202
1157 $::WANT_REFRESH->start; 1203 $::WANT_REFRESH = 1;
1158} 1204}
1159 1205
1160sub set_opencont { 1206sub set_opencont {
1161 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
1162 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
1163 update_floorbox; 1209 update_floorbox;
1164 1210
1165 $::INVR_HB->clear (); 1211 $::INVR_HB->clear;
1166 $::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);
1167 1213
1168 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
1169 $::INVR_HB->add (new CFPlus::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
1170 text => "Close container", 1216 text => "Close container",
1171 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
1172 on_activate => sub { 1218 on_activate => sub {
1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1174 if $tag != 0; 1220 if $tag != 0;
… …
1181} 1227}
1182 1228
1183sub update_containers { 1229sub update_containers {
1184 my ($self) = @_; 1230 my ($self) = @_;
1185 1231
1186 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1187 my $todo = delete $self->{update_container} 1233 my $todo = delete $self->{update_container}
1188 or return; 1234 or return;
1189 1235
1190 for my $tag (keys %$todo) { 1236 for my $tag (keys %$todo) {
1191 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1226} 1272}
1227 1273
1228sub item_update { 1274sub item_update {
1229 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
1230 1276
1231 #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";
1232 1278
1233 CFPlus::Item::update_widgets $item; 1279 DC::Item::update_widgets $item;
1234 1280
1235 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1236 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
1237 1283
1238 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
1239 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1240 1286
1241 } else { 1287 } else {
1242 $self->{update_container}{$item->{container}}++; 1288 $self->{update_container}{$item->{container}}++;
1243 $self->update_containers; 1289 $self->update_containers;
1244 } 1290 }
… …
1255 1301
1256 my $weight = .001 * $self->{player}{weight}; 1302 my $weight = .001 * $self->{player}{weight};
1257 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1258 1304
1259 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1260 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1306 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1261 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1262} 1308}
1263 1309
1264sub update_server_info { 1310sub update_server_info {
1265 my ($self) = @_; 1311 my ($self) = @_;
1266 1312
1267 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>");
1268 1314
1315 my $version = JSON::XS->new->encode ($self->{s_version});
1316
1269 $::SERVER_INFO->set_markup ( 1317 $::SERVER_INFO->set_markup (
1270 "server <tt>$self->{host}:$self->{port}</tt>\n" 1318 "server <tt>$self->{host}:$self->{port}</tt>\n"
1271 . "protocol version <tt>$self->{version}</tt>\n" 1319 . "protocol version <tt>$version</tt>\n"
1272 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1273 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1274 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1275 . "editing support $yesno[!!$self->{editor_support}]\n" 1320 . "editing support $yesno[!!$self->{editor_support}]\n"
1276 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1277 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1321 . "client support $yesno[$self->{cfplus_ext} > 0]"
1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1322 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1280 . "map size $self->{mapw}×$self->{maph}\n" 1323 . "map size $self->{mapw}×$self->{maph}\n"
1281 ); 1324 );
1282 1325
1283} 1326}
… …
1304 }); 1347 });
1305 1348
1306 $self->update_server_info; 1349 $self->update_server_info;
1307 1350
1308 $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;
1309 $self->send_command ("pickup $::CFG->{pickup}"); 1352 $self->send_pickup ($::CFG->{pickup});
1310} 1353}
1311 1354
1312sub lookat { 1355sub lookat {
1313 my ($self, $x, $y) = @_; 1356 my ($self, $x, $y) = @_;
1314 1357
… …
1316 $self->send_ext_req (lookat => $x, $y, sub { 1359 $self->send_ext_req (lookat => $x, $y, sub {
1317 my (%msg) = @_; 1360 my (%msg) = @_;
1318 1361
1319 if (exists $msg{npc_dialog}) { 1362 if (exists $msg{npc_dialog}) {
1320 # start npc chat dialog 1363 # start npc chat dialog
1321 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1364 $self->{w}{npc_dialog} = new DC::NPCDialog::
1322 token => $msg{npc_dialog}, 1365 token => $msg{npc_dialog},
1323 title => "$msg{npc_dialog}[0] (NPC)", 1366 title => "$msg{npc_dialog}[0] (NPC)",
1324 conn => $self, 1367 conn => $self,
1325 ; 1368 ;
1326 } 1369 }
… …
1331} 1374}
1332 1375
1333sub destroy { 1376sub destroy {
1334 my ($self) = @_; 1377 my ($self) = @_;
1335 1378
1336 (delete $self->{npc_dialog})->destroy 1379 $_->destroy
1337 if $self->{npc_dialog}; 1380 for values %{ $self->{w} };
1338 1381
1339 $self->SUPER::destroy; 1382 $self->SUPER::destroy;
1340 1383
1341 %$self = (); 1384 %$self = ();
1342} 1385}
1343 1386
1344package CFPlus::NPCDialog; 1387package DC::NPCDialog;
1345 1388
1346our @ISA = 'CFPlus::UI::Toplevel'; 1389our @ISA = 'DC::UI::Toplevel';
1347 1390
1348sub new { 1391sub new {
1349 my $class = shift; 1392 my $class = shift;
1350 1393
1351 my $self = $class->SUPER::new ( 1394 my $self = $class->SUPER::new (
… …
1358 kw => { hi => 0, yes => 0, no => 0 }, 1401 kw => { hi => 0, yes => 0, no => 0 },
1359 has_close_button => 1, 1402 has_close_button => 1,
1360 @_, 1403 @_,
1361 ); 1404 );
1362 1405
1363 CFPlus::weaken (my $this = $self); 1406 DC::weaken (my $this = $self);
1364 1407
1365 $self->connect (delete => sub { $this->destroy; 1 }); 1408 $self->connect (delete => sub { $this->destroy; 1 });
1366 1409
1367 # better use a pane... 1410 # better use a pane...
1368 $self->add (my $hbox = new CFPlus::UI::HBox); 1411 $self->add (my $hbox = new DC::UI::HBox);
1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1412 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1370 1413
1371 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1414 $hbox->add (my $vbox = new DC::UI::VBox);
1372 1415
1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1416 $vbox->add (new DC::UI::Label text => "Message Entry:");
1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1417 $vbox->add ($self->{entry} = new DC::UI::Entry
1375 tooltip => "#npc_message_entry", 1418 tooltip => "#npc_message_entry",
1376 on_activate => sub { 1419 on_activate => sub {
1377 my ($entry, $text) = @_; 1420 my ($entry, $text) = @_;
1378 1421
1379 return unless $text =~ /\S/; 1422 return unless $text =~ /\S/;
… …
1383 1426
1384 0 1427 0
1385 }, 1428 },
1386 ); 1429 );
1387 1430
1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1431 $vbox->add ($self->{options} = new DC::UI::VBox);
1389 1432
1390 $self->{bye_button} = new CFPlus::UI::Button 1433 $self->{bye_button} = new DC::UI::Button
1391 text => "Bye (close)", 1434 text => "Bye (close)",
1392 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.",
1393 on_activate => sub { $this->destroy; 1 }, 1436 on_activate => sub { $this->destroy; 1 },
1394 ; 1437 ;
1395 1438
… …
1414}; 1457};
1415 1458
1416sub update_options { 1459sub update_options {
1417 my ($self) = @_; 1460 my ($self) = @_;
1418 1461
1419 CFPlus::weaken $self; 1462 DC::weaken $self;
1420 1463
1421 $self->{options}->clear; 1464 $self->{options}->clear;
1422 $self->{options}->add ($self->{bye_button}); 1465 $self->{options}->add ($self->{bye_button});
1423 1466
1424 for my $kw (sort keys %{ $self->{kw} }) { 1467 for my $kw (sort keys %{ $self->{kw} }) {
1425 $self->{options}->add (new CFPlus::UI::Button 1468 $self->{options}->add (new DC::UI::Button
1426 text => $kw, 1469 text => $kw,
1427 on_activate => sub { 1470 on_activate => sub {
1428 $self->send ($kw); 1471 $self->send ($kw);
1429 0 1472 0
1430 }, 1473 },
… …
1433} 1476}
1434 1477
1435sub feed { 1478sub feed {
1436 my ($self, $type, @arg) = @_; 1479 my ($self, $type, @arg) = @_;
1437 1480
1438 CFPlus::weaken $self; 1481 DC::weaken $self;
1439 1482
1440 if ($type eq "update") { 1483 if ($type eq "update") {
1441 my (%info) = @arg; 1484 my (%info) = @arg;
1442 1485
1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1486 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1487 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1445 1488
1446 if (exists $info{msg}) { 1489 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1490 my $text = "\n" . DC::sanitise_cfxml $info{msg};
1448 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} };
1449 my @link; 1492 my @link;
1450 $text =~ s{ 1493 $text =~ s{
1451 ($match) 1494 ($match)
1452 }{ 1495 }{
1453 my $kw = $1; 1496 my $kw = $1;
1454 1497
1455 push @link, new CFPlus::UI::Label 1498 push @link, new DC::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1499 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1, 1500 can_hover => 1,
1458 can_events => 1, 1501 can_events => 1,
1459 padding_x => 0, 1502 padding_x => 0,
1460 padding_y => 0, 1503 padding_y => 0,
… …
1478} 1521}
1479 1522
1480sub send { 1523sub send {
1481 my ($self, $msg) = @_; 1524 my ($self, $msg) = @_;
1482 1525
1483 $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 });
1484 $self->{textview}->scroll_to_bottom; 1532 $self->{textview}->scroll_to_bottom;
1485 1533
1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1534 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1487} 1535}
1488 1536
… …
1491 1539
1492 #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
1493 1541
1494 if ($self->{conn}) { 1542 if ($self->{conn}) {
1495 $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};
1496 delete $self->{conn}{npc_dialog}; 1544 delete $self->{conn}{w}{npc_dialog};
1497 $self->{conn}->disconnect_ext ($self->{id}); 1545 $self->{conn}->disconnect_ext ($self->{id});
1498 } 1546 }
1499 1547
1500 $self->SUPER::destroy; 1548 $self->SUPER::destroy;
1501} 1549}

Diff Legend

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