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

Diff Legend

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