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.80 by root, Fri Aug 18 03:20:00 2006 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 CFClient::UI; 9use CFPlus::UI;
10use CFPlus::Pod;
10 11
11use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
14 13
15sub new { 14sub new {
16 my $class = shift; 15 my $class = shift;
17 16
18 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
19 18
20 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
21 20
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 21 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 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 23 or die "unparseable command help: $_->{kw}[0]";
30 24
31 my $cmd = $1; 25 my $cmd = $1;
32 my @args = split /\|/, $2; 26 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 27 @args = (".*") unless @args;
34 28
29 my (undef, @par) = CFPlus::Pod::section_of $_;
30 my $text = CFPlus::Pod::as_label @par;
31
35 $_ = $_ eq ".*" ? "" : " $_" 32 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 33 for @args;
37 34
38 my $text = CFClient::pod_to_pango $head2->content; 35 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
42 @args; 37 @args
43 } 38 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*";
44 40
45 \@cmd_help
46 };
47
48 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 42 for @cmd_help;
50 43
51 $self->{noface} = new_from_file CFClient::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
53 46
54 $self->{open_container} = 0; 47 $self->{open_container} = 0;
55 48
56 # "global" 49 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache"; 50 $self->{tilecache} = CFPlus::db_table "tilecache"
51 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFClient::db_table "facemap"; 52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
59 54
60 # per server 55 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
62 58
63 $self 59 $self
64} 60}
65 61
66sub logprint { 62sub logprint {
67 my ($self, @a) = @_; 63 my ($self, @a) = @_;
64
65 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 66 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 67
70 my $fh = $open_logs{$filename}; 68 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}: $!"; 69 or die "Couldn't open logfile $path: $!";
75 70
76 $open_logs{$filename} = $fh; 71 $fh->autoflush (1);
72
73 $fh;
77 } 74 };
78 75
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 76 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 77
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 78 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 79 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 80
84 print $fh "$ts ", @a, "\n"; 81 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 82}
87 83
88sub _stat_numdiff { 84sub _stat_numdiff {
89 my ($self, $name, $old, $new) = @_; 85 my ($self, $name, $old, $new) = @_;
90 86
… …
155); 151);
156 152
157sub stats_update { 153sub stats_update {
158 my ($self, $stats) = @_; 154 my ($self, $stats) = @_;
159 155
160 if (my $prev = $self->{prev_stats}) { 156 my $prev = $self->{prev_stats} || { };
161 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) { 157
158 if (my @diffs =
159 (
160 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
161 map {
162 $stats->{$_} && $prev->{$_}
163 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
164 } sort { $a <=> $b } keys %{$self->{skill_info}}
165 )
166 ) {
167 my $msg = join " ", @diffs;
162 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5); 168 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
169 }
170
171 if (
172 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
173 ) {
174 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
175 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
176 }
177
178 $self->update_stats_window ($stats, $prev);
179
180 $self->{prev_stats} = { %$stats };
181}
182
183my %RES_TBL = (
184 phys => CS_STAT_RES_PHYS,
185 magic => CS_STAT_RES_MAG,
186 fire => CS_STAT_RES_FIRE,
187 elec => CS_STAT_RES_ELEC,
188 cold => CS_STAT_RES_COLD,
189 conf => CS_STAT_RES_CONF,
190 acid => CS_STAT_RES_ACID,
191 drain => CS_STAT_RES_DRAIN,
192 ghit => CS_STAT_RES_GHOSTHIT,
193 pois => CS_STAT_RES_POISON,
194 slow => CS_STAT_RES_SLOW,
195 para => CS_STAT_RES_PARA,
196 tund => CS_STAT_TURN_UNDEAD,
197 fear => CS_STAT_RES_FEAR,
198 depl => CS_STAT_RES_DEPLETE,
199 deat => CS_STAT_RES_DEATH,
200 holyw => CS_STAT_RES_HOLYWORD,
201 blind => CS_STAT_RES_BLIND,
202);
203
204sub update_stats_window {
205 my ($self, $stats, $prev) = @_;
206
207 # I love text protocols...
208
209 my $hp = $stats->{+CS_STAT_HP} * 1;
210 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
211 my $sp = $stats->{+CS_STAT_SP} * 1;
212 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
213 my $fo = $stats->{+CS_STAT_FOOD} * 1;
214 my $fo_m = 999;
215 my $gr = $stats->{+CS_STAT_GRACE} * 1;
216 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
217
218 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
219 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
220 $::GAUGES->{food} ->set_value ($fo, $fo_m);
221 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
222 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224 my $rng = $stats->{+CS_STAT_RANGE};
225 $rng =~ s/^Range: //; # thank you so much dear server
226 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
227 my $title = $stats->{+CS_STAT_TITLE};
228 $title =~ s/^Player: //;
229 $::STATWIDS->{title} ->set_text ("Title: " . $title);
230
231 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
232 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
233 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
234 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
235 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
236 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
237 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
238 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
239 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
240 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
241 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
242 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
243 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
244
245 $self->update_weight;
246
247 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
248 for keys %RES_TBL;
249
250 my $sktbl = $::STATWIDS->{skill_tbl};
251 my @skills = keys %{ $self->{skill_info} };
252
253 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
254 $sktbl->clear;
255
256 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
257 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
258 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
259 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262
263 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
264
265 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
266 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
267
268 my ($x, $y) = (0, 1);
269 for (
270 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
271 map [$_, $self->{skill_info}{$_}],
272 grep exists $stats->{$_},
273 @skills
274 ) {
275 my ($idx, $name) = @$_;
276
277 my $spell_cb = sub {
278 my ($widget, $ev) = @_;
279
280 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) {
285 (new CFPlus::UI::Menu
286 items => [
287 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
288 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
289 ],
290 )->popup ($ev);
291 } else {
292 return 0;
293 }
294
295 1
296 };
297
298 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
299 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
300 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
301 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
302 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
303 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
304
305 $x++ and ($x, $y) = (0, $y + 1);
163 } 306 }
164
165 if (
166 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
167 ) {
168 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
169 $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
170 }
171 } 307 }
172 308
173 $self->{prev_stats} = { %$stats }; 309 for (grep exists $stats->{$_}, @skills) {
174 310 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
175 ::update_stats_window ($stats); 311 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312 }
176} 313}
177 314
178sub user_send { 315sub user_send {
179 my ($self, $command) = @_; 316 my ($self, $command) = @_;
180 317
… …
205} 342}
206 343
207sub feed_map1a { 344sub feed_map1a {
208 my ($self, $data) = @_; 345 my ($self, $data) = @_;
209 346
210 $self->{map}->map1a_update ($data); 347 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
211 $self->{map_widget}->update; 348 $self->{map_widget}->update;
212} 349}
213 350
214sub magicmap { 351sub magicmap {
215 my ($self, $w, $h, $x, $y, $data) = @_; 352 my ($self, $w, $h, $x, $y, $data) = @_;
… …
385 522
386 unless ($id) { 523 unless ($id) {
387 # create new id for face 524 # create new id for face
388 # I love transactions 525 # I love transactions
389 for (1..100) { 526 for (1..100) {
390 my $txn = $CFClient::DB_ENV->txn_begin; 527 my $txn = $CFPlus::DB_ENV->txn_begin;
391 my $status = $self->{facemap}->db_get (id => $id); 528 my $status = $self->{facemap}->db_get (id => $id);
392 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 529 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
393 $id = ($id || 64) + 1; 530 $id = ($id || 64) + 1;
394 if ($self->{facemap}->put (id => $id) == 0 531 if ($self->{facemap}->put (id => $id) == 0
395 && $self->{facemap}->put ($hash => $id) == 0) { 532 && $self->{facemap}->put ($hash => $id) == 0) {
… …
399 } 536 }
400 } 537 }
401 $txn->txn_abort; 538 $txn->txn_abort;
402 } 539 }
403 540
404 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 541 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
405 } 542 }
406 543
407gotid: 544gotid:
408 $face->{id} = $id; 545 $face->{id} = $id;
409 $self->{map}->set_face ($facenum => $id); 546 $self->{map}->set_face ($facenum => $id);
… …
420 undef 557 undef
421 }; 558 };
422} 559}
423 560
424sub face_update { 561sub face_update {
425 my ($self, $facenum, $face) = @_; 562 my ($self, $facenum, $face, $changed) = @_;
426 563
427 $self->{tilecache}->put ($face->{id} => $face->{image}) 564 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
428 if $self->{tilecache}->get ($face->{id}) ne $face->{image};
429 565
430 $self->set_texture ($face->{id} => delete $face->{image}); 566 $self->set_texture ($face->{id} => delete $face->{image});
431} 567}
432 568
433sub set_texture { 569sub set_texture {
434 my ($self, $id, $data) = @_; 570 my ($self, $id, $data) = @_;
435 571
436 $self->{texture}[$id] ||= do { 572 $self->{texture}[$id] ||= do {
437 my $tex = 573 my $tex =
438 new_from_image CFClient::Texture 574 new_from_image CFPlus::Texture
439 $data, minify => 1, mipmap => 1; 575 $data, minify => 1, mipmap => 1;
440 576
441 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 577 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
442 $self->{map_widget}->update; 578 $self->{map_widget}->update;
443 579
… …
474 [0.11, 0.56, 1.00], 610 [0.11, 0.56, 1.00],
475 [0.93, 0.46, 0.00], 611 [0.93, 0.46, 0.00],
476 [0.18, 0.54, 0.34], 612 [0.18, 0.54, 0.34],
477 [0.56, 0.73, 0.56], 613 [0.56, 0.73, 0.56],
478 [0.80, 0.80, 0.80], 614 [0.80, 0.80, 0.80],
479 [0.55, 0.41, 0.13], 615 [0.75, 0.61, 0.20],
480 [0.99, 0.77, 0.26], 616 [0.99, 0.77, 0.26],
481 [0.74, 0.65, 0.41], 617 [0.74, 0.65, 0.41],
482 ); 618 );
483 619
484 $self->logprint ("info: ", $text); 620 $self->logprint ("info: ", $text);
… …
486 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
487 623
488 # try to create single paragraphs of multiple lines sent by the server 624 # try to create single paragraphs of multiple lines sent by the server
489 $text =~ s/(?<=\S)\n(?=\w)/ /g; 625 $text =~ s/(?<=\S)\n(?=\w)/ /g;
490 626
491 $text = CFClient::UI::Label::escape $text; 627 $text = CFPlus::asxml $text;
492 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
493 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
494 630
495 $self->{logview}->add_paragraph ($color[$color], $_) 631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
496 for map "$time $_", split /\n/, $text; 632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
497 $self->{logview}->scroll_to_bottom; 633 $self->{logview}->scroll_to_bottom;
498 634
499 $self->{statusbox}->add ($text, 635 $self->{statusbox}->add ($text,
500 group => $text, 636 group => $text,
501 fg => $color[$color], 637 fg => $color[$color],
502 timeout => $color >= 2 ? 60 : 10, 638 timeout => $color >= 2 ? 180 : 10,
503 tooltip_font => $::FONT_FIXED, 639 tooltip_font => $::FONT_FIXED,
504 ); 640 );
505} 641}
506 642
507sub drawextinfo { 643sub drawextinfo {
… …
511} 647}
512 648
513sub spell_add { 649sub spell_add {
514 my ($self, $spell) = @_; 650 my ($self, $spell) = @_;
515 651
516 # try to create single paragraphs of multiple lines sent by the server 652 # try to create single paragraphs out of the multiple lines sent by the server
517 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
518 $spell->{message} =~ s/\n+$//; 654 $spell->{message} =~ s/\n+$//;
519 $spell->{message} ||= "Server did not provide a description for this spell."; 655 $spell->{message} ||= "Server did not provide a description for this spell.";
520 656
521 $::SPELL_PAGE->add_spell ($spell); 657 $::SPELL_PAGE->add_spell ($spell);
522 658
523 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 659 $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}); 660 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
525} 661}
526 662
527sub spell_delete { 663sub spell_delete {
528 my ($self, $spell) = @_; 664 my ($self, $spell) = @_;
529 665
… …
531} 667}
532 668
533sub addme_success { 669sub addme_success {
534 my ($self) = @_; 670 my ($self) = @_;
535 671
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; 672 my %skill_help;
540 673
541 for my $head2 ($pom->head1->[3]->head2) { 674 for my $node (CFPlus::Pod::find skill_description => "*") {
542 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 675 my (undef, @par) = CFPlus::Pod::section_of $node;
543 } 676 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
544
545 \%skill_help
546 }; 677 };
547 678
548 for my $skill (values %{$self->{skill_info}}) { 679 for my $skill (values %{$self->{skill_info}}) {
549 $self->{map_widget}->add_command ("ready_skill $skill", 680 $self->{map_widget}->add_command ("ready_skill $skill",
550 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 681 (CFPlus::asxml "Ready the skill '$skill'\n\n")
551 . $skill_help->{$skill}); 682 . $skill_help{$skill});
552 $self->{map_widget}->add_command ("use_skill $skill", 683 $self->{map_widget}->add_command ("use_skill $skill",
553 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 684 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
554 . $skill_help->{$skill}); 685 . $skill_help{$skill});
555 } 686 }
556} 687}
557 688
558sub eof { 689sub eof {
559 my ($self) = @_; 690 my ($self) = @_;
… …
583 714
584 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 715 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
585 716
586 $self->send ("requestinfo image_sums $face $face"); 717 $self->send ("requestinfo image_sums $face $face");
587 718
588 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 719 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
589 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 720 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
590 } elsif (!exists $self->{num_faces}) { 721 } elsif (!exists $self->{num_faces}) {
591 $self->send ("requestinfo image_info"); 722 $self->send ("requestinfo image_info");
592 723
593 $self->{num_faces} = 0; 724 $self->{num_faces} = 0;
594 725
595 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 726 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
596 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 727 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
597 } 728 }
598} 729}
599 730
600sub update_floorbox { 731sub update_floorbox {
601 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 732 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
602 return unless $::CONN; 733 return unless $::CONN;
603 734
604 $::FLOORBOX->clear; 735 $::FLOORBOX->clear;
605 736
606 my $row; 737 my $row;
607 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 738 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
608 if ($row < 6) { 739 if ($row < 6) {
609 local $_->{face_widget}; # hack to force recreation of widget 740 local $_->{face_widget}; # hack to force recreation of widget
610 local $_->{desc_widget}; # hack to force recreation of widget 741 local $_->{desc_widget}; # hack to force recreation of widget
611 CFClient::Item::update_widgets $_; 742 CFPlus::Item::update_widgets $_;
612 743
613 $::FLOORBOX->add (0, $row, $_->{face_widget}); 744 $::FLOORBOX->add (0, $row, $_->{face_widget});
614 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 745 $::FLOORBOX->add (1, $row, $_->{desc_widget});
615 746
616 $row++; 747 $row++;
617 } else { 748 } else {
618 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 749 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
619 text => "More...", 750 text => "More...",
620 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 751 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
621 ); 752 );
622 last; 753 last;
623 } 754 }
624 } 755 }
756 if ($::CONN->{open_container}) {
757 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
758 text => "Close container",
759 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
760 );
761 }
625 }); 762 });
626 763
627 $::WANT_REFRESH++; 764 $::WANT_REFRESH++;
628} 765}
629 766
630sub set_opencont { 767sub set_opencont {
631 my ($conn, $tag, $name) = @_; 768 my ($conn, $tag, $name) = @_;
632 $conn->{open_container} = $tag; 769 $conn->{open_container} = $tag;
770 update_floorbox;
633 771
634 $::INV_RIGHT_HB->clear (); 772 $::INV_RIGHT_HB->clear ();
635 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 773 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
636 774
637 if ($tag != 0) { # Floor isn't closable, is it? 775 if ($tag != 0) { # Floor isn't closable, is it?
638 $::INV_RIGHT_HB->add (new CFClient::UI::Button 776 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
639 text => "Close container", 777 text => "Close container",
640 tooltip => "Close the currently open container (if one is open)", 778 tooltip => "Close the currently open container (if one is open)",
641 on_activate => sub { 779 on_activate => sub {
642 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 780 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
643 if $tag != 0; 781 if $tag != 0;
… …
651} 789}
652 790
653sub update_containers { 791sub update_containers {
654 my ($self) = @_; 792 my ($self) = @_;
655 793
656 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 794 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
657 my $todo = delete $self->{update_container} 795 my $todo = delete $self->{update_container}
658 or return; 796 or return;
659 797
660 for my $tag (keys %$todo) { 798 for my $tag (keys %$todo) {
799 update_floorbox if $tag == 0 or $tag == $self->{open_container};
661 if ($tag == 0) { 800 if ($tag == 0) {
662 update_floorbox;
663 $::INVR->set_items ($self->{container}{0}) 801 $::INVR->set_items ($self->{container}{0})
664 if $tag == $self->{open_container}; 802 if $tag == $self->{open_container};
665 } elsif ($tag == $self->{player}{tag}) { 803 } elsif ($tag == $self->{player}{tag}) {
666 $::INV->set_items ($self->{container}{$tag}) 804 $::INV->set_items ($self->{container}{$tag})
667 } else { 805 } else {
… …
698sub item_update { 836sub item_update {
699 my ($self, $item) = @_; 837 my ($self, $item) = @_;
700 838
701 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 839 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
702 840
703 CFClient::Item::update_widgets $item; 841 CFPlus::Item::update_widgets $item;
704 842
705 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 843 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
706 set_opencont ($::CONN, 0, "Floor"); 844 set_opencont ($::CONN, 0, "Floor");
707 845
708 } elsif ($item->{flags} & F_OPEN) { 846 } elsif ($item->{flags} & F_OPEN) {
709 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 847 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
710 848
711 } else { 849 } else {
712 $self->{update_container}{$item->{container}}++; 850 $self->{update_container}{$item->{container}}++;
713 $self->update_containers; 851 $self->update_containers;
714 } 852 }
715} 853}
716 854
717sub player_update { 855sub player_update {
718 my ($self, $player) = @_; 856 my ($self, $player) = @_;
857
858 $self->update_weight;
859}
860
861sub update_weight {
862 my ($self) = @_;
863
864 my $weight = .001 * $self->{player}{weight};
865 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
866
719 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 867 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
868 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
869 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
720} 870}
721 871
722sub update_server_info { 872sub update_server_info {
723 my ($self) = @_; 873 my ($self) = @_;
724 874
… …
727 $::SERVER_INFO->set_markup ( 877 $::SERVER_INFO->set_markup (
728 "server <tt>$self->{host}:$self->{port}</tt>\n" 878 "server <tt>$self->{host}:$self->{port}</tt>\n"
729 . "protocol version <tt>$self->{version}</tt>\n" 879 . "protocol version <tt>$self->{version}</tt>\n"
730 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
731 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 881 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
882 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
732 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
733 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
734 . "map size $self->{mapw}×$self->{maph}\n" 885 . "map size $self->{mapw}×$self->{maph}\n"
735 ); 886 );
736} 887}
737 888
738sub logged_in { 889sub logged_in {
739 my ($self) = @_; 890 my ($self) = @_;
740 891
741 $self->send_ext_req (cfplus_support => "1", sub { 892 $self->send_ext_req (cfplus_support => version => 1, sub {
742 $self->{cfplus_ext} = $_[0]; 893 $self->{cfplus_ext} = $_[0]{version};
743 $self->update_server_info; 894 $self->update_server_info;
895
896 0
744 }); 897 });
745 898
746 $self->update_server_info; 899 $self->update_server_info;
747 900
748 $self->send_command ("output-sync $::CFG->{output_sync}"); 901 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
752 905
753sub lookat { 906sub lookat {
754 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
755 908
756 if ($self->{cfplus_ext}) { 909 if ($self->{cfplus_ext}) {
757 $self->send_ext_req (lookat => "$x $y", sub { 910 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
758 my %res = split /\x00/, $_[0]; 911 my ($msg) = @_;
759 912
760 if (exists $res{npc_dialog}) { 913 if (exists $msg->{npc_dialog}) {
761 # start npc chat dialog 914 # start npc chat dialog
762 $self->{npc_dialog} = new CFClient::NPCDialog:: 915 $self->{npc_dialog} = new CFPlus::NPCDialog::
763 dx => $x, 916 dx => $x,
764 dy => $y, 917 dy => $y,
765 title => "$res{npc_dialog} (NPC)", 918 title => "$msg->{npc_dialog} (NPC)",
766 conn => $self, 919 conn => $self,
767 ; 920 ;
768 } 921 }
769 }); 922 });
770 } 923 }
… …
773} 926}
774 927
775sub destroy { 928sub destroy {
776 my ($self) = @_; 929 my ($self) = @_;
777 930
778 $self->{npc_dialog}->destroy 931 (delete $self->{npc_dialog})->destroy
779 if $self->{npc_dialog}; 932 if $self->{npc_dialog};
780 933
781 $self->SUPER::destroy; 934 $self->SUPER::destroy;
782} 935}
783 936
784package CFClient::NPCDialog; 937package CFPlus::NPCDialog;
785 938
786our @ISA = 'CFClient::UI::FancyFrame'; 939our @ISA = 'CFPlus::UI::Toplevel';
787 940
788sub new { 941sub new {
789 my $class = shift; 942 my $class = shift;
790 943
791 my $self = $class->SUPER::new ( 944 my $self = $class->SUPER::new (
… …
794 name => "npc_dialog", 947 name => "npc_dialog",
795 force_w => $::WIDTH * 0.7, 948 force_w => $::WIDTH * 0.7,
796 force_h => $::HEIGHT * 0.7, 949 force_h => $::HEIGHT * 0.7,
797 title => "NPC Dialog", 950 title => "NPC Dialog",
798 kw => { hi => 0, yes => 0, no => 0 }, 951 kw => { hi => 0, yes => 0, no => 0 },
952 has_close_button => 1,
799 @_, 953 @_,
800 ); 954 );
801 955
802 Scalar::Util::weaken (my $this = $self); 956 Scalar::Util::weaken (my $this = $self);
803 957
958 $self->connect (delete => sub { $this->destroy; 1 });
959
804 # better use a pane... 960 # better use a pane...
805 $self->add (my $hbox = new CFClient::UI::HBox); 961 $self->add (my $hbox = new CFPlus::UI::HBox);
806 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 962 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
807 963
808 $hbox->add (my $vbox = new CFClient::UI::VBox); 964 $hbox->add (my $vbox = new CFPlus::UI::VBox);
809 965
810 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 966 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
811 $vbox->add ($self->{entry} = new CFClient::UI::Entry 967 $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" 968 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 { 969 on_activate => sub {
818 my ($entry, $text) = @_; 970 my ($entry, $text) = @_;
819 971
820 return unless $text =~ /\S/; 972 return unless $text =~ /\S/;
821 973
… …
824 976
825 0 977 0
826 }, 978 },
827 ); 979 );
828 980
829 $vbox->add ($self->{options} = new CFClient::UI::VBox); 981 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
830 982
831 $self->{bye_button} = new CFClient::UI::Button 983 $self->{bye_button} = new CFPlus::UI::Button
832 text => "Bye (close)", 984 text => "Bye (close)",
833 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 985 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
834 on_activate => sub { $this->destroy; 0 }, 986 on_activate => sub { $this->destroy; 1 },
835 ; 987 ;
836 988
837 $self->update_options; 989 $self->update_options;
838 990
839 $self->{token} = $self->{conn}->ext_token; 991 $self->{id} = $self->{conn}->send_ext_req (
840 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 992 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
841 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 993 sub { $this && $this->feed (@_) }
994 );
842 995
843 $self->{entry}->grab_focus; 996 $self->{entry}->grab_focus;
844 997
845 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 998 $self->{textview}->add_paragraph ({
999 fg => [1, 1, 0, 1],
1000 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1001 });
846 1002
847 $self->show; 1003 $self->show;
848 $self 1004 $self
849}; 1005};
850 1006
… …
855 1011
856 $self->{options}->clear; 1012 $self->{options}->clear;
857 $self->{options}->add ($self->{bye_button}); 1013 $self->{options}->add ($self->{bye_button});
858 1014
859 for my $kw (sort keys %{ $self->{kw} }) { 1015 for my $kw (sort keys %{ $self->{kw} }) {
860 $self->{options}->add (new CFClient::UI::Button 1016 $self->{options}->add (new CFPlus::UI::Button
861 text => $kw, 1017 text => $kw,
862 on_activate => sub { 1018 on_activate => sub {
863 $self->send ($kw); 1019 $self->send ($kw);
864 0 1020 0
865 }, 1021 },
866 ); 1022 );
867 } 1023 }
868} 1024}
869 1025
870sub feed { 1026sub feed {
871 my ($self, $data) = @_; 1027 my ($self, $msg) = @_;
872 1028
873 Scalar::Util::weaken $self; 1029 Scalar::Util::weaken $self;
874 1030
875 my ($type, $msg) = split / /, $data, 2; 1031 if ($msg->{msgtype} eq "reply") {
1032 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1033 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
876 1034
877 if ($type eq "msg") { 1035 my $text = "\n" . CFPlus::asxml $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} }; 1036 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
883 my @link; 1037 my @link;
884 $msg =~ s{ 1038 $text =~ s{
885 ($match) 1039 ($match)
886 }{ 1040 }{
887 my $kw = $1; 1041 my $kw = $1;
888 1042
889 push @link, new CFClient::UI::Label 1043 push @link, new CFPlus::UI::Label
890 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1044 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
891 can_hover => 1, 1045 can_hover => 1,
892 can_events => 1, 1046 can_events => 1,
893 padding_x => 0, 1047 padding_x => 0,
894 padding_y => 0, 1048 padding_y => 0,
895 on_button_up => sub { 1049 on_button_up => sub {
896 $self->send ($kw); 1050 $self->send ($kw);
897 }; 1051 };
898 1052
899 chr 0xfffc 1053 "\x{fffc}"
900 }giex; 1054 }giex;
901 1055
902 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1056 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
903 $self->{textview}->scroll_to_bottom; 1057 $self->{textview}->scroll_to_bottom;
904 $self->update_options; 1058 $self->update_options;
905 } else { 1059 } else {
906 $self->destroy; 1060 $self->destroy;
907 } 1061 }
… …
910} 1064}
911 1065
912sub send { 1066sub send {
913 my ($self, $msg) = @_; 1067 my ($self, $msg) = @_;
914 1068
915 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1069 $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; 1070 $self->{textview}->scroll_to_bottom;
1071
1072 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
918} 1073}
919 1074
920sub destroy { 1075sub destroy {
921 my ($self) = @_; 1076 my ($self) = @_;
922 1077
923 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1078 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
924 1079
1080 if ($self->{conn}) {
925 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1081 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
926 delete $self->{conn}{npc_dialog}; 1082 delete $self->{conn}{npc_dialog};
927 $self->{conn}->disconnect_ext ($self->{token}); 1083 $self->{conn}->disconnect_ext ($self->{id});
1084 }
928 1085
929 $self->SUPER::destroy; 1086 $self->SUPER::destroy;
930} 1087}
931 1088
9321; 10891

Diff Legend

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