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

Diff Legend

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