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

Diff Legend

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