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.206 by elmex, Sun Dec 7 16:20:44 2008 UTC

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

Diff Legend

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