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.175 by root, Thu Sep 6 15:06:25 2007 UTC vs.
Revision 1.229 by root, Mon Nov 26 13:02:28 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 $::COMPLETER->{command_lists} = \@faces;
174
175 for my $idx (@faces) {
176 $handler->{$idx} = $self->register_face_handler ($idx, sub {
177 my ($face) = @_;
178
179 $commands->{$idx} =
180 $face->{cache} ||= $self->{json_coder}->decode ($face->{data});
181 });
182 }
183}
184
142############################################################################# 185#############################################################################
143 186
144sub widget_associate { 187sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_; 188 my ($self, $ws, $id, $widget) = @_;
146 189
147 $widget ||= new CFPlus::UI::Bin; 190 $widget ||= new DC::UI::Bin;
148 191
149 $widget->{s_id} = $id; 192 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget; 193 $self->{widget}{$id} = $widget;
151 194
152 if ($ws) { 195 if ($ws) {
… …
188 my ($self, $ws, $id, $class, $args) = @_; 231 my ($self, $ws, $id, $class, $args) = @_;
189 232
190 $self->widget_associate ( 233 $self->widget_associate (
191 $ws, $id => scalar eval { 234 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 235 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args) 236 "DC::UI::$class"->new (%$args)
194 } 237 }
195 ); 238 );
239}
240
241# widgetset create template
242sub ext_ws_ct {
243 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
244
245 $done_cb ||= sub { };
246
247 my $parse_list; $parse_list = sub {
248 my ($list) = @_;
249 my @w;
250
251 while (@$list) {
252 my ($class, $args) = splice @$list, 0, 2;
253 my $name = delete $args->{s_id};
254 my $cl = delete $args->{s_cl};
255 my $cfg = delete $cfg->{$name};
256 my $id = delete $cfg->{id};
257 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
258 or next;
259
260 $self->widget_associate ($ws, $id, $w)
261 if $id;
262
263 $w->add ($parse_list->($cl))
264 if $cl;
265
266 push @w, $w;
267 }
268
269 @w
270 };
271
272 # either array reference, or face #
273 if ($type eq "inline") {
274 $done_cb->();
275 $parse_list->($template);
276 } elsif ($type eq "face") {
277 my $handler; $handler = $self->register_face_handler ($template, sub {
278 my ($face) = @_;
279
280 undef $handler;
281 $done_cb->();
282 $parse_list->($self->{json_coder}->decode ($face->{data}));
283 });
284 } else {
285 $done_cb->(0);
286 }
196} 287}
197 288
198# widgetset associate 289# widgetset associate
199sub ext_ws_a { 290sub ext_ws_a {
200 my ($self, %ass) = @_; 291 my ($self, %ass) = @_;
201 292
202 # everything that has a name, wether conceivably useful or not 293 # everything that has a name, wether conceivably useful or not
203 my %wkw = ( 294 my %wkw = (
204 root => $CFPlus::UI::ROOT, 295 root => $DC::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP, 296 tooltip => $DC::UI::TOOLTIP,
206 297
207 mapwidget => $::MAPWIDGET, 298 mapwidget => $::MAPWIDGET,
299 menubar => $::MENUBAR,
300 menupopup => $::MENUPOPUP,
301 pickup_enable => $::PICKUP_ENABLE,
208 buttonbar => $::BUTTONBAR, 302 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER, 303 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR, 304 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON, 305 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG, 306 quit_dialog => $::QUIT_DIALOG,
… …
228 spell_list => $::SPELL_LIST, 322 spell_list => $::SPELL_LIST,
229 323
230 floorbox => $::FLOORBOX, 324 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW, 325 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW, 326 message_window => $::MESSAGE_WINDOW,
327 message_dist => $::MESSAGE_DIST,
233 statusbox => $::SDTATUSBOX, 328 statusbox => $::STATUSBOX,
234 329
235 inv => $::INV, 330 inv => $::INV,
236 invr => $::INVR, 331 invr => $::INVR,
237 invr_hb => $::INVR_HB, 332 invr_hb => $::INVR_HB,
238 ); 333 );
… …
286 381
287# message window 382# message window
288sub ext_channel_info { 383sub ext_channel_info {
289 my ($self, $info) = @_; 384 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info; 385 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info); 386 $::MESSAGE_DIST->add_channel ($info);
292} 387}
293 388
294############################################################################# 389#############################################################################
295 390
296sub logprint { 391sub logprint {
297 my ($self, @a) = @_; 392 my ($self, @a) = @_;
298 393
299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 394 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 395}
301 396
302sub _stat_numdiff { 397sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 398 my ($self, $name, $old, $new) = @_;
304 399
… …
322 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 417 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
323 : () 418 : ()
324 } 419 }
325 sort { $a <=> $b } keys %{$self->{spell_paths}}; 420 sort { $a <=> $b } keys %{$self->{spell_paths}};
326 421
327 join "", @diff 422 "\u$name: " . (join ", ", @diff)
328} 423}
329 424
330# all stats that are chacked against changes 425# all stats that are chacked against changes
331my @statchange = ( 426my @statchange = (
332 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 427 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
375 470
376 if (my @diffs = 471 if (my @diffs =
377 ( 472 (
378 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 473 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
379 map { 474 map {
380 $stats->{$_} && $prev->{$_} 475 $stats->{$_} && $prev->{$_}
381 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 476 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
382 } sort { $a <=> $b } keys %{$self->{skill_info}} 477 } sort { $a <=> $b } keys %{$self->{skill_info}}
383 ) 478 )
384 ) { 479 ) {
385 my $msg = join " ", @diffs; 480 my $msg = join " ", @diffs;
… …
387 } 482 }
388 483
389 if ( 484 if (
390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 485 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
391 ) { 486 ) {
392 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 487 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); 488 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
394 } 489 }
395 490
396 $self->update_stats_window ($stats, $prev); 491 $self->update_stats_window ($stats, $prev);
397 492
… …
435 530
436 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 531 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
437 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 532 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
438 $::GAUGES->{food} ->set_value ($fo, $fo_m); 533 $::GAUGES->{food} ->set_value ($fo, $fo_m);
439 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 534 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 535 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 536 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 537 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 538 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
444 my $title = $stats->{+CS_STAT_TITLE}; 539 my $title = $stats->{+CS_STAT_TITLE};
445 $title =~ s/^Player: //; 540 $title =~ s/^Player: //;
446 $::STATWIDS->{title} ->set_text ("Title: " . $title); 541 $::STATWIDS->{title} ->set_text ("Title: " . $title);
447 542
… …
459 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 554 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
460 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 555 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
461 556
462 $self->update_weight; 557 $self->update_weight;
463 558
464 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 559 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
465 for keys %RES_TBL; 560 for keys %RES_TBL;
466 561
467 my $sktbl = $::STATWIDS->{skill_tbl}; 562 my $sktbl = $::STATWIDS->{skill_tbl};
468 my @skills = keys %{ $self->{skill_info} }; 563 my @skills = keys %{ $self->{skill_info} };
469 564
… …
476 $self->{stat_order} = join ",", map $_->[0], @order; 571 $self->{stat_order} = join ",", map $_->[0], @order;
477 572
478 $sktbl->clear; 573 $sktbl->clear;
479 574
480 my $sw = $self->{skillwid}{""} ||= [ 575 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 576 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 577 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 578 2, 0, (new DC::UI::Label text => "Progress"),
484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 579 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 580 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 581 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 582 6, 0, (new DC::UI::Label text => "Progress"),
488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 583 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 ]; 584 ];
490 585
491 my @add = @$sw; 586 my @add = @$sw;
492 587
493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 588 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
494 589
495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 590 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); 591 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
497 592
498 my ($x, $y) = (0, 1); 593 my ($x, $y) = (0, 1);
… …
505 if ($ev->{button} == 1) { 600 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 601 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 602 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 603 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 604 } elsif ($ev->{button} == 3) {
510 my $shortname = CFPlus::shorten $name, 14; 605 my $shortname = DC::shorten $name, 14;
511 (new CFPlus::UI::Menu 606 (new DC::UI::Menu
512 items => [ 607 items => [
513 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 608 ["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"] }], 609 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
515 ], 610 ],
516 )->popup ($ev); 611 )->popup ($ev);
517 } else { 612 } else {
518 return 0; 613 return 0;
519 } 614 }
… …
521 1 616 1
522 }; 617 };
523 618
524 my $sw = $self->{skillwid}{$idx} ||= [ 619 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 620 # exp
526 (new CFPlus::UI::Label 621 (new DC::UI::Label
527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 622 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
528 623
529 # level 624 # level
530 (new CFPlus::UI::Label 625 (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), 626 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532 627
533 # progress 628 # progress
534 (new CFPlus::UI::ExperienceProgress), 629 (new DC::UI::ExperienceProgress),
535 630
536 # label 631 # label
537 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 632 (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), 633 can_events => 1, can_hover => 1, tooltip => "#(skill/$name)$TOOLTIP_ALL"),
539 ]; 634 ];
540 635
541 push @add, 636 push @add,
542 $x * 4 + 0, $y, $sw->[0], 637 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 638 $x * 4 + 1, $y, $sw->[1],
… …
560 my $sw = $self->{skillwid}{$idx}; 655 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1])); 656 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1); 657 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val); 658 $sw->[2]->set_value (@$val);
564 659
565 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 660 $::GAUGES->{skillexp}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val); 661 $::GAUGES->{skillexp}->set_value (@$val);
567 } 662 }
568} 663}
569 664
570sub user_send { 665sub user_send {
571 my ($self, $command) = @_; 666 my ($self, $command) = @_;
… …
584} 679}
585 680
586sub map_scroll { 681sub map_scroll {
587 my ($self, $dx, $dy) = @_; 682 my ($self, $dx, $dy) = @_;
588 683
589 $self->{map}->scroll ($dx, $dy); 684 $self->{map_widget}->scroll ($dx, $dy);
590} 685}
591 686
592sub feed_map1a { 687sub feed_map1a {
593 my ($self, $data) = @_; 688 my ($self, $data) = @_;
594 689
595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 690 my $missing = $self->{map}->map1a_update ($data);
596 my $delay; 691 my $delay;
597 692
598 for my $tile (@$missing) { 693 for my $tile (@$missing) {
599 next if $self->{delay}{$tile}; 694 next if $self->{delay}{$tile};
600 695
601 $delay = 1; 696 $delay = 1;
602 697
603 if (my $tex = $::CONN->{texture}[$tile]) { 698 if (my $tex = $self->{texture}[$tile]) {
604 $tex->upload; 699 $tex->upload;
605 } else { 700 } else {
606 $self->{delay}{$tile} = 1; 701 $self->{delay}{$tile} = 1;
607 702
608 # we assume the face is in-flight and will eventually come 703 # we assume the face is in-flight and will eventually arrive
609 push @{$self->{tile_cb}{$tile}}, sub { 704 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile}; 705 delete $self->{delay}{$tile};
611 $_[0]->upload; 706 $_[0]->upload;
612 }; 707 };
613 } 708 }
614 } 709 }
615 710
616 if ($delay) { 711 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched 712 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
618 Event->timer (after => 0.03, cb => sub { 713 EV::once undef, 0, 0.03, sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update 714 $self->{map_widget}->update
621 if $self->{map_widget}; 715 if $self->{map_widget};
622 }); 716 };
623 } else { 717 } else {
624 $self->{map_widget}->update; 718 $self->{map_widget}->update;
625 } 719 }
626} 720}
627 721
… …
632} 726}
633 727
634sub flush_map { 728sub flush_map {
635 my ($self) = @_; 729 my ($self) = @_;
636 730
637 my $map_info = delete $self->{map_info} 731 return unless $self->{map_info};
638 or return;
639 732
733 for my $map_info (values %{ $self->{map_cache} || {} }) {
640 my ($hash, $x, $y, $w, $h) = @$map_info; 734 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
641 735
642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 736 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
643 $self->{map_cache_new}{$hash} = \$data; 737
738 if ($data ne $$rdata) {
739 $map_info->[1] = \$data;
740 my $cdata = Compress::LZF::compress $data;
644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 741 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
742 }
743 }
645} 744}
646 745
647sub map_clear { 746sub map_clear {
648 my ($self) = @_; 747 my ($self) = @_;
649 748
650 $self->flush_map; 749 $self->flush_map;
750 delete $self->{map_info};
651 delete $self->{neigh_map}; 751 delete $self->{neigh_map};
652 752
653 $self->{map}->clear; 753 $self->{map}->clear;
654 delete $self->{map_widget}{magicmap}; 754 delete $self->{map_widget}{magicmap};
655} 755}
… …
662 do { 762 do {
663 $tile = pop @{$self->{bg_fetch}} 763 $tile = pop @{$self->{bg_fetch}}
664 or return; 764 or return;
665 } while $self->{texture}[$tile]; 765 } while $self->{texture}[$tile];
666 766
667 CFPlus::DB::get tilecache => $tile, sub { 767 DC::DB::get tilecache => $tile, sub {
668 my ($data) = @_; 768 my ($data) = @_;
669 769
670 return unless $self->{map}; # stop when destroyed 770 return unless $self->{map}; # stop when destroyed
671 771
672 if (defined $data) { 772 if (defined $data) {
… …
676 776
677 $self->bg_fetch; 777 $self->bg_fetch;
678 }; 778 };
679} 779}
680 780
681sub load_map($$$) { 781sub load_map($$$$$$) {
682 my ($self, $hash, $x, $y) = @_; 782 my ($self, $hash, $x, $y, $w, $h) = @_;
683 783
684 my $gen = $self->{map_change_gen}; 784 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
685 785
686 my $cb = sub { 786 my $cb = sub {
687 return unless $gen == $self->{map_change_gen}; 787 $map_info->[1] = \$_[0];
688 788
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} || [] }; 789 my $inprogress = @{ $self->{bg_fetch} || [] };
697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 790 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
698 $self->bg_fetch unless $inprogress; 791 $self->bg_fetch unless $inprogress;
699 }
700 }; 792 };
701 793
702 if (my $rdata = $self->{map_cache_old}{$hash}) { 794 if (my $map_info = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata); 795 $cb->(${ $map_info->[1] });
704 } else { 796 } else {
797 my $gen = $self->{map_change_gen};
798
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 799 DC::DB::get $self->{mapcache} => $hash, sub {
800 return unless $gen == $self->{map_change_gen};
801 return unless defined $_[0];
802 $cb->(Compress::LZF::decompress $_[0]);
803 };
706 } 804 }
707} 805}
708 806
709# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 807# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
710# (server resource,s latency, bandwidth), so this hack is warranted. 808# (server resources, latency, bandwidth), so this hack is warranted.
711# the right fix is to make real tiled maps with an overview file 809# the right fix is to make real tiled maps with an overview file
712sub send_mapinfo { 810sub send_mapinfo {
713 my ($self, $data, $cb) = @_; 811 my ($self, $data, $cb) = @_;
714 812
715 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 813 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
740} 838}
741 839
742# this method does a "flood fill" into every tile direction 840# this method does a "flood fill" into every tile direction
743# it assumes that tiles are arranged in a rectangular grid, 841# 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. 842# 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 843# failure to comply is harmless and results in display errors
746# at worst. 844# at worst.
747sub flood_fill { 845sub flood_fill {
748 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 846 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
749 847
750 # the server does not allow map paths > 6 848 # the server does not allow map paths > 6
… …
786 return if $mode ne "spatial"; 884 return if $mode ne "spatial";
787 885
788 $x += $self->{map}->ox; 886 $x += $self->{map}->ox;
789 $y += $self->{map}->oy; 887 $y += $self->{map}->oy;
790 888
791 $self->load_map ($hash, $x, $y) 889 $self->load_map ($hash, $x, $y, $w, $h)
792 unless $self->{neigh_map}{$hash}[5]++;#d# 890 unless $self->{neigh_map}{$hash}[5]++;#d#
793 891
794 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 892 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
795 893
796 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 894 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 902 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
805 903
806 $self->flush_map; 904 $self->flush_map;
807 905
808 ++$self->{map_change_gen}; 906 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new}; 907 $self->{map_cache_old} = delete $self->{map_cache};
810 908
811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 909 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
812 910
813 my $mapmapw = $self->{mapmap}->{w}; 911 my $mapmapw = $self->{mapmap}->{w};
814 my $mapmaph = $self->{mapmap}->{h}; 912 my $mapmaph = $self->{mapmap}->{h};
… …
826 $self->{map_info} = [$hash, $x, $y, $w, $h]; 924 $self->{map_info} = [$hash, $x, $y, $w, $h];
827 925
828 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 926 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
829 $::STATWIDS->{map}->set_text ("Map: " . $map); 927 $::STATWIDS->{map}->set_text ("Map: " . $map);
830 928
831 $self->load_map ($hash, $x, $y); 929 $self->load_map ($hash, $x, $y, $w, $h);
832 $self->flood_fill (0, 0, 0, "", $hash, $flags); 930 $self->flood_fill (0, 0, 0, "", $hash, $flags);
833} 931}
834 932
835sub face_find { 933sub face_find {
836 my ($self, $facenum, $face, $cb) = @_; 934 my ($self, $facenum, $face, $cb) = @_;
837 935
838 if ($face->{type} == 0) { # FT_FACE 936 if ($face->{type} == 0) { # FT_FACE
839 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 937 my $id = DC::DB::get_tile_id_sync $face->{name};
840 938
841 $face->{id} = $id; 939 $face->{id} = $id;
842 $self->{map}->set_tileid ($facenum => $id); 940 $self->{map}->set_tileid ($facenum => $id);
843 941
844 CFPlus::DB::get tilecache => $id, $cb; 942 DC::DB::get tilecache => $id, $cb;
845 943
846 } elsif ($face->{type} & 1) { # with metadata 944 } elsif ($face->{type} & 1) { # with metadata
847 CFPlus::DB::get res_meta => $face->{name}, $cb; 945 DC::DB::get res_meta => $face->{name}, $cb;
848 946
849 } else { # no metadata 947 } else { # no metadata
850 CFPlus::DB::get res_data => $face->{name}, $cb; 948 DC::DB::get res_data => $face->{name}, $cb;
851 } 949 }
852} 950}
853 951
854sub face_update { 952sub face_update {
855 my ($self, $facenum, $face, $changed) = @_; 953 my ($self, $facenum, $face, $changed) = @_;
856 954
857 if ($face->{type} == 0) { 955 if ($face->{type} == 0) {
858 # image, FT_FACE 956 # image, FT_FACE
859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 957 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
860 if $changed; 958 if $changed;
861 959
862 $self->have_tile ($face->{id}, delete $face->{data}); 960 $self->have_tile ($face->{id}, delete $face->{data});
863 961
864 } elsif ($face->{type} & 1) { 962 } elsif ($face->{type} & 1) {
… …
866 if ($changed) { # new data 964 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 965 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta; 966 $face->{data} = $meta;
869 967
870 # rely on strict ordering here and also on later fetch 968 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 969 DC::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 970 DC::DB::put res_meta => $face->{name} => $meta, sub { };
873 } 971 }
874 972
875 $face->{data} = $self->{json_coder}->decode ($face->{data}); 973 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face); 974 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 975 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed; 976 if $changed;
879 977
880 if ($face->{type} == 3) { # FT_MUSIC 978 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum); 979 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND 980 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum); 981 &::audio_sound_push ($facenum);
884 } 982 }
885 983
886 } else { 984 } else {
887 # flat resource case, FT_RSRC 985 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 986 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed; 987 if $changed;
890 } 988 }
891 989
892 if (my $cbs = $self->{face_cb}{$facenum}) { 990 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs; 991 $_->($face, $changed) for @$cbs;
… …
904 my ($self, $tile, $data) = @_; 1002 my ($self, $tile, $data) = @_;
905 1003
906 return unless $self->{map}; 1004 return unless $self->{map};
907 1005
908 my $tex = $self->{texture}[$tile] ||= 1006 my $tex = $self->{texture}[$tile] ||=
909 new CFPlus::Texture 1007 new DC::Texture
910 tile => $tile, 1008 tile => $tile,
911 image => $data, delete_image => 1, 1009 image => $data, delete_image => 1,
912 minify => 1, mipmap => 1; 1010 minify => 1;
913 1011
914 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1012 if (my $cbs = delete $self->{tile_cb}{$tile}) {
915 $_->($tex) for @$cbs; 1013 $_->($tex) for @$cbs;
916 } 1014 }
917} 1015}
… …
922 my ($self, $num, $cb) = @_; 1020 my ($self, $num, $cb) = @_;
923 1021
924 push @{$self->{face_cb}{$num}}, $cb; 1022 push @{$self->{face_cb}{$num}}, $cb;
925 1023
926 defined wantarray 1024 defined wantarray
927 ? CFPlus::guard { 1025 ? Guard::guard {
928 @{$self->{face_cb}{$num}} 1026 @{$self->{face_cb}{$num}}
929 = grep $_ != $cb, 1027 = grep $_ != $cb,
930 @{$self->{face_cb}{$num}}; 1028 @{$self->{face_cb}{$num}};
931 } 1029 }
932 : () 1030 : ()
… …
960 my ($self, $flags, $prompt) = @_; 1058 my ($self, $flags, $prompt) = @_;
961 1059
962 $prompt = $LAST_QUERY unless length $prompt; 1060 $prompt = $LAST_QUERY unless length $prompt;
963 $LAST_QUERY = $prompt; 1061 $LAST_QUERY = $prompt;
964 1062
965 $self->{query}-> ($self, $flags, $prompt); 1063 $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} 1064}
986 1065
987our %NAME_TO_COLOR = ( 1066our %NAME_TO_COLOR = (
988 black => 0, 1067 black => 0,
989 white => 1, 1068 white => 1,
… …
1000 tan => 12, 1079 tan => 12,
1001); 1080);
1002 1081
1003our @CF_COLOR = ( 1082our @CF_COLOR = (
1004 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1083 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1005 [1.00, 1.00, 1.00], 1084 [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] 1085 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
1007 [1.00, 0.00, 0.00], 1086 [1.00, 0.00, 0.00],
1008 [1.00, 0.54, 0.00], 1087 [1.00, 0.54, 0.00],
1009 [0.11, 0.56, 1.00], 1088 [0.11, 0.56, 1.00],
1010 [0.93, 0.46, 0.00], 1089 [0.93, 0.46, 0.00],
1011 [0.18, 0.54, 0.34], 1090 [0.18, 0.54, 0.34],
… …
1017); 1096);
1018 1097
1019sub msg { 1098sub msg {
1020 my ($self, $color, $type, $text, @extra) = @_; 1099 my ($self, $color, $type, $text, @extra) = @_;
1021 1100
1022 $text = sanitise_xml $text; 1101 $text = DC::sanitise_cfxml $text;
1023 1102
1024 if (my $cb = $self->{cb_msg}{$type}) { 1103 if (my $cb = $self->{cb_msg}{$type}) {
1025 $_->($self, $color, $type, $text, @extra) for values %$cb; 1104 $_->($self, $color, $type, $text, @extra) for values %$cb;
1026 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1105 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1027 $type =~ s/-/_/g; 1106 $type =~ s/-/_/g;
… …
1030 $self->logprint ("msg: ", $text); 1109 $self->logprint ("msg: ", $text);
1031 return if $color < 0; # negative color == ignore if not understood 1110 return if $color < 0; # negative color == ignore if not understood
1032 1111
1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1112 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1034 1113
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 ({ 1114 ::message ({
1041 fg => $fg, 1115 fg => $fg,
1042 markup => $_, 1116 markup => $text,
1043 type => $type, 1117 type => $type,
1044 extra => [@extra], 1118 extra => [@extra],
1045 color_flags => $color, #d# ugly, kill 1119 color_flags => $color, #d# ugly, kill
1046 }); 1120 });
1047 1121
1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1122# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1049 # actually, this is an ugly design. _we_ should control the channels, 1123# # actually, this is an ugly design. _we_ should control the channels,
1050 # not some random other widget, as the channels are clearly protocol-specific. 1124# # 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 1125# # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above. 1126# # hacks such as color_flags, above.
1053 }
1054 1127
1055 $self->{statusbox}->add ($text, 1128 $self->{statusbox}->add ($text,
1056 group => $text, 1129 group => $text,
1057 fg => $fg, 1130 fg => $fg,
1058 timeout => $color >= 2 ? 180 : 10, 1131 timeout => $color >= 2 ? 180 : 10,
… …
1062} 1135}
1063 1136
1064sub spell_add { 1137sub spell_add {
1065 my ($self, $spell) = @_; 1138 my ($self, $spell) = @_;
1066 1139
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); 1140 $::SPELL_LIST->add_spell ($spell);
1073 1141 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} 1142}
1077 1143
1078sub spell_delete { 1144sub spell_delete {
1079 my ($self, $spell) = @_; 1145 my ($self, $spell) = @_;
1080 1146
1081 $::SPELL_LIST->remove_spell ($spell); 1147 $::SPELL_LIST->remove_spell ($spell);
1148 delete $::COMPLETER->{command_list}{spells};
1082} 1149}
1083 1150
1084sub setup { 1151sub setup {
1085 my ($self, $setup) = @_; 1152 my ($self, $setup) = @_;
1086 1153
1087 $self->{map_widget}->set_tilesize ($self->{tilesize}); 1154 $self->{map_widget}->set_tilesize ($self->{tilesize});
1088 $::MAP->resize ($self->{mapw}, $self->{maph}); 1155 $::MAP->resize ($self->{mapw}, $self->{maph});
1089} 1156}
1090 1157
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 { 1158sub eof {
1112 my ($self) = @_; 1159 my ($self) = @_;
1113 1160
1114 $self->{map_widget}->clr_commands; 1161 $::COMPLETER->reset;
1115 1162
1116 ::stop_game (); 1163 ::stop_game ();
1117} 1164}
1118 1165
1119sub update_floorbox { 1166sub update_floorbox {
1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1121 return unless $::CONN; 1168 return unless $::CONN;
1122 1169
1123 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
1124 1171
1125 my @add; 1172 my @add;
1126 1173
1127 my $row; 1174 my $row;
1128 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1175 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1176 next if $_->{tag} & 0x80000000;
1129 if ($row < 6) { 1177 if ($row < 6) {
1130 local $_->{face_widget}; # hack to force recreation of widget 1178 local $_->{face_widget}; # hack to force recreation of widget
1131 local $_->{desc_widget}; # hack to force recreation of widget 1179 local $_->{desc_widget}; # hack to force recreation of widget
1132 CFPlus::Item::update_widgets $_; 1180 DC::Item::update_widgets $_;
1133 1181
1134 push @add, 1182 push @add,
1135 0, $row, $_->{face_widget}, 1183 0, $row, $_->{face_widget},
1136 1, $row, $_->{desc_widget}; 1184 1, $row, $_->{desc_widget};
1137 1185
1138 $row++; 1186 $row++;
1139 } else { 1187 } else {
1140 push @add, 1, $row, new CFPlus::UI::Button 1188 push @add, 1, $row, new DC::UI::Button
1141 text => "More...", 1189 text => "More...",
1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1190 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1143 ; 1191 ;
1144 last; 1192 last;
1145 } 1193 }
1146 } 1194 }
1147 if ($::CONN->{open_container}) { 1195 if ($::CONN->{open_container}) {
1148 push @add, 1, $row++, new CFPlus::UI::Button 1196 push @add, 1, $row++, new DC::UI::Button
1149 text => "Close container", 1197 text => "Close container",
1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1198 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1151 ; 1199 ;
1152 } 1200 }
1153 1201
1154 $::FLOORBOX->add_at (@add); 1202 $::FLOORBOX->add_at (@add);
1155 }); 1203 });
1156 1204
1157 $::WANT_REFRESH->start; 1205 $::WANT_REFRESH = 1;
1158} 1206}
1159 1207
1160sub set_opencont { 1208sub set_opencont {
1161 my ($conn, $tag, $name) = @_; 1209 my ($conn, $tag, $name) = @_;
1162 $conn->{open_container} = $tag; 1210 $conn->{open_container} = $tag;
1163 update_floorbox; 1211 update_floorbox;
1164 1212
1165 $::INVR_HB->clear (); 1213 $::INVR_HB->clear;
1166 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1214 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1167 1215
1168 if ($tag != 0) { # Floor isn't closable, is it? 1216 if ($tag != 0) { # Floor isn't closable, is it?
1169 $::INVR_HB->add (new CFPlus::UI::Button 1217 $::INVR_HB->add (new DC::UI::Button
1170 text => "Close container", 1218 text => "Close container",
1171 tooltip => "Close the currently open container (if one is open)", 1219 tooltip => "Close the currently open container (if one is open)",
1172 on_activate => sub { 1220 on_activate => sub {
1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1221 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1174 if $tag != 0; 1222 if $tag != 0;
… …
1181} 1229}
1182 1230
1183sub update_containers { 1231sub update_containers {
1184 my ($self) = @_; 1232 my ($self) = @_;
1185 1233
1186 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1234 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1187 my $todo = delete $self->{update_container} 1235 my $todo = delete $self->{update_container}
1188 or return; 1236 or return;
1189 1237
1190 for my $tag (keys %$todo) { 1238 for my $tag (keys %$todo) {
1191 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1239 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1226} 1274}
1227 1275
1228sub item_update { 1276sub item_update {
1229 my ($self, $item) = @_; 1277 my ($self, $item) = @_;
1230 1278
1231 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1279 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1232 1280
1233 CFPlus::Item::update_widgets $item; 1281 DC::Item::update_widgets $item;
1234 1282
1235 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1283 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1236 set_opencont ($::CONN, 0, "Floor"); 1284 set_opencont ($::CONN, 0, "Floor");
1237 1285
1238 } elsif ($item->{flags} & F_OPEN) { 1286 } elsif ($item->{flags} & F_OPEN) {
1239 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1287 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1240 1288
1241 } else { 1289 } else {
1242 $self->{update_container}{$item->{container}}++; 1290 $self->{update_container}{$item->{container}}++;
1243 $self->update_containers; 1291 $self->update_containers;
1244 } 1292 }
… …
1255 1303
1256 my $weight = .001 * $self->{player}{weight}; 1304 my $weight = .001 * $self->{player}{weight};
1257 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1305 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1258 1306
1259 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1307 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1260 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1308 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1261 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1309 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1262} 1310}
1263 1311
1264sub update_server_info { 1312sub update_server_info {
1265 my ($self) = @_; 1313 my ($self) = @_;
1266 1314
1267 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1315 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1268 1316
1317 my $version = JSON::XS->new->encode ($self->{s_version});
1318
1269 $::SERVER_INFO->set_markup ( 1319 $::SERVER_INFO->set_markup (
1270 "server <tt>$self->{host}:$self->{port}</tt>\n" 1320 "server <tt>$self->{host}:$self->{port}</tt>\n"
1271 . "protocol version <tt>$self->{version}</tt>\n" 1321 . "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" 1322 . "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]" 1323 . "client support $yesno[$self->{cfplus_ext} > 0]"
1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1324 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1280 . "map size $self->{mapw}×$self->{maph}\n" 1325 . "map size $self->{mapw}×$self->{maph}\n"
1281 ); 1326 );
1282 1327
1283} 1328}
… …
1303 0 1348 0
1304 }); 1349 });
1305 1350
1306 $self->update_server_info; 1351 $self->update_server_info;
1307 1352
1308 $self->send_command ("output-sync $::CFG->{output_sync}");
1309 $self->send_command ("output-count $::CFG->{output_count}");
1310 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1353 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1311 $self->send_command ("pickup $::CFG->{pickup}"); 1354 $self->send_pickup ($::CFG->{pickup});
1312} 1355}
1313 1356
1314sub lookat { 1357sub lookat {
1315 my ($self, $x, $y) = @_; 1358 my ($self, $x, $y) = @_;
1316 1359
… …
1318 $self->send_ext_req (lookat => $x, $y, sub { 1361 $self->send_ext_req (lookat => $x, $y, sub {
1319 my (%msg) = @_; 1362 my (%msg) = @_;
1320 1363
1321 if (exists $msg{npc_dialog}) { 1364 if (exists $msg{npc_dialog}) {
1322 # start npc chat dialog 1365 # start npc chat dialog
1323 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1366 $self->{w}{npc_dialog} = new DC::NPCDialog::
1324 token => $msg{npc_dialog}, 1367 token => $msg{npc_dialog},
1325 title => "$msg{npc_dialog}[0] (NPC)", 1368 title => "$msg{npc_dialog}[0] (NPC)",
1326 conn => $self, 1369 conn => $self,
1327 ; 1370 ;
1328 } 1371 }
… …
1333} 1376}
1334 1377
1335sub destroy { 1378sub destroy {
1336 my ($self) = @_; 1379 my ($self) = @_;
1337 1380
1338 (delete $self->{npc_dialog})->destroy 1381 $_->destroy
1339 if $self->{npc_dialog}; 1382 for values %{ $self->{w} };
1340 1383
1341 $self->SUPER::destroy; 1384 $self->SUPER::destroy;
1342 1385
1343 %$self = (); 1386 %$self = ();
1344} 1387}
1345 1388
1346package CFPlus::NPCDialog; 1389package DC::NPCDialog;
1347 1390
1348our @ISA = 'CFPlus::UI::Toplevel'; 1391our @ISA = 'DC::UI::Toplevel';
1349 1392
1350sub new { 1393sub new {
1351 my $class = shift; 1394 my $class = shift;
1352 1395
1353 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
… …
1360 kw => { hi => 0, yes => 0, no => 0 }, 1403 kw => { hi => 0, yes => 0, no => 0 },
1361 has_close_button => 1, 1404 has_close_button => 1,
1362 @_, 1405 @_,
1363 ); 1406 );
1364 1407
1365 CFPlus::weaken (my $this = $self); 1408 DC::weaken (my $this = $self);
1366 1409
1367 $self->connect (delete => sub { $this->destroy; 1 }); 1410 $self->connect (delete => sub { $this->destroy; 1 });
1368 1411
1369 # better use a pane... 1412 # better use a pane...
1370 $self->add (my $hbox = new CFPlus::UI::HBox); 1413 $self->add (my $hbox = new DC::UI::HBox);
1371 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1414 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1372 1415
1373 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1416 $hbox->add (my $vbox = new DC::UI::VBox);
1374 1417
1375 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1418 $vbox->add (new DC::UI::Label text => "Message Entry:");
1376 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1419 $vbox->add ($self->{entry} = new DC::UI::Entry
1377 tooltip => "#npc_message_entry", 1420 tooltip => "#npc_message_entry",
1378 on_activate => sub { 1421 on_activate => sub {
1379 my ($entry, $text) = @_; 1422 my ($entry, $text) = @_;
1380 1423
1381 return unless $text =~ /\S/; 1424 return unless $text =~ /\S/;
… …
1385 1428
1386 0 1429 0
1387 }, 1430 },
1388 ); 1431 );
1389 1432
1390 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1433 $vbox->add ($self->{options} = new DC::UI::VBox);
1391 1434
1392 $self->{bye_button} = new CFPlus::UI::Button 1435 $self->{bye_button} = new DC::UI::Button
1393 text => "Bye (close)", 1436 text => "Bye (close)",
1394 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1437 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1395 on_activate => sub { $this->destroy; 1 }, 1438 on_activate => sub { $this->destroy; 1 },
1396 ; 1439 ;
1397 1440
… …
1416}; 1459};
1417 1460
1418sub update_options { 1461sub update_options {
1419 my ($self) = @_; 1462 my ($self) = @_;
1420 1463
1421 CFPlus::weaken $self; 1464 DC::weaken $self;
1422 1465
1423 $self->{options}->clear; 1466 $self->{options}->clear;
1424 $self->{options}->add ($self->{bye_button}); 1467 $self->{options}->add ($self->{bye_button});
1425 1468
1426 for my $kw (sort keys %{ $self->{kw} }) { 1469 for my $kw (sort keys %{ $self->{kw} }) {
1427 $self->{options}->add (new CFPlus::UI::Button 1470 $self->{options}->add (new DC::UI::Button
1428 text => $kw, 1471 text => $kw,
1429 on_activate => sub { 1472 on_activate => sub {
1430 $self->send ($kw); 1473 $self->send ($kw);
1431 0 1474 0
1432 }, 1475 },
… …
1435} 1478}
1436 1479
1437sub feed { 1480sub feed {
1438 my ($self, $type, @arg) = @_; 1481 my ($self, $type, @arg) = @_;
1439 1482
1440 CFPlus::weaken $self; 1483 DC::weaken $self;
1441 1484
1442 if ($type eq "update") { 1485 if ($type eq "update") {
1443 my (%info) = @arg; 1486 my (%info) = @arg;
1444 1487
1445 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1488 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1446 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1489 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1447 1490
1448 if (exists $info{msg}) { 1491 if (exists $info{msg}) {
1449 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1492 my $text = "\n" . DC::sanitise_cfxml $info{msg};
1450 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1493 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1451 my @link; 1494 my @link;
1452 $text =~ s{ 1495 $text =~ s{
1453 ($match) 1496 ($match)
1454 }{ 1497 }{
1455 my $kw = $1; 1498 my $kw = $1;
1456 1499
1457 push @link, new CFPlus::UI::Label 1500 push @link, new DC::UI::Label
1458 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1501 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1459 can_hover => 1, 1502 can_hover => 1,
1460 can_events => 1, 1503 can_events => 1,
1461 padding_x => 0, 1504 padding_x => 0,
1462 padding_y => 0, 1505 padding_y => 0,
… …
1480} 1523}
1481 1524
1482sub send { 1525sub send {
1483 my ($self, $msg) = @_; 1526 my ($self, $msg) = @_;
1484 1527
1485 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1528 $self->{textview}->add_paragraph ({
1529 markup =>
1530 "\n<span foreground='#ffff00'><b>"
1531 . (DC::asxml $msg)
1532 . "</b></span>"
1533 });
1486 $self->{textview}->scroll_to_bottom; 1534 $self->{textview}->scroll_to_bottom;
1487 1535
1488 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1536 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1489} 1537}
1490 1538
… …
1493 1541
1494 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1542 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1495 1543
1496 if ($self->{conn}) { 1544 if ($self->{conn}) {
1497 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1545 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1498 delete $self->{conn}{npc_dialog}; 1546 delete $self->{conn}{w}{npc_dialog};
1499 $self->{conn}->disconnect_ext ($self->{id}); 1547 $self->{conn}->disconnect_ext ($self->{id});
1500 } 1548 }
1501 1549
1502 $self->SUPER::destroy; 1550 $self->SUPER::destroy;
1503} 1551}

Diff Legend

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