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

Diff Legend

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