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

Diff Legend

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