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.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.121 by root, Sat Jul 14 13:08:40 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
88sub _stat_numdiff { 273sub _stat_numdiff {
89 my ($self, $old, $new) = @_; 274 my ($self, $name, $old, $new) = @_;
90 275
91 my $diff = $new - $old; 276 my $diff = $new - $old;
92 $diff > 0 ? "+$diff" : $diff 277
278 $diff = 0.01 * int $diff * 100;
279
280 0.1 >= abs $diff ? ()
281 : $diff < 0 ? "$name$diff" : "$name+$diff"
93} 282}
94 283
95sub _stat_skillmaskdiff { 284sub _stat_skillmaskdiff {
96 my ($self, $old, $new) = @_; 285 my ($self, $name, $old, $new) = @_;
97 286
98 my $diff = $old ^ $new; 287 my $diff = $old ^ $new
288 or return;
99 289
100 my @diff = map 290 my @diff = map
101 { 291 {
102 $diff & $_ 292 $diff & $_
103 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 293 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
… …
150); 340);
151 341
152sub stats_update { 342sub stats_update {
153 my ($self, $stats) = @_; 343 my ($self, $stats) = @_;
154 344
155 if (my $prev = $self->{prev_stats}) { 345 my $prev = $self->{prev_stats} || { };
156 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) { 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;
157 $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);
158 } 358 }
159 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
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);
160 if ( 456 for (
161 my @diffs = map { 457 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
162 $stats->{$_->[0]} != $prev->{$_->[0]} 458 map [$_, $self->{skill_info}{$_}],
163 ? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : (); 459 grep exists $stats->{$_},
164 } 460 @skills
165 @statchange
166 ) { 461 ) {
167 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 462 my ($idx, $name) = @$_;
168 $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10); 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
169 } 484 };
170 }
171 485
172 $self->{prev_stats} = { %$stats }; 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);
173 492
174 ::update_stats_window ($stats); 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 }
175} 509}
176 510
177sub user_send { 511sub user_send {
178 my ($self, $command) = @_; 512 my ($self, $command) = @_;
179 513
514 $self->{record}->($command)
180 if ($self->{record}) { 515 if $self->{record};
181 push @{$self->{record}}, $command;
182 }
183 516
184 $self->logprint ("send: ", $command); 517 $self->logprint ("send: ", $command);
185 $self->send_command ($command); 518 $self->send_command ($command);
186 ::status ($command); 519 ::status ($command);
187} 520}
188 521
189sub start_record { 522sub record {
190 my ($self) = @_; 523 my ($self, $cb) = @_;
191 524
192 $self->{record} = []; 525 $self->{record} = $cb;
193}
194
195sub stop_record {
196 my ($self) = @_;
197 return delete $self->{record};
198} 526}
199 527
200sub map_scroll { 528sub map_scroll {
201 my ($self, $dx, $dy) = @_; 529 my ($self, $dx, $dy) = @_;
202 530
… …
204} 532}
205 533
206sub feed_map1a { 534sub feed_map1a {
207 my ($self, $data) = @_; 535 my ($self, $data) = @_;
208 536
209 $self->{map}->map1a_update ($data); 537 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
210 $self->{map_widget}->update; 538 $self->{map_widget}->update;
211} 539}
212 540
213sub magicmap { 541sub magicmap {
214 my ($self, $w, $h, $x, $y, $data) = @_; 542 my ($self, $w, $h, $x, $y, $data) = @_;
… …
223 or return; 551 or return;
224 552
225 my ($hash, $x, $y, $w, $h) = @$map_info; 553 my ($hash, $x, $y, $w, $h) = @$map_info;
226 554
227 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 555 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
228 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 556 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
229 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 557 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
230} 558}
231 559
232sub map_clear { 560sub map_clear {
233 my ($self) = @_; 561 my ($self) = @_;
… …
237 565
238 $self->{map}->clear; 566 $self->{map}->clear;
239 delete $self->{map_widget}{magicmap}; 567 delete $self->{map_widget}{magicmap};
240} 568}
241 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}
242 591
243sub load_map($$$) { 592sub load_map($$$) {
244 my ($self, $hash, $x, $y) = @_; 593 my ($self, $hash, $x, $y) = @_;
245 594
246 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) {
247 $data = Compress::LZF::decompress $data; 603 $data = Compress::LZF::decompress $data;
248 #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#
249 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
250 my $data = $self->{tilecache}->get ($id)
251 or next;
252 605
253 $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;
254 } 609 }
255 } 610 };
256} 611}
257 612
258# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 613# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
259# (server resource,s latency, bandwidth), so this hack is warranted. 614# (server resource,s latency, bandwidth), so this hack is warranted.
260# 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
… …
324 679
325 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 680 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
326 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 681 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
327 682
328 } else { 683 } else {
684 my $gen = $self->{map_change_gen};
329 $self->send_mapinfo ("spatial $path$tile", sub { 685 $self->send_mapinfo ("spatial $path$tile", sub {
686 return unless $gen == $self->{map_change_gen};
687
330 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 688 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
331 689
332 return if $mode ne "spatial"; 690 return if $mode ne "spatial";
333 691
334 $x += $self->{map}->ox; 692 $x += $self->{map}->ox;
… …
348 706
349sub map_change { 707sub map_change {
350 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
351 709
352 $self->flush_map; 710 $self->flush_map;
711
712 ++$self->{map_change_gen};
353 713
354 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 714 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
355 715
356 my $mapmapw = $self->{mapmap}->{w}; 716 my $mapmapw = $self->{mapmap}->{w};
357 my $mapmaph = $self->{mapmap}->{h}; 717 my $mapmaph = $self->{mapmap}->{h};
… …
374 $self->load_map ($hash, $x, $y); 734 $self->load_map ($hash, $x, $y);
375 $self->flood_fill (0, 0, 0, "", $hash, $flags); 735 $self->flood_fill (0, 0, 0, "", $hash, $flags);
376} 736}
377 737
378sub 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 {
379 my ($self, $facenum, $face) = @_; 763 my ($self, $facenum, $face) = @_;
380 764
381 my $hash = "$face->{chksum},$face->{name}"; 765 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
382
383 my $id = $self->{facemap}->get ($hash);
384
385 unless ($id) {
386 # create new id for face
387 # I love transactions
388 for (1..100) {
389 my $txn = $CFClient::DB_ENV->txn_begin;
390 my $status = $self->{facemap}->db_get (id => $id);
391 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
392 $id = ($id || 64) + 1;
393 if ($self->{facemap}->put (id => $id) == 0
394 && $self->{facemap}->put ($hash => $id) == 0) {
395 $txn->txn_commit;
396
397 goto gotid;
398 }
399 }
400 $txn->txn_abort;
401 }
402
403 CFClient::fatal "maximum number of transaction retries reached - database problems?";
404 }
405
406gotid:
407 $face->{id} = $id;
408 $self->{map}->set_face ($facenum => $id);
409 $self->{faceid}[$facenum] = $id;#d#
410
411 my $face = $self->{tilecache}->get ($id);
412
413 if ($face) {
414 #$self->face_prefetch;
415 $face
416 } else {
417 my $tex = $self->{noface};
418 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
419 undef
420 };
421}
422
423sub face_update {
424 my ($self, $facenum, $face) = @_;
425
426 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
427
428 $self->set_texture ($face->{id} => delete $face->{image});
429} 766}
430 767
431sub set_texture { 768sub set_texture {
432 my ($self, $id, $data) = @_; 769 my ($self, $id, $data) = @_;
433 770
771 return unless $self->{map};
772
434 $self->{texture}[$id] ||= do { 773 $self->{texture}[$id] = my $tex =
435 my $tex =
436 new_from_image CFClient::Texture 774 new_from_image CFPlus::Texture
437 $data, minify => 1, mipmap => 1; 775 $data, minify => 1, mipmap => 1;
438 776
439 $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}});
440 $self->{map_widget}->update; 778 $self->{map_widget}->update;
441
442 $tex
443 };
444} 779}
445 780
446sub sound_play { 781sub sound_play {
447 my ($self, $x, $y, $soundnum, $type) = @_; 782 my ($self, $x, $y, $soundnum, $type) = @_;
448 783
… …
458 $LAST_QUERY = $prompt; 793 $LAST_QUERY = $prompt;
459 794
460 $self->{query}-> ($self, $flags, $prompt); 795 $self->{query}-> ($self, $flags, $prompt);
461} 796}
462 797
463sub drawinfo { 798sub sanitise_xml($) {
464 my ($self, $color, $text) = @_; 799 local $_ = shift;
465 800
466 my @color = ( 801 # we now weed out all tags we do not support
802 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
803 # now all entities
804 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
805
806 # handle some elements
807 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
808 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
809
810 $_
811}
812
813our %NAME_TO_COLOR = (
814 black => 0,
815 white => 1,
816 darkblue => 2,
817 red => 3,
818 orange => 4,
819 lightblue => 5,
820 darkorange => 6,
821 green => 7,
822 darkgreen => 8,
823 grey => 9,
824 brown => 10,
825 yellow => 11,
826 tan => 12,
827);
828
829our @CF_COLOR = (
467 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 830 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
468 [1.00, 1.00, 1.00], 831 [1.00, 1.00, 1.00],
469 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 832 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
470 [1.00, 0.00, 0.00], 833 [1.00, 0.00, 0.00],
471 [1.00, 0.54, 0.00], 834 [1.00, 0.54, 0.00],
472 [0.11, 0.56, 1.00], 835 [0.11, 0.56, 1.00],
473 [0.93, 0.46, 0.00], 836 [0.93, 0.46, 0.00],
474 [0.18, 0.54, 0.34], 837 [0.18, 0.54, 0.34],
475 [0.56, 0.73, 0.56], 838 [0.56, 0.73, 0.56],
476 [0.80, 0.80, 0.80], 839 [0.80, 0.80, 0.80],
477 [0.55, 0.41, 0.13], 840 [0.75, 0.61, 0.20],
478 [0.99, 0.77, 0.26], 841 [0.99, 0.77, 0.26],
479 [0.74, 0.65, 0.41], 842 [0.74, 0.65, 0.41],
480 ); 843);
481 844
845sub msg {
846 my ($self, $color, $type, $text, @extra) = @_;
847
848 $text = sanitise_xml $text;
849
850 if (my $cb = $self->{cb_msg}{$type}) {
851 $_->($self, $color, $type, $text, @extra) for values %$cb;
852 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
853 $type =~ s/-/_/g;
854 $self->{$type} = $text;
855 } else {
482 $self->logprint ("info: ", $text); 856 $self->logprint ("msg: ", $text);
857 return if $color < 0; # negative color == ignore if not understood
483 858
484 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 859 my $fg = $CF_COLOR[$color % @CF_COLOR];
485 860
486 # try to create single paragraphs of multiple lines sent by the server 861 ## try to create single paragraphs of multiple lines sent by the server
862 # no longer neecssary with TRT servers
487 $text =~ s/(?<=\S)\n(?=\w)/ /g; 863 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
488 864
489 $text = CFClient::UI::Label::escape $text; 865 ::message ({ fg => $fg, markup => $_ })
490 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 866 for split /\n/, $text;
491 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
492 867
493 $self->{logview}->add_paragraph ($color[$color], $_)
494 for map "$time $_", split /\n/, $text;
495 $self->{logview}->scroll_to_bottom;
496
497 $self->{statusbox}->add ($text, 868 $self->{statusbox}->add ($text,
498 group => $text, 869 group => $text,
499 fg => $color[$color], 870 fg => $fg,
500 timeout => $color >= 2 ? 60 : 10, 871 timeout => $color >= 2 ? 180 : 10,
501 tooltip_font => $::FONT_FIXED, 872 tooltip_font => $::FONT_FIXED,
502 ); 873 );
503} 874 }
504
505sub drawextinfo {
506 my ($self, $color, $type, $subtype, $message) = @_;
507
508 $self->drawinfo ($color, $message);
509} 875}
510 876
511sub spell_add { 877sub spell_add {
512 my ($self, $spell) = @_; 878 my ($self, $spell) = @_;
513 879
514 # try to create single paragraphs of multiple lines sent by the server 880 # try to create single paragraphs out of the multiple lines sent by the server
515 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 881 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
516 $spell->{message} =~ s/\n+$//; 882 $spell->{message} =~ s/\n+$//;
517 $spell->{message} ||= "Server did not provide a description for this spell."; 883 $spell->{message} ||= "Server did not provide a description for this spell.";
518 884
519 $::SPELL_PAGE->add_spell ($spell); 885 $::SPELL_LIST->add_spell ($spell);
520 886
521 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 887 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
522 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 888 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
523} 889}
524 890
525sub spell_delete { 891sub spell_delete {
526 my ($self, $spell) = @_; 892 my ($self, $spell) = @_;
527 893
528 $::SPELL_PAGE->remove_spell ($spell); 894 $::SPELL_LIST->remove_spell ($spell);
895}
896
897sub setup {
898 my ($self, $setup) = @_;
899
900 $self->{map_widget}->set_tilesize ($self->{tilesize});
901 $::MAP->resize ($self->{mapw}, $self->{maph});
529} 902}
530 903
531sub addme_success { 904sub addme_success {
532 my ($self) = @_; 905 my ($self) = @_;
533 906
534 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
535 my ($pom) = @_;
536
537 my %skill_help; 907 my %skill_help;
538 908
539 for my $head2 ($pom->head1->[3]->head2) { 909 for my $node (CFPlus::Pod::find skill_description => "*") {
540 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 910 my (undef, @par) = CFPlus::Pod::section_of $node;
541 } 911 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
542
543 \%skill_help
544 }; 912 };
545 913
546 for my $skill (values %{$self->{skill_info}}) { 914 for my $skill (values %{$self->{skill_info}}) {
547 $self->{map_widget}->add_command ("ready_skill $skill", 915 $self->{map_widget}->add_command ("ready_skill $skill",
548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 916 (CFPlus::asxml "Ready the skill '$skill'\n\n")
549 . $skill_help->{$skill}); 917 . $skill_help{$skill});
550 $self->{map_widget}->add_command ("use_skill $skill", 918 $self->{map_widget}->add_command ("use_skill $skill",
551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 919 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
552 . $skill_help->{$skill}); 920 . $skill_help{$skill});
553 } 921 }
554} 922}
555 923
556sub eof { 924sub eof {
557 my ($self) = @_; 925 my ($self) = @_;
… …
581 949
582 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 950 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
583 951
584 $self->send ("requestinfo image_sums $face $face"); 952 $self->send ("requestinfo image_sums $face $face");
585 953
586 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 954 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
587 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
588 } elsif (!exists $self->{num_faces}) { 956 } elsif (!exists $self->{num_faces}) {
589 $self->send ("requestinfo image_info"); 957 $self->send ("requestinfo image_info");
590 958
591 $self->{num_faces} = 0; 959 $self->{num_faces} = 0;
592 960
593 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 961 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
594 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 962 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
595 } 963 }
596} 964}
597 965
598sub update_floorbox { 966sub update_floorbox {
599 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 967 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
600 return unless $::CONN; 968 return unless $::CONN;
601 969
602 $::FLOORBOX->clear; 970 $::FLOORBOX->clear;
603 971
604 my $row; 972 my $row;
605 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 973 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
606 if ($row < 6) { 974 if ($row < 6) {
607 local $_->{face_widget}; # hack to force recreation of widget 975 local $_->{face_widget}; # hack to force recreation of widget
608 local $_->{desc_widget}; # hack to force recreation of widget 976 local $_->{desc_widget}; # hack to force recreation of widget
609 CFClient::Item::update_widgets $_; 977 CFPlus::Item::update_widgets $_;
610 978
611 $::FLOORBOX->add (0, $row, $_->{face_widget}); 979 $::FLOORBOX->add (0, $row, $_->{face_widget});
612 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 980 $::FLOORBOX->add (1, $row, $_->{desc_widget});
613 981
614 $row++; 982 $row++;
615 } else { 983 } else {
616 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 984 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
617 text => "More...", 985 text => "More...",
618 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 986 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
619 ); 987 );
620 last; 988 last;
621 } 989 }
622 } 990 }
991 if ($::CONN->{open_container}) {
992 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
993 text => "Close container",
994 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
995 );
996 }
623 }); 997 });
624 998
625 $::WANT_REFRESH++; 999 $::WANT_REFRESH++;
626} 1000}
627 1001
628sub set_opencont { 1002sub set_opencont {
629 my ($conn, $tag, $name) = @_; 1003 my ($conn, $tag, $name) = @_;
630 $conn->{open_container} = $tag; 1004 $conn->{open_container} = $tag;
1005 update_floorbox;
631 1006
632 $::INV_RIGHT_HB->clear (); 1007 $::INV_RIGHT_HB->clear ();
633 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
634 1009
635 if ($tag != 0) { # Floor isn't closable, is it? 1010 if ($tag != 0) { # Floor isn't closable, is it?
636 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1011 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
637 text => "Close container", 1012 text => "Close container",
638 tooltip => "Close the currently open container (if one is open)", 1013 tooltip => "Close the currently open container (if one is open)",
639 on_activate => sub { 1014 on_activate => sub {
640 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1015 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
641 if $tag != 0; 1016 if $tag != 0;
… …
649} 1024}
650 1025
651sub update_containers { 1026sub update_containers {
652 my ($self) = @_; 1027 my ($self) = @_;
653 1028
654 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1029 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
655 for my $tag (keys %{ delete $self->{update_container} }) { 1030 my $todo = delete $self->{update_container}
1031 or return;
1032
1033 for my $tag (keys %$todo) {
1034 update_floorbox if $tag == 0 or $tag == $self->{open_container};
656 if ($tag == 0) { 1035 if ($tag == 0) {
657 update_floorbox;
658 $::INVR->set_items ($self->{container}{0}) 1036 $::INVR->set_items ($self->{container}{0})
659 if $tag == $self->{open_container}; 1037 if $tag == $self->{open_container};
660 } elsif ($tag == $self->{player}{tag}) { 1038 } elsif ($tag == $self->{player}{tag}) {
661 $::INV->set_items ($self->{container}{$tag}) 1039 $::INV->set_items ($self->{container}{$tag})
662 } else { 1040 } else {
… …
693sub item_update { 1071sub item_update {
694 my ($self, $item) = @_; 1072 my ($self, $item) = @_;
695 1073
696 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1074 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
697 1075
698 CFClient::Item::update_widgets $item; 1076 CFPlus::Item::update_widgets $item;
699 1077
700 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1078 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
701 set_opencont ($::CONN, 0, "Floor"); 1079 set_opencont ($::CONN, 0, "Floor");
702 1080
703 } elsif ($item->{flags} & F_OPEN) { 1081 } elsif ($item->{flags} & F_OPEN) {
704 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1082 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
705 1083
706 } else { 1084 } else {
707 $self->{update_container}{$item->{container}}++; 1085 $self->{update_container}{$item->{container}}++;
708 $self->update_containers; 1086 $self->update_containers;
709# if ($item->{container} == 0) {
710# update_floorbox;
711# update_container (0);
712# } elsif ($item->{container} == $self->{player}{tag}) {
713# $::INV->set_items ($self->{container}{$item->{container}})
714# }
715 } 1087 }
716} 1088}
717 1089
718sub player_update { 1090sub player_update {
719 my ($self, $player) = @_; 1091 my ($self, $player) = @_;
1092
1093 $self->update_weight;
1094}
1095
1096sub update_weight {
1097 my ($self) = @_;
1098
1099 my $weight = .001 * $self->{player}{weight};
1100 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1101
720 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1102 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1103 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1104 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
721} 1105}
722 1106
723sub update_server_info { 1107sub update_server_info {
724 my ($self) = @_; 1108 my ($self) = @_;
725 1109
… …
728 $::SERVER_INFO->set_markup ( 1112 $::SERVER_INFO->set_markup (
729 "server <tt>$self->{host}:$self->{port}</tt>\n" 1113 "server <tt>$self->{host}:$self->{port}</tt>\n"
730 . "protocol version <tt>$self->{version}</tt>\n" 1114 . "protocol version <tt>$self->{version}</tt>\n"
731 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1115 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
732 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1116 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1117 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1118 . "editing support $yesno[!!$self->{editor_support}]\n"
1119 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1120 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
733 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
734 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
735 . "map size $self->{mapw}×$self->{maph}\n" 1123 . "map size $self->{mapw}×$self->{maph}\n"
736 ); 1124 );
1125
1126 ::setup_build_button ($self->{editor_support}->{builder_ui});
737} 1127}
738 1128
739sub logged_in { 1129sub logged_in {
740 my ($self) = @_; 1130 my ($self) = @_;
741 1131
742 $self->send_ext_req (cfplus_support => "1", sub { 1132 $self->send_ext_req (cfplus_support => version => 1, sub {
743 $self->{cfplus_ext} = $_[0]; 1133 $self->{cfplus_ext} = $_[0]{version};
744 $self->update_server_info; 1134 $self->update_server_info;
1135
1136 if ($self->{cfplus_ext} >= 2) {
1137 $self->send_ext_req ("editor_support", sub {
1138 $self->{editor_support} = $_[0];
1139 $self->update_server_info;
1140
1141 0
1142 });
1143 }
1144
1145 0
745 }); 1146 });
746 1147
747 $self->update_server_info; 1148 $self->update_server_info;
748 1149
749 $self->send_command ("output-sync $::CFG->{output_sync}"); 1150 $self->send_command ("output-sync $::CFG->{output_sync}");
750 $self->send_command ("output-count $::CFG->{output_count}"); 1151 $self->send_command ("output-count $::CFG->{output_count}");
1152 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
751 $self->send_command ("pickup $::CFG->{pickup}"); 1153 $self->send_command ("pickup $::CFG->{pickup}");
1154}
1155
1156sub buildat {
1157 my ($self, $builditem, $x, $y) = @_;
1158
1159 if ($self->{cfplus_ext}) {
1160 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1161 }
752} 1162}
753 1163
754sub lookat { 1164sub lookat {
755 my ($self, $x, $y) = @_; 1165 my ($self, $x, $y) = @_;
756 1166
757 if ($self->{cfplus_ext}) { 1167 if ($self->{cfplus_ext}) {
758 $self->send_ext_req (lookat => "$x $y", sub { 1168 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
759 my %res = split /\x00/, $_[0]; 1169 my ($msg) = @_;
760 1170
761 if (exists $res{npc_dialog}) { 1171 if (exists $msg->{npc_dialog}) {
762 # start npc chat dialog 1172 # start npc chat dialog
763 $self->{npc_dialog} = new CFClient::NPCDialog:: 1173 $self->{npc_dialog} = new CFPlus::NPCDialog::
764 dx => $x, 1174 dx => $x,
765 dy => $y, 1175 dy => $y,
766 title => "$res{npc_dialog} (NPC)", 1176 title => "$msg->{npc_dialog} (NPC)",
767 conn => $self, 1177 conn => $self,
768 ; 1178 ;
769 } 1179 }
770 }); 1180 });
771 } 1181 }
… …
774} 1184}
775 1185
776sub destroy { 1186sub destroy {
777 my ($self) = @_; 1187 my ($self) = @_;
778 1188
779 $self->{npc_dialog}->destroy 1189 (delete $self->{npc_dialog})->destroy
780 if $self->{npc_dialog}; 1190 if $self->{npc_dialog};
781 1191
782 $self->SUPER::destroy; 1192 $self->SUPER::destroy;
783}
784 1193
1194 %$self = ();
1195}
1196
785package CFClient::NPCDialog; 1197package CFPlus::NPCDialog;
786 1198
787our @ISA = 'CFClient::UI::FancyFrame'; 1199our @ISA = 'CFPlus::UI::Toplevel';
788 1200
789sub new { 1201sub new {
790 my $class = shift; 1202 my $class = shift;
791 1203
792 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
… …
795 name => "npc_dialog", 1207 name => "npc_dialog",
796 force_w => $::WIDTH * 0.7, 1208 force_w => $::WIDTH * 0.7,
797 force_h => $::HEIGHT * 0.7, 1209 force_h => $::HEIGHT * 0.7,
798 title => "NPC Dialog", 1210 title => "NPC Dialog",
799 kw => { hi => 0, yes => 0, no => 0 }, 1211 kw => { hi => 0, yes => 0, no => 0 },
1212 has_close_button => 1,
800 @_, 1213 @_,
801 ); 1214 );
802 1215
803 Scalar::Util::weaken (my $this = $self); 1216 CFPlus::weaken (my $this = $self);
1217
1218 $self->connect (delete => sub { $this->destroy; 1 });
804 1219
805 # better use a pane... 1220 # better use a pane...
806 $self->add (my $hbox = new CFClient::UI::HBox); 1221 $self->add (my $hbox = new CFPlus::UI::HBox);
807 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1222 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
808 1223
809 $hbox->add (my $vbox = new CFClient::UI::VBox); 1224 $hbox->add (my $vbox = new CFPlus::UI::VBox);
810 1225
811 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1226 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
812 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1227 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
813 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1228 tooltip => "#npc_message_entry",
814 . "Sometimes you have to tell an NPC something you cannot find out during "
815 . "a normal conversation (such as a password). In those cases you have to use "
816 . "this text entry. You can also enter responses manually instead of using the response "
817 . "buttons below.",
818 on_activate => sub { 1229 on_activate => sub {
819 my ($entry, $text) = @_; 1230 my ($entry, $text) = @_;
820 1231
821 return unless $text =~ /\S/; 1232 return unless $text =~ /\S/;
822 1233
… …
825 1236
826 0 1237 0
827 }, 1238 },
828 ); 1239 );
829 1240
830 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1241 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
831 1242
832 $self->{bye_button} = new CFClient::UI::Button 1243 $self->{bye_button} = new CFPlus::UI::Button
833 text => "Bye (close)", 1244 text => "Bye (close)",
834 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1245 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
835 on_activate => sub { $this->destroy; 0 }, 1246 on_activate => sub { $this->destroy; 1 },
836 ; 1247 ;
837 1248
838 $self->update_options; 1249 $self->update_options;
839 1250
840 $self->{token} = $self->{conn}->ext_token; 1251 $self->{id} = $self->{conn}->send_ext_req (
841 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1252 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
842 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1253 sub { $this && $this->feed (@_) }
1254 );
843 1255
844 $self->{entry}->grab_focus; 1256 $self->{entry}->grab_focus;
845 1257
846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1258 $self->{textview}->add_paragraph ({
1259 fg => [1, 1, 0, 1],
1260 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1261 });
847 1262
848 $self->show; 1263 $self->show;
849 $self 1264 $self
850}; 1265};
851 1266
852sub update_options { 1267sub update_options {
853 my ($self) = @_; 1268 my ($self) = @_;
854 1269
855 Scalar::Util::weaken $self; 1270 CFPlus::weaken $self;
856 1271
857 $self->{options}->clear; 1272 $self->{options}->clear;
858 $self->{options}->add ($self->{bye_button}); 1273 $self->{options}->add ($self->{bye_button});
859 1274
860 for my $kw (sort keys %{ $self->{kw} }) { 1275 for my $kw (sort keys %{ $self->{kw} }) {
861 $self->{options}->add (new CFClient::UI::Button 1276 $self->{options}->add (new CFPlus::UI::Button
862 text => $kw, 1277 text => $kw,
863 on_activate => sub { 1278 on_activate => sub {
864 $self->send ($kw); 1279 $self->send ($kw);
865 0 1280 0
866 }, 1281 },
867 ); 1282 );
868 } 1283 }
869} 1284}
870 1285
871sub feed { 1286sub feed {
872 my ($self, $data) = @_; 1287 my ($self, $msg) = @_;
873 1288
874 Scalar::Util::weaken $self; 1289 CFPlus::weaken $self;
875 1290
876 my ($type, $msg) = split / /, $data, 2; 1291 if ($msg->{msgtype} eq "reply") {
1292 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1293 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
877 1294
878 if ($type eq "msg") { 1295 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
879 my ($msg, @kw) = split /\x00/, $msg;
880 $self->{kw}{$_} = 1 for @kw;
881
882 $msg = "\n" . CFClient::UI::Label::escape $msg;
883 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1296 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
884 my @link; 1297 my @link;
885 $msg =~ s{ 1298 $text =~ s{
886 ($match) 1299 ($match)
887 }{ 1300 }{
888 my $kw = $1; 1301 my $kw = $1;
889 1302
890 push @link, new CFClient::UI::Label 1303 push @link, new CFPlus::UI::Label
891 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1304 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
892 can_hover => 1, 1305 can_hover => 1,
893 can_events => 1, 1306 can_events => 1,
894 padding_x => 0, 1307 padding_x => 0,
895 padding_y => 0, 1308 padding_y => 0,
896 on_button_up => sub { 1309 on_button_up => sub {
897 $self->send ($kw); 1310 $self->send ($kw);
898 }; 1311 };
899 1312
900 chr 0xfffc 1313 "\x{fffc}"
901 }giex; 1314 }giex;
902 1315
903 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1316 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
904 $self->{textview}->scroll_to_bottom; 1317 $self->{textview}->scroll_to_bottom;
905 $self->update_options; 1318 $self->update_options;
906 } else { 1319 } else {
907 $self->destroy; 1320 $self->destroy;
908 } 1321 }
… …
911} 1324}
912 1325
913sub send { 1326sub send {
914 my ($self, $msg) = @_; 1327 my ($self, $msg) = @_;
915 1328
916 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1329 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
917 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
918 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331
1332 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
919} 1333}
920 1334
921sub destroy { 1335sub destroy {
922 my ($self) = @_; 1336 my ($self) = @_;
923 1337
924 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1338 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
925 1339
1340 if ($self->{conn}) {
1341 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
926 delete $self->{conn}{npc_dialog}; 1342 delete $self->{conn}{npc_dialog};
927 $self->{conn}->disconnect_ext ($self->{token}); 1343 $self->{conn}->disconnect_ext ($self->{id});
1344 }
928 1345
929 $self->SUPER::destroy; 1346 $self->SUPER::destroy;
930} 1347}
931 1348
9321; 13491
1350

Diff Legend

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