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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.210 by root, Sun Nov 15 19:05:13 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,
37 widget => 2,
26 %{$arg{setup_req} || {}}, 38 %{$arg{setup_req} || {}},
27 }, 39 },
28 ); 40 );
29 41
30 $self->{map_widget}->clr_commands; 42 $self->{map_widget}->clr_commands;
31 43
32 my @cmd_help = map { 44 my @cmd_help = map {
33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 45 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
34 or die "unparseable command help: $_->{kw}[0]"; 46 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
35 47
36 my $cmd = $1; 48 my $cmd = $1;
37 my @args = split /\|/, $2; 49 my @args = split /\|/, $2;
38 @args = (".*") unless @args; 50 @args = (".*") unless @args;
39 51
40 my (undef, @par) = CFPlus::Pod::section_of $_; 52 my (undef, @par) = DC::Pod::section_of $_;
41 my $text = CFPlus::Pod::as_label @par; 53 my $text = DC::Pod::as_label @par;
42 54
43 $_ = $_ eq ".*" ? "" : " $_" 55 $_ = $_ eq ".*" ? "" : " $_"
44 for @args; 56 for @args;
45 57
46 map ["$cmd$_", $text], 58 map ["$cmd$_", $text],
47 sort { (length $a) <=> (length $b) } 59 sort { (length $a) <=> (length $b) }
48 @args 60 @args
49 } sort { $a->{par} <=> $b->{par} } 61 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
50 CFPlus::Pod::find command => "*"; 62 DC::Pod::find command => "*";
51 63
52 $self->connect_ext (event_capabilities => sub { 64 $self->{json_coder}
65 ->convert_blessed
66 ->filter_json_single_key_object ("\fw" => sub {
67 $self->{widget}{$_[0]}
68 })
69 ->filter_json_single_key_object ("\fc" => sub {
53 my ($cap) = @_; 70 my ($id) = @_;
54 71 sub {
55 if (my $ts = $cap->{tileset}) { 72 $self->send_exti_msg (w_e => $id, @_);
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 } 73 }
66 } 74 });
75
76 # destroy widgets on logout
77 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
78 for my $ws (values %{delete $self->{widgetset} || {}}) {
79 $_->destroy
80 for values %{delete $ws->{w} || {}};
81 }
82
83 delete $self->{items};
84 $::INV->clear;
85 $::INVR->clear;
86 $::INVR_HB->clear;
87 $::FLOORBOX->clear;
67 }); 88 });
68 89
69 $self->{map_widget}->add_command (@$_) 90 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 91 for @cmd_help;
71 92
72 { 93 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 94 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75 $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}});
76 } 96 }
77 97
78 { 98 {
79 $self->{noface} = my $tex = new_from_file CFPlus::Texture 99 $self->{noface} = my $tex = $TEX_NOFACE;
80 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81 $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}});
82 } 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# };
83 122
84 $self->{open_container} = 0; 123 $self->{open_container} = 0;
85 124
86 # per server 125 # per server
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 126 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 127
89 $self 128 $self
90} 129}
91 130
131sub update_fx_want {
132 my ($self) = @_;
133
134 $self->send_exti_msg (fx_want => {
135 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
136 5 => !!$::CFG->{audio_enable}, # FT_SOUND
137 6 => 1, # FT_RSRC
138 });
139}
140
141sub ext_capabilities {
142 my ($self, %cap) = @_;
143
144 $self->update_fx_want;
145
146 $self->send_exti_req (resource => "exp_table", sub {
147 my ($exp_table) = @_;
148
149 $self->register_face_handler ($exp_table, sub {
150 my ($face) = @_;
151
152 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
153 $_->() for values %{ $self->{on_exp_update} || {} };
154 });
155
156 ()
157 });
158
159 if (my $ts = $cap{tileset}) {
160 if (my ($default) = grep $_->[2] & 1, @$ts) {
161 $self->{tileset} = $default;
162 $self->{tilesize} = $default->[3];
163 $self->setup_req (tileset => $default->[0]);
164
165 my $w = int $self->{mapw} * 32 / $self->{tilesize};
166 my $h = int $self->{maph} * 32 / $self->{tilesize};
167
168 $self->setup_req (mapsize => "${w}x${h}");
169 }
170 }
171}
172
173sub ext_ambient_music {
174 my ($self, $songs) = @_;
175 &::audio_music_set_ambient ($songs);
176}
177
178#############################################################################
179
180sub widget_associate {
181 my ($self, $ws, $id, $widget) = @_;
182
183 $widget ||= new DC::UI::Bin;
184
185 $widget->{s_id} = $id;
186 $self->{widget}{$id} = $widget;
187
188 if ($ws) {
189 $widget->{s_ws} = $ws;
190 $self->{widgetset}{$ws}{w}{$id} = $widget;
191 }
192
193 $widget->connect (on_destroy => sub {
194 my ($widget) = @_;
195
196 delete $self->{widget}{$widget->{s_id}};
197 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
198 if exists $widget->{s_ws};
199 });
200}
201
202# widgetset new
203sub ext_ws_n {
204 my ($self, $id) = @_;
205
206 $self->{widgetset}{$id} = {
207 w => {},
208 };
209}
210
211# widgetset destroy
212sub ext_ws_d {
213 my ($self, $id) = @_;
214
215 my $ws = delete $self->{widgetset}{$id}
216 or return;
217
218 $_->destroy
219 for values %{$ws->{w}};
220}
221
222# widgetset create
223sub ext_ws_c {
224 my ($self, $ws, $id, $class, $args) = @_;
225
226 $self->widget_associate (
227 $ws, $id => scalar eval {
228 local $SIG{__DIE__};
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}));
276 });
277 } else {
278 $done_cb->(0);
279 }
280}
281
282# widgetset associate
283sub ext_ws_a {
284 my ($self, %ass) = @_;
285
286 # everything that has a name, wether conceivably useful or not
287 my %wkw = (
288 root => $DC::UI::ROOT,
289 tooltip => $DC::UI::TOOLTIP,
290
291 mapwidget => $::MAPWIDGET,
292 menubar => $::MENUBAR,
293 menupopup => $::MENUPOPUP,
294 pickup_enable => $::PICKUP_ENABLE,
295 buttonbar => $::BUTTONBAR,
296 metaserver => $::METASERVER,
297 buttonbar => $::BUTTONBAR,
298 login_button => $::LOGIN_BUTTON,
299 quit_dialog => $::QUIT_DIALOG,
300 host_entry => $::HOST_ENTRY,
301 metaserver => $::METASERVER,
302 server_info => $::SERVER_INFO,
303
304 setup_dialog => $::SETUP_DIALOG,
305 setup_notebook => $::SETUP_NOTEBOOK,
306 setup_server => $::SETUP_SERVER,
307 setup_keyboard => $::SETUP_KEYBOARD,
308
309 pl_notebook => $::PL_NOTEBOOK,
310 pl_window => $::PL_WINDOW,
311 inventory_page => $::INVENTORY_PAGE,
312 stats_page => $::STATS_PAGE,
313 skill_page => $::SKILL_PAGE,
314 spell_page => $::SPELL_PAGE,
315 spell_list => $::SPELL_LIST,
316
317 floorbox => $::FLOORBOX,
318 help_window => $::HELP_WINDOW,
319 message_window => $::MESSAGE_WINDOW,
320 message_dist => $::MESSAGE_DIST,
321 statusbox => $::STATUSBOX,
322
323 inv => $::INV,
324 invr => $::INVR,
325 invr_hb => $::INVR_HB,
326 );
327
328 while (my ($id, $name) = each %ass) {
329 $self->widget_associate (undef, $id => $wkw{$name});
330 }
331}
332
333# widget call
334sub ext_w_c {
335 my ($self, $id, $rcb, $method, @args) = @_;
336
337 my $w = $self->{widget}{$id}
338 or return;
339
340 if ($rcb) {
341 $rcb->($w->$method (@args));
342 } else {
343 $w->$method (@args);
344 }
345}
346
347# widget set
348sub ext_w_s {
349 my ($self, $id, $attr) = @_;
350
351 my $w = $self->{widget}{$id}
352 or return;
353
354 for (my $i = 0; $i < $#$attr; $i += 2) {
355 my ($member, $value) = @$attr[$i, $i+1];
356 if (defined $value) {
357 $w->{$member} = $value;
358 } else {
359 delete $w->{$member};
360 }
361 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
362 }
363}
364
365# widget get
366sub ext_w_g {
367 my ($self, $id, $rid, @attr) = @_;
368
369 my $w = $self->{widget}{$id}
370 or return;
371
372 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
373}
374
375# message window
376sub ext_channel_info {
377 my ($self, $info) = @_;
378 $self->{channels}->{$info->{id}} = $info;
379 $::MESSAGE_DIST->add_channel ($info);
380}
381
382#############################################################################
383
92sub logprint { 384sub logprint {
93 my ($self, @a) = @_; 385 my ($self, @a) = @_;
94 386
95 $self->{log_fh} ||= do { 387 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 388}
113 389
114sub _stat_numdiff { 390sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 391 my ($self, $name, $old, $new) = @_;
116 392
… …
200 476
201 if ( 477 if (
202 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 478 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
203 ) { 479 ) {
204 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 480 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
205 $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);
206 } 482 }
207 483
208 $self->update_stats_window ($stats, $prev); 484 $self->update_stats_window ($stats, $prev);
209 485
210 $self->{prev_stats} = { %$stats }; 486 $self->{prev_stats} = { %$stats };
… …
247 523
248 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 524 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 525 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 526 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 527 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 528 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 529 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
530 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 531 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 my $title = $stats->{+CS_STAT_TITLE}; 532 my $title = $stats->{+CS_STAT_TITLE};
256 $title =~ s/^Player: //; 533 $title =~ s/^Player: //;
257 $::STATWIDS->{title} ->set_text ("Title: " . $title); 534 $::STATWIDS->{title} ->set_text ("Title: " . $title);
258 535
… …
276 for keys %RES_TBL; 553 for keys %RES_TBL;
277 554
278 my $sktbl = $::STATWIDS->{skill_tbl}; 555 my $sktbl = $::STATWIDS->{skill_tbl};
279 my @skills = keys %{ $self->{skill_info} }; 556 my @skills = keys %{ $self->{skill_info} };
280 557
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 558 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
559 map [$_, $self->{skill_info}{$_}],
560 grep exists $stats->{$_},
561 @skills;
562
563 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
564 $self->{stat_order} = join ",", map $_->[0], @order;
565
282 $sktbl->clear; 566 $sktbl->clear;
283 567
568 my $sw = $self->{skillwid}{""} ||= [
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 569 0, 0, (new DC::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 570 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 571 2, 0, (new DC::UI::Label text => "Progress"),
572 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 573 4, 0, (new DC::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 574 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 575 6, 0, (new DC::UI::Label text => "Progress"),
576 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
577 ];
290 578
579 my @add = @$sw;
580
291 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>";
292 582
293 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);
294 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);
295 585
296 my ($x, $y) = (0, 1); 586 my ($x, $y) = (0, 1);
297 for ( 587 for (@order) {
298 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
299 map [$_, $self->{skill_info}{$_}],
300 grep exists $stats->{$_},
301 @skills
302 ) {
303 my ($idx, $name) = @$_; 588 my ($idx, $name) = @$_;
304 589
305 my $spell_cb = sub { 590 my $spell_cb = sub {
306 my ($widget, $ev) = @_; 591 my ($widget, $ev) = @_;
307 592
308 if ($ev->{button} == 1) { 593 if ($ev->{button} == 1) {
309 $::CONN->user_send ("ready_skill $name"); 594 $::CONN->user_send ("ready_skill $name");
310 } elsif ($ev->{button} == 2) { 595 } elsif ($ev->{button} == 2) {
311 $::CONN->user_send ("use_skill $name"); 596 $::CONN->user_send ("use_skill $name");
312 } elsif ($ev->{button} == 3) { 597 } elsif ($ev->{button} == 3) {
313 my $shortname = CFPlus::shorten $name, 14; 598 my $shortname = DC::shorten $name, 14;
314 (new CFPlus::UI::Menu 599 (new DC::UI::Menu
315 items => [ 600 items => [
316 ["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"] }],
317 ["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"] }],
318 ], 603 ],
319 )->popup ($ev); 604 )->popup ($ev);
320 } else { 605 } else {
321 return 0; 606 return 0;
322 } 607 }
323 608
324 1 609 1
325 }; 610 };
326 611
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 612 my $sw = $self->{skillwid}{$idx} ||= [
613 # exp
614 (new DC::UI::Label
328 text => "0", 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),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 616
617 # level
618 (new DC::UI::Label
330 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),
620
621 # progress
622 (new DC::UI::ExperienceProgress),
623
624 # label
331 $sktbl->add ($x * 3 + 2, $y, 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,
332 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),
627 ];
628
629 push @add,
630 $x * 4 + 0, $y, $sw->[0],
631 $x * 4 + 1, $y, $sw->[1],
632 $x * 4 + 2, $y, $sw->[2],
633 $x * 4 + 3, $y, $sw->[3],
634 ;
333 635
334 $x++ and ($x, $y) = (0, $y + 1); 636 $x++ and ($x, $y) = (0, $y + 1);
335 } 637 }
336 }
337 638
338 for (grep exists $stats->{$_}, @skills) { 639 $sktbl->add_at (@add);
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
341 } 640 }
342}
343 641
344sub macro_send { 642 for (@order) {
345 my ($self, $macro) = @_; 643 my ($idx, $name) = @$_;
644 my $val = $stats->{$idx};
346 645
347 for my $cmd (@{ $macro->{action} }) { 646 next if $prev->{$idx}[1] eq $val->[1];
348 $self->send_command ($cmd); 647
648 my $sw = $self->{skillwid}{$idx};
649 $sw->[0]->set_text (::formsep ($val->[1]));
650 $sw->[1]->set_text ($val->[0] * 1);
651 $sw->[2]->set_value (@$val);
652
653 $::GAUGES->{skillexp}->set_label ("$name %d%%");
654 $::GAUGES->{skillexp}->set_value (@$val);
349 } 655 }
350} 656}
351 657
352sub user_send { 658sub user_send {
353 my ($self, $command) = @_; 659 my ($self, $command) = @_;
… …
355 $self->{record}->($command) 661 $self->{record}->($command)
356 if $self->{record}; 662 if $self->{record};
357 663
358 $self->logprint ("send: ", $command); 664 $self->logprint ("send: ", $command);
359 $self->send_command ($command); 665 $self->send_command ($command);
360 ::status ($command);
361} 666}
362 667
363sub record { 668sub record {
364 my ($self, $cb) = @_; 669 my ($self, $cb) = @_;
365 670
… …
367} 672}
368 673
369sub map_scroll { 674sub map_scroll {
370 my ($self, $dx, $dy) = @_; 675 my ($self, $dx, $dy) = @_;
371 676
372 $self->{map}->scroll ($dx, $dy); 677 $self->{map_widget}->scroll ($dx, $dy);
373} 678}
374 679
375sub feed_map1a { 680sub feed_map1a {
376 my ($self, $data) = @_; 681 my ($self, $data) = @_;
377 682
378 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 683 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
684 my $delay;
685
686 for my $tile (@$missing) {
687 next if $self->{delay}{$tile};
688
689 $delay = 1;
690
691 if (my $tex = $self->{texture}[$tile]) {
692 $tex->upload;
693 } else {
694 $self->{delay}{$tile} = 1;
695
696 # we assume the face is in-flight and will eventually arrive
697 push @{$self->{tile_cb}{$tile}}, sub {
698 delete $self->{delay}{$tile};
699 $_[0]->upload;
700 };
701 }
702 }
703
704 if ($delay) {
705 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
706 EV::once undef, 0, 0.03, sub {
707 $self->{map_widget}->update
708 if $self->{map_widget};
709 };
710 } else {
379 $self->{map_widget}->update; 711 $self->{map_widget}->update;
712 }
380} 713}
381 714
382sub magicmap { 715sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 716 my ($self, $w, $h, $x, $y, $data) = @_;
384 717
… …
386} 719}
387 720
388sub flush_map { 721sub flush_map {
389 my ($self) = @_; 722 my ($self) = @_;
390 723
391 my $map_info = delete $self->{map_info} 724 return unless $self->{map_info};
392 or return;
393 725
726 for my $map_info (values %{ $self->{map_cache} || {} }) {
394 my ($hash, $x, $y, $w, $h) = @$map_info; 727 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
395 728
396 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 729 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
730
731 if ($data ne $$rdata) {
732 $map_info->[1] = \$data;
733 my $cdata = Compress::LZF::compress $data;
397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 734 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 735 }
736 }
399} 737}
400 738
401sub map_clear { 739sub map_clear {
402 my ($self) = @_; 740 my ($self) = @_;
403 741
404 $self->flush_map; 742 $self->flush_map;
743 delete $self->{map_info};
405 delete $self->{neigh_map}; 744 delete $self->{neigh_map};
406 745
407 $self->{map}->clear; 746 $self->{map}->clear;
408 delete $self->{map_widget}{magicmap}; 747 delete $self->{map_widget}{magicmap};
409} 748}
410 749
411sub bg_fetch { 750sub bg_fetch {
412 my ($self) = @_; 751 my ($self) = @_;
413 752
414 my $id; 753 my $tile;
415 754
416 do { 755 do {
417 $id = pop @{$self->{bg_fetch}} 756 $tile = pop @{$self->{bg_fetch}}
418 or return; 757 or return;
419 } while $self->{texture}[$id]; 758 } while $self->{texture}[$tile];
420 759
421 CFPlus::DB::get tilecache => $id, sub { 760 DC::DB::get tilecache => $tile, sub {
422 my ($data) = @_; 761 my ($data) = @_;
423 762
424 return unless $self->{map}; # stop when destroyed 763 return unless $self->{map}; # stop when destroyed
425 764
426 $self->set_texture ($id => $data)
427 if defined $data; 765 if (defined $data) {
766 $self->have_tile ($tile, $data);
767 $self->{texture}[$tile]->upload;
768 }
428 769
429 $self->bg_fetch; 770 $self->bg_fetch;
430 }; 771 };
431} 772}
432 773
433sub load_map($$$) { 774sub load_map($$$$$$) {
434 my ($self, $hash, $x, $y) = @_; 775 my ($self, $hash, $x, $y, $w, $h) = @_;
435 776
436 my $gen = $self->{map_change_gen}; 777 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
437 778
438 CFPlus::DB::get $self->{mapcache} => $hash, sub { 779 my $cb = sub {
439 return unless $gen == $self->{map_change_gen}; 780 $map_info->[1] = \$_[0];
440 781
441 my ($data) = @_;
442
443 if (defined $data) {
444 $data = Compress::LZF::decompress $data;
445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
446
447 my $inprogress = @{ $self->{bg_fetch} || [] }; 782 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 783 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
449 $self->bg_fetch unless $inprogress; 784 $self->bg_fetch unless $inprogress;
450 }
451 }; 785 };
786
787 if (my $map_info = $self->{map_cache_old}{$hash}) {
788 $cb->(${ $map_info->[1] });
789 } else {
790 my $gen = $self->{map_change_gen};
791
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 };
797 }
452} 798}
453 799
454# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 800# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
455# (server resource,s latency, bandwidth), so this hack is warranted. 801# (server resources, latency, bandwidth), so this hack is warranted.
456# 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
457sub send_mapinfo { 803sub send_mapinfo {
458 my ($self, $data, $cb) = @_; 804 my ($self, $data, $cb) = @_;
459 805
460 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)$%) {
… …
485} 831}
486 832
487# this method does a "flood fill" into every tile direction 833# this method does a "flood fill" into every tile direction
488# it assumes that tiles are arranged in a rectangular grid, 834# it assumes that tiles are arranged in a rectangular grid,
489# 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.
490# failure to comply are harmless and result in display errors 836# failure to comply is harmless and results in display errors
491# at worst. 837# at worst.
492sub flood_fill { 838sub flood_fill {
493 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 839 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
494 840
495 # the server does not allow map paths > 6 841 # the server does not allow map paths > 6
… …
531 return if $mode ne "spatial"; 877 return if $mode ne "spatial";
532 878
533 $x += $self->{map}->ox; 879 $x += $self->{map}->ox;
534 $y += $self->{map}->oy; 880 $y += $self->{map}->oy;
535 881
536 $self->load_map ($hash, $x, $y) 882 $self->load_map ($hash, $x, $y, $w, $h)
537 unless $self->{neigh_map}{$hash}[5]++;#d# 883 unless $self->{neigh_map}{$hash}[5]++;#d#
538 884
539 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 885 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
540 886
541 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 887 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 895 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
550 896
551 $self->flush_map; 897 $self->flush_map;
552 898
553 ++$self->{map_change_gen}; 899 ++$self->{map_change_gen};
900 $self->{map_cache_old} = delete $self->{map_cache};
554 901
555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 902 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
556 903
557 my $mapmapw = $self->{mapmap}->{w}; 904 my $mapmapw = $self->{mapmap}->{w};
558 my $mapmaph = $self->{mapmap}->{h}; 905 my $mapmaph = $self->{mapmap}->{h};
… …
570 $self->{map_info} = [$hash, $x, $y, $w, $h]; 917 $self->{map_info} = [$hash, $x, $y, $w, $h];
571 918
572 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 919 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
573 $::STATWIDS->{map}->set_text ("Map: " . $map); 920 $::STATWIDS->{map}->set_text ("Map: " . $map);
574 921
575 $self->load_map ($hash, $x, $y); 922 $self->load_map ($hash, $x, $y, $w, $h);
576 $self->flood_fill (0, 0, 0, "", $hash, $flags); 923 $self->flood_fill (0, 0, 0, "", $hash, $flags);
577} 924}
578 925
579sub face_find { 926sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 927 my ($self, $facenum, $face, $cb) = @_;
581 928
582 my $hash = "$face->{chksum},$face->{name}"; 929 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 930 my $id = DC::DB::get_tile_id_sync $face->{name};
585 931
586 $face->{id} = $id; 932 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id;
588
589 $self->{map}->set_tileid ($facenum => $id); 933 $self->{map}->set_tileid ($facenum => $id);
590 934
591 CFPlus::DB::get tilecache => $id, $cb; 935 DC::DB::get tilecache => $id, $cb;
936
937 } elsif ($face->{type} & 1) { # with metadata
938 DC::DB::get res_meta => $face->{name}, $cb;
939
940 } else { # no metadata
941 DC::DB::get res_data => $face->{name}, $cb;
942 }
592} 943}
593 944
594sub face_update { 945sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 946 my ($self, $facenum, $face, $changed) = @_;
596 947
948 if ($face->{type} == 0) {
949 # image, FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 950 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 951 if $changed;
599 952
600 $self->set_texture ($face->{id} => delete $face->{image}); 953 $self->have_tile ($face->{id}, delete $face->{data});
954
955 } elsif ($face->{type} & 1) {
956 # split metadata case, FT_MUSIC, FT_SOUND
957 if ($changed) { # new data
958 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
959 $face->{data} = $meta;
960
961 # rely on strict ordering here and also on later fetch
962 DC::DB::put res_data => $face->{name} => $data, sub { };
963 DC::DB::put res_meta => $face->{name} => $meta, sub { };
964 }
965
966 $face->{data} = $self->{json_coder}->decode ($face->{data});
967 ::add_license ($face);
968 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
969 if $changed;
970
971 if ($face->{type} == 3) { # FT_MUSIC
972 &::audio_music_push ($facenum);
973 } elsif ($face->{type} == 5) { # FT_SOUND
974 &::audio_sound_push ($facenum);
975 }
976
977 } else {
978 # flat resource case, FT_RSRC
979 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
980 if $changed;
981 }
982
983 if (my $cbs = $self->{face_cb}{$facenum}) {
984 $_->($face, $changed) for @$cbs;
985 }
601} 986}
602 987
603sub smooth_update { 988sub smooth_update {
604 my ($self, $facenum, $face) = @_; 989 my ($self, $facenum, $face) = @_;
605 990
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 991 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 992}
608 993
609sub set_texture { 994sub have_tile {
610 my ($self, $id, $data) = @_; 995 my ($self, $tile, $data) = @_;
611 996
612 $self->{texture}[$id] = my $tex = 997 return unless $self->{map};
613 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1;
615 998
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 999 my $tex = $self->{texture}[$tile] ||=
617 $self->{map_widget}->update; 1000 new DC::Texture
1001 tile => $tile,
1002 image => $data, delete_image => 1,
1003 minify => 1;
1004
1005 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1006 $_->($tex) for @$cbs;
1007 }
1008}
1009
1010# call in non-void context registers a temporary
1011# hook with handle, otherwise its permanent
1012sub on_face_change {
1013 my ($self, $num, $cb) = @_;
1014
1015 push @{$self->{face_cb}{$num}}, $cb;
1016
1017 defined wantarray
1018 ? Guard::guard {
1019 @{$self->{face_cb}{$num}}
1020 = grep $_ != $cb,
1021 @{$self->{face_cb}{$num}};
1022 }
1023 : ()
1024}
1025
1026# call in non-void context registers a temporary
1027# hook with handle, otherwise its permanent
1028sub register_face_handler {
1029 my ($self, $num, $cb) = @_;
1030
1031 return unless $num;
1032
1033 # invoke if available right now
1034 $cb->($self->{face}[$num], 0)
1035 unless exists $self->{face}[$num]{loading};
1036
1037 # future changes
1038 $self->on_face_change ($num => $cb)
618} 1039}
619 1040
620sub sound_play { 1041sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 1042 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 1043
623 $self->{sound_play}->($x, $y, $soundnum, $type); 1044 &::audio_sound_play ($face, $dx, $dy, $vol)
1045 unless $type & 1; # odd types are silent for future expansion
624} 1046}
625 1047
626my $LAST_QUERY; # server is stupid, stupid, stupid 1048my $LAST_QUERY; # server is stupid, stupid, stupid
627 1049
628sub query { 1050sub query {
… …
630 1052
631 $prompt = $LAST_QUERY unless length $prompt; 1053 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 1054 $LAST_QUERY = $prompt;
633 1055
634 $self->{query}-> ($self, $flags, $prompt); 1056 $self->{query}-> ($self, $flags, $prompt);
1057}
1058
1059sub sanitise_xml($) {
1060 local $_ = shift;
1061
1062 # we now weed out all tags we do not support
1063 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1064 }{
1065 "&lt;"
1066 }gex;
1067
1068 # now all entities
1069 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1070
1071 # handle some elements
1072 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+$//;
1076
1077 $_
635} 1078}
636 1079
637our %NAME_TO_COLOR = ( 1080our %NAME_TO_COLOR = (
638 black => 0, 1081 black => 0,
639 white => 1, 1082 white => 1,
… …
667); 1110);
668 1111
669sub msg { 1112sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 1113 my ($self, $color, $type, $text, @extra) = @_;
671 1114
1115 $text = sanitise_xml $text;
1116
672 if (my $cb = $self->{cb_msg}{$type}) { 1117 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 1118 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1119 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 1120 $type =~ s/-/_/g;
676 $self->{$type} = $text; 1121 $self->{$type} = $text;
677 } else { 1122 } else {
678 $self->logprint ("msg: ", $text); 1123 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 1124 return if $color < 0; # negative color == ignore if not understood
680 1125
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1126 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
682 1127
683 ## 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
684 # no longer neecssary with TRT servers 1129 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1130 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 1131
687 ::message ({ fg => $fg, markup => $_ }) 1132 ::message ({
688 for split /\n/, $text; 1133 fg => $fg,
1134 markup => $text,
1135 type => $type,
1136 extra => [@extra],
1137 color_flags => $color, #d# ugly, kill
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.
689 1145
690 $self->{statusbox}->add ($text, 1146 $self->{statusbox}->add ($text,
691 group => $text, 1147 group => $text,
692 fg => $fg, 1148 fg => $fg,
693 timeout => $color >= 2 ? 180 : 10, 1149 timeout => $color >= 2 ? 180 : 10,
694 tooltip_font => $::FONT_FIXED, 1150 tooltip_font => $::FONT_FIXED,
695 ); 1151 ) if $type eq "info";
696 } 1152 }
697} 1153}
698 1154
699sub spell_add { 1155sub spell_add {
700 my ($self, $spell) = @_; 1156 my ($self, $spell) = @_;
… …
704 $spell->{message} =~ s/\n+$//; 1160 $spell->{message} =~ s/\n+$//;
705 $spell->{message} ||= "Server did not provide a description for this spell."; 1161 $spell->{message} ||= "Server did not provide a description for this spell.";
706 1162
707 $::SPELL_LIST->add_spell ($spell); 1163 $::SPELL_LIST->add_spell ($spell);
708 1164
709 $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});
710 $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});
711} 1167}
712 1168
713sub spell_delete { 1169sub spell_delete {
714 my ($self, $spell) = @_; 1170 my ($self, $spell) = @_;
715 1171
… …
726sub addme_success { 1182sub addme_success {
727 my ($self) = @_; 1183 my ($self) = @_;
728 1184
729 my %skill_help; 1185 my %skill_help;
730 1186
731 for my $node (CFPlus::Pod::find skill_description => "*") { 1187 for my $node (DC::Pod::find skill_description => "*") {
732 my (undef, @par) = CFPlus::Pod::section_of $node; 1188 my (undef, @par) = DC::Pod::section_of $node;
733 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1189 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
734 }; 1190 };
735 1191
736 for my $skill (values %{$self->{skill_info}}) { 1192 for my $skill (values %{$self->{skill_info}}) {
737 $self->{map_widget}->add_command ("ready_skill $skill", 1193 $self->{map_widget}->add_command ("ready_skill $skill",
738 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1194 (DC::asxml "Ready the skill '$skill'\n\n")
739 . $skill_help{$skill}); 1195 . $skill_help{$skill});
740 $self->{map_widget}->add_command ("use_skill $skill", 1196 $self->{map_widget}->add_command ("use_skill $skill",
741 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1197 (DC::asxml "Immediately use the skill '$skill'\n\n")
742 . $skill_help{$skill}); 1198 . $skill_help{$skill});
743 } 1199 }
744} 1200}
745 1201
746sub eof { 1202sub eof {
… …
749 $self->{map_widget}->clr_commands; 1205 $self->{map_widget}->clr_commands;
750 1206
751 ::stop_game (); 1207 ::stop_game ();
752} 1208}
753 1209
754sub image_info {
755 my ($self, $numfaces) = @_;
756
757 $self->{num_faces} = $numfaces;
758 $self->{face_prefetch} = [1 .. $numfaces];
759 $self->face_prefetch;
760}
761
762sub face_prefetch {
763 my ($self) = @_;
764
765 return unless $::CFG->{face_prefetch};
766
767 if ($self->{num_faces}) {
768 return if @{ $self->{send_queue} || [] };
769 my $todo = @{ $self->{face_prefetch} }
770 or return;
771
772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
773
774 $self->send ("requestinfo image_sums $face $face");
775
776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
778 } elsif (!exists $self->{num_faces}) {
779 $self->send ("requestinfo image_info");
780
781 $self->{num_faces} = 0;
782
783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
785 }
786}
787
788sub update_floorbox { 1210sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1211 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 1212 return unless $::CONN;
791 1213
792 $::FLOORBOX->clear; 1214 $::FLOORBOX->clear;
793 1215
1216 my @add;
1217
794 my $row; 1218 my $row;
795 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;
796 if ($row < 6) { 1221 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 1222 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 1223 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 1224 DC::Item::update_widgets $_;
800 1225
1226 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1227 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1228 1, $row, $_->{desc_widget};
803 1229
804 $row++; 1230 $row++;
805 } else { 1231 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1232 push @add, 1, $row, new DC::UI::Button
807 text => "More...", 1233 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1234 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1235 ;
810 last; 1236 last;
811 } 1237 }
812 } 1238 }
813 if ($::CONN->{open_container}) { 1239 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1240 push @add, 1, $row++, new DC::UI::Button
815 text => "Close container", 1241 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1242 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1243 ;
818 } 1244 }
1245
1246 $::FLOORBOX->add_at (@add);
819 }); 1247 });
820 1248
821 $::WANT_REFRESH++; 1249 $::WANT_REFRESH = 1;
822} 1250}
823 1251
824sub set_opencont { 1252sub set_opencont {
825 my ($conn, $tag, $name) = @_; 1253 my ($conn, $tag, $name) = @_;
826 $conn->{open_container} = $tag; 1254 $conn->{open_container} = $tag;
827 update_floorbox; 1255 update_floorbox;
828 1256
829 $::INV_RIGHT_HB->clear (); 1257 $::INVR_HB->clear;
830 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1258 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
831 1259
832 if ($tag != 0) { # Floor isn't closable, is it? 1260 if ($tag != 0) { # Floor isn't closable, is it?
833 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1261 $::INVR_HB->add (new DC::UI::Button
834 text => "Close container", 1262 text => "Close container",
835 tooltip => "Close the currently open container (if one is open)", 1263 tooltip => "Close the currently open container (if one is open)",
836 on_activate => sub { 1264 on_activate => sub {
837 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1265 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
838 if $tag != 0; 1266 if $tag != 0;
839 #if $CONN->{open_container} != 0;
840 0 1267 0
841 }, 1268 },
842 ); 1269 );
843 } 1270 }
844 1271
… …
846} 1273}
847 1274
848sub update_containers { 1275sub update_containers {
849 my ($self) = @_; 1276 my ($self) = @_;
850 1277
851 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1278 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
852 my $todo = delete $self->{update_container} 1279 my $todo = delete $self->{update_container}
853 or return; 1280 or return;
854 1281
855 for my $tag (keys %$todo) { 1282 for my $tag (keys %$todo) {
856 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1283 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
891} 1318}
892 1319
893sub item_update { 1320sub item_update {
894 my ($self, $item) = @_; 1321 my ($self, $item) = @_;
895 1322
896 #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";
897 1324
898 CFPlus::Item::update_widgets $item; 1325 DC::Item::update_widgets $item;
899 1326
900 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1327 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
901 set_opencont ($::CONN, 0, "Floor"); 1328 set_opencont ($::CONN, 0, "Floor");
902 1329
903 } elsif ($item->{flags} & F_OPEN) { 1330 } elsif ($item->{flags} & F_OPEN) {
904 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1331 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
905 1332
906 } else { 1333 } else {
907 $self->{update_container}{$item->{container}}++; 1334 $self->{update_container}{$item->{container}}++;
908 $self->update_containers; 1335 $self->update_containers;
909 } 1336 }
… …
920 1347
921 my $weight = .001 * $self->{player}{weight}; 1348 my $weight = .001 * $self->{player}{weight};
922 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1349 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
923 1350
924 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1351 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
925 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1352 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
926 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1353 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
927} 1354}
928 1355
929sub update_server_info { 1356sub update_server_info {
930 my ($self) = @_; 1357 my ($self) = @_;
… …
938 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1365 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
939 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1366 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
940 . "editing support $yesno[!!$self->{editor_support}]\n" 1367 . "editing support $yesno[!!$self->{editor_support}]\n"
941 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1368 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
942 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1369 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1370 . "client support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1371 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1372 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1373 );
947 1374
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1375}
950 1376
951sub logged_in { 1377sub logged_in {
952 my ($self) = @_; 1378 my ($self) = @_;
953 1379
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1380 $self->send_ext_req (cfplus_support => version => 2, sub {
1381 my (%msg) = @_;
1382
955 $self->{cfplus_ext} = $_[0]{version}; 1383 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1384 $self->update_server_info;
957 1385
958 if ($self->{cfplus_ext} >= 2) { 1386 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1387 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1388 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1389 $self->update_server_info;
962 1390
963 0 1391 0
964 }); 1392 });
965 } 1393 }
… …
967 0 1395 0
968 }); 1396 });
969 1397
970 $self->update_server_info; 1398 $self->update_server_info;
971 1399
972 $self->send_command ("output-sync $::CFG->{output_sync}");
973 $self->send_command ("output-count $::CFG->{output_count}");
974 $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;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1401 $self->send_pickup ($::CFG->{pickup});
976}
977 1402
978sub buildat { 1403 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
979 my ($self, $builditem, $x, $y) = @_; 1404 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
984} 1405}
985 1406
986sub lookat { 1407sub lookat {
987 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
988 1409
989 if ($self->{cfplus_ext}) { 1410 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1411 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1412 my (%msg) = @_;
992 1413
993 if (exists $msg->{npc_dialog}) { 1414 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1415 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1416 $self->{npc_dialog} = new DC::NPCDialog::
996 dx => $x, 1417 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1418 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1419 conn => $self,
1000 ; 1420 ;
1001 } 1421 }
1002 }); 1422 });
1003 } 1423 }
… …
1010 1430
1011 (delete $self->{npc_dialog})->destroy 1431 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1432 if $self->{npc_dialog};
1013 1433
1014 $self->SUPER::destroy; 1434 $self->SUPER::destroy;
1015}
1016 1435
1436 %$self = ();
1437}
1438
1017package CFPlus::NPCDialog; 1439package DC::NPCDialog;
1018 1440
1019our @ISA = 'CFPlus::UI::Toplevel'; 1441our @ISA = 'DC::UI::Toplevel';
1020 1442
1021sub new { 1443sub new {
1022 my $class = shift; 1444 my $class = shift;
1023 1445
1024 my $self = $class->SUPER::new ( 1446 my $self = $class->SUPER::new (
… …
1031 kw => { hi => 0, yes => 0, no => 0 }, 1453 kw => { hi => 0, yes => 0, no => 0 },
1032 has_close_button => 1, 1454 has_close_button => 1,
1033 @_, 1455 @_,
1034 ); 1456 );
1035 1457
1036 CFPlus::weaken (my $this = $self); 1458 DC::weaken (my $this = $self);
1037 1459
1038 $self->connect (delete => sub { $this->destroy; 1 }); 1460 $self->connect (delete => sub { $this->destroy; 1 });
1039 1461
1040 # better use a pane... 1462 # better use a pane...
1041 $self->add (my $hbox = new CFPlus::UI::HBox); 1463 $self->add (my $hbox = new DC::UI::HBox);
1042 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1464 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1043 1465
1044 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1466 $hbox->add (my $vbox = new DC::UI::VBox);
1045 1467
1046 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1468 $vbox->add (new DC::UI::Label text => "Message Entry:");
1047 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1469 $vbox->add ($self->{entry} = new DC::UI::Entry
1048 tooltip => "#npc_message_entry", 1470 tooltip => "#npc_message_entry",
1049 on_activate => sub { 1471 on_activate => sub {
1050 my ($entry, $text) = @_; 1472 my ($entry, $text) = @_;
1051 1473
1052 return unless $text =~ /\S/; 1474 return unless $text =~ /\S/;
… …
1056 1478
1057 0 1479 0
1058 }, 1480 },
1059 ); 1481 );
1060 1482
1061 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1483 $vbox->add ($self->{options} = new DC::UI::VBox);
1062 1484
1063 $self->{bye_button} = new CFPlus::UI::Button 1485 $self->{bye_button} = new DC::UI::Button
1064 text => "Bye (close)", 1486 text => "Bye (close)",
1065 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.",
1066 on_activate => sub { $this->destroy; 1 }, 1488 on_activate => sub { $this->destroy; 1 },
1067 ; 1489 ;
1068 1490
1069 $self->update_options; 1491 $self->update_options;
1070 1492
1071 $self->{id} = $self->{conn}->send_ext_req ( 1493 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1494 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1495 $this->feed (@_) if $this;
1074 ); 1496 });
1497
1498 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1499
1076 $self->{entry}->grab_focus; 1500 $self->{entry}->grab_focus;
1077 1501
1078 $self->{textview}->add_paragraph ({ 1502 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1503 fg => [1, 1, 0, 1],
… …
1085}; 1509};
1086 1510
1087sub update_options { 1511sub update_options {
1088 my ($self) = @_; 1512 my ($self) = @_;
1089 1513
1090 CFPlus::weaken $self; 1514 DC::weaken $self;
1091 1515
1092 $self->{options}->clear; 1516 $self->{options}->clear;
1093 $self->{options}->add ($self->{bye_button}); 1517 $self->{options}->add ($self->{bye_button});
1094 1518
1095 for my $kw (sort keys %{ $self->{kw} }) { 1519 for my $kw (sort keys %{ $self->{kw} }) {
1096 $self->{options}->add (new CFPlus::UI::Button 1520 $self->{options}->add (new DC::UI::Button
1097 text => $kw, 1521 text => $kw,
1098 on_activate => sub { 1522 on_activate => sub {
1099 $self->send ($kw); 1523 $self->send ($kw);
1100 0 1524 0
1101 }, 1525 },
1102 ); 1526 );
1103 } 1527 }
1104} 1528}
1105 1529
1106sub feed { 1530sub feed {
1107 my ($self, $msg) = @_; 1531 my ($self, $type, @arg) = @_;
1108 1532
1109 CFPlus::weaken $self; 1533 DC::weaken $self;
1110 1534
1111 if ($msg->{msgtype} eq "reply") { 1535 if ($type eq "update") {
1536 my (%info) = @arg;
1537
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1538 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1539 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 1540
1541 if (exists $info{msg}) {
1542 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1543 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1544 my @link;
1545 $text =~ s{
1546 ($match)
1547 }{
1548 my $kw = $1;
1549
1550 push @link, new DC::UI::Label
1551 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1552 can_hover => 1,
1553 can_events => 1,
1554 padding_x => 0,
1555 padding_y => 0,
1556 on_button_up => sub {
1557 $self->send ($kw);
1558 };
1559
1560 "\x{fffc}"
1561 }giex;
1562
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1563 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1564 $self->{textview}->scroll_to_bottom;
1565 }
1566
1138 $self->update_options; 1567 $self->update_options;
1139 } else { 1568 } else {
1140 $self->destroy; 1569 $self->destroy;
1141 } 1570 }
1142 1571
… …
1144} 1573}
1145 1574
1146sub send { 1575sub send {
1147 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1148 1577
1149 $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 });
1150 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1151 1585
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1587}
1154 1588
1155sub destroy { 1589sub destroy {
1156 my ($self) = @_; 1590 my ($self) = @_;
1157 1591
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1593
1160 if ($self->{conn}) { 1594 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1596 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1597 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1598 }
1165 1599
1166 $self->SUPER::destroy; 1600 $self->SUPER::destroy;

Diff Legend

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