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.41 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.126 by root, Sun Jul 22 19:34:58 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
13our %open_logs;
14
15sub new { 19sub new {
16 my $class = shift; 20 my ($class, %arg) = @_;
17 21
18 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
19 30
20 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
21 32
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
23 my ($pom) = @_;
24
25 my @cmd_help;
26
27 for my $head2 ($pom->head1->[-2]->head2) {
28 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 35 or die "unparseable command help: $_->{kw}[0]";
30 36
31 my $cmd = $1; 37 my $cmd = $1;
32 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 39 @args = (".*") unless @args;
34 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
35 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 45 for @args;
37 46
38 my $text = CFClient::pod_to_pango $head2->content; 47 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (event_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 };
42 @args; 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 (event_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}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
43 } 136 };
44
45 \@cmd_help
46 }; 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 $w->{$attr->[$i]} = $attr->[$i+1];
218 $w->{parent}->realloc if $attr->[$i] =~ /^c_/ && $w->{visible};#d# really?
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($arg) = @_;
225
226 my $w = $self->{widget}{$arg->{id}}
227 or return;
228
229 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
230 });
231
232 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy
236 for values %{delete $ws->{w} || {}};
237 }
238 });
47 239
48 $self->{map_widget}->add_command (@$_) 240 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 241 for @cmd_help;
50 242
243 {
244 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
245 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
246 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
247 }
248
249 {
51 $self->{noface} = new_from_file CFClient::Texture 250 $self->{noface} = my $tex = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 251 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
252 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
253 }
53 254
54 $self->{open_container} = 0; 255 $self->{open_container} = 0;
55 256
56 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache";
58 $self->{facemap} = CFClient::db_table "facemap";
59
60 # per server 257 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 258 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
62 259
63 $self 260 $self
64} 261}
65 262
66sub logprint { 263sub logprint {
67 my ($self, @a) = @_; 264 my ($self, @a) = @_;
265
266 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 267 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 268
70 my $fh = $open_logs{$filename}; 269 open my $fh, ">>:utf8", $path
71 unless ($fh) {
72 # FIXME: handle this more gracefully?
73 open $fh, ">>", $filename
74 or die "Couldn't open logfile: log.$self->{host}: $!"; 270 or die "Couldn't open logfile $path: $!";
75 271
76 $open_logs{$filename} = $fh; 272 $fh->autoflush (1);
273
274 $fh;
77 } 275 };
78 276
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 277 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 278
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 279 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 280 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 281
84 print $fh "$ts ", @a, "\n"; 282 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 283}
284
285sub _stat_numdiff {
286 my ($self, $name, $old, $new) = @_;
287
288 my $diff = $new - $old;
289
290 $diff = 0.01 * int $diff * 100;
291
292 0.1 >= abs $diff ? ()
293 : $diff < 0 ? "$name$diff" : "$name+$diff"
294}
295
296sub _stat_skillmaskdiff {
297 my ($self, $name, $old, $new) = @_;
298
299 my $diff = $old ^ $new
300 or return;
301
302 my @diff = map
303 {
304 $diff & $_
305 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
306 : ()
307 }
308 sort { $a <=> $b } keys %{$self->{spell_paths}};
309
310 join "", @diff
311}
312
313# all stats that are chacked against changes
314my @statchange = (
315 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
316 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
317 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
318 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
319 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
320 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
321 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
322 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
323 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
324 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
325 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
326 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
327 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
328 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
329 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
330 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
331 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
332 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
333 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
334 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
335 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
336 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
337 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
338 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
339 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
340 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
341 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
342 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
343 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
344 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
345 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
346 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
347 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
348 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
349 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
350 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
351 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
352);
87 353
88sub stats_update { 354sub stats_update {
89 my ($self, $stats) = @_; 355 my ($self, $stats) = @_;
90 356
91 if (my $exp = $stats->{+CS_STAT_EXP64}) { 357 my $prev = $self->{prev_stats} || { };
92 my $diff = $exp - $self->{prev_exp}; 358
359 if (my @diffs =
360 (
361 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
362 map {
363 $stats->{$_} && $prev->{$_}
364 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
365 } sort { $a <=> $b } keys %{$self->{skill_info}}
366 )
367 ) {
368 my $msg = join " ", @diffs;
93 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 369 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
94 if exists $self->{prev_exp} && $diff;
95 $self->{prev_exp} = $exp;
96 } 370 }
97 371
372 if (
373 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
374 ) {
375 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
376 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
377 }
378
98 ::update_stats_window ($stats); 379 $self->update_stats_window ($stats, $prev);
380
381 $self->{prev_stats} = { %$stats };
382}
383
384my %RES_TBL = (
385 phys => CS_STAT_RES_PHYS,
386 magic => CS_STAT_RES_MAG,
387 fire => CS_STAT_RES_FIRE,
388 elec => CS_STAT_RES_ELEC,
389 cold => CS_STAT_RES_COLD,
390 conf => CS_STAT_RES_CONF,
391 acid => CS_STAT_RES_ACID,
392 drain => CS_STAT_RES_DRAIN,
393 ghit => CS_STAT_RES_GHOSTHIT,
394 pois => CS_STAT_RES_POISON,
395 slow => CS_STAT_RES_SLOW,
396 para => CS_STAT_RES_PARA,
397 tund => CS_STAT_TURN_UNDEAD,
398 fear => CS_STAT_RES_FEAR,
399 depl => CS_STAT_RES_DEPLETE,
400 deat => CS_STAT_RES_DEATH,
401 holyw => CS_STAT_RES_HOLYWORD,
402 blind => CS_STAT_RES_BLIND,
403);
404
405sub update_stats_window {
406 my ($self, $stats, $prev) = @_;
407
408 # I love text protocols...
409
410 my $hp = $stats->{+CS_STAT_HP} * 1;
411 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
412 my $sp = $stats->{+CS_STAT_SP} * 1;
413 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
414 my $fo = $stats->{+CS_STAT_FOOD} * 1;
415 my $fo_m = 999;
416 my $gr = $stats->{+CS_STAT_GRACE} * 1;
417 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
418
419 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
420 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
421 $::GAUGES->{food} ->set_value ($fo, $fo_m);
422 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
423 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
424 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
425 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
426 my $title = $stats->{+CS_STAT_TITLE};
427 $title =~ s/^Player: //;
428 $::STATWIDS->{title} ->set_text ("Title: " . $title);
429
430 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
431 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
432 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
433 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
434 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
435 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
436 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
437 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
438 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
439 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
440 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
441 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
442 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
443
444 $self->update_weight;
445
446 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
447 for keys %RES_TBL;
448
449 my $sktbl = $::STATWIDS->{skill_tbl};
450 my @skills = keys %{ $self->{skill_info} };
451
452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
453 $sktbl->clear;
454
455 my @add;
456
457 push @add,
458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
465
466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
467
468 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
470
471 my ($x, $y) = (0, 1);
472 for (
473 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
474 map [$_, $self->{skill_info}{$_}],
475 grep exists $stats->{$_},
476 @skills
477 ) {
478 my ($idx, $name) = @$_;
479
480 my $spell_cb = sub {
481 my ($widget, $ev) = @_;
482
483 if ($ev->{button} == 1) {
484 $::CONN->user_send ("ready_skill $name");
485 } elsif ($ev->{button} == 2) {
486 $::CONN->user_send ("use_skill $name");
487 } elsif ($ev->{button} == 3) {
488 my $shortname = CFPlus::shorten $name, 14;
489 (new CFPlus::UI::Menu
490 items => [
491 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
492 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
493 ],
494 )->popup ($ev);
495 } else {
496 return 0;
497 }
498
499 1
500 };
501
502 push @add,
503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
506 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
510
511 $x++ and ($x, $y) = (0, $y + 1);
512 }
513
514 $sktbl->add_at (@add);
515 }
516
517 for (grep exists $stats->{$_}, @skills) {
518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
520 }
521}
522
523sub macro_send {
524 my ($self, $macro) = @_;
525
526 for my $cmd (@{ $macro->{action} }) {
527 $self->send_command ($cmd);
528 }
99} 529}
100 530
101sub user_send { 531sub user_send {
102 my ($self, $command) = @_; 532 my ($self, $command) = @_;
103 533
534 $self->{record}->($command)
104 if ($self->{record}) { 535 if $self->{record};
105 push @{$self->{record}}, $command;
106 }
107 536
108 $self->logprint ("send: ", $command); 537 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 538 $self->send_command ($command);
110 ::status $command; 539 ::status ($command);
111} 540}
112 541
113sub start_record { 542sub record {
114 my ($self) = @_; 543 my ($self, $cb) = @_;
115 544
116 $self->{record} = []; 545 $self->{record} = $cb;
117}
118
119sub stop_record {
120 my ($self) = @_;
121 return delete $self->{record};
122} 546}
123 547
124sub map_scroll { 548sub map_scroll {
125 my ($self, $dx, $dy) = @_; 549 my ($self, $dx, $dy) = @_;
126 550
… …
128} 552}
129 553
130sub feed_map1a { 554sub feed_map1a {
131 my ($self, $data) = @_; 555 my ($self, $data) = @_;
132 556
133 $self->{map}->map1a_update ($data); 557 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
134 $self->{map_widget}->update; 558 $self->{map_widget}->update;
135} 559}
136 560
137sub magicmap { 561sub magicmap {
138 my ($self, $w, $h, $x, $y, $data) = @_; 562 my ($self, $w, $h, $x, $y, $data) = @_;
… …
147 or return; 571 or return;
148 572
149 my ($hash, $x, $y, $w, $h) = @$map_info; 573 my ($hash, $x, $y, $w, $h) = @$map_info;
150 574
151 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 575 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
152 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 576 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
153 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 577 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
154} 578}
155 579
156sub map_clear { 580sub map_clear {
157 my ($self) = @_; 581 my ($self) = @_;
… …
161 585
162 $self->{map}->clear; 586 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap}; 587 delete $self->{map_widget}{magicmap};
164} 588}
165 589
590sub bg_fetch {
591 my ($self) = @_;
592
593 my $id;
594
595 do {
596 $id = pop @{$self->{bg_fetch}}
597 or return;
598 } while $self->{texture}[$id];
599
600 CFPlus::DB::get tilecache => $id, sub {
601 my ($data) = @_;
602
603 return unless $self->{map}; # stop when destroyed
604
605 $self->set_texture ($id => $data)
606 if defined $data;
607
608 $self->bg_fetch;
609 };
610}
166 611
167sub load_map($$$) { 612sub load_map($$$) {
168 my ($self, $hash, $x, $y) = @_; 613 my ($self, $hash, $x, $y) = @_;
169 614
170 if (defined (my $data = $self->{mapcache}->get ($hash))) { 615 my $gen = $self->{map_change_gen};
616
617 CFPlus::DB::get $self->{mapcache} => $hash, sub {
618 return unless $gen == $self->{map_change_gen};
619
620 my ($data) = @_;
621
622 if (defined $data) {
171 $data = Compress::LZF::decompress $data; 623 $data = Compress::LZF::decompress $data;
172 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 624 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
173 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
174 my $data = $self->{tilecache}->get ($id)
175 or next;
176 625
177 $self->set_texture ($id => $data); 626 my $inprogress = @{ $self->{bg_fetch} || [] };
627 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
628 $self->bg_fetch unless $inprogress;
178 } 629 }
179 } 630 };
180} 631}
181 632
182# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 633# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
183# (server resource,s latency, bandwidth), so this hack is warranted. 634# (server resource,s latency, bandwidth), so this hack is warranted.
184# the right fix is to make real tiled maps with an overview file 635# the right fix is to make real tiled maps with an overview file
… …
248 699
249 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 700 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
250 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 701 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
251 702
252 } else { 703 } else {
704 my $gen = $self->{map_change_gen};
253 $self->send_mapinfo ("spatial $path$tile", sub { 705 $self->send_mapinfo ("spatial $path$tile", sub {
706 return unless $gen == $self->{map_change_gen};
707
254 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
255 709
256 return if $mode ne "spatial"; 710 return if $mode ne "spatial";
257 711
258 $x += $self->{map}->ox; 712 $x += $self->{map}->ox;
… …
272 726
273sub map_change { 727sub map_change {
274 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 728 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
275 729
276 $self->flush_map; 730 $self->flush_map;
731
732 ++$self->{map_change_gen};
277 733
278 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 734 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
279 735
280 my $mapmapw = $self->{mapmap}->{w}; 736 my $mapmapw = $self->{mapmap}->{w};
281 my $mapmaph = $self->{mapmap}->{h}; 737 my $mapmaph = $self->{mapmap}->{h};
… …
298 $self->load_map ($hash, $x, $y); 754 $self->load_map ($hash, $x, $y);
299 $self->flood_fill (0, 0, 0, "", $hash, $flags); 755 $self->flood_fill (0, 0, 0, "", $hash, $flags);
300} 756}
301 757
302sub face_find { 758sub face_find {
759 my ($self, $facenum, $face, $cb) = @_;
760
761 my $hash = "$face->{chksum},$face->{name}";
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash;
764
765 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id;
767
768 $self->{map}->set_tileid ($facenum => $id);
769
770 CFPlus::DB::get tilecache => $id, $cb;
771}
772
773sub face_update {
774 my ($self, $facenum, $face, $changed) = @_;
775
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
777 if $changed;
778
779 $self->set_texture ($face->{id} => delete $face->{image});
780}
781
782sub smooth_update {
303 my ($self, $facenum, $face) = @_; 783 my ($self, $facenum, $face) = @_;
304 784
305 my $hash = "$face->{chksum},$face->{name}"; 785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
306
307 my $id = $self->{facemap}->get ($hash);
308
309 unless ($id) {
310 # create new id for face
311 # I love transactions
312 for (1..100) {
313 my $txn = $CFClient::DB_ENV->txn_begin;
314 my $status = $self->{facemap}->db_get (id => $id);
315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
316 $id = ($id || 64) + 1;
317 if ($self->{facemap}->put (id => $id) == 0
318 && $self->{facemap}->put ($hash => $id) == 0) {
319 $txn->txn_commit;
320
321 goto gotid;
322 }
323 }
324 $txn->txn_abort;
325 }
326
327 CFClient::fatal "maximum number of transaction retries reached - database problems?";
328 }
329
330gotid:
331 $face->{id} = $id;
332 $self->{map}->set_face ($facenum => $id);
333 $self->{faceid}[$facenum] = $id;#d#
334
335 my $face = $self->{tilecache}->get ($id);
336
337 if ($face) {
338 #$self->face_prefetch;
339 $face
340 } else {
341 my $tex = $self->{noface};
342 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
343 undef
344 };
345}
346
347sub face_update {
348 my ($self, $facenum, $face) = @_;
349
350 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
351
352 $self->set_texture ($face->{id} => delete $face->{image});
353} 786}
354 787
355sub set_texture { 788sub set_texture {
356 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
357 790
791 return unless $self->{map};
792
358 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
359 my $tex =
360 new_from_image CFClient::Texture 794 new_from_image CFPlus::Texture
361 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
362 796
363 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
364 $self->{map_widget}->update; 798 $self->{map_widget}->update;
365 799
366 $tex 800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
367 }; 812 }
368} 813}
369 814
370sub sound_play { 815sub sound_play {
371 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
372 817
… …
382 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
383 828
384 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
385} 830}
386 831
387sub drawinfo { 832sub sanitise_xml($) {
388 my ($self, $color, $text) = @_; 833 local $_ = shift;
389 834
390 my @color = ( 835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
391 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
392 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
393 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
394 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
395 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
396 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
397 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
398 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
399 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
400 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
401 [0.55, 0.41, 0.13], 874 [0.75, 0.61, 0.20],
402 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
403 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
404 ); 877);
405 878
879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
406 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
407 892
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 893 my $fg = $CF_COLOR[$color % @CF_COLOR];
409 894
410 # try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
412 898
413 $text = CFClient::UI::Label::escape $text; 899 ::message ({ fg => $fg, markup => $_ })
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 900 for split /\n/, $text;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 901
417 $self->{logview}->add_paragraph ($color[$color], $_)
418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
420
421 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
422 group => $text, 903 group => $text,
423 fg => $color[$color], 904 fg => $fg,
424 timeout => $color >= 2 ? 60 : 10, 905 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
426 ); 907 );
427} 908 }
428
429sub drawextinfo {
430 my ($self, $color, $type, $subtype, $message) = @_;
431
432 $self->drawinfo ($color, $message);
433} 909}
434 910
435sub spell_add { 911sub spell_add {
436 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
437 913
438 # try to create single paragraphs of multiple lines sent by the server 914 # try to create single paragraphs out of the multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 915 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 916 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 917 $spell->{message} ||= "Server did not provide a description for this spell.";
442 918
443 $::SETUP_SPELLS->add_spell ($spell); 919 $::SPELL_LIST->add_spell ($spell);
444 920
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 921 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 922 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
447} 923}
448 924
449sub spell_delete { 925sub spell_delete {
450 my ($self, $spell) = @_; 926 my ($self, $spell) = @_;
927
451 $::SETUP_SPELLS->remove_spell ($spell); 928 $::SPELL_LIST->remove_spell ($spell);
929}
930
931sub setup {
932 my ($self, $setup) = @_;
933
934 $self->{map_widget}->set_tilesize ($self->{tilesize});
935 $::MAP->resize ($self->{mapw}, $self->{maph});
452} 936}
453 937
454sub addme_success { 938sub addme_success {
455 my ($self) = @_; 939 my ($self) = @_;
456 940
457 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
458 my ($pom) = @_;
459
460 my %skill_help; 941 my %skill_help;
461 942
462 for my $head2 ($pom->head1->[3]->head2) { 943 for my $node (CFPlus::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 944 my (undef, @par) = CFPlus::Pod::section_of $node;
464 } 945 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466 \%skill_help
467 }; 946 };
468 947
469 for my $skill (values %{$self->{skill_info}}) { 948 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 949 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 950 (CFPlus::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 951 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 952 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 953 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 954 . $skill_help{$skill});
476 } 955 }
477} 956}
478 957
479sub eof { 958sub eof {
480 my ($self) = @_; 959 my ($self) = @_;
… …
504 983
505 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 984 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506 985
507 $self->send ("requestinfo image_sums $face $face"); 986 $self->send ("requestinfo image_sums $face $face");
508 987
509 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 988 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
510 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 989 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511 } elsif (!exists $self->{num_faces}) { 990 } elsif (!exists $self->{num_faces}) {
512 $self->send ("requestinfo image_info"); 991 $self->send ("requestinfo image_info");
513 992
514 $self->{num_faces} = 0; 993 $self->{num_faces} = 0;
515 994
516 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 995 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
517 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518 } 997 }
519} 998}
520 999
521sub update_floorbox { 1000sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 1002 return unless $::CONN;
524 1003
525 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
526 1005
1006 my @add;
1007
527 my $row; 1008 my $row;
528 for (@{ $::CONN->{container}{0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 1010 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
533 1014
1015 push @add,
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
536 1018
537 $row++; 1019 $row++;
538 } else { 1020 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
540 text => "More...", 1022 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 1024 ;
543 last; 1025 last;
544 } 1026 }
545 } 1027 }
1028 if ($::CONN->{open_container}) {
1029 push @add, 1, $row++, new CFPlus::UI::Button
1030 text => "Close container",
1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1032 ;
1033 }
1034
1035 $::FLOORBOX->add_at (@add);
546 }); 1036 });
547 1037
548 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
549} 1039}
550 1040
551sub set_opencont { 1041sub set_opencont {
552 my ($conn, $tag, $name) = @_; 1042 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 1043 $conn->{open_container} = $tag;
1044 update_floorbox;
554 1045
555 $::INV_RIGHT_HB->clear (); 1046 $::INV_RIGHT_HB->clear ();
556 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1047 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
557 1048
558 if ($tag != 0) { # Floor isn't closable, is it? 1049 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1050 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
560 text => "Close container", 1051 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 1052 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 1053 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1054 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 1055 if $tag != 0;
… …
569 } 1060 }
570 1061
571 $::INVR->set_items ($conn->{container}{$tag}); 1062 $::INVR->set_items ($conn->{container}{$tag});
572} 1063}
573 1064
574sub update_container { 1065sub update_containers {
575 my ($tag) = @_; 1066 my ($self) = @_;
576 1067
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1068 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1069 my $todo = delete $self->{update_container}
1070 or return;
1071
1072 for my $tag (keys %$todo) {
1073 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1074 if ($tag == 0) {
1075 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 1076 if $tag == $self->{open_container};
1077 } elsif ($tag == $self->{player}{tag}) {
1078 $::INV->set_items ($self->{container}{$tag})
1079 } else {
1080 $::INVR->set_items ($self->{container}{$tag})
1081 if $tag == $self->{open_container};
1082 }
1083 }
1084 });
579} 1085}
580 1086
581sub container_add { 1087sub container_add {
582 my ($self, $tag, $items) = @_; 1088 my ($self, $tag, $items) = @_;
583 1089
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1090 $self->{update_container}{$tag}++;
585 1091 $self->update_containers;
586 if ($tag == 0) {
587 update_floorbox;
588 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($tag);
593 }
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 1092}
598 1093
599sub container_clear { 1094sub container_clear {
600 my ($self, $tag) = @_; 1095 my ($self, $tag) = @_;
601 1096
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1097 $self->{update_container}{$tag}++;
603 1098 $self->update_containers;
604 if ($tag == 0) {
605 update_floorbox;
606 update_container (0);
607 } elsif ($tag == $self->{player}{tag}) {
608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
611 }
612
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 1099}
615 1100
616sub item_delete { 1101sub item_delete {
617 my ($self, @items) = @_; 1102 my ($self, @items) = @_;
618 1103
1104 $self->{update_container}{$_->{container}}++
619 for (@items) { 1105 for @items;
620 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622 if ($_->{container} == 0) {
623 update_floorbox;
624 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else {
628 update_container ($_->{container});
629 }
630 } 1106
1107 $self->update_containers;
631} 1108}
632 1109
633sub item_update { 1110sub item_update {
634 my ($self, $item) = @_; 1111 my ($self, $item) = @_;
635 1112
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1113 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 1114
638 if ($item->{tag} == $self->{player}{tag}) {
639 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640 return;
641 }
642
643 CFClient::Item::update_widgets $item; 1115 CFPlus::Item::update_widgets $item;
644 1116
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1117 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 1118 set_opencont ($::CONN, 0, "Floor");
647 1119
648 } elsif ($item->{flags} & F_OPEN) { 1120 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1121 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1122
650 } else { 1123 } else {
651 if ($item->{container} == 0) { 1124 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 1125 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 1126 }
658} 1127}
659 1128
660sub player_update { 1129sub player_update {
661 my ($self, $player) = @_; 1130 my ($self, $player) = @_;
662 1131
1132 $self->update_weight;
1133}
1134
1135sub update_weight {
1136 my ($self) = @_;
1137
1138 my $weight = .001 * $self->{player}{weight};
1139 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1140
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1141 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1142 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1143 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
664} 1144}
665 1145
666sub update_server_info { 1146sub update_server_info {
667 my ($self) = @_; 1147 my ($self) = @_;
668 1148
… …
671 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
672 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
673 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
674 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
675 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1157 . "editing support $yesno[!!$self->{editor_support}]\n"
1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
676 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
677 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
678 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
679 ); 1163 );
1164
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
680} 1166}
681 1167
682sub logged_in { 1168sub logged_in {
683 my ($self) = @_; 1169 my ($self) = @_;
684 1170
685 $self->send_ext_req (cfplus_support => "1", sub { 1171 $self->send_ext_req (cfplus_support => version => 1, sub {
686 $self->{cfplus_ext} = $_[0]; 1172 $self->{cfplus_ext} = $_[0]{version};
687 $self->update_server_info; 1173 $self->update_server_info;
1174
1175 if ($self->{cfplus_ext} >= 2) {
1176 $self->send_ext_req ("editor_support", sub {
1177 $self->{editor_support} = $_[0];
1178 $self->update_server_info;
1179
1180 0
1181 });
1182 }
1183
1184 0
688 }); 1185 });
689 1186
690 $self->update_server_info; 1187 $self->update_server_info;
691 1188
692 $self->send_command ("output-sync $::CFG->{output_sync}"); 1189 $self->send_command ("output-sync $::CFG->{output_sync}");
693 $self->send_command ("output-count $::CFG->{output_count}"); 1190 $self->send_command ("output-count $::CFG->{output_count}");
1191 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
694 $self->send_command ("pickup $::CFG->{pickup}"); 1192 $self->send_command ("pickup $::CFG->{pickup}");
1193}
1194
1195sub buildat {
1196 my ($self, $builditem, $x, $y) = @_;
1197
1198 if ($self->{cfplus_ext}) {
1199 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1200 }
695} 1201}
696 1202
697sub lookat { 1203sub lookat {
698 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
699 1205
700 if ($self->{cfplus_ext}) { 1206 if ($self->{cfplus_ext}) {
701 $self->send_ext_req (lookat => "$x $y", sub { 1207 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
702 my %res = split /\x00/, $_[0]; 1208 my ($msg) = @_;
703 1209
704 if (exists $res{npc_dialog}) { 1210 if (exists $msg->{npc_dialog}) {
705 # start npc chat dialog 1211 # start npc chat dialog
706 $self->{npc_dialog} = new CFClient::NPCDialog:: 1212 $self->{npc_dialog} = new CFPlus::NPCDialog::
707 dx => $x, 1213 dx => $x,
708 dy => $y, 1214 dy => $y,
709 title => "$res{npc_dialog} (NPC)", 1215 title => "$msg->{npc_dialog} (NPC)",
710 conn => $self, 1216 conn => $self,
711 ; 1217 ;
712 } 1218 }
713 }); 1219 });
714 } 1220 }
… …
717} 1223}
718 1224
719sub destroy { 1225sub destroy {
720 my ($self) = @_; 1226 my ($self) = @_;
721 1227
722 $self->{npc_dialog}->destroy 1228 (delete $self->{npc_dialog})->destroy
723 if $self->{npc_dialog}; 1229 if $self->{npc_dialog};
724 1230
725 $self->SUPER::destroy; 1231 $self->SUPER::destroy;
726}
727 1232
1233 %$self = ();
1234}
1235
728package CFClient::NPCDialog; 1236package CFPlus::NPCDialog;
729 1237
730our @ISA = 'CFClient::UI::FancyFrame'; 1238our @ISA = 'CFPlus::UI::Toplevel';
731 1239
732sub new { 1240sub new {
733 my $class = shift; 1241 my $class = shift;
734 1242
735 my $self = $class->SUPER::new ( 1243 my $self = $class->SUPER::new (
… …
738 name => "npc_dialog", 1246 name => "npc_dialog",
739 force_w => $::WIDTH * 0.7, 1247 force_w => $::WIDTH * 0.7,
740 force_h => $::HEIGHT * 0.7, 1248 force_h => $::HEIGHT * 0.7,
741 title => "NPC Dialog", 1249 title => "NPC Dialog",
742 kw => { hi => 0, yes => 0, no => 0 }, 1250 kw => { hi => 0, yes => 0, no => 0 },
1251 has_close_button => 1,
743 @_, 1252 @_,
744 ); 1253 );
745 1254
746 Scalar::Util::weaken (my $this = $self); 1255 CFPlus::weaken (my $this = $self);
1256
1257 $self->connect (delete => sub { $this->destroy; 1 });
747 1258
748 # better use a pane... 1259 # better use a pane...
749 $self->add (my $hbox = new CFClient::UI::HBox); 1260 $self->add (my $hbox = new CFPlus::UI::HBox);
750 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1261 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
751 1262
752 $hbox->add (my $vbox = new CFClient::UI::VBox); 1263 $hbox->add (my $vbox = new CFPlus::UI::VBox);
753 1264
754 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1265 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
755 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1266 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
756 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1267 tooltip => "#npc_message_entry",
757 . "Sometimes you have to tell an NPC something you cannot find out during "
758 . "a normal conversation (such as a password). In those cases you have to use "
759 . "this text entry. You can also enter responses manually instead of using the response "
760 . "buttons below.",
761 on_activate => sub { 1268 on_activate => sub {
762 my ($entry, $text) = @_; 1269 my ($entry, $text) = @_;
763 1270
764 return unless $text =~ /\S/; 1271 return unless $text =~ /\S/;
765 1272
… …
768 1275
769 0 1276 0
770 }, 1277 },
771 ); 1278 );
772 1279
773 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1280 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
774 1281
775 $self->{bye_button} = new CFClient::UI::Button 1282 $self->{bye_button} = new CFPlus::UI::Button
776 text => "Bye (close)", 1283 text => "Bye (close)",
777 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1284 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
778 on_activate => sub { $this->destroy; 0 }, 1285 on_activate => sub { $this->destroy; 1 },
779 ; 1286 ;
780 1287
781 $self->update_options; 1288 $self->update_options;
782 1289
783 $self->{token} = $self->{conn}->ext_token; 1290 $self->{id} = $self->{conn}->send_ext_req (
784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1291 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
785 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1292 sub { $this && $this->feed (@_) }
1293 );
786 1294
787 $self->{entry}->grab_focus; 1295 $self->{entry}->grab_focus;
788 1296
789 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1297 $self->{textview}->add_paragraph ({
1298 fg => [1, 1, 0, 1],
1299 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1300 });
790 1301
791 $self->show; 1302 $self->show;
792 $self 1303 $self
793}; 1304};
794 1305
795sub update_options { 1306sub update_options {
796 my ($self) = @_; 1307 my ($self) = @_;
797 1308
798 Scalar::Util::weaken $self; 1309 CFPlus::weaken $self;
799 1310
800 $self->{options}->clear; 1311 $self->{options}->clear;
801 $self->{options}->add ($self->{bye_button}); 1312 $self->{options}->add ($self->{bye_button});
802 1313
803 for my $kw (sort keys %{ $self->{kw} }) { 1314 for my $kw (sort keys %{ $self->{kw} }) {
804 $self->{options}->add (new CFClient::UI::Button 1315 $self->{options}->add (new CFPlus::UI::Button
805 text => $kw, 1316 text => $kw,
806 on_activate => sub { 1317 on_activate => sub {
807 $self->send ($kw); 1318 $self->send ($kw);
808 0 1319 0
809 }, 1320 },
810 ); 1321 );
811 } 1322 }
812} 1323}
813 1324
814sub feed { 1325sub feed {
815 my ($self, $data) = @_; 1326 my ($self, $msg) = @_;
816 1327
817 my ($type, $msg) = split / /, $data, 2; 1328 CFPlus::weaken $self;
818 1329
819 if ($type eq "msg") { 1330 if ($msg->{msgtype} eq "reply") {
820 my ($msg, @kw) = split /\x00/, $msg; 1331 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
821 $self->{kw}{$_} = 1 for @kw; 1332 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
822 1333
823 $msg = "\n" . CFClient::UI::Label::escape $msg; 1334 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1335 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
825 my @link; 1336 my @link;
826 $msg =~ s{ 1337 $text =~ s{
827 ($match) 1338 ($match)
828 }{ 1339 }{
1340 my $kw = $1;
1341
829 push @link, new CFClient::UI::Label 1342 push @link, new CFPlus::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>", 1343 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
831 can_hover => 1, 1344 can_hover => 1,
832 can_events => 1; 1345 can_events => 1,
1346 padding_x => 0,
1347 padding_y => 0,
1348 on_button_up => sub {
1349 $self->send ($kw);
1350 };
833 1351
834 chr 0xfffc 1352 "\x{fffc}"
835 }giex; 1353 }giex;
836 1354
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1355 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1356 $self->{textview}->scroll_to_bottom;
838 $self->update_options; 1357 $self->update_options;
839 } else { 1358 } else {
840 $self->destroy; 1359 $self->destroy;
841 } 1360 }
842 1361
… …
844} 1363}
845 1364
846sub send { 1365sub send {
847 my ($self, $msg) = @_; 1366 my ($self, $msg) = @_;
848 1367
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1368 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
850 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1369 $self->{textview}->scroll_to_bottom;
1370
1371 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
851} 1372}
852 1373
853sub destroy { 1374sub destroy {
854 my ($self) = @_; 1375 my ($self) = @_;
855 1376
856 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1377 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
857 1378
1379 if ($self->{conn}) {
1380 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
858 delete $self->{conn}{npc_dialog}; 1381 delete $self->{conn}{npc_dialog};
859 $self->{conn}->disconnect_ext ($self->{token}); 1382 $self->{conn}->disconnect_ext ($self->{id});
1383 }
860 1384
861 $self->SUPER::destroy; 1385 $self->SUPER::destroy;
862} 1386}
863 1387
8641; 13881
1389

Diff Legend

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