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

Diff Legend

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