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

Diff Legend

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