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

Diff Legend

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