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

Diff Legend

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