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.209 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

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