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.25 by root, Tue Jun 6 03:13:00 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
10 16
11use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
12 18
13sub new { 19sub new {
14 my $class = shift; 20 my ($class, %arg) = @_;
15 21
16 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
17 30
18 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
19 32
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 35 or die "unparseable command help: $_->{kw}[0]";
28 36
29 my $cmd = $1; 37 my $cmd = $1;
30 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 39 @args = (".*") unless @args;
32 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
33 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 45 for @args;
35 46
36 my $text = CFClient::pod_to_pango $head2->content; 47 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
40 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
77 if (my $ts = $cap{tileset}) {
78 if (my ($default) = grep $_->[2] & 1, @$ts) {
79 $self->{tileset} = $default;
80 $self->{tilesize} = $default->[3];
81 $self->setup_req (tileset => $default->[0]);
82
83 my $w = int $self->{mapw} * 32 / $self->{tilesize};
84 my $h = int $self->{maph} * 32 / $self->{tilesize};
85
86 $self->setup_req (mapsize => "${w}x${h}");
87 }
88 }
89 });
90
91 $self->{json_coder}
92 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub {
94 $self->{widget}{$_[0]}
95 });
96
97 # widgetset new
98 $self->connect_ext (ws_n => sub {
99 my ($id) = @_;
100
101 $self->{widgetset}{$id} = {
102 w => {},
41 } 103 };
42
43 \@cmd_help
44 }; 104 });
105
106 # widgetset destroy
107 $self->connect_ext (ws_d => sub {
108 my ($id) = @_;
109
110 my $ws = delete $self->{widgetset}{$id}
111 or return;
112
113 $_->destroy
114 for values %{$ws->{w}};
115 });
116
117 # widgetset create
118 $self->connect_ext (ws_c => sub {
119 my ($ws, $id, $class, $args) = @_;
120
121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
123 $args->{$ev} = sub {
124 my $id = shift->{s_id};
125 $self->send_exti_msg (w_e => $id, $rid, @_);
126
127 1
128 };
129 }
130
131 $self->widget_associate (
132 $ws, $id => scalar eval {
133 local $SIG{__DIE__};
134 "CFPlus::UI::$class"->new (%$args)
135 }
136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
184 }
185 });
186
187 # widget call
188 $self->connect_ext (w_c => sub {
189 my ($id, $rid, $method, @args) = @_;
190
191 my $w = $self->{widget}{$id}
192 or return;
193
194 if ($rid) {
195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
196 } else {
197 $w->$method (@args);
198 }
199 });
200
201 # widget set
202 $self->connect_ext (w_s => sub {
203 my ($id, $attr) = @_;
204
205 my $w = $self->{widget}{$id}
206 or return;
207
208 for (my $i = 0; $i < $#$attr; $i += 2) {
209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
217 });
218
219 # widget get
220 $self->connect_ext (w_g => sub {
221 my ($id, $rid, $attr) = @_;
222
223 my $w = $self->{widget}{$id}
224 or return;
225
226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
234 });
235
236 # destroy widgets on logout
237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
238 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy
240 for values %{delete $ws->{w} || {}};
241 }
242 });
45 243
46 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 245 for @cmd_help;
48 246
247 {
248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
251 }
252
253 {
49 $self->{noface} = new_from_file CFClient::Texture 254 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 255 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
256 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
257 }
51 258
52 $self->{open_container} = 0; 259 $self->{open_container} = 0;
53 260
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 261 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 263
61 $self 264 $self
62} 265}
266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
295sub update_fx_want {
296 my ($self) = @_;
297
298 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
302 });
303}
304
305sub logprint {
306 my ($self, @a) = @_;
307
308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
309}
310
311sub _stat_numdiff {
312 my ($self, $name, $old, $new) = @_;
313
314 my $diff = $new - $old;
315
316 $diff = 0.01 * int $diff * 100;
317
318 0.1 >= abs $diff ? ()
319 : $diff < 0 ? "$name$diff" : "$name+$diff"
320}
321
322sub _stat_skillmaskdiff {
323 my ($self, $name, $old, $new) = @_;
324
325 my $diff = $old ^ $new
326 or return;
327
328 my @diff = map
329 {
330 $diff & $_
331 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
332 : ()
333 }
334 sort { $a <=> $b } keys %{$self->{spell_paths}};
335
336 join "", @diff
337}
338
339# all stats that are chacked against changes
340my @statchange = (
341 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
342 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
343 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
344 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
345 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
346 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
347 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
348 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
349 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
350 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
351 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
352 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
353 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
354 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
355 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
356 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
357 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
358 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
359 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
360 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
361 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
362 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
363 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
364 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
365 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
366 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
367 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
368 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
369 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
370 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
371 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
372 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
373 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
374 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
375 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
376 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
377 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
378);
63 379
64sub stats_update { 380sub stats_update {
65 my ($self, $stats) = @_; 381 my ($self, $stats) = @_;
66 382
67 if (my $exp = $stats->{+CS_STAT_EXP64}) { 383 my $prev = $self->{prev_stats} || { };
68 my $diff = $exp - $self->{prev_exp}; 384
385 if (my @diffs =
386 (
387 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
388 map {
389 $stats->{$_} && $prev->{$_}
390 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
391 } sort { $a <=> $b } keys %{$self->{skill_info}}
392 )
393 ) {
394 my $msg = join " ", @diffs;
69 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 395 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
70 if exists $self->{prev_exp} && $diff;
71 $self->{prev_exp} = $exp;
72 } 396 }
73 397
398 if (
399 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
400 ) {
401 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
402 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
403 }
404
74 ::update_stats_window ($stats); 405 $self->update_stats_window ($stats, $prev);
406
407 $self->{prev_stats} = { %$stats };
408}
409
410my %RES_TBL = (
411 phys => CS_STAT_RES_PHYS,
412 magic => CS_STAT_RES_MAG,
413 fire => CS_STAT_RES_FIRE,
414 elec => CS_STAT_RES_ELEC,
415 cold => CS_STAT_RES_COLD,
416 conf => CS_STAT_RES_CONF,
417 acid => CS_STAT_RES_ACID,
418 drain => CS_STAT_RES_DRAIN,
419 ghit => CS_STAT_RES_GHOSTHIT,
420 pois => CS_STAT_RES_POISON,
421 slow => CS_STAT_RES_SLOW,
422 para => CS_STAT_RES_PARA,
423 tund => CS_STAT_TURN_UNDEAD,
424 fear => CS_STAT_RES_FEAR,
425 depl => CS_STAT_RES_DEPLETE,
426 deat => CS_STAT_RES_DEATH,
427 holyw => CS_STAT_RES_HOLYWORD,
428 blind => CS_STAT_RES_BLIND,
429);
430
431sub update_stats_window {
432 my ($self, $stats, $prev) = @_;
433
434 # I love text protocols...
435
436 my $hp = $stats->{+CS_STAT_HP} * 1;
437 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
438 my $sp = $stats->{+CS_STAT_SP} * 1;
439 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
440 my $fo = $stats->{+CS_STAT_FOOD} * 1;
441 my $fo_m = 999;
442 my $gr = $stats->{+CS_STAT_GRACE} * 1;
443 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
444
445 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
453 my $title = $stats->{+CS_STAT_TITLE};
454 $title =~ s/^Player: //;
455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
456
457 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
458 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
459 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
460 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
461 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
462 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
463 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
464 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
465 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
466 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
467 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
468 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
469 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
470
471 $self->update_weight;
472
473 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
474 for keys %RES_TBL;
475
476 my $sktbl = $::STATWIDS->{skill_tbl};
477 my @skills = keys %{ $self->{skill_info} };
478
479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
480 $sktbl->clear;
481
482 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
491 ];
492
493 my @add = @$sw;
494
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
496
497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
499
500 my ($x, $y) = (0, 1);
501 for (
502 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
503 map [$_, $self->{skill_info}{$_}],
504 grep exists $stats->{$_},
505 @skills
506 ) {
507 my ($idx, $name) = @$_;
508
509 my $spell_cb = sub {
510 my ($widget, $ev) = @_;
511
512 if ($ev->{button} == 1) {
513 $::CONN->user_send ("ready_skill $name");
514 } elsif ($ev->{button} == 2) {
515 $::CONN->user_send ("use_skill $name");
516 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14;
518 (new CFPlus::UI::Menu
519 items => [
520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
521 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
522 ],
523 )->popup ($ev);
524 } else {
525 return 0;
526 }
527
528 1
529 };
530
531 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp
533 (new CFPlus::UI::Label
534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
535
536 # level
537 (new CFPlus::UI::Label
538 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539
540 # progress
541 (new CFPlus::UI::ExperienceProgress),
542
543 # label
544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ];
547
548 push @add,
549 $x * 4 + 0, $y, $sw->[0],
550 $x * 4 + 1, $y, $sw->[1],
551 $x * 4 + 2, $y, $sw->[2],
552 $x * 4 + 3, $y, $sw->[3],
553 ;
554
555 $x++ and ($x, $y) = (0, $y + 1);
556 }
557
558 $sktbl->add_at (@add);
559 }
560
561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
566 }
567}
568
569sub macro_send {
570 my ($self, $macro) = @_;
571
572 for my $cmd (@{ $macro->{action} }) {
573 $self->send_command ($cmd);
574 }
75} 575}
76 576
77sub user_send { 577sub user_send {
78 my ($self, $command) = @_; 578 my ($self, $command) = @_;
79 579
580 $self->{record}->($command)
80 if ($self->{record}) { 581 if $self->{record};
81 push @{$self->{record}}, $command;
82 }
83 582
583 $self->logprint ("send: ", $command);
84 $self->send_command ($command); 584 $self->send_command ($command);
85 ::status $command; 585 ::status ($command);
86} 586}
87 587
88sub start_record { 588sub record {
89 my ($self) = @_; 589 my ($self, $cb) = @_;
90 590
91 $self->{record} = []; 591 $self->{record} = $cb;
92}
93
94sub stop_record {
95 my ($self) = @_;
96 return delete $self->{record};
97} 592}
98 593
99sub map_scroll { 594sub map_scroll {
100 my ($self, $dx, $dy) = @_; 595 my ($self, $dx, $dy) = @_;
101 596
… …
103} 598}
104 599
105sub feed_map1a { 600sub feed_map1a {
106 my ($self, $data) = @_; 601 my ($self, $data) = @_;
107 602
108 $self->{map}->map1a_update ($data); 603 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
604 my $delay;
605
606 for my $tile (@$missing) {
607 next if $self->{delay}{$tile};
608
609 $delay = 1;
610
611 if (my $tex = $::CONN->{texture}[$tile]) {
612 $tex->upload;
613 } else {
614 $self->{delay}{$tile} = 1;
615
616 # we assume the face is in-flight and will eventually come
617 push @{$self->{tile_cb}{$tile}}, sub {
618 delete $self->{delay}{$tile};
619 $_[0]->upload;
620 };
621 }
622 }
623
624 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update;
629 });
630 } else {
109 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
633}
634
635sub magicmap {
636 my ($self, $w, $h, $x, $y, $data) = @_;
637
638 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110} 639}
111 640
112sub flush_map { 641sub flush_map {
113 my ($self) = @_; 642 my ($self) = @_;
114 643
115 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
116 or return; 645 or return;
117 646
118 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
119 648
120 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
121 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 650 $self->{map_cache_new}{$hash} = \$data;
122 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
123} 652}
124 653
125sub map_clear { 654sub map_clear {
126 my ($self) = @_; 655 my ($self) = @_;
127 656
128 $self->flush_map; 657 $self->flush_map;
129 delete $self->{neigh_map}; 658 delete $self->{neigh_map};
130 659
131 $self->{map}->clear; 660 $self->{map}->clear;
661 delete $self->{map_widget}{magicmap};
132} 662}
133 663
664sub bg_fetch {
665 my ($self) = @_;
666
667 my $tile;
668
669 do {
670 $tile = pop @{$self->{bg_fetch}}
671 or return;
672 } while $self->{texture}[$tile];
673
674 CFPlus::DB::get tilecache => $tile, sub {
675 my ($data) = @_;
676
677 return unless $self->{map}; # stop when destroyed
678
679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
683
684 $self->bg_fetch;
685 };
686}
134 687
135sub load_map($$$) { 688sub load_map($$$) {
136 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
137 690
138 if (defined (my $data = $self->{mapcache}->get ($hash))) { 691 my $gen = $self->{map_change_gen};
692
693 my $cb = sub {
694 return unless $gen == $self->{map_change_gen};
695
696 my ($data) = @_;
697
698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
139 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
140 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
141 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
142 my $data = $self->{tilecache}->get ($id)
143 or next;
144 702
145 $self->set_texture ($id => $data); 703 my $inprogress = @{ $self->{bg_fetch} || [] };
704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
705 $self->bg_fetch unless $inprogress;
146 } 706 }
707 };
708
709 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata);
711 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
147 } 713 }
148} 714}
149 715
150# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
151# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
… …
216 782
217 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 783 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
218 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 784 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
219 785
220 } else { 786 } else {
787 my $gen = $self->{map_change_gen};
221 $self->send_mapinfo ("spatial $path$tile", sub { 788 $self->send_mapinfo ("spatial $path$tile", sub {
789 return unless $gen == $self->{map_change_gen};
790
222 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 791 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
223 792
224 return if $mode ne "spatial"; 793 return if $mode ne "spatial";
225 794
226 $x += $self->{map}->ox; 795 $x += $self->{map}->ox;
… …
240 809
241sub map_change { 810sub map_change {
242 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
243 812
244 $self->flush_map; 813 $self->flush_map;
814
815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
245 817
246 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
247 819
248 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
249 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
266 $self->load_map ($hash, $x, $y); 838 $self->load_map ($hash, $x, $y);
267 $self->flood_fill (0, 0, 0, "", $hash, $flags); 839 $self->flood_fill (0, 0, 0, "", $hash, $flags);
268} 840}
269 841
270sub face_find { 842sub face_find {
843 my ($self, $facenum, $face, $cb) = @_;
844
845 if ($face->{type} == 0) { # FT_FACE
846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
847
848 $face->{id} = $id;
849 $self->{map}->set_tileid ($facenum => $id);
850
851 CFPlus::DB::get tilecache => $id, $cb;
852
853 } elsif ($face->{type} & 1) { # with metadata
854 CFPlus::DB::get res_meta => $face->{name}, $cb;
855
856 } else { # no metadata
857 CFPlus::DB::get res_data => $face->{name}, $cb;
858 }
859}
860
861sub face_update {
862 my ($self, $facenum, $face, $changed) = @_;
863
864 if ($face->{type} == 0) {
865 # image, FT_FACE
866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
867 if $changed;
868
869 $self->have_tile ($face->{id}, delete $face->{data});
870
871 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta;
876
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
879 }
880
881 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face);
884
885 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum);
895 }
896
897 } else {
898 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed;
901 }
902
903 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs;
905 }
906}
907
908sub smooth_update {
271 my ($self, $facenum, $face) = @_; 909 my ($self, $facenum, $face) = @_;
272 910
273 my $hash = "$face->{chksum},$face->{name}"; 911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
912}
274 913
275 my $id = $self->{facemap}->get ($hash); 914sub have_tile {
915 my ($self, $tile, $data) = @_;
276 916
277 unless ($id) { 917 return unless $self->{map};
278 # create new id for face
279 # I love transactions
280 for (1..100) {
281 my $txn = $CFClient::DB_ENV->txn_begin;
282 my $status = $self->{facemap}->db_get (id => $id);
283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
284 $id = ($id || 16) + 1;
285 if ($self->{facemap}->put (id => $id) == 0
286 && $self->{facemap}->put ($hash => $id) == 0) {
287 $txn->txn_commit;
288 918
289 goto gotid; 919 my $tex = $self->{texture}[$tile] ||=
290 } 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
923 minify => 1, mipmap => 1;
924
925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
926 $_->($tex) for @$cbs;
927 }
928}
929
930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
933 my ($self, $num, $cb) = @_;
934
935 push @{$self->{face_cb}{$num}}, $cb;
936
937 defined wantarray
938 ? CFPlus::guard {
939 @{$self->{face_cb}{$num}}
940 = grep $_ != $cb,
941 @{$self->{face_cb}{$num}};
291 } 942 }
292 $txn->txn_abort; 943 : ()
293 }
294
295 CFClient::fatal "maximum number of transaction retries reached - database problems?";
296 }
297
298gotid:
299 $face->{id} = $id;
300 $self->{map}->set_face ($facenum => $id);
301 $self->{faceid}[$facenum] = $id;#d#
302
303 my $face = $self->{tilecache}->get ($id);
304
305 if ($face) {
306 #$self->face_prefetch;
307 $face
308 } else {
309 my $tex = $self->{noface};
310 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
311 undef
312 };
313} 944}
314 945
315sub face_update { 946# call in non-void context registers a temporary
947# hook with handle, otherwise its permanent
948sub register_face_handler {
316 my ($self, $facenum, $face) = @_; 949 my ($self, $num, $cb) = @_;
317 950
318 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 951 return unless $num;
319 952
320 $self->set_texture ($face->{id} => delete $face->{image}); 953 # invoke if available right now
321} 954 $cb->($self->{face}[$num], 0)
955 unless exists $self->{face}[$num]{loading};
322 956
323sub set_texture { 957 # future changes
324 my ($self, $id, $data) = @_; 958 $self->on_face_change ($num => $cb)
325
326 $self->{texture}[$id] ||= do {
327 my $tex =
328 new_from_image CFClient::Texture
329 $data, minify => 1, mipmap => 1;
330
331 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
332 $self->{map_widget}->update;
333
334 $tex
335 };
336} 959}
337 960
338sub sound_play { 961sub sound_play {
339 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
340 963
341 $self->{sound_play}->($x, $y, $soundnum, $type); 964 &::audio_sound_play ($face, $dx, $dy, $vol)
965 unless $type & 1; # odd types are silent for future expansion
342} 966}
343 967
344my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
345 969
346sub query { 970sub query {
… …
350 $LAST_QUERY = $prompt; 974 $LAST_QUERY = $prompt;
351 975
352 $self->{query}-> ($self, $flags, $prompt); 976 $self->{query}-> ($self, $flags, $prompt);
353} 977}
354 978
355sub drawinfo { 979sub sanitise_xml($) {
356 my ($self, $color, $text) = @_; 980 local $_ = shift;
357 981
358 my @color = ( 982 # we now weed out all tags we do not support
983 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
984 # now all entities
985 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
986
987 # handle some elements
988 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
989 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
990
991 $_
992}
993
994our %NAME_TO_COLOR = (
995 black => 0,
996 white => 1,
997 darkblue => 2,
998 red => 3,
999 orange => 4,
1000 lightblue => 5,
1001 darkorange => 6,
1002 green => 7,
1003 darkgreen => 8,
1004 grey => 9,
1005 brown => 10,
1006 yellow => 11,
1007 tan => 12,
1008);
1009
1010our @CF_COLOR = (
359 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1011 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
360 [1.00, 1.00, 1.00], 1012 [1.00, 1.00, 1.00],
361 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1013 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
362 [1.00, 0.00, 0.00], 1014 [1.00, 0.00, 0.00],
363 [1.00, 0.54, 0.00], 1015 [1.00, 0.54, 0.00],
364 [0.11, 0.56, 1.00], 1016 [0.11, 0.56, 1.00],
365 [0.93, 0.46, 0.00], 1017 [0.93, 0.46, 0.00],
366 [0.18, 0.54, 0.34], 1018 [0.18, 0.54, 0.34],
367 [0.56, 0.73, 0.56], 1019 [0.56, 0.73, 0.56],
368 [0.80, 0.80, 0.80], 1020 [0.80, 0.80, 0.80],
369 [0.55, 0.41, 0.13], 1021 [0.75, 0.61, 0.20],
370 [0.99, 0.77, 0.26], 1022 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 1023 [0.74, 0.65, 0.41],
372 ); 1024);
373 1025
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1026sub msg {
1027 my ($self, $color, $type, $text, @extra) = @_;
375 1028
1029 $text = sanitise_xml $text;
1030
1031 if (my $cb = $self->{cb_msg}{$type}) {
1032 $_->($self, $color, $type, $text, @extra) for values %$cb;
1033 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1034 $type =~ s/-/_/g;
1035 $self->{$type} = $text;
1036 } else {
1037 $self->logprint ("msg: ", $text);
1038 return if $color < 0; # negative color == ignore if not understood
1039
1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1041
376 # try to create single paragraphs of multiple lines sent by the server 1042 ## try to create single paragraphs of multiple lines sent by the server
1043 # no longer neecssary with TRT servers
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
378 1045
379 $text = CFClient::UI::Label::escape $text; 1046 ::message ({
380 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1047 fg => $fg,
381 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1048 markup => $_,
1049 type => $type,
1050 extra => [@extra],
1051 color_flags => $color
1052 }) for split /\n/, $text;
382 1053
383 $self->{logview}->add_paragraph ($color[$color],
384 join "\n", map "$time $_", split /\n/, $text);
385
386 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
387 group => $text, 1055 group => $text,
388 fg => $color[$color], 1056 fg => $fg,
389 timeout => $color >= 2 ? 60 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
390 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
391 ); 1059 );
392} 1060 }
393
394sub drawextinfo {
395 my ($self, $color, $type, $subtype, $message) = @_;
396
397 $self->drawinfo ($color, $message);
398} 1061}
399 1062
400sub spell_add { 1063sub spell_add {
401 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
402 1065
403 # TODO 1066 # try to create single paragraphs out of the multiple lines sent by the server
404 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1067 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
1068 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell.";
1070
405 $::SETUP_SPELLS->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
406 1072
407 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1073 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
408 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1074 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
409} 1075}
410 1076
411sub spell_delete { 1077sub spell_delete {
412 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
1079
413 $::SETUP_SPELLS->remove_spell ($spell); 1080 $::SPELL_LIST->remove_spell ($spell);
1081}
1082
1083sub setup {
1084 my ($self, $setup) = @_;
1085
1086 $self->{map_widget}->set_tilesize ($self->{tilesize});
1087 $::MAP->resize ($self->{mapw}, $self->{maph});
414} 1088}
415 1089
416sub addme_success { 1090sub addme_success {
417 my ($self) = @_; 1091 my ($self) = @_;
418 1092
419 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
420 my ($pom) = @_;
421
422 my %skill_help; 1093 my %skill_help;
423 1094
424 for my $head2 ($pom->head1->[3]->head2) { 1095 for my $node (CFPlus::Pod::find skill_description => "*") {
425 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1096 my (undef, @par) = CFPlus::Pod::section_of $node;
426 } 1097 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
427
428 \%skill_help
429 }; 1098 };
430 1099
431 for my $skill (values %{$self->{skill_info}}) { 1100 for my $skill (values %{$self->{skill_info}}) {
432 $self->{map_widget}->add_command ("ready_skill $skill", 1101 $self->{map_widget}->add_command ("ready_skill $skill",
433 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1102 (CFPlus::asxml "Ready the skill '$skill'\n\n")
434 . $skill_help->{$skill}); 1103 . $skill_help{$skill});
435 $self->{map_widget}->add_command ("use_skill $skill", 1104 $self->{map_widget}->add_command ("use_skill $skill",
436 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1105 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
437 . $skill_help->{$skill}); 1106 . $skill_help{$skill});
438 } 1107 }
439} 1108}
440 1109
441sub eof { 1110sub eof {
442 my ($self) = @_; 1111 my ($self) = @_;
… …
444 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
445 1114
446 ::stop_game (); 1115 ::stop_game ();
447} 1116}
448 1117
449sub image_info {
450 my ($self, $numfaces) = @_;
451
452 $self->{num_faces} = $numfaces;
453 $self->{face_prefetch} = [1 .. $numfaces];
454 $self->face_prefetch;
455}
456
457sub face_prefetch {
458 my ($self) = @_;
459
460 return unless $::CFG->{face_prefetch};
461
462 if ($self->{num_faces}) {
463 return if @{ $self->{send_queue} || [] };
464 my $todo = @{ $self->{face_prefetch} }
465 or return;
466
467 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
468
469 $self->send ("requestinfo image_sums $face $face");
470
471 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
472 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
473 } elsif (!exists $self->{num_faces}) {
474 $self->send ("requestinfo image_info");
475
476 $self->{num_faces} = 0;
477
478 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
479 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
480 }
481}
482
483sub update_floorbox { 1118sub update_floorbox {
484 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
485 return unless $::CONN; 1120 return unless $::CONN;
486 1121
487 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
488 1123
1124 my @add;
1125
489 my $row; 1126 my $row;
490 for (@{ $::CONN->{container}{0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
491 if ($row < 6) { 1128 if ($row < 6) {
492 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
493 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
494 CFClient::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
495 1132
1133 push @add,
496 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
497 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
498 1136
499 $row++; 1137 $row++;
500 } else { 1138 } else {
501 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
502 text => "More...", 1140 text => "More...",
503 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
504 ); 1142 ;
505 last; 1143 last;
506 } 1144 }
507 } 1145 }
1146 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new CFPlus::UI::Button
1148 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ;
1151 }
1152
1153 $::FLOORBOX->add_at (@add);
508 }); 1154 });
509 1155
510 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
511} 1157}
512 1158
513sub set_opencont { 1159sub set_opencont {
514 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
515 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1162 update_floorbox;
516 1163
517 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
518 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
519 1166
520 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
521 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
522 text => "Close container", 1169 text => "Close container",
523 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
524 on_activate => sub { 1171 on_activate => sub {
525 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
526 if $tag != 0; 1173 if $tag != 0;
527 #if $CONN->{open_container} != 0; 1174 0
528 }, 1175 },
529 ); 1176 );
530 } 1177 }
531 1178
532 $::INVR->set_items ($conn->{container}{$tag}); 1179 $::INVR->set_items ($conn->{container}{$tag});
533} 1180}
534 1181
535sub update_container { 1182sub update_containers {
536 my ($tag) = @_; 1183 my ($self) = @_;
537 1184
538 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1185 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container}
1187 or return;
1188
1189 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1191 if ($tag == 0) {
1192 $::INVR->set_items ($self->{container}{0})
539 if $tag == $::CONN->{open_container}; 1193 if $tag == $self->{open_container};
1194 } elsif ($tag == $self->{player}{tag}) {
1195 $::INV->set_items ($self->{container}{$tag})
1196 } else {
1197 $::INVR->set_items ($self->{container}{$tag})
1198 if $tag == $self->{open_container};
1199 }
1200 }
1201 });
540} 1202}
541 1203
542sub container_add { 1204sub container_add {
543 my ($self, $tag, $items) = @_; 1205 my ($self, $tag, $items) = @_;
544 1206
545 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1207 $self->{update_container}{$tag}++;
546 1208 $self->update_containers;
547 if ($tag == 0) {
548 update_floorbox;
549 update_container (0);
550 } elsif ($tag == $self->{player}{tag}) {
551 $::INV->set_items ($self->{container}{$self->{player}{tag}})
552 } else {
553 update_container ($tag);
554 }
555
556 # $self-<{player}{tag} => player inv
557 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
558} 1209}
559 1210
560sub container_clear { 1211sub container_clear {
561 my ($self, $tag) = @_; 1212 my ($self, $tag) = @_;
562 1213
563 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1214 $self->{update_container}{$tag}++;
564 1215 $self->update_containers;
565 if ($tag == 0) {
566 update_floorbox;
567 update_container (0);
568 } elsif ($tag == $self->{player}{tag}) {
569 $::INV->set_items ($self->{container}{$tag})
570 } else {
571 update_container ($tag);
572 }
573
574# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
575} 1216}
576 1217
577sub item_delete { 1218sub item_delete {
578 my ($self, @items) = @_; 1219 my ($self, @items) = @_;
579 1220
1221 $self->{update_container}{$_->{container}}++
580 for (@items) { 1222 for @items;
581 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
582
583 if ($_->{container} == 0) {
584 update_floorbox;
585 update_container ($_->{tag});
586 } elsif ($_->{container} == $self->{player}{tag}) {
587 $::INV->set_items ($self->{container}{$self->{player}{tag}})
588 } else {
589 update_container ($_->{container});
590 }
591 } 1223
1224 $self->update_containers;
592} 1225}
593 1226
594sub item_update { 1227sub item_update {
595 my ($self, $item) = @_; 1228 my ($self, $item) = @_;
596 1229
597 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
598 1231
599 if ($item->{tag} == $self->{player}{tag}) {
600 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
601 return;
602 }
603
604 CFClient::Item::update_widgets $item; 1232 CFPlus::Item::update_widgets $item;
605 1233
606 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
607 set_opencont ($::CONN, 0, "Floor"); 1235 set_opencont ($::CONN, 0, "Floor");
608 1236
609 } elsif ($item->{flags} & F_OPEN) { 1237 } elsif ($item->{flags} & F_OPEN) {
610 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1238 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1239
611 } else { 1240 } else {
612 if ($item->{container} == 0) { 1241 $self->{update_container}{$item->{container}}++;
613 update_floorbox;
614 update_container (0); 1242 $self->update_containers;
615 } elsif ($item->{container} == $self->{player}{tag}) {
616 $::INV->set_items ($self->{container}{$item->{container}})
617 }
618 } 1243 }
619} 1244}
620 1245
621sub player_update { 1246sub player_update {
622 my ($self, $player) = @_; 1247 my ($self, $player) = @_;
1248
1249 $self->update_weight;
1250}
1251
1252sub update_weight {
1253 my ($self) = @_;
1254
1255 my $weight = .001 * $self->{player}{weight};
1256 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1257
623 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1258 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1259 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1260 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1261}
624 1262
625 # do it here because it is ignored earlier, and there is no "login" event 1263sub update_server_info {
1264 my ($self) = @_;
1265
1266 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1267
1268 $::SERVER_INFO->set_markup (
1269 "server <tt>$self->{host}:$self->{port}</tt>\n"
1270 . "protocol version <tt>$self->{version}</tt>\n"
1271 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1274 . "editing support $yesno[!!$self->{editor_support}]\n"
1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1279 . "map size $self->{mapw}×$self->{maph}\n"
1280 );
1281
1282}
1283
1284sub logged_in {
1285 my ($self) = @_;
1286
1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
1290 $self->{cfplus_ext} = $msg{version};
1291 $self->update_server_info;
1292
1293 if ($self->{cfplus_ext} >= 2) {
1294 $self->send_ext_req ("editor_support", sub {
1295 $self->{editor_support} = { @_ };
1296 $self->update_server_info;
1297
1298 0
1299 });
1300 }
1301
1302 0
1303 });
1304
1305 $self->update_server_info;
1306
626 $self->send_command ("output-sync $::CFG->{output_sync}"); 1307 $self->send_command ("output-sync $::CFG->{output_sync}");
627 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
1309 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1310 $self->send_command ("pickup $::CFG->{pickup}");
628} 1311}
629 1312
6301; 1313sub lookat {
1314 my ($self, $x, $y) = @_;
1315
1316 if ($self->{cfplus_ext}) {
1317 $self->send_ext_req (lookat => $x, $y, sub {
1318 my (%msg) = @_;
1319
1320 if (exists $msg{npc_dialog}) {
1321 # start npc chat dialog
1322 $self->{npc_dialog} = new CFPlus::NPCDialog::
1323 token => $msg{npc_dialog},
1324 title => "$msg{npc_dialog}[0] (NPC)",
1325 conn => $self,
1326 ;
1327 }
1328 });
1329 }
1330
1331 $self->send ("lookat $x $y");
1332}
1333
1334sub destroy {
1335 my ($self) = @_;
1336
1337 (delete $self->{npc_dialog})->destroy
1338 if $self->{npc_dialog};
1339
1340 $self->SUPER::destroy;
1341
1342 %$self = ();
1343}
1344
1345package CFPlus::NPCDialog;
1346
1347our @ISA = 'CFPlus::UI::Toplevel';
1348
1349sub new {
1350 my $class = shift;
1351
1352 my $self = $class->SUPER::new (
1353 x => 'center',
1354 y => 'center',
1355 name => "npc_dialog",
1356 force_w => $::WIDTH * 0.7,
1357 force_h => $::HEIGHT * 0.7,
1358 title => "NPC Dialog",
1359 kw => { hi => 0, yes => 0, no => 0 },
1360 has_close_button => 1,
1361 @_,
1362 );
1363
1364 CFPlus::weaken (my $this = $self);
1365
1366 $self->connect (delete => sub { $this->destroy; 1 });
1367
1368 # better use a pane...
1369 $self->add (my $hbox = new CFPlus::UI::HBox);
1370 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
1371
1372 $hbox->add (my $vbox = new CFPlus::UI::VBox);
1373
1374 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
1375 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
1376 tooltip => "#npc_message_entry",
1377 on_activate => sub {
1378 my ($entry, $text) = @_;
1379
1380 return unless $text =~ /\S/;
1381
1382 $entry->set_text ("");
1383 $this->send ($text);
1384
1385 0
1386 },
1387 );
1388
1389 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
1390
1391 $self->{bye_button} = new CFPlus::UI::Button
1392 text => "Bye (close)",
1393 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1394 on_activate => sub { $this->destroy; 1 },
1395 ;
1396
1397 $self->update_options;
1398
1399 $self->{id} = "npc-channel-" . $self->{conn}->token;
1400 $self->{conn}->connect_ext ($self->{id} => sub {
1401 $this->feed (@_) if $this;
1402 });
1403
1404 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1405
1406 $self->{entry}->grab_focus;
1407
1408 $self->{textview}->add_paragraph ({
1409 fg => [1, 1, 0, 1],
1410 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1411 });
1412
1413 $self->show;
1414 $self
1415};
1416
1417sub update_options {
1418 my ($self) = @_;
1419
1420 CFPlus::weaken $self;
1421
1422 $self->{options}->clear;
1423 $self->{options}->add ($self->{bye_button});
1424
1425 for my $kw (sort keys %{ $self->{kw} }) {
1426 $self->{options}->add (new CFPlus::UI::Button
1427 text => $kw,
1428 on_activate => sub {
1429 $self->send ($kw);
1430 0
1431 },
1432 );
1433 }
1434}
1435
1436sub feed {
1437 my ($self, $type, @arg) = @_;
1438
1439 CFPlus::weaken $self;
1440
1441 if ($type eq "update") {
1442 my (%info) = @arg;
1443
1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1446
1447 if (exists $info{msg}) {
1448 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1449 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1450 my @link;
1451 $text =~ s{
1452 ($match)
1453 }{
1454 my $kw = $1;
1455
1456 push @link, new CFPlus::UI::Label
1457 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1458 can_hover => 1,
1459 can_events => 1,
1460 padding_x => 0,
1461 padding_y => 0,
1462 on_button_up => sub {
1463 $self->send ($kw);
1464 };
1465
1466 "\x{fffc}"
1467 }giex;
1468
1469 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1470 $self->{textview}->scroll_to_bottom;
1471 }
1472
1473 $self->update_options;
1474 } else {
1475 $self->destroy;
1476 }
1477
1478 1
1479}
1480
1481sub send {
1482 my ($self, $msg) = @_;
1483
1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1485 $self->{textview}->scroll_to_bottom;
1486
1487 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1488}
1489
1490sub destroy {
1491 my ($self) = @_;
1492
1493 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1494
1495 if ($self->{conn}) {
1496 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1497 delete $self->{conn}{npc_dialog};
1498 $self->{conn}->disconnect_ext ($self->{id});
1499 }
1500
1501 $self->SUPER::destroy;
1502}
1503
15041
1505

Diff Legend

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