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.39 by root, Mon Jun 19 06:50:45 2006 UTC vs.
Revision 1.137 by root, Sat Jul 28 00:45:28 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}
251
252sub _stat_numdiff {
253 my ($self, $name, $old, $new) = @_;
254
255 my $diff = $new - $old;
256
257 $diff = 0.01 * int $diff * 100;
258
259 0.1 >= abs $diff ? ()
260 : $diff < 0 ? "$name$diff" : "$name+$diff"
261}
262
263sub _stat_skillmaskdiff {
264 my ($self, $name, $old, $new) = @_;
265
266 my $diff = $old ^ $new
267 or return;
268
269 my @diff = map
270 {
271 $diff & $_
272 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
273 : ()
274 }
275 sort { $a <=> $b } keys %{$self->{spell_paths}};
276
277 join "", @diff
278}
279
280# all stats that are chacked against changes
281my @statchange = (
282 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
283 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
284 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
285 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
286 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
287 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
288 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
289 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
290 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
291 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
292 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
293 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
294 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
295 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
296 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
297 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
298 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
299 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
300 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
301 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
302 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
303 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
304 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
305 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
306 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
307 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
308 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
309 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
310 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
311 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
312 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
313 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
314 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
315 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
316 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
317 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
318 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
319);
87 320
88sub stats_update { 321sub stats_update {
89 my ($self, $stats) = @_; 322 my ($self, $stats) = @_;
90 323
91 if (my $exp = $stats->{+CS_STAT_EXP64}) { 324 my $prev = $self->{prev_stats} || { };
92 my $diff = $exp - $self->{prev_exp}; 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;
93 $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);
94 if exists $self->{prev_exp} && $diff;
95 $self->{prev_exp} = $exp;
96 } 337 }
97 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
98 ::update_stats_window ($stats); 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),
431 ;
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);
439 for (
440 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
441 map [$_, $self->{skill_info}{$_}],
442 grep exists $stats->{$_},
443 @skills
444 ) {
445 my ($idx, $name) = @$_;
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
467 };
468
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 ;
477
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 }
99} 496}
100 497
101sub user_send { 498sub user_send {
102 my ($self, $command) = @_; 499 my ($self, $command) = @_;
103 500
501 $self->{record}->($command)
104 if ($self->{record}) { 502 if $self->{record};
105 push @{$self->{record}}, $command;
106 }
107 503
108 $self->logprint ("send: ", $command); 504 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 505 $self->send_command ($command);
110 ::status $command; 506 ::status ($command);
111} 507}
112 508
113sub start_record { 509sub record {
114 my ($self) = @_; 510 my ($self, $cb) = @_;
115 511
116 $self->{record} = []; 512 $self->{record} = $cb;
117}
118
119sub stop_record {
120 my ($self) = @_;
121 return delete $self->{record};
122} 513}
123 514
124sub map_scroll { 515sub map_scroll {
125 my ($self, $dx, $dy) = @_; 516 my ($self, $dx, $dy) = @_;
126 517
… …
128} 519}
129 520
130sub feed_map1a { 521sub feed_map1a {
131 my ($self, $data) = @_; 522 my ($self, $data) = @_;
132 523
133 $self->{map}->map1a_update ($data); 524 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
134 $self->{map_widget}->update; 525 $self->{map_widget}->update;
135} 526}
136 527
137sub magicmap { 528sub magicmap {
138 my ($self, $w, $h, $x, $y, $data) = @_; 529 my ($self, $w, $h, $x, $y, $data) = @_;
… …
147 or return; 538 or return;
148 539
149 my ($hash, $x, $y, $w, $h) = @$map_info; 540 my ($hash, $x, $y, $w, $h) = @$map_info;
150 541
151 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 542 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
152 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 543 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
153 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 544 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
154} 545}
155 546
156sub map_clear { 547sub map_clear {
157 my ($self) = @_; 548 my ($self) = @_;
… …
161 552
162 $self->{map}->clear; 553 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap}; 554 delete $self->{map_widget}{magicmap};
164} 555}
165 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}
166 578
167sub load_map($$$) { 579sub load_map($$$) {
168 my ($self, $hash, $x, $y) = @_; 580 my ($self, $hash, $x, $y) = @_;
169 581
170 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) {
171 $data = Compress::LZF::decompress $data; 590 $data = Compress::LZF::decompress $data;
172 #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#
173 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
174 my $data = $self->{tilecache}->get ($id)
175 or next;
176 592
177 $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;
178 } 596 }
179 } 597 };
180} 598}
181 599
182# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 600# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
183# (server resource,s latency, bandwidth), so this hack is warranted. 601# (server resource,s latency, bandwidth), so this hack is warranted.
184# 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
… …
248 666
249 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 667 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
250 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 668 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
251 669
252 } else { 670 } else {
671 my $gen = $self->{map_change_gen};
253 $self->send_mapinfo ("spatial $path$tile", sub { 672 $self->send_mapinfo ("spatial $path$tile", sub {
673 return unless $gen == $self->{map_change_gen};
674
254 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 675 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
255 676
256 return if $mode ne "spatial"; 677 return if $mode ne "spatial";
257 678
258 $x += $self->{map}->ox; 679 $x += $self->{map}->ox;
… …
272 693
273sub map_change { 694sub map_change {
274 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 695 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
275 696
276 $self->flush_map; 697 $self->flush_map;
698
699 ++$self->{map_change_gen};
277 700
278 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
279 702
280 my $mapmapw = $self->{mapmap}->{w}; 703 my $mapmapw = $self->{mapmap}->{w};
281 my $mapmaph = $self->{mapmap}->{h}; 704 my $mapmaph = $self->{mapmap}->{h};
… …
298 $self->load_map ($hash, $x, $y); 721 $self->load_map ($hash, $x, $y);
299 $self->flood_fill (0, 0, 0, "", $hash, $flags); 722 $self->flood_fill (0, 0, 0, "", $hash, $flags);
300} 723}
301 724
302sub 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
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 };
765 }
766
767 if ($changed) { # new data
768 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
769 my $path = CFPlus::DB::path_of_res $face->{name};
770
771 CFPlus::DB::write_file $path, $data, sub {
772 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
773 $face->{meta} = $self->{json_coder}->decode ($meta_json);
774 $face->{path} = $path;
775
776 $cb->();
777 };
778 };
779 } else {
780 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
781 $cb->();
782 }
783 }
784}
785
786sub smooth_update {
303 my ($self, $facenum, $face) = @_; 787 my ($self, $facenum, $face) = @_;
304 788
305 my $hash = "$face->{chksum},$face->{name}"; 789 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
306
307 my $id = $self->{facemap}->get ($hash);
308
309 unless ($id) {
310 # create new id for face
311 # I love transactions
312 for (1..100) {
313 my $txn = $CFClient::DB_ENV->txn_begin;
314 my $status = $self->{facemap}->db_get (id => $id);
315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
316 $id = ($id || 64) + 1;
317 if ($self->{facemap}->put (id => $id) == 0
318 && $self->{facemap}->put ($hash => $id) == 0) {
319 $txn->txn_commit;
320
321 goto gotid;
322 }
323 }
324 $txn->txn_abort;
325 }
326
327 CFClient::fatal "maximum number of transaction retries reached - database problems?";
328 }
329
330gotid:
331 $face->{id} = $id;
332 $self->{map}->set_face ($facenum => $id);
333 $self->{faceid}[$facenum] = $id;#d#
334
335 my $face = $self->{tilecache}->get ($id);
336
337 if ($face) {
338 #$self->face_prefetch;
339 $face
340 } else {
341 my $tex = $self->{noface};
342 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
343 undef
344 };
345}
346
347sub face_update {
348 my ($self, $facenum, $face) = @_;
349
350 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
351
352 $self->set_texture ($face->{id} => delete $face->{image});
353} 790}
354 791
355sub set_texture { 792sub set_texture {
356 my ($self, $id, $data) = @_; 793 my ($self, $id, $data) = @_;
357 794
795 return unless $self->{map};
796
358 $self->{texture}[$id] ||= do { 797 $self->{texture}[$id] = my $tex =
359 my $tex =
360 new_from_image CFClient::Texture 798 new_from_image CFPlus::Texture
361 $data, minify => 1, mipmap => 1; 799 $data, minify => 1, mipmap => 1;
362 800
363 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 801 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
364 $self->{map_widget}->update; 802 $self->{map_widget}->update;
365 803
366 $tex 804 $_->() for @{(delete $self->{face_cb}{$id}) || []};
805}
806
807sub connect_face_update {
808 my ($self, $id, $cb) = @_;
809
810 push @{$self->{face_cb}{$id}}, $cb;
811
812 CFPlus::guard {
813 @{$self->{face_cb}{$id}}
814 = grep $_ != $cb,
815 @{$self->{face_cb}{$id}};
367 }; 816 }
368} 817}
369 818
370sub sound_play { 819sub sound_play {
371 my ($self, $x, $y, $soundnum, $type) = @_; 820 my ($self, $x, $y, $soundnum, $type) = @_;
821 warn "sound play <@_>\n";#d#
372 822
373 $self->{sound_play}->($x, $y, $soundnum, $type); 823 #$self->{sound_play}->($x, $y, $soundnum, $type);
374} 824}
375 825
376my $LAST_QUERY; # server is stupid, stupid, stupid 826my $LAST_QUERY; # server is stupid, stupid, stupid
377 827
378sub query { 828sub query {
… …
382 $LAST_QUERY = $prompt; 832 $LAST_QUERY = $prompt;
383 833
384 $self->{query}-> ($self, $flags, $prompt); 834 $self->{query}-> ($self, $flags, $prompt);
385} 835}
386 836
387sub drawinfo { 837sub sanitise_xml($) {
388 my ($self, $color, $text) = @_; 838 local $_ = shift;
389 839
390 my @color = ( 840 # we now weed out all tags we do not support
841 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
842 # now all entities
843 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
844
845 # handle some elements
846 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
847 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
848
849 $_
850}
851
852our %NAME_TO_COLOR = (
853 black => 0,
854 white => 1,
855 darkblue => 2,
856 red => 3,
857 orange => 4,
858 lightblue => 5,
859 darkorange => 6,
860 green => 7,
861 darkgreen => 8,
862 grey => 9,
863 brown => 10,
864 yellow => 11,
865 tan => 12,
866);
867
868our @CF_COLOR = (
391 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 869 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
392 [1.00, 1.00, 1.00], 870 [1.00, 1.00, 1.00],
393 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 871 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
394 [1.00, 0.00, 0.00], 872 [1.00, 0.00, 0.00],
395 [1.00, 0.54, 0.00], 873 [1.00, 0.54, 0.00],
396 [0.11, 0.56, 1.00], 874 [0.11, 0.56, 1.00],
397 [0.93, 0.46, 0.00], 875 [0.93, 0.46, 0.00],
398 [0.18, 0.54, 0.34], 876 [0.18, 0.54, 0.34],
399 [0.56, 0.73, 0.56], 877 [0.56, 0.73, 0.56],
400 [0.80, 0.80, 0.80], 878 [0.80, 0.80, 0.80],
401 [0.55, 0.41, 0.13], 879 [0.75, 0.61, 0.20],
402 [0.99, 0.77, 0.26], 880 [0.99, 0.77, 0.26],
403 [0.74, 0.65, 0.41], 881 [0.74, 0.65, 0.41],
404 ); 882);
405 883
884sub msg {
885 my ($self, $color, $type, $text, @extra) = @_;
886
887 $text = sanitise_xml $text;
888
889 if (my $cb = $self->{cb_msg}{$type}) {
890 $_->($self, $color, $type, $text, @extra) for values %$cb;
891 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
892 $type =~ s/-/_/g;
893 $self->{$type} = $text;
894 } else {
406 $self->logprint ("info: ", $text); 895 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood
407 897
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 898 my $fg = $CF_COLOR[$color % @CF_COLOR];
409 899
410 # try to create single paragraphs of multiple lines sent by the server 900 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
412 903
413 $text = CFClient::UI::Label::escape $text; 904 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 905 for split /\n/, $text;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 906
417 $self->{logview}->add_paragraph ($color[$color],
418 join "\n", map "$time $_", split /\n/, $text);
419
420 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
421 group => $text, 908 group => $text,
422 fg => $color[$color], 909 fg => $fg,
423 timeout => $color >= 2 ? 60 : 10, 910 timeout => $color >= 2 ? 180 : 10,
424 tooltip_font => $::FONT_FIXED, 911 tooltip_font => $::FONT_FIXED,
425 ); 912 );
426} 913 }
427
428sub drawextinfo {
429 my ($self, $color, $type, $subtype, $message) = @_;
430
431 $self->drawinfo ($color, $message);
432} 914}
433 915
434sub spell_add { 916sub spell_add {
435 my ($self, $spell) = @_; 917 my ($self, $spell) = @_;
436 918
437 # try to create single paragraphs of multiple lines sent by the server 919 # try to create single paragraphs out of the multiple lines sent by the server
438 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 920 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
439 $spell->{message} =~ s/\n+$//; 921 $spell->{message} =~ s/\n+$//;
440 $spell->{message} ||= "Server did not provide a description for this spell."; 922 $spell->{message} ||= "Server did not provide a description for this spell.";
441 923
442 $::SETUP_SPELLS->add_spell ($spell); 924 $::SPELL_LIST->add_spell ($spell);
443 925
444 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 926 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
445 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 927 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
446} 928}
447 929
448sub spell_delete { 930sub spell_delete {
449 my ($self, $spell) = @_; 931 my ($self, $spell) = @_;
932
450 $::SETUP_SPELLS->remove_spell ($spell); 933 $::SPELL_LIST->remove_spell ($spell);
934}
935
936sub setup {
937 my ($self, $setup) = @_;
938
939 $self->{map_widget}->set_tilesize ($self->{tilesize});
940 $::MAP->resize ($self->{mapw}, $self->{maph});
451} 941}
452 942
453sub addme_success { 943sub addme_success {
454 my ($self) = @_; 944 my ($self) = @_;
455 945
456 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
457 my ($pom) = @_;
458
459 my %skill_help; 946 my %skill_help;
460 947
461 for my $head2 ($pom->head1->[3]->head2) { 948 for my $node (CFPlus::Pod::find skill_description => "*") {
462 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 949 my (undef, @par) = CFPlus::Pod::section_of $node;
463 } 950 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
464
465 \%skill_help
466 }; 951 };
467 952
468 for my $skill (values %{$self->{skill_info}}) { 953 for my $skill (values %{$self->{skill_info}}) {
469 $self->{map_widget}->add_command ("ready_skill $skill", 954 $self->{map_widget}->add_command ("ready_skill $skill",
470 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 955 (CFPlus::asxml "Ready the skill '$skill'\n\n")
471 . $skill_help->{$skill}); 956 . $skill_help{$skill});
472 $self->{map_widget}->add_command ("use_skill $skill", 957 $self->{map_widget}->add_command ("use_skill $skill",
473 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 958 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
474 . $skill_help->{$skill}); 959 . $skill_help{$skill});
475 } 960 }
476} 961}
477 962
478sub eof { 963sub eof {
479 my ($self) = @_; 964 my ($self) = @_;
… …
503 988
504 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 989 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
505 990
506 $self->send ("requestinfo image_sums $face $face"); 991 $self->send ("requestinfo image_sums $face $face");
507 992
508 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 993 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
509 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 994 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
510 } elsif (!exists $self->{num_faces}) { 995 } elsif (!exists $self->{num_faces}) {
511 $self->send ("requestinfo image_info"); 996 $self->send ("requestinfo image_info");
512 997
513 $self->{num_faces} = 0; 998 $self->{num_faces} = 0;
514 999
515 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 1000 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
516 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 1001 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
517 } 1002 }
518} 1003}
519 1004
520sub update_floorbox { 1005sub update_floorbox {
521 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
522 return unless $::CONN; 1007 return unless $::CONN;
523 1008
524 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
525 1010
1011 my @add;
1012
526 my $row; 1013 my $row;
527 for (@{ $::CONN->{container}{0} }) { 1014 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
528 if ($row < 6) { 1015 if ($row < 6) {
529 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
530 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
531 CFClient::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
532 1019
1020 push @add,
533 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
534 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
535 1023
536 $row++; 1024 $row++;
537 } else { 1025 } else {
538 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
539 text => "More...", 1027 text => "More...",
540 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
541 ); 1029 ;
542 last; 1030 last;
543 } 1031 }
544 } 1032 }
1033 if ($::CONN->{open_container}) {
1034 push @add, 1, $row++, new CFPlus::UI::Button
1035 text => "Close container",
1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1037 ;
1038 }
1039
1040 $::FLOORBOX->add_at (@add);
545 }); 1041 });
546 1042
547 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
548} 1044}
549 1045
550sub set_opencont { 1046sub set_opencont {
551 my ($conn, $tag, $name) = @_; 1047 my ($conn, $tag, $name) = @_;
552 $conn->{open_container} = $tag; 1048 $conn->{open_container} = $tag;
1049 update_floorbox;
553 1050
554 $::INV_RIGHT_HB->clear (); 1051 $::INV_RIGHT_HB->clear ();
555 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1052 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
556 1053
557 if ($tag != 0) { # Floor isn't closable, is it? 1054 if ($tag != 0) { # Floor isn't closable, is it?
558 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1055 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
559 text => "Close container", 1056 text => "Close container",
560 tooltip => "Close the currently open container (if one is open)", 1057 tooltip => "Close the currently open container (if one is open)",
561 on_activate => sub { 1058 on_activate => sub {
562 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1059 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
563 if $tag != 0; 1060 if $tag != 0;
… …
568 } 1065 }
569 1066
570 $::INVR->set_items ($conn->{container}{$tag}); 1067 $::INVR->set_items ($conn->{container}{$tag});
571} 1068}
572 1069
573sub update_container { 1070sub update_containers {
574 my ($tag) = @_; 1071 my ($self) = @_;
575 1072
576 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1073 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1074 my $todo = delete $self->{update_container}
1075 or return;
1076
1077 for my $tag (keys %$todo) {
1078 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1079 if ($tag == 0) {
1080 $::INVR->set_items ($self->{container}{0})
577 if $tag == $::CONN->{open_container}; 1081 if $tag == $self->{open_container};
1082 } elsif ($tag == $self->{player}{tag}) {
1083 $::INV->set_items ($self->{container}{$tag})
1084 } else {
1085 $::INVR->set_items ($self->{container}{$tag})
1086 if $tag == $self->{open_container};
1087 }
1088 }
1089 });
578} 1090}
579 1091
580sub container_add { 1092sub container_add {
581 my ($self, $tag, $items) = @_; 1093 my ($self, $tag, $items) = @_;
582 1094
583 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1095 $self->{update_container}{$tag}++;
584 1096 $self->update_containers;
585 if ($tag == 0) {
586 update_floorbox;
587 update_container (0);
588 } elsif ($tag == $self->{player}{tag}) {
589 $::INV->set_items ($self->{container}{$self->{player}{tag}})
590 } else {
591 update_container ($tag);
592 }
593
594 # $self-<{player}{tag} => player inv
595 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
596} 1097}
597 1098
598sub container_clear { 1099sub container_clear {
599 my ($self, $tag) = @_; 1100 my ($self, $tag) = @_;
600 1101
601 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1102 $self->{update_container}{$tag}++;
602 1103 $self->update_containers;
603 if ($tag == 0) {
604 update_floorbox;
605 update_container (0);
606 } elsif ($tag == $self->{player}{tag}) {
607 $::INV->set_items ($self->{container}{$tag})
608 } else {
609 update_container ($tag);
610 }
611
612# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
613} 1104}
614 1105
615sub item_delete { 1106sub item_delete {
616 my ($self, @items) = @_; 1107 my ($self, @items) = @_;
617 1108
1109 $self->{update_container}{$_->{container}}++
618 for (@items) { 1110 for @items;
619 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
620
621 if ($_->{container} == 0) {
622 update_floorbox;
623 update_container ($_->{tag});
624 } elsif ($_->{container} == $self->{player}{tag}) {
625 $::INV->set_items ($self->{container}{$self->{player}{tag}})
626 } else {
627 update_container ($_->{container});
628 }
629 } 1111
1112 $self->update_containers;
630} 1113}
631 1114
632sub item_update { 1115sub item_update {
633 my ($self, $item) = @_; 1116 my ($self, $item) = @_;
634 1117
635 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1118 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
636 1119
637 if ($item->{tag} == $self->{player}{tag}) {
638 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
639 return;
640 }
641
642 CFClient::Item::update_widgets $item; 1120 CFPlus::Item::update_widgets $item;
643 1121
644 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1122 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645 set_opencont ($::CONN, 0, "Floor"); 1123 set_opencont ($::CONN, 0, "Floor");
646 1124
647 } elsif ($item->{flags} & F_OPEN) { 1125 } elsif ($item->{flags} & F_OPEN) {
648 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1126 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1127
649 } else { 1128 } else {
650 if ($item->{container} == 0) { 1129 $self->{update_container}{$item->{container}}++;
651 update_floorbox;
652 update_container (0); 1130 $self->update_containers;
653 } elsif ($item->{container} == $self->{player}{tag}) {
654 $::INV->set_items ($self->{container}{$item->{container}})
655 }
656 } 1131 }
657} 1132}
658 1133
659sub player_update { 1134sub player_update {
660 my ($self, $player) = @_; 1135 my ($self, $player) = @_;
661 1136
1137 $self->update_weight;
1138}
1139
1140sub update_weight {
1141 my ($self) = @_;
1142
1143 my $weight = .001 * $self->{player}{weight};
1144 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1145
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1146 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1147 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1148 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
663} 1149}
664 1150
665sub update_server_info { 1151sub update_server_info {
666 my ($self) = @_; 1152 my ($self) = @_;
667 1153
… …
670 $::SERVER_INFO->set_markup ( 1156 $::SERVER_INFO->set_markup (
671 "server <tt>$self->{host}:$self->{port}</tt>\n" 1157 "server <tt>$self->{host}:$self->{port}</tt>\n"
672 . "protocol version <tt>$self->{version}</tt>\n" 1158 . "protocol version <tt>$self->{version}</tt>\n"
673 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1159 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
674 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1160 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1161 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1162 . "editing support $yesno[!!$self->{editor_support}]\n"
1163 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1164 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
675 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
676 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
677 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
678 ); 1168 );
1169
679} 1170}
680 1171
681sub logged_in { 1172sub logged_in {
682 my ($self) = @_; 1173 my ($self) = @_;
683 1174
684 $self->send_ext_req (cfplus_support => "1", sub { 1175 $self->send_ext_req (cfplus_support => version => 2, sub {
1176 my (%msg) = @_;
1177
685 $self->{cfplus_ext} = $_[0]; 1178 $self->{cfplus_ext} = $msg{version};
686 $self->update_server_info; 1179 $self->update_server_info;
1180
1181 if ($self->{cfplus_ext} >= 2) {
1182 $self->send_ext_req ("editor_support", sub {
1183 $self->{editor_support} = { @_ };
1184 $self->update_server_info;
1185
1186 0
1187 });
1188 }
1189
1190 0
687 }); 1191 });
688 1192
689 $self->update_server_info; 1193 $self->update_server_info;
690 1194
691 $self->send_command ("output-sync $::CFG->{output_sync}"); 1195 $self->send_command ("output-sync $::CFG->{output_sync}");
692 $self->send_command ("output-count $::CFG->{output_count}"); 1196 $self->send_command ("output-count $::CFG->{output_count}");
1197 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
693 $self->send_command ("pickup $::CFG->{pickup}"); 1198 $self->send_command ("pickup $::CFG->{pickup}");
694} 1199}
695 1200
696sub lookat { 1201sub lookat {
697 my ($self, $x, $y) = @_; 1202 my ($self, $x, $y) = @_;
698 1203
699 if ($self->{cfplus_ext}) { 1204 if ($self->{cfplus_ext}) {
700 $self->send_ext_req (lookat => "$x $y", sub { 1205 $self->send_ext_req (lookat => $x, $y, sub {
701 my %res = split /\x00/, $_[0]; 1206 my (%msg) = @_;
702 1207
703 if (exists $res{npc_dialog}) { 1208 if (exists $msg{npc_dialog}) {
704 # start npc chat dialog 1209 # start npc chat dialog
705 $self->{npc_dialog} = new CFClient::NPCDialog:: 1210 $self->{npc_dialog} = new CFPlus::NPCDialog::
706 dx => $x, 1211 token => $msg{npc_dialog},
707 dy => $y,
708 title => "$res{npc_dialog} (NPC)", 1212 title => "$msg{npc_dialog}[0] (NPC)",
709 conn => $self, 1213 conn => $self,
710 ; 1214 ;
711 } 1215 }
712 }); 1216 });
713 } 1217 }
… …
716} 1220}
717 1221
718sub destroy { 1222sub destroy {
719 my ($self) = @_; 1223 my ($self) = @_;
720 1224
721 $self->{npc_dialog}->destroy 1225 (delete $self->{npc_dialog})->destroy
722 if $self->{npc_dialog}; 1226 if $self->{npc_dialog};
723 1227
724 $self->SUPER::destroy; 1228 $self->SUPER::destroy;
725}
726 1229
1230 %$self = ();
1231}
1232
727package CFClient::NPCDialog; 1233package CFPlus::NPCDialog;
728 1234
729our @ISA = 'CFClient::UI::FancyFrame'; 1235our @ISA = 'CFPlus::UI::Toplevel';
730 1236
731sub new { 1237sub new {
732 my $class = shift; 1238 my $class = shift;
733 1239
734 my $self = $class->SUPER::new ( 1240 my $self = $class->SUPER::new (
… …
737 name => "npc_dialog", 1243 name => "npc_dialog",
738 force_w => $::WIDTH * 0.7, 1244 force_w => $::WIDTH * 0.7,
739 force_h => $::HEIGHT * 0.7, 1245 force_h => $::HEIGHT * 0.7,
740 title => "NPC Dialog", 1246 title => "NPC Dialog",
741 kw => { hi => 0, yes => 0, no => 0 }, 1247 kw => { hi => 0, yes => 0, no => 0 },
1248 has_close_button => 1,
742 @_, 1249 @_,
743 ); 1250 );
744 1251
745 Scalar::Util::weaken (my $this = $self); 1252 CFPlus::weaken (my $this = $self);
1253
1254 $self->connect (delete => sub { $this->destroy; 1 });
746 1255
747 # better use a pane... 1256 # better use a pane...
748 $self->add (my $hbox = new CFClient::UI::HBox); 1257 $self->add (my $hbox = new CFPlus::UI::HBox);
749 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1258 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
750 1259
751 $hbox->add (my $vbox = new CFClient::UI::VBox); 1260 $hbox->add (my $vbox = new CFPlus::UI::VBox);
752 1261
753 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1262 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
754 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1263 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
755 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1264 tooltip => "#npc_message_entry",
756 . "Sometimes you have to tell an NPC something you cannot find out during "
757 . "a normal conversation (such as a password). In those cases you have to use "
758 . "this text entry. You can also enter responses manually instead of using the response "
759 . "buttons below.",
760 on_activate => sub { 1265 on_activate => sub {
761 my ($entry, $text) = @_; 1266 my ($entry, $text) = @_;
762 1267
763 return unless $text =~ /\S/; 1268 return unless $text =~ /\S/;
764 1269
… …
767 1272
768 0 1273 0
769 }, 1274 },
770 ); 1275 );
771 1276
772 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1277 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
773 1278
774 $self->{bye_button} = new CFClient::UI::Button 1279 $self->{bye_button} = new CFPlus::UI::Button
775 text => "Bye (close)", 1280 text => "Bye (close)",
776 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1281 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
777 on_activate => sub { $this->destroy; 0 }, 1282 on_activate => sub { $this->destroy; 1 },
778 ; 1283 ;
779 1284
780 $self->update_options; 1285 $self->update_options;
781 1286
782 $self->{token} = $self->{conn}->ext_token; 1287 $self->{id} = "npc-channel-" . $self->{conn}->token;
783 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1288 $self->{conn}->connect_ext ($self->{id} => sub {
784 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1289 $this->feed (@_) if $this;
1290 });
1291
1292 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
785 1293
786 $self->{entry}->grab_focus; 1294 $self->{entry}->grab_focus;
787 1295
788 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1296 $self->{textview}->add_paragraph ({
1297 fg => [1, 1, 0, 1],
1298 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1299 });
789 1300
790 $self->show; 1301 $self->show;
791 $self 1302 $self
792}; 1303};
793 1304
794sub update_options { 1305sub update_options {
795 my ($self) = @_; 1306 my ($self) = @_;
796 1307
797 Scalar::Util::weaken $self; 1308 CFPlus::weaken $self;
798 1309
799 $self->{options}->clear; 1310 $self->{options}->clear;
800 $self->{options}->add ($self->{bye_button}); 1311 $self->{options}->add ($self->{bye_button});
801 1312
802 for my $kw (sort keys %{ $self->{kw} }) { 1313 for my $kw (sort keys %{ $self->{kw} }) {
803 $self->{options}->add (new CFClient::UI::Button 1314 $self->{options}->add (new CFPlus::UI::Button
804 text => $kw, 1315 text => $kw,
805 on_activate => sub { 1316 on_activate => sub {
806 $self->send ($kw); 1317 $self->send ($kw);
807 0 1318 0
808 }, 1319 },
809 ); 1320 );
810 } 1321 }
811} 1322}
812 1323
813sub feed { 1324sub feed {
814 my ($self, $data) = @_; 1325 my ($self, $type, @arg) = @_;
815 1326
816 my ($type, $msg) = split / /, $data, 2; 1327 CFPlus::weaken $self;
817 1328
818 if ($type eq "msg") { 1329 if ($type eq "update") {
819 my ($msg, @kw) = split /\x00/, $msg; 1330 my (%info) = @arg;
820 $self->{kw}{$_} = 1 for @kw;
821 1331
822 $msg = CFClient::UI::Label::escape $msg; 1332 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
823 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1333 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
824 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
825 1334
826 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1335 if (exists $info{msg}) {
1336 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1337 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1338 my @link;
1339 $text =~ s{
1340 ($match)
1341 }{
1342 my $kw = $1;
1343
1344 push @link, new CFPlus::UI::Label
1345 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1346 can_hover => 1,
1347 can_events => 1,
1348 padding_x => 0,
1349 padding_y => 0,
1350 on_button_up => sub {
1351 $self->send ($kw);
1352 };
1353
1354 "\x{fffc}"
1355 }giex;
1356
1357 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1358 $self->{textview}->scroll_to_bottom;
1359 }
1360
827 $self->update_options; 1361 $self->update_options;
828 } else { 1362 } else {
829 $self->destroy; 1363 $self->destroy;
830 } 1364 }
831 1365
… …
833} 1367}
834 1368
835sub send { 1369sub send {
836 my ($self, $msg) = @_; 1370 my ($self, $msg) = @_;
837 1371
1372 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1373 $self->{textview}->scroll_to_bottom;
1374
838 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1375 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
839 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
840} 1376}
841 1377
842sub destroy { 1378sub destroy {
843 my ($self) = @_; 1379 my ($self) = @_;
844 1380
845 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1381 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
846 1382
1383 if ($self->{conn}) {
1384 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
847 delete $self->{conn}{npc_dialog}; 1385 delete $self->{conn}{npc_dialog};
848 $self->{conn}->disconnect_ext ($self->{token}); 1386 $self->{conn}->disconnect_ext ($self->{id});
1387 }
849 1388
850 $self->SUPER::destroy; 1389 $self->SUPER::destroy;
851} 1390}
852 1391
8531; 13921
1393

Diff Legend

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