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

Diff Legend

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