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.128 by root, Mon Jul 23 21:03:26 2007 UTC vs.
Revision 1.176 by root, Sun Oct 14 15:33:30 2007 UTC

… …
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro; 12use CFPlus::Macro;
13use CFPlus::Item; 13use CFPlus::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 ywidget => 1, 24 xwidget2 => 1,#d#
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
52 50
53 $self->connect_ext (music => sub {
54 my (%ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_;
109
110 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder} 51 $self->{json_coder}
125 ->convert_blessed 52 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
127 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
128 }); 61 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) {
219 $w->{$member} = $value;
220 } else {
221 delete $w->{$member};
222 }
223 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
224 }
225 });
226
227 # widget get
228 $self->connect_ext (w_g => sub {
229 my ($arg) = @_;
230
231 my $w = $self->{widget}{$arg->{id}}
232 or return;
233
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
235 });
236 62
237 # destroy widgets on logout 63 # destroy widgets on logout
238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
240 $_->destroy 66 $_->destroy
… …
263 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
264 90
265 $self 91 $self
266} 92}
267 93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]);
128
129 my $w = int $self->{mapw} * 32 / $self->{tilesize};
130 my $h = int $self->{maph} * 32 / $self->{tilesize};
131
132 $self->setup_req (mapsize => "${w}x${h}");
133 }
134 }
135}
136
137sub ext_ambient_music {
138 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs);
140}
141
142#############################################################################
143
144sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_;
146
147 $widget ||= new CFPlus::UI::Bin;
148
149 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget;
151
152 if ($ws) {
153 $widget->{s_ws} = $ws;
154 $self->{widgetset}{$ws}{w}{$id} = $widget;
155 }
156
157 $widget->connect (on_destroy => sub {
158 my ($widget) = @_;
159
160 delete $self->{widget}{$widget->{s_id}};
161 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
162 if exists $widget->{s_ws};
163 });
164}
165
166# widgetset new
167sub ext_ws_n {
168 my ($self, $id) = @_;
169
170 $self->{widgetset}{$id} = {
171 w => {},
172 };
173}
174
175# widgetset destroy
176sub ext_ws_d {
177 my ($self, $id) = @_;
178
179 my $ws = delete $self->{widgetset}{$id}
180 or return;
181
182 $_->destroy
183 for values %{$ws->{w}};
184}
185
186# widgetset create
187sub ext_ws_c {
188 my ($self, $ws, $id, $class, $args) = @_;
189
190 $self->widget_associate (
191 $ws, $id => scalar eval {
192 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args)
194 }
195 );
196}
197
198# widgetset associate
199sub ext_ws_a {
200 my ($self, %ass) = @_;
201
202 # everything that has a name, wether conceivably useful or not
203 my %wkw = (
204 root => $CFPlus::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP,
206
207 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG,
213 host_entry => $::HOST_ENTRY,
214 metaserver => $::METASERVER,
215 server_info => $::SERVER_INFO,
216
217 setup_dialog => $::SETUP_DIALOG,
218 setup_notebook => $::SETUP_NOTEBOOK,
219 setup_server => $::SETUP_SERVER,
220 setup_keyboard => $::SETUP_KEYBOARD,
221
222 pl_notebook => $::PL_NOTEBOOK,
223 pl_window => $::PL_WINDOW,
224 inventory_page => $::INVENTORY_PAGE,
225 stats_page => $::STATS_PAGE,
226 skill_page => $::SKILL_PAGE,
227 spell_page => $::SPELL_PAGE,
228 spell_list => $::SPELL_LIST,
229
230 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW,
233 statusbox => $::SDTATUSBOX,
234
235 inv => $::INV,
236 invr => $::INVR,
237 invr_hb => $::INVR_HB,
238 );
239
240 while (my ($id, $name) = each %ass) {
241 $self->widget_associate (undef, $id => $wkw{$name});
242 }
243}
244
245# widget call
246sub ext_w_c {
247 my ($self, $id, $rcb, $method, @args) = @_;
248
249 my $w = $self->{widget}{$id}
250 or return;
251
252 if ($rcb) {
253 $rcb->($w->$method (@args));
254 } else {
255 $w->$method (@args);
256 }
257}
258
259# widget set
260sub ext_w_s {
261 my ($self, $id, $attr) = @_;
262
263 my $w = $self->{widget}{$id}
264 or return;
265
266 for (my $i = 0; $i < $#$attr; $i += 2) {
267 my ($member, $value) = @$attr[$i, $i+1];
268 if (defined $value) {
269 $w->{$member} = $value;
270 } else {
271 delete $w->{$member};
272 }
273 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
274 }
275}
276
277# widget get
278sub ext_w_g {
279 my ($self, $id, $rid, @attr) = @_;
280
281 my $w = $self->{widget}{$id}
282 or return;
283
284 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
285}
286
287# message window
288sub ext_channel_info {
289 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info);
292}
293
294#############################################################################
295
268sub logprint { 296sub logprint {
269 my ($self, @a) = @_; 297 my ($self, @a) = @_;
270 298
271 $self->{log_fh} ||= do { 299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
272 my $path = "$Crossfire::VARDIR/log.$self->{host}";
273
274 open my $fh, ">>:utf8", $path
275 or die "Couldn't open logfile $path: $!";
276
277 $fh->autoflush (1);
278
279 $fh;
280 };
281
282 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
283
284 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
285 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
286
287 print {$self->{log_fh}} "$ts ", @a, "\n";
288} 300}
289 301
290sub _stat_numdiff { 302sub _stat_numdiff {
291 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
292 304
… …
376 388
377 if ( 389 if (
378 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
379 ) { 391 ) {
380 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
381 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
382 } 394 }
383 395
384 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
385 397
386 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
425 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
426 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
427 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
428 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
429 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
430 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
431 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
432 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
433 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
434 447
… …
452 for keys %RES_TBL; 465 for keys %RES_TBL;
453 466
454 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
455 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
456 469
457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 470 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
471 map [$_, $self->{skill_info}{$_}],
472 grep exists $stats->{$_},
473 @skills;
474
475 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
476 $self->{stat_order} = join ",", map $_->[0], @order;
477
458 $sktbl->clear; 478 $sktbl->clear;
459 479
460 my @add; 480 my $sw = $self->{skillwid}{""} ||= [
461
462 push @add,
463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ; 489 ];
490
491 my @add = @$sw;
470 492
471 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
472 494
473 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
474 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
475 497
476 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
477 for ( 499 for (@order) {
478 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
479 map [$_, $self->{skill_info}{$_}],
480 grep exists $stats->{$_},
481 @skills
482 ) {
483 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
484 501
485 my $spell_cb = sub { 502 my $spell_cb = sub {
486 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
487 504
… …
502 } 519 }
503 520
504 1 521 1
505 }; 522 };
506 523
524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp
526 (new CFPlus::UI::Label
527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
528
529 # level
530 (new CFPlus::UI::Label
531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532
533 # progress
534 (new CFPlus::UI::ExperienceProgress),
535
536 # label
537 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ];
540
507 push @add, 541 push @add,
508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 542 $x * 4 + 0, $y, $sw->[0],
509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 543 $x * 4 + 1, $y, $sw->[1],
510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 544 $x * 4 + 2, $y, $sw->[2],
511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 545 $x * 4 + 3, $y, $sw->[3],
512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ; 546 ;
515 547
516 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
517 } 549 }
518 550
519 $sktbl->add_at (@add); 551 $sktbl->add_at (@add);
520 } 552 }
521 553
522 for (grep exists $stats->{$_}, @skills) { 554 for (@order) {
523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 555 my ($idx, $name) = @$_;
524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 556 my $val = $stats->{$idx};
525 }
526}
527 557
528sub macro_send { 558 next if $prev->{$idx}[1] eq $val->[1];
529 my ($self, $macro) = @_;
530 559
531 for my $cmd (@{ $macro->{action} }) { 560 my $sw = $self->{skillwid}{$idx};
532 $self->send_command ($cmd); 561 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val);
564
565 $::GAUGES->{sklprg}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val);
533 } 567 }
534} 568}
535 569
536sub user_send { 570sub user_send {
537 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
539 $self->{record}->($command) 573 $self->{record}->($command)
540 if $self->{record}; 574 if $self->{record};
541 575
542 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
543 $self->send_command ($command); 577 $self->send_command ($command);
544 ::status ($command);
545} 578}
546 579
547sub record { 580sub record {
548 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
549 582
… …
557} 590}
558 591
559sub feed_map1a { 592sub feed_map1a {
560 my ($self, $data) = @_; 593 my ($self, $data) = @_;
561 594
562 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
596 my $delay;
597
598 for my $tile (@$missing) {
599 next if $self->{delay}{$tile};
600
601 $delay = 1;
602
603 if (my $tex = $::CONN->{texture}[$tile]) {
604 $tex->upload;
605 } else {
606 $self->{delay}{$tile} = 1;
607
608 # we assume the face is in-flight and will eventually come
609 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile};
611 $_[0]->upload;
612 };
613 }
614 }
615
616 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
618 Event->timer (after => 0.03, cb => sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update
621 if $self->{map_widget};
622 });
623 } else {
563 $self->{map_widget}->update; 624 $self->{map_widget}->update;
625 }
564} 626}
565 627
566sub magicmap { 628sub magicmap {
567 my ($self, $w, $h, $x, $y, $data) = @_; 629 my ($self, $w, $h, $x, $y, $data) = @_;
568 630
… …
575 my $map_info = delete $self->{map_info} 637 my $map_info = delete $self->{map_info}
576 or return; 638 or return;
577 639
578 my ($hash, $x, $y, $w, $h) = @$map_info; 640 my ($hash, $x, $y, $w, $h) = @$map_info;
579 641
580 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
643 $self->{map_cache_new}{$hash} = \$data;
581 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
582 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
583} 645}
584 646
585sub map_clear { 647sub map_clear {
586 my ($self) = @_; 648 my ($self) = @_;
587 649
… …
593} 655}
594 656
595sub bg_fetch { 657sub bg_fetch {
596 my ($self) = @_; 658 my ($self) = @_;
597 659
598 my $id; 660 my $tile;
599 661
600 do { 662 do {
601 $id = pop @{$self->{bg_fetch}} 663 $tile = pop @{$self->{bg_fetch}}
602 or return; 664 or return;
603 } while $self->{texture}[$id]; 665 } while $self->{texture}[$tile];
604 666
605 CFPlus::DB::get tilecache => $id, sub { 667 CFPlus::DB::get tilecache => $tile, sub {
606 my ($data) = @_; 668 my ($data) = @_;
607 669
608 return unless $self->{map}; # stop when destroyed 670 return unless $self->{map}; # stop when destroyed
609 671
610 $self->set_texture ($id => $data)
611 if defined $data; 672 if (defined $data) {
673 $self->have_tile ($tile, $data);
674 $self->{texture}[$tile]->upload;
675 }
612 676
613 $self->bg_fetch; 677 $self->bg_fetch;
614 }; 678 };
615} 679}
616 680
617sub load_map($$$) { 681sub load_map($$$) {
618 my ($self, $hash, $x, $y) = @_; 682 my ($self, $hash, $x, $y) = @_;
619 683
620 my $gen = $self->{map_change_gen}; 684 my $gen = $self->{map_change_gen};
621 685
622 CFPlus::DB::get $self->{mapcache} => $hash, sub { 686 my $cb = sub {
623 return unless $gen == $self->{map_change_gen}; 687 return unless $gen == $self->{map_change_gen};
624 688
625 my ($data) = @_; 689 my ($data) = @_;
626 690
627 if (defined $data) { 691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
628 $data = Compress::LZF::decompress $data; 694 my $data = Compress::LZF::decompress $data;
629 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
630 695
631 my $inprogress = @{ $self->{bg_fetch} || [] }; 696 my $inprogress = @{ $self->{bg_fetch} || [] };
632 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
633 $self->bg_fetch unless $inprogress; 698 $self->bg_fetch unless $inprogress;
634 } 699 }
635 }; 700 };
701
702 if (my $rdata = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata);
704 } else {
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
706 }
636} 707}
637 708
638# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 709# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
639# (server resource,s latency, bandwidth), so this hack is warranted. 710# (server resource,s latency, bandwidth), so this hack is warranted.
640# the right fix is to make real tiled maps with an overview file 711# the right fix is to make real tiled maps with an overview file
… …
733 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
734 805
735 $self->flush_map; 806 $self->flush_map;
736 807
737 ++$self->{map_change_gen}; 808 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new};
738 810
739 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
740 812
741 my $mapmapw = $self->{mapmap}->{w}; 813 my $mapmapw = $self->{mapmap}->{w};
742 my $mapmaph = $self->{mapmap}->{h}; 814 my $mapmaph = $self->{mapmap}->{h};
… …
761} 833}
762 834
763sub face_find { 835sub face_find {
764 my ($self, $facenum, $face, $cb) = @_; 836 my ($self, $facenum, $face, $cb) = @_;
765 837
766 my $hash = "$face->{chksum},$face->{name}"; 838 if ($face->{type} == 0) { # FT_FACE
767
768 my $id = CFPlus::DB::get_tile_id_sync $hash; 839 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
769 840
770 $face->{id} = $id; 841 $face->{id} = $id;
771 $self->{faceid}[$facenum] = $id;
772
773 $self->{map}->set_tileid ($facenum => $id); 842 $self->{map}->set_tileid ($facenum => $id);
774 843
775 CFPlus::DB::get tilecache => $id, $cb; 844 CFPlus::DB::get tilecache => $id, $cb;
845
846 } elsif ($face->{type} & 1) { # with metadata
847 CFPlus::DB::get res_meta => $face->{name}, $cb;
848
849 } else { # no metadata
850 CFPlus::DB::get res_data => $face->{name}, $cb;
851 }
776} 852}
777 853
778sub face_update { 854sub face_update {
779 my ($self, $facenum, $face, $changed) = @_; 855 my ($self, $facenum, $face, $changed) = @_;
780 856
857 if ($face->{type} == 0) {
858 # image, FT_FACE
781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
782 if $changed; 860 if $changed;
783 861
784 $self->set_texture ($face->{id} => delete $face->{image}); 862 $self->have_tile ($face->{id}, delete $face->{data});
863
864 } elsif ($face->{type} & 1) {
865 # split metadata case, FT_MUSIC, FT_SOUND
866 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta;
869
870 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
873 }
874
875 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed;
879
880 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum);
884 }
885
886 } else {
887 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed;
890 }
891
892 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs;
894 }
785} 895}
786 896
787sub smooth_update { 897sub smooth_update {
788 my ($self, $facenum, $face) = @_; 898 my ($self, $facenum, $face) = @_;
789 899
790 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 900 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
791} 901}
792 902
793sub set_texture { 903sub have_tile {
794 my ($self, $id, $data) = @_; 904 my ($self, $tile, $data) = @_;
795 905
796 return unless $self->{map}; 906 return unless $self->{map};
797 907
798 $self->{texture}[$id] = my $tex = 908 my $tex = $self->{texture}[$tile] ||=
799 new_from_image CFPlus::Texture 909 new CFPlus::Texture
910 tile => $tile,
911 image => $data, delete_image => 1,
800 $data, minify => 1, mipmap => 1; 912 minify => 1, mipmap => 1;
801 913
802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 914 if (my $cbs = delete $self->{tile_cb}{$tile}) {
803 $self->{map_widget}->update; 915 $_->($tex) for @$cbs;
804 916 }
805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806} 917}
807 918
808sub connect_face_update { 919# call in non-void context registers a temporary
920# hook with handle, otherwise its permanent
921sub on_face_change {
809 my ($self, $id, $cb) = @_; 922 my ($self, $num, $cb) = @_;
810 923
811 push @{$self->{face_cb}{$id}}, $cb; 924 push @{$self->{face_cb}{$num}}, $cb;
812 925
926 defined wantarray
813 CFPlus::guard { 927 ? CFPlus::guard {
814 @{$self->{face_cb}{$id}} 928 @{$self->{face_cb}{$num}}
815 = grep $_ != $cb, 929 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}}; 930 @{$self->{face_cb}{$num}};
817 } 931 }
932 : ()
933}
934
935# call in non-void context registers a temporary
936# hook with handle, otherwise its permanent
937sub register_face_handler {
938 my ($self, $num, $cb) = @_;
939
940 return unless $num;
941
942 # invoke if available right now
943 $cb->($self->{face}[$num], 0)
944 unless exists $self->{face}[$num]{loading};
945
946 # future changes
947 $self->on_face_change ($num => $cb)
818} 948}
819 949
820sub sound_play { 950sub sound_play {
821 my ($self, $x, $y, $soundnum, $type) = @_; 951 my ($self, $type, $face, $dx, $dy, $vol) = @_;
822 952
823 $self->{sound_play}->($x, $y, $soundnum, $type); 953 &::audio_sound_play ($face, $dx, $dy, $vol)
954 unless $type & 1; # odd types are silent for future expansion
824} 955}
825 956
826my $LAST_QUERY; # server is stupid, stupid, stupid 957my $LAST_QUERY; # server is stupid, stupid, stupid
827 958
828sub query { 959sub query {
… …
836 967
837sub sanitise_xml($) { 968sub sanitise_xml($) {
838 local $_ = shift; 969 local $_ = shift;
839 970
840 # we now weed out all tags we do not support 971 # we now weed out all tags we do not support
841 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
842 # now all entities 977 # now all entities
843 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
844 979
845 # handle some elements 980 # handle some elements
846 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
893 $self->{$type} = $text; 1028 $self->{$type} = $text;
894 } else { 1029 } else {
895 $self->logprint ("msg: ", $text); 1030 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood 1031 return if $color < 0; # negative color == ignore if not understood
897 1032
898 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
899 1034
900 ## try to create single paragraphs of multiple lines sent by the server 1035 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers 1036 # no longer neecssary with TRT servers
902 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
903 1038
904 ::message ({ fg => $fg, markup => $_ })
905 for split /\n/, $text; 1039 for (split /\n/, $text) {
1040 ::message ({
1041 fg => $fg,
1042 markup => $_,
1043 type => $type,
1044 extra => [@extra],
1045 color_flags => $color, #d# ugly, kill
1046 });
1047
1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1049 # actually, this is an ugly design. _we_ should control the channels,
1050 # not some random other widget, as the channels are clearly protocol-specific.
1051 # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above.
1053 }
906 1054
907 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
908 group => $text, 1056 group => $text,
909 fg => $fg, 1057 fg => $fg,
910 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
911 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
912 ); 1060 ) if $type eq "info";
913 } 1061 }
914} 1062}
915 1063
916sub spell_add { 1064sub spell_add {
917 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
… …
966 $self->{map_widget}->clr_commands; 1114 $self->{map_widget}->clr_commands;
967 1115
968 ::stop_game (); 1116 ::stop_game ();
969} 1117}
970 1118
971sub image_info {
972 my ($self, $numfaces) = @_;
973
974 $self->{num_faces} = $numfaces;
975 $self->{face_prefetch} = [1 .. $numfaces];
976 $self->face_prefetch;
977}
978
979sub face_prefetch {
980 my ($self) = @_;
981
982 return unless $::CFG->{face_prefetch};
983
984 if ($self->{num_faces}) {
985 return if @{ $self->{send_queue} || [] };
986 my $todo = @{ $self->{face_prefetch} }
987 or return;
988
989 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
990
991 $self->send ("requestinfo image_sums $face $face");
992
993 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
994 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
995 } elsif (!exists $self->{num_faces}) {
996 $self->send ("requestinfo image_info");
997
998 $self->{num_faces} = 0;
999
1000 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
1001 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
1002 }
1003}
1004
1005sub update_floorbox { 1119sub update_floorbox {
1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1007 return unless $::CONN; 1121 return unless $::CONN;
1008 1122
1009 $::FLOORBOX->clear; 1123 $::FLOORBOX->clear;
… …
1038 } 1152 }
1039 1153
1040 $::FLOORBOX->add_at (@add); 1154 $::FLOORBOX->add_at (@add);
1041 }); 1155 });
1042 1156
1043 $::WANT_REFRESH++; 1157 $::WANT_REFRESH->start;
1044} 1158}
1045 1159
1046sub set_opencont { 1160sub set_opencont {
1047 my ($conn, $tag, $name) = @_; 1161 my ($conn, $tag, $name) = @_;
1048 $conn->{open_container} = $tag; 1162 $conn->{open_container} = $tag;
1049 update_floorbox; 1163 update_floorbox;
1050 1164
1051 $::INV_RIGHT_HB->clear (); 1165 $::INVR_HB->clear ();
1052 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1166 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1053 1167
1054 if ($tag != 0) { # Floor isn't closable, is it? 1168 if ($tag != 0) { # Floor isn't closable, is it?
1055 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1169 $::INVR_HB->add (new CFPlus::UI::Button
1056 text => "Close container", 1170 text => "Close container",
1057 tooltip => "Close the currently open container (if one is open)", 1171 tooltip => "Close the currently open container (if one is open)",
1058 on_activate => sub { 1172 on_activate => sub {
1059 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1060 if $tag != 0; 1174 if $tag != 0;
1061 #if $CONN->{open_container} != 0;
1062 0 1175 0
1063 }, 1176 },
1064 ); 1177 );
1065 } 1178 }
1066 1179
… …
1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1167 . "map size $self->{mapw}×$self->{maph}\n" 1280 . "map size $self->{mapw}×$self->{maph}\n"
1168 ); 1281 );
1169 1282
1170 ::setup_build_button ($self->{editor_support}->{builder_ui});
1171} 1283}
1172 1284
1173sub logged_in { 1285sub logged_in {
1174 my ($self) = @_; 1286 my ($self) = @_;
1175 1287
… …
1191 0 1303 0
1192 }); 1304 });
1193 1305
1194 $self->update_server_info; 1306 $self->update_server_info;
1195 1307
1196 $self->send_command ("output-sync $::CFG->{output_sync}");
1197 $self->send_command ("output-count $::CFG->{output_count}");
1198 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1308 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1199 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
1200}
1201
1202sub buildat {
1203 my ($self, $builditem, $x, $y) = @_;
1204
1205 if ($self->{cfplus_ext}) {
1206 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1207 }
1208} 1310}
1209 1311
1210sub lookat { 1312sub lookat {
1211 my ($self, $x, $y) = @_; 1313 my ($self, $x, $y) = @_;
1212 1314

Diff Legend

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