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

Diff Legend

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