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.122 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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