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

Diff Legend

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