ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

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

Diff Legend

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