ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC vs.
Revision 1.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 };
… …
478 for keys %RES_TBL; 540 for keys %RES_TBL;
479 541
480 my $sktbl = $::STATWIDS->{skill_tbl}; 542 my $sktbl = $::STATWIDS->{skill_tbl};
481 my @skills = keys %{ $self->{skill_info} }; 543 my @skills = keys %{ $self->{skill_info} };
482 544
483 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 545 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
546 map [$_, $self->{skill_info}{$_}],
547 grep exists $stats->{$_},
548 @skills;
549
550 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
551 $self->{stat_order} = join ",", map $_->[0], @order;
552
484 $sktbl->clear; 553 $sktbl->clear;
485 554
486 my $sw = $self->{skillwid}{""} ||= [ 555 my $sw = $self->{skillwid}{""} ||= [
487 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 556 0, 0, (new DC::UI::Label text => "Experience", align => 1),
488 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 557 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
489 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 558 2, 0, (new DC::UI::Label text => "Progress"),
490 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 559 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
491 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 560 4, 0, (new DC::UI::Label text => "Experience", align => 1),
492 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 561 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
493 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 562 6, 0, (new DC::UI::Label text => "Progress"),
494 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 563 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
495 ]; 564 ];
496 565
497 my @add = @$sw; 566 my @add = @$sw;
498 567
499 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>";
500 569
501 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);
502 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);
503 572
504 my ($x, $y) = (0, 1); 573 my ($x, $y) = (0, 1);
505 for ( 574 for (@order) {
506 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
507 map [$_, $self->{skill_info}{$_}],
508 grep exists $stats->{$_},
509 @skills
510 ) {
511 my ($idx, $name) = @$_; 575 my ($idx, $name) = @$_;
512 576
513 my $spell_cb = sub { 577 my $spell_cb = sub {
514 my ($widget, $ev) = @_; 578 my ($widget, $ev) = @_;
515 579
516 if ($ev->{button} == 1) { 580 if ($ev->{button} == 1) {
517 $::CONN->user_send ("ready_skill $name"); 581 $::CONN->user_send ("ready_skill $name");
518 } elsif ($ev->{button} == 2) { 582 } elsif ($ev->{button} == 2) {
519 $::CONN->user_send ("use_skill $name"); 583 $::CONN->user_send ("use_skill $name");
520 } elsif ($ev->{button} == 3) { 584 } elsif ($ev->{button} == 3) {
521 my $shortname = CFPlus::shorten $name, 14; 585 my $shortname = DC::shorten $name, 14;
522 (new CFPlus::UI::Menu 586 (new DC::UI::Menu
523 items => [ 587 items => [
524 ["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"] }],
525 ["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"] }],
526 ], 590 ],
527 )->popup ($ev); 591 )->popup ($ev);
528 } else { 592 } else {
529 return 0; 593 return 0;
530 } 594 }
… …
532 1 596 1
533 }; 597 };
534 598
535 my $sw = $self->{skillwid}{$idx} ||= [ 599 my $sw = $self->{skillwid}{$idx} ||= [
536 # exp 600 # exp
537 (new CFPlus::UI::Label 601 (new DC::UI::Label
538 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),
539 603
540 # level 604 # level
541 (new CFPlus::UI::Label 605 (new DC::UI::Label
542 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 606 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
543 607
544 # progress 608 # progress
545 (new CFPlus::UI::ExperienceProgress), 609 (new DC::UI::ExperienceProgress),
546 610
547 # label 611 # label
548 (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,
549 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),
550 ]; 614 ];
551 615
552 push @add, 616 push @add,
553 $x * 4 + 0, $y, $sw->[0], 617 $x * 4 + 0, $y, $sw->[0],
554 $x * 4 + 1, $y, $sw->[1], 618 $x * 4 + 1, $y, $sw->[1],
… …
560 } 624 }
561 625
562 $sktbl->add_at (@add); 626 $sktbl->add_at (@add);
563 } 627 }
564 628
565 for (grep exists $stats->{$_}, @skills) { 629 for (@order) {
630 my ($idx, $name) = @$_;
631 my $val = $stats->{$idx};
632
633 next if $prev->{$idx}[1] eq $val->[1];
634
566 my $sw = $self->{skillwid}{$_}; 635 my $sw = $self->{skillwid}{$idx};
567 $sw->[0]->set_text (::formsep ($stats->{$_}[1])); 636 $sw->[0]->set_text (::formsep ($val->[1]));
568 $sw->[1]->set_text ($stats->{$_}[0] * 1); 637 $sw->[1]->set_text ($val->[0] * 1);
569 $sw->[2]->set_value (@{$stats->{$_}}); 638 $sw->[2]->set_value (@$val);
570 }
571}
572 639
573sub macro_send { 640 $::GAUGES->{sklprg}->set_label ("$name %d%%");
574 my ($self, $macro) = @_; 641 $::GAUGES->{sklprg}->set_value (@$val);
575
576 for my $cmd (@{ $macro->{action} }) {
577 $self->send_command ($cmd);
578 } 642 }
579} 643}
580 644
581sub user_send { 645sub user_send {
582 my ($self, $command) = @_; 646 my ($self, $command) = @_;
… …
584 $self->{record}->($command) 648 $self->{record}->($command)
585 if $self->{record}; 649 if $self->{record};
586 650
587 $self->logprint ("send: ", $command); 651 $self->logprint ("send: ", $command);
588 $self->send_command ($command); 652 $self->send_command ($command);
589 ::status ($command);
590} 653}
591 654
592sub record { 655sub record {
593 my ($self, $cb) = @_; 656 my ($self, $cb) = @_;
594 657
… …
596} 659}
597 660
598sub map_scroll { 661sub map_scroll {
599 my ($self, $dx, $dy) = @_; 662 my ($self, $dx, $dy) = @_;
600 663
601 $self->{map}->scroll ($dx, $dy); 664 $self->{map_widget}->scroll ($dx, $dy);
602} 665}
603 666
604sub feed_map1a { 667sub feed_map1a {
605 my ($self, $data) = @_; 668 my ($self, $data) = @_;
606 669
… …
610 for my $tile (@$missing) { 673 for my $tile (@$missing) {
611 next if $self->{delay}{$tile}; 674 next if $self->{delay}{$tile};
612 675
613 $delay = 1; 676 $delay = 1;
614 677
615 if (my $tex = $::CONN->{texture}[$tile]) { 678 if (my $tex = $self->{texture}[$tile]) {
616 $tex->upload; 679 $tex->upload;
617 } else { 680 } else {
618 $self->{delay}{$tile} = 1; 681 $self->{delay}{$tile} = 1;
619 682
620 # we assume the face is in-flight and will eventually come 683 # we assume the face is in-flight and will eventually arrive
621 push @{$self->{tile_cb}{$tile}}, sub { 684 push @{$self->{tile_cb}{$tile}}, sub {
622 delete $self->{delay}{$tile}; 685 delete $self->{delay}{$tile};
623 $_[0]->upload; 686 $_[0]->upload;
624 }; 687 };
625 } 688 }
626 } 689 }
627 690
628 if ($delay) { 691 if ($delay) {
629 # 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
630 Event->timer (after => 0.03, cb => sub { 693 EV::once undef, 0, 0.03, sub {
631 $_[0]->w->cancel;
632 $self->{map_widget}->update; 694 $self->{map_widget}->update
695 if $self->{map_widget};
633 }); 696 };
634 } else { 697 } else {
635 $self->{map_widget}->update; 698 $self->{map_widget}->update;
636 } 699 }
637} 700}
638 701
… …
643} 706}
644 707
645sub flush_map { 708sub flush_map {
646 my ($self) = @_; 709 my ($self) = @_;
647 710
648 my $map_info = delete $self->{map_info} 711 return unless $self->{map_info};
649 or return;
650 712
713 for my $map_info (values %{ $self->{map_cache} || {} }) {
651 my ($hash, $x, $y, $w, $h) = @$map_info; 714 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
652 715
653 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 716 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
654 $self->{map_cache_new}{$hash} = \$data; 717
718 if ($data ne $$rdata) {
719 $map_info->[1] = \$data;
720 my $cdata = Compress::LZF::compress $data;
655 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 721 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
722 }
723 }
656} 724}
657 725
658sub map_clear { 726sub map_clear {
659 my ($self) = @_; 727 my ($self) = @_;
660 728
661 $self->flush_map; 729 $self->flush_map;
730 delete $self->{map_info};
662 delete $self->{neigh_map}; 731 delete $self->{neigh_map};
663 732
664 $self->{map}->clear; 733 $self->{map}->clear;
665 delete $self->{map_widget}{magicmap}; 734 delete $self->{map_widget}{magicmap};
666} 735}
… …
673 do { 742 do {
674 $tile = pop @{$self->{bg_fetch}} 743 $tile = pop @{$self->{bg_fetch}}
675 or return; 744 or return;
676 } while $self->{texture}[$tile]; 745 } while $self->{texture}[$tile];
677 746
678 CFPlus::DB::get tilecache => $tile, sub { 747 DC::DB::get tilecache => $tile, sub {
679 my ($data) = @_; 748 my ($data) = @_;
680 749
681 return unless $self->{map}; # stop when destroyed 750 return unless $self->{map}; # stop when destroyed
682 751
683 if (defined $data) { 752 if (defined $data) {
… …
687 756
688 $self->bg_fetch; 757 $self->bg_fetch;
689 }; 758 };
690} 759}
691 760
692sub load_map($$$) { 761sub load_map($$$$$$) {
693 my ($self, $hash, $x, $y) = @_; 762 my ($self, $hash, $x, $y, $w, $h) = @_;
694 763
695 my $gen = $self->{map_change_gen}; 764 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
696 765
697 my $cb = sub { 766 my $cb = sub {
698 return unless $gen == $self->{map_change_gen}; 767 $map_info->[1] = \$_[0];
699 768
700 my ($data) = @_;
701
702 if (defined $data) {
703 $self->{map_cache_new}{$hash} = \$data;
704
705 my $data = Compress::LZF::decompress $data;
706
707 my $inprogress = @{ $self->{bg_fetch} || [] }; 769 my $inprogress = @{ $self->{bg_fetch} || [] };
708 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 770 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
709 $self->bg_fetch unless $inprogress; 771 $self->bg_fetch unless $inprogress;
710 }
711 }; 772 };
712 773
713 if (my $rdata = $self->{map_cache_old}{$hash}) { 774 if (my $map_info = $self->{map_cache_old}{$hash}) {
714 $cb->($$rdata); 775 $cb->(${ $map_info->[1] });
715 } else { 776 } else {
777 my $gen = $self->{map_change_gen};
778
716 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 };
717 } 784 }
718} 785}
719 786
720# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 787# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
721# (server resource,s latency, bandwidth), so this hack is warranted. 788# (server resources, latency, bandwidth), so this hack is warranted.
722# 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
723sub send_mapinfo { 790sub send_mapinfo {
724 my ($self, $data, $cb) = @_; 791 my ($self, $data, $cb) = @_;
725 792
726 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)$%) {
… …
751} 818}
752 819
753# this method does a "flood fill" into every tile direction 820# this method does a "flood fill" into every tile direction
754# it assumes that tiles are arranged in a rectangular grid, 821# it assumes that tiles are arranged in a rectangular grid,
755# i.e. a map is the same as the left of the right map etc. 822# i.e. a map is the same as the left of the right map etc.
756# failure to comply are harmless and result in display errors 823# failure to comply is harmless and results in display errors
757# at worst. 824# at worst.
758sub flood_fill { 825sub flood_fill {
759 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 826 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
760 827
761 # the server does not allow map paths > 6 828 # the server does not allow map paths > 6
… …
797 return if $mode ne "spatial"; 864 return if $mode ne "spatial";
798 865
799 $x += $self->{map}->ox; 866 $x += $self->{map}->ox;
800 $y += $self->{map}->oy; 867 $y += $self->{map}->oy;
801 868
802 $self->load_map ($hash, $x, $y) 869 $self->load_map ($hash, $x, $y, $w, $h)
803 unless $self->{neigh_map}{$hash}[5]++;#d# 870 unless $self->{neigh_map}{$hash}[5]++;#d#
804 871
805 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 872 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
806 873
807 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 874 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
815 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 882 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
816 883
817 $self->flush_map; 884 $self->flush_map;
818 885
819 ++$self->{map_change_gen}; 886 ++$self->{map_change_gen};
820 $self->{map_cache_old} = delete $self->{map_cache_new}; 887 $self->{map_cache_old} = delete $self->{map_cache};
821 888
822 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 889 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
823 890
824 my $mapmapw = $self->{mapmap}->{w}; 891 my $mapmapw = $self->{mapmap}->{w};
825 my $mapmaph = $self->{mapmap}->{h}; 892 my $mapmaph = $self->{mapmap}->{h};
… …
837 $self->{map_info} = [$hash, $x, $y, $w, $h]; 904 $self->{map_info} = [$hash, $x, $y, $w, $h];
838 905
839 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 906 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
840 $::STATWIDS->{map}->set_text ("Map: " . $map); 907 $::STATWIDS->{map}->set_text ("Map: " . $map);
841 908
842 $self->load_map ($hash, $x, $y); 909 $self->load_map ($hash, $x, $y, $w, $h);
843 $self->flood_fill (0, 0, 0, "", $hash, $flags); 910 $self->flood_fill (0, 0, 0, "", $hash, $flags);
844} 911}
845 912
846sub face_find { 913sub face_find {
847 my ($self, $facenum, $face, $cb) = @_; 914 my ($self, $facenum, $face, $cb) = @_;
848 915
849 if ($face->{type} == 0) { # FT_FACE 916 if ($face->{type} == 0) { # FT_FACE
850 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 917 my $id = DC::DB::get_tile_id_sync $face->{name};
851 918
852 $face->{id} = $id; 919 $face->{id} = $id;
853 $self->{map}->set_tileid ($facenum => $id); 920 $self->{map}->set_tileid ($facenum => $id);
854 921
855 CFPlus::DB::get tilecache => $id, $cb; 922 DC::DB::get tilecache => $id, $cb;
856 923
857 } elsif ($face->{type} & 1) { # with metadata 924 } elsif ($face->{type} & 1) { # with metadata
858 CFPlus::DB::get res_meta => $face->{name}, $cb; 925 DC::DB::get res_meta => $face->{name}, $cb;
859 926
860 } else { # no metadata 927 } else { # no metadata
861 CFPlus::DB::get res_data => $face->{name}, $cb; 928 DC::DB::get res_data => $face->{name}, $cb;
862 } 929 }
863} 930}
864 931
865sub face_update { 932sub face_update {
866 my ($self, $facenum, $face, $changed) = @_; 933 my ($self, $facenum, $face, $changed) = @_;
867 934
868 if ($face->{type} == 0) { 935 if ($face->{type} == 0) {
869 # image, FT_FACE 936 # image, FT_FACE
870 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 937 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
871 if $changed; 938 if $changed;
872 939
873 $self->have_tile ($face->{id}, delete $face->{data}); 940 $self->have_tile ($face->{id}, delete $face->{data});
874 941
875 } elsif ($face->{type} & 1) { 942 } elsif ($face->{type} & 1) {
876 # split metadata case, FT_MUSIC, FT_SOUND 943 # split metadata case, FT_MUSIC, FT_SOUND
877 if ($changed) { # new data 944 if ($changed) { # new data
878 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 945 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
879 $face->{data} = $meta; 946 $face->{data} = $meta;
880 947
948 # rely on strict ordering here and also on later fetch
881 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 949 DC::DB::put res_data => $face->{name} => $data, sub { };
882 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 950 DC::DB::put res_meta => $face->{name} => $meta, sub { };
883 } 951 }
884 952
885 $face->{data} = $self->{json_coder}->decode ($face->{data}); 953 $face->{data} = $self->{json_coder}->decode ($face->{data});
886
887 ::add_license ($face); 954 ::add_license ($face);
955 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
956 if $changed;
888 957
889 if ($face->{type} == 3) { # FT_MUSIC 958 if ($face->{type} == 3) { # FT_MUSIC
890 ::message ({ markup => "downloaded song #$facenum" })
891 if $changed;
892
893 &::audio_music_push ($facenum); 959 &::audio_music_push ($facenum);
894 } elsif ($face->{type} == 5) { # FT_SOUND 960 } elsif ($face->{type} == 5) { # FT_SOUND
895 ::message ({ markup => "downloaded sound #$facenum" })
896 if $changed;
897
898 &::audio_sound_push ($facenum); 961 &::audio_sound_push ($facenum);
899 } 962 }
900 963
901 } else { 964 } else {
902 # flat resource case, FT_RSRC 965 # flat resource case, FT_RSRC
903 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 966 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
904 if $changed; 967 if $changed;
905 } 968 }
906 969
907 if (my $cbs = $self->{face_cb}{$facenum}) { 970 if (my $cbs = $self->{face_cb}{$facenum}) {
908 $_->($face, $changed) for @$cbs; 971 $_->($face, $changed) for @$cbs;
… …
919 my ($self, $tile, $data) = @_; 982 my ($self, $tile, $data) = @_;
920 983
921 return unless $self->{map}; 984 return unless $self->{map};
922 985
923 my $tex = $self->{texture}[$tile] ||= 986 my $tex = $self->{texture}[$tile] ||=
924 new CFPlus::Texture 987 new DC::Texture
925 tile => $tile, 988 tile => $tile,
926 image => $data, delete_image => 1, 989 image => $data, delete_image => 1,
927 minify => 1, mipmap => 1; 990 minify => 1, mipmap => 1;
928 991
929 if (my $cbs = delete $self->{tile_cb}{$tile}) { 992 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
937 my ($self, $num, $cb) = @_; 1000 my ($self, $num, $cb) = @_;
938 1001
939 push @{$self->{face_cb}{$num}}, $cb; 1002 push @{$self->{face_cb}{$num}}, $cb;
940 1003
941 defined wantarray 1004 defined wantarray
942 ? CFPlus::guard { 1005 ? DC::guard {
943 @{$self->{face_cb}{$num}} 1006 @{$self->{face_cb}{$num}}
944 = grep $_ != $cb, 1007 = grep $_ != $cb,
945 @{$self->{face_cb}{$num}}; 1008 @{$self->{face_cb}{$num}};
946 } 1009 }
947 : () 1010 : ()
… …
982 1045
983sub sanitise_xml($) { 1046sub sanitise_xml($) {
984 local $_ = shift; 1047 local $_ = shift;
985 1048
986 # we now weed out all tags we do not support 1049 # we now weed out all tags we do not support
987 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
988 # now all entities 1055 # now all entities
989 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;
990 1057
991 # handle some elements 1058 # handle some elements
992 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1059 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
993 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+$//;
994 1063
995 $_ 1064 $_
996} 1065}
997 1066
998our %NAME_TO_COLOR = ( 1067our %NAME_TO_COLOR = (
… …
1046 ## 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
1047 # no longer neecssary with TRT servers 1116 # no longer neecssary with TRT servers
1048 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1117 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1049 1118
1050 ::message ({ 1119 ::message ({
1051 fg => $fg, 1120 fg => $fg,
1052 markup => $_, 1121 markup => $text,
1053 type => $type, 1122 type => $type,
1054 extra => [@extra], 1123 extra => [@extra],
1055 color_flags => $color 1124 color_flags => $color, #d# ugly, kill
1056 }) 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.
1057 1132
1058 $self->{statusbox}->add ($text, 1133 $self->{statusbox}->add ($text,
1059 group => $text, 1134 group => $text,
1060 fg => $fg, 1135 fg => $fg,
1061 timeout => $color >= 2 ? 180 : 10, 1136 timeout => $color >= 2 ? 180 : 10,
1062 tooltip_font => $::FONT_FIXED, 1137 tooltip_font => $::FONT_FIXED,
1063 ); 1138 ) if $type eq "info";
1064 } 1139 }
1065} 1140}
1066 1141
1067sub spell_add { 1142sub spell_add {
1068 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
… …
1072 $spell->{message} =~ s/\n+$//; 1147 $spell->{message} =~ s/\n+$//;
1073 $spell->{message} ||= "Server did not provide a description for this spell."; 1148 $spell->{message} ||= "Server did not provide a description for this spell.";
1074 1149
1075 $::SPELL_LIST->add_spell ($spell); 1150 $::SPELL_LIST->add_spell ($spell);
1076 1151
1077 $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});
1078 $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});
1079} 1154}
1080 1155
1081sub spell_delete { 1156sub spell_delete {
1082 my ($self, $spell) = @_; 1157 my ($self, $spell) = @_;
1083 1158
… …
1094sub addme_success { 1169sub addme_success {
1095 my ($self) = @_; 1170 my ($self) = @_;
1096 1171
1097 my %skill_help; 1172 my %skill_help;
1098 1173
1099 for my $node (CFPlus::Pod::find skill_description => "*") { 1174 for my $node (DC::Pod::find skill_description => "*") {
1100 my (undef, @par) = CFPlus::Pod::section_of $node; 1175 my (undef, @par) = DC::Pod::section_of $node;
1101 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1176 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1102 }; 1177 };
1103 1178
1104 for my $skill (values %{$self->{skill_info}}) { 1179 for my $skill (values %{$self->{skill_info}}) {
1105 $self->{map_widget}->add_command ("ready_skill $skill", 1180 $self->{map_widget}->add_command ("ready_skill $skill",
1106 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1181 (DC::asxml "Ready the skill '$skill'\n\n")
1107 . $skill_help{$skill}); 1182 . $skill_help{$skill});
1108 $self->{map_widget}->add_command ("use_skill $skill", 1183 $self->{map_widget}->add_command ("use_skill $skill",
1109 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1184 (DC::asxml "Immediately use the skill '$skill'\n\n")
1110 . $skill_help{$skill}); 1185 . $skill_help{$skill});
1111 } 1186 }
1112} 1187}
1113 1188
1114sub eof { 1189sub eof {
… …
1118 1193
1119 ::stop_game (); 1194 ::stop_game ();
1120} 1195}
1121 1196
1122sub update_floorbox { 1197sub update_floorbox {
1123 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1198 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1124 return unless $::CONN; 1199 return unless $::CONN;
1125 1200
1126 $::FLOORBOX->clear; 1201 $::FLOORBOX->clear;
1127 1202
1128 my @add; 1203 my @add;
1129 1204
1130 my $row; 1205 my $row;
1131 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;
1132 if ($row < 6) { 1208 if ($row < 6) {
1133 local $_->{face_widget}; # hack to force recreation of widget 1209 local $_->{face_widget}; # hack to force recreation of widget
1134 local $_->{desc_widget}; # hack to force recreation of widget 1210 local $_->{desc_widget}; # hack to force recreation of widget
1135 CFPlus::Item::update_widgets $_; 1211 DC::Item::update_widgets $_;
1136 1212
1137 push @add, 1213 push @add,
1138 0, $row, $_->{face_widget}, 1214 0, $row, $_->{face_widget},
1139 1, $row, $_->{desc_widget}; 1215 1, $row, $_->{desc_widget};
1140 1216
1141 $row++; 1217 $row++;
1142 } else { 1218 } else {
1143 push @add, 1, $row, new CFPlus::UI::Button 1219 push @add, 1, $row, new DC::UI::Button
1144 text => "More...", 1220 text => "More...",
1145 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1221 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1146 ; 1222 ;
1147 last; 1223 last;
1148 } 1224 }
1149 } 1225 }
1150 if ($::CONN->{open_container}) { 1226 if ($::CONN->{open_container}) {
1151 push @add, 1, $row++, new CFPlus::UI::Button 1227 push @add, 1, $row++, new DC::UI::Button
1152 text => "Close container", 1228 text => "Close container",
1153 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1229 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1154 ; 1230 ;
1155 } 1231 }
1156 1232
1157 $::FLOORBOX->add_at (@add); 1233 $::FLOORBOX->add_at (@add);
1158 }); 1234 });
1159 1235
1160 $::WANT_REFRESH->start; 1236 $::WANT_REFRESH = 1;
1161} 1237}
1162 1238
1163sub set_opencont { 1239sub set_opencont {
1164 my ($conn, $tag, $name) = @_; 1240 my ($conn, $tag, $name) = @_;
1165 $conn->{open_container} = $tag; 1241 $conn->{open_container} = $tag;
1166 update_floorbox; 1242 update_floorbox;
1167 1243
1168 $::INVR_HB->clear (); 1244 $::INVR_HB->clear;
1169 $::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);
1170 1246
1171 if ($tag != 0) { # Floor isn't closable, is it? 1247 if ($tag != 0) { # Floor isn't closable, is it?
1172 $::INVR_HB->add (new CFPlus::UI::Button 1248 $::INVR_HB->add (new DC::UI::Button
1173 text => "Close container", 1249 text => "Close container",
1174 tooltip => "Close the currently open container (if one is open)", 1250 tooltip => "Close the currently open container (if one is open)",
1175 on_activate => sub { 1251 on_activate => sub {
1176 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1252 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1177 if $tag != 0; 1253 if $tag != 0;
… …
1184} 1260}
1185 1261
1186sub update_containers { 1262sub update_containers {
1187 my ($self) = @_; 1263 my ($self) = @_;
1188 1264
1189 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1265 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1190 my $todo = delete $self->{update_container} 1266 my $todo = delete $self->{update_container}
1191 or return; 1267 or return;
1192 1268
1193 for my $tag (keys %$todo) { 1269 for my $tag (keys %$todo) {
1194 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1270 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1229} 1305}
1230 1306
1231sub item_update { 1307sub item_update {
1232 my ($self, $item) = @_; 1308 my ($self, $item) = @_;
1233 1309
1234 #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";
1235 1311
1236 CFPlus::Item::update_widgets $item; 1312 DC::Item::update_widgets $item;
1237 1313
1238 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1314 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1239 set_opencont ($::CONN, 0, "Floor"); 1315 set_opencont ($::CONN, 0, "Floor");
1240 1316
1241 } elsif ($item->{flags} & F_OPEN) { 1317 } elsif ($item->{flags} & F_OPEN) {
1242 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1318 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1243 1319
1244 } else { 1320 } else {
1245 $self->{update_container}{$item->{container}}++; 1321 $self->{update_container}{$item->{container}}++;
1246 $self->update_containers; 1322 $self->update_containers;
1247 } 1323 }
… …
1258 1334
1259 my $weight = .001 * $self->{player}{weight}; 1335 my $weight = .001 * $self->{player}{weight};
1260 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1336 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1261 1337
1262 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1338 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1263 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1339 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1264 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1340 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1265} 1341}
1266 1342
1267sub update_server_info { 1343sub update_server_info {
1268 my ($self) = @_; 1344 my ($self) = @_;
… …
1276 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1352 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1277 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1353 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1278 . "editing support $yesno[!!$self->{editor_support}]\n" 1354 . "editing support $yesno[!!$self->{editor_support}]\n"
1279 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1355 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1280 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1356 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1281 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1357 . "client support $yesno[$self->{cfplus_ext} > 0]"
1282 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1358 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1283 . "map size $self->{mapw}×$self->{maph}\n" 1359 . "map size $self->{mapw}×$self->{maph}\n"
1284 ); 1360 );
1285 1361
1286} 1362}
… …
1306 0 1382 0
1307 }); 1383 });
1308 1384
1309 $self->update_server_info; 1385 $self->update_server_info;
1310 1386
1311 $self->send_command ("output-sync $::CFG->{output_sync}");
1312 $self->send_command ("output-count $::CFG->{output_count}");
1313 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1387 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1314 $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#
1315} 1392}
1316 1393
1317sub lookat { 1394sub lookat {
1318 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1319 1396
… …
1321 $self->send_ext_req (lookat => $x, $y, sub { 1398 $self->send_ext_req (lookat => $x, $y, sub {
1322 my (%msg) = @_; 1399 my (%msg) = @_;
1323 1400
1324 if (exists $msg{npc_dialog}) { 1401 if (exists $msg{npc_dialog}) {
1325 # start npc chat dialog 1402 # start npc chat dialog
1326 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1403 $self->{npc_dialog} = new DC::NPCDialog::
1327 token => $msg{npc_dialog}, 1404 token => $msg{npc_dialog},
1328 title => "$msg{npc_dialog}[0] (NPC)", 1405 title => "$msg{npc_dialog}[0] (NPC)",
1329 conn => $self, 1406 conn => $self,
1330 ; 1407 ;
1331 } 1408 }
… …
1344 $self->SUPER::destroy; 1421 $self->SUPER::destroy;
1345 1422
1346 %$self = (); 1423 %$self = ();
1347} 1424}
1348 1425
1349package CFPlus::NPCDialog; 1426package DC::NPCDialog;
1350 1427
1351our @ISA = 'CFPlus::UI::Toplevel'; 1428our @ISA = 'DC::UI::Toplevel';
1352 1429
1353sub new { 1430sub new {
1354 my $class = shift; 1431 my $class = shift;
1355 1432
1356 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
… …
1363 kw => { hi => 0, yes => 0, no => 0 }, 1440 kw => { hi => 0, yes => 0, no => 0 },
1364 has_close_button => 1, 1441 has_close_button => 1,
1365 @_, 1442 @_,
1366 ); 1443 );
1367 1444
1368 CFPlus::weaken (my $this = $self); 1445 DC::weaken (my $this = $self);
1369 1446
1370 $self->connect (delete => sub { $this->destroy; 1 }); 1447 $self->connect (delete => sub { $this->destroy; 1 });
1371 1448
1372 # better use a pane... 1449 # better use a pane...
1373 $self->add (my $hbox = new CFPlus::UI::HBox); 1450 $self->add (my $hbox = new DC::UI::HBox);
1374 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1451 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1375 1452
1376 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1453 $hbox->add (my $vbox = new DC::UI::VBox);
1377 1454
1378 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1455 $vbox->add (new DC::UI::Label text => "Message Entry:");
1379 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1456 $vbox->add ($self->{entry} = new DC::UI::Entry
1380 tooltip => "#npc_message_entry", 1457 tooltip => "#npc_message_entry",
1381 on_activate => sub { 1458 on_activate => sub {
1382 my ($entry, $text) = @_; 1459 my ($entry, $text) = @_;
1383 1460
1384 return unless $text =~ /\S/; 1461 return unless $text =~ /\S/;
… …
1388 1465
1389 0 1466 0
1390 }, 1467 },
1391 ); 1468 );
1392 1469
1393 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1470 $vbox->add ($self->{options} = new DC::UI::VBox);
1394 1471
1395 $self->{bye_button} = new CFPlus::UI::Button 1472 $self->{bye_button} = new DC::UI::Button
1396 text => "Bye (close)", 1473 text => "Bye (close)",
1397 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.",
1398 on_activate => sub { $this->destroy; 1 }, 1475 on_activate => sub { $this->destroy; 1 },
1399 ; 1476 ;
1400 1477
… …
1419}; 1496};
1420 1497
1421sub update_options { 1498sub update_options {
1422 my ($self) = @_; 1499 my ($self) = @_;
1423 1500
1424 CFPlus::weaken $self; 1501 DC::weaken $self;
1425 1502
1426 $self->{options}->clear; 1503 $self->{options}->clear;
1427 $self->{options}->add ($self->{bye_button}); 1504 $self->{options}->add ($self->{bye_button});
1428 1505
1429 for my $kw (sort keys %{ $self->{kw} }) { 1506 for my $kw (sort keys %{ $self->{kw} }) {
1430 $self->{options}->add (new CFPlus::UI::Button 1507 $self->{options}->add (new DC::UI::Button
1431 text => $kw, 1508 text => $kw,
1432 on_activate => sub { 1509 on_activate => sub {
1433 $self->send ($kw); 1510 $self->send ($kw);
1434 0 1511 0
1435 }, 1512 },
… …
1438} 1515}
1439 1516
1440sub feed { 1517sub feed {
1441 my ($self, $type, @arg) = @_; 1518 my ($self, $type, @arg) = @_;
1442 1519
1443 CFPlus::weaken $self; 1520 DC::weaken $self;
1444 1521
1445 if ($type eq "update") { 1522 if ($type eq "update") {
1446 my (%info) = @arg; 1523 my (%info) = @arg;
1447 1524
1448 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1525 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1449 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1526 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1450 1527
1451 if (exists $info{msg}) { 1528 if (exists $info{msg}) {
1452 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1529 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1453 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1530 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1454 my @link; 1531 my @link;
1455 $text =~ s{ 1532 $text =~ s{
1456 ($match) 1533 ($match)
1457 }{ 1534 }{
1458 my $kw = $1; 1535 my $kw = $1;
1459 1536
1460 push @link, new CFPlus::UI::Label 1537 push @link, new DC::UI::Label
1461 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1538 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1462 can_hover => 1, 1539 can_hover => 1,
1463 can_events => 1, 1540 can_events => 1,
1464 padding_x => 0, 1541 padding_x => 0,
1465 padding_y => 0, 1542 padding_y => 0,
… …
1483} 1560}
1484 1561
1485sub send { 1562sub send {
1486 my ($self, $msg) = @_; 1563 my ($self, $msg) = @_;
1487 1564
1488 $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 });
1489 $self->{textview}->scroll_to_bottom; 1571 $self->{textview}->scroll_to_bottom;
1490 1572
1491 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1573 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1492} 1574}
1493 1575

Diff Legend

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