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

Diff Legend

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