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

Diff Legend

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