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

Diff Legend

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