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.204 by elmex, Fri Oct 17 11:21:55 2008 UTC

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

Diff Legend

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