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.49 by root, Wed Jun 28 23:39:15 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}
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 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 {
303 my ($self, $facenum, $face) = @_; 806 my ($self, $facenum, $face) = @_;
304 807
305 my $hash = "$face->{chksum},$face->{name}"; 808 $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} 809}
354 810
355sub set_texture { 811sub set_texture {
356 my ($self, $id, $data) = @_; 812 my ($self, $id, $data) = @_;
357 813
814 return unless $self->{map};
815
358 $self->{texture}[$id] ||= do { 816 $self->{texture}[$id] = my $tex =
359 my $tex =
360 new_from_image CFClient::Texture 817 new_from_image CFPlus::Texture
361 $data, minify => 1, mipmap => 1; 818 $data, minify => 1, mipmap => 1;
362 819
363 $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}});
364 $self->{map_widget}->update; 821 $self->{map_widget}->update;
365 822
366 $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}};
367 }; 835 }
368} 836}
369 837
370sub sound_play { 838sub sound_play {
371 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
372 841
373 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
374} 843}
375 844
376my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
377 846
378sub query { 847sub query {
… …
382 $LAST_QUERY = $prompt; 851 $LAST_QUERY = $prompt;
383 852
384 $self->{query}-> ($self, $flags, $prompt); 853 $self->{query}-> ($self, $flags, $prompt);
385} 854}
386 855
387sub drawinfo { 856sub sanitise_xml($) {
388 my ($self, $color, $text) = @_; 857 local $_ = shift;
389 858
390 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 = (
391 [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],
392 [1.00, 1.00, 1.00], 889 [1.00, 1.00, 1.00],
393 [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]
394 [1.00, 0.00, 0.00], 891 [1.00, 0.00, 0.00],
395 [1.00, 0.54, 0.00], 892 [1.00, 0.54, 0.00],
396 [0.11, 0.56, 1.00], 893 [0.11, 0.56, 1.00],
397 [0.93, 0.46, 0.00], 894 [0.93, 0.46, 0.00],
398 [0.18, 0.54, 0.34], 895 [0.18, 0.54, 0.34],
399 [0.56, 0.73, 0.56], 896 [0.56, 0.73, 0.56],
400 [0.80, 0.80, 0.80], 897 [0.80, 0.80, 0.80],
401 [0.55, 0.41, 0.13], 898 [0.75, 0.61, 0.20],
402 [0.99, 0.77, 0.26], 899 [0.99, 0.77, 0.26],
403 [0.74, 0.65, 0.41], 900 [0.74, 0.65, 0.41],
404 ); 901);
405 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 {
406 $self->logprint ("info: ", $text); 914 $self->logprint ("msg: ", $text);
915 return if $color < 0; # negative color == ignore if not understood
407 916
408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
409 918
410 # 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
411 $text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
412 922
413 $text = CFClient::UI::Label::escape $text; 923 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 924 for split /\n/, $text;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 925
417 $self->{logview}->add_paragraph ($color[$color], $_)
418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
420
421 $self->{statusbox}->add ($text, 926 $self->{statusbox}->add ($text,
422 group => $text, 927 group => $text,
423 fg => $color[$color], 928 fg => $fg,
424 timeout => $color >= 2 ? 60 : 10, 929 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 930 tooltip_font => $::FONT_FIXED,
426 ); 931 );
427} 932 }
428
429sub drawextinfo {
430 my ($self, $color, $type, $subtype, $message) = @_;
431
432 $self->drawinfo ($color, $message);
433} 933}
434 934
435sub spell_add { 935sub spell_add {
436 my ($self, $spell) = @_; 936 my ($self, $spell) = @_;
437 937
438 # 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
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 939 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 940 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 941 $spell->{message} ||= "Server did not provide a description for this spell.";
442 942
443 $::SETUP_SPELLS->add_spell ($spell); 943 $::SPELL_LIST->add_spell ($spell);
444 944
445 $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});
446 $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});
447} 947}
448 948
449sub spell_delete { 949sub spell_delete {
450 my ($self, $spell) = @_; 950 my ($self, $spell) = @_;
951
451 $::SETUP_SPELLS->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});
452} 960}
453 961
454sub addme_success { 962sub addme_success {
455 my ($self) = @_; 963 my ($self) = @_;
456 964
457 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
458 my ($pom) = @_;
459
460 my %skill_help; 965 my %skill_help;
461 966
462 for my $head2 ($pom->head1->[3]->head2) { 967 for my $node (CFPlus::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 968 my (undef, @par) = CFPlus::Pod::section_of $node;
464 } 969 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466 \%skill_help
467 }; 970 };
468 971
469 for my $skill (values %{$self->{skill_info}}) { 972 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 973 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 974 (CFPlus::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 975 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 976 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 977 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 978 . $skill_help{$skill});
476 } 979 }
477} 980}
478 981
479sub eof { 982sub eof {
480 my ($self) = @_; 983 my ($self) = @_;
… …
482 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
483 986
484 ::stop_game (); 987 ::stop_game ();
485} 988}
486 989
487sub image_info {
488 my ($self, $numfaces) = @_;
489
490 $self->{num_faces} = $numfaces;
491 $self->{face_prefetch} = [1 .. $numfaces];
492 $self->face_prefetch;
493}
494
495sub face_prefetch {
496 my ($self) = @_;
497
498 return unless $::CFG->{face_prefetch};
499
500 if ($self->{num_faces}) {
501 return if @{ $self->{send_queue} || [] };
502 my $todo = @{ $self->{face_prefetch} }
503 or return;
504
505 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506
507 $self->send ("requestinfo image_sums $face $face");
508
509 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
510 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511 } elsif (!exists $self->{num_faces}) {
512 $self->send ("requestinfo image_info");
513
514 $self->{num_faces} = 0;
515
516 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
517 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518 }
519}
520
521sub update_floorbox { 990sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 992 return unless $::CONN;
524 993
525 $::FLOORBOX->clear; 994 $::FLOORBOX->clear;
526 995
996 my @add;
997
527 my $row; 998 my $row;
528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 999 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 1000 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 1001 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 1002 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 1003 CFPlus::Item::update_widgets $_;
533 1004
1005 push @add,
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1006 0, $row, $_->{face_widget},
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1007 1, $row, $_->{desc_widget};
536 1008
537 $row++; 1009 $row++;
538 } else { 1010 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1011 push @add, 1, $row, new CFPlus::UI::Button
540 text => "More...", 1012 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 1013 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 1014 ;
543 last; 1015 last;
544 } 1016 }
545 } 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);
546 }); 1026 });
547 1027
548 $::WANT_REFRESH++; 1028 $::WANT_REFRESH++;
549} 1029}
550 1030
551sub set_opencont { 1031sub set_opencont {
552 my ($conn, $tag, $name) = @_; 1032 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 1033 $conn->{open_container} = $tag;
1034 update_floorbox;
554 1035
555 $::INV_RIGHT_HB->clear (); 1036 $::INV_RIGHT_HB->clear ();
556 $::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);
557 1038
558 if ($tag != 0) { # Floor isn't closable, is it? 1039 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1040 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
560 text => "Close container", 1041 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 1042 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 1043 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1044 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 1045 if $tag != 0;
… …
572} 1053}
573 1054
574sub update_containers { 1055sub update_containers {
575 my ($self) = @_; 1056 my ($self) = @_;
576 1057
577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1058 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 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};
579 if ($tag == 0) { 1064 if ($tag == 0) {
580 update_floorbox;
581 $::INVR->set_items ($self->{container}{0}) 1065 $::INVR->set_items ($self->{container}{0})
582 if $tag == $self->{open_container}; 1066 if $tag == $self->{open_container};
583 } elsif ($tag == $self->{player}{tag}) { 1067 } elsif ($tag == $self->{player}{tag}) {
584 $::INV->set_items ($self->{container}{$tag}) 1068 $::INV->set_items ($self->{container}{$tag})
585 } else { 1069 } else {
… …
616sub item_update { 1100sub item_update {
617 my ($self, $item) = @_; 1101 my ($self, $item) = @_;
618 1102
619 #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";
620 1104
621 if ($item->{tag} == $self->{player}{tag}) {
622 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
623 return;
624 }
625
626 CFClient::Item::update_widgets $item; 1105 CFPlus::Item::update_widgets $item;
627 1106
628 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1107 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
629 set_opencont ($::CONN, 0, "Floor"); 1108 set_opencont ($::CONN, 0, "Floor");
630 1109
631 } elsif ($item->{flags} & F_OPEN) { 1110 } elsif ($item->{flags} & F_OPEN) {
632 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1111 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
633 1112
634 } else { 1113 } else {
635 $self->{update_container}{$item->{container}}++; 1114 $self->{update_container}{$item->{container}}++;
636 $self->update_containers; 1115 $self->update_containers;
637# if ($item->{container} == 0) {
638# update_floorbox;
639# update_container (0);
640# } elsif ($item->{container} == $self->{player}{tag}) {
641# $::INV->set_items ($self->{container}{$item->{container}})
642# }
643 } 1116 }
644} 1117}
645 1118
646sub player_update { 1119sub player_update {
647 my ($self, $player) = @_; 1120 my ($self, $player) = @_;
648 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
649 $::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);
650} 1134}
651 1135
652sub update_server_info { 1136sub update_server_info {
653 my ($self) = @_; 1137 my ($self) = @_;
654 1138
… …
657 $::SERVER_INFO->set_markup ( 1141 $::SERVER_INFO->set_markup (
658 "server <tt>$self->{host}:$self->{port}</tt>\n" 1142 "server <tt>$self->{host}:$self->{port}</tt>\n"
659 . "protocol version <tt>$self->{version}</tt>\n" 1143 . "protocol version <tt>$self->{version}</tt>\n"
660 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1144 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
661 . "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"
662 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1150 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
663 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1151 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
664 . "map size $self->{mapw}×$self->{maph}\n" 1152 . "map size $self->{mapw}×$self->{maph}\n"
665 ); 1153 );
1154
666} 1155}
667 1156
668sub logged_in { 1157sub logged_in {
669 my ($self) = @_; 1158 my ($self) = @_;
670 1159
671 $self->send_ext_req (cfplus_support => "1", sub { 1160 $self->send_ext_req (cfplus_support => version => 2, sub {
1161 my (%msg) = @_;
1162
672 $self->{cfplus_ext} = $_[0]; 1163 $self->{cfplus_ext} = $msg{version};
673 $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
674 }); 1176 });
675 1177
676 $self->update_server_info; 1178 $self->update_server_info;
677 1179
678 $self->send_command ("output-sync $::CFG->{output_sync}"); 1180 $self->send_command ("output-sync $::CFG->{output_sync}");
679 $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;
680 $self->send_command ("pickup $::CFG->{pickup}"); 1183 $self->send_command ("pickup $::CFG->{pickup}");
681} 1184}
682 1185
683sub lookat { 1186sub lookat {
684 my ($self, $x, $y) = @_; 1187 my ($self, $x, $y) = @_;
685 1188
686 if ($self->{cfplus_ext}) { 1189 if ($self->{cfplus_ext}) {
687 $self->send_ext_req (lookat => "$x $y", sub { 1190 $self->send_ext_req (lookat => $x, $y, sub {
688 my %res = split /\x00/, $_[0]; 1191 my (%msg) = @_;
689 1192
690 if (exists $res{npc_dialog}) { 1193 if (exists $msg{npc_dialog}) {
691 # start npc chat dialog 1194 # start npc chat dialog
692 $self->{npc_dialog} = new CFClient::NPCDialog:: 1195 $self->{npc_dialog} = new CFPlus::NPCDialog::
693 dx => $x, 1196 token => $msg{npc_dialog},
694 dy => $y,
695 title => "$res{npc_dialog} (NPC)", 1197 title => "$msg{npc_dialog}[0] (NPC)",
696 conn => $self, 1198 conn => $self,
697 ; 1199 ;
698 } 1200 }
699 }); 1201 });
700 } 1202 }
… …
703} 1205}
704 1206
705sub destroy { 1207sub destroy {
706 my ($self) = @_; 1208 my ($self) = @_;
707 1209
708 $self->{npc_dialog}->destroy 1210 (delete $self->{npc_dialog})->destroy
709 if $self->{npc_dialog}; 1211 if $self->{npc_dialog};
710 1212
711 $self->SUPER::destroy; 1213 $self->SUPER::destroy;
712}
713 1214
1215 %$self = ();
1216}
1217
714package CFClient::NPCDialog; 1218package CFPlus::NPCDialog;
715 1219
716our @ISA = 'CFClient::UI::FancyFrame'; 1220our @ISA = 'CFPlus::UI::Toplevel';
717 1221
718sub new { 1222sub new {
719 my $class = shift; 1223 my $class = shift;
720 1224
721 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
… …
724 name => "npc_dialog", 1228 name => "npc_dialog",
725 force_w => $::WIDTH * 0.7, 1229 force_w => $::WIDTH * 0.7,
726 force_h => $::HEIGHT * 0.7, 1230 force_h => $::HEIGHT * 0.7,
727 title => "NPC Dialog", 1231 title => "NPC Dialog",
728 kw => { hi => 0, yes => 0, no => 0 }, 1232 kw => { hi => 0, yes => 0, no => 0 },
1233 has_close_button => 1,
729 @_, 1234 @_,
730 ); 1235 );
731 1236
732 Scalar::Util::weaken (my $this = $self); 1237 CFPlus::weaken (my $this = $self);
1238
1239 $self->connect (delete => sub { $this->destroy; 1 });
733 1240
734 # better use a pane... 1241 # better use a pane...
735 $self->add (my $hbox = new CFClient::UI::HBox); 1242 $self->add (my $hbox = new CFPlus::UI::HBox);
736 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1243 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
737 1244
738 $hbox->add (my $vbox = new CFClient::UI::VBox); 1245 $hbox->add (my $vbox = new CFPlus::UI::VBox);
739 1246
740 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1247 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
741 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1248 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
742 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1249 tooltip => "#npc_message_entry",
743 . "Sometimes you have to tell an NPC something you cannot find out during "
744 . "a normal conversation (such as a password). In those cases you have to use "
745 . "this text entry. You can also enter responses manually instead of using the response "
746 . "buttons below.",
747 on_activate => sub { 1250 on_activate => sub {
748 my ($entry, $text) = @_; 1251 my ($entry, $text) = @_;
749 1252
750 return unless $text =~ /\S/; 1253 return unless $text =~ /\S/;
751 1254
… …
754 1257
755 0 1258 0
756 }, 1259 },
757 ); 1260 );
758 1261
759 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1262 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
760 1263
761 $self->{bye_button} = new CFClient::UI::Button 1264 $self->{bye_button} = new CFPlus::UI::Button
762 text => "Bye (close)", 1265 text => "Bye (close)",
763 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.",
764 on_activate => sub { $this->destroy; 0 }, 1267 on_activate => sub { $this->destroy; 1 },
765 ; 1268 ;
766 1269
767 $self->update_options; 1270 $self->update_options;
768 1271
769 $self->{token} = $self->{conn}->ext_token; 1272 $self->{id} = "npc-channel-" . $self->{conn}->token;
770 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1273 $self->{conn}->connect_ext ($self->{id} => sub {
771 $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});
772 1278
773 $self->{entry}->grab_focus; 1279 $self->{entry}->grab_focus;
774 1280
775 $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 });
776 1285
777 $self->show; 1286 $self->show;
778 $self 1287 $self
779}; 1288};
780 1289
781sub update_options { 1290sub update_options {
782 my ($self) = @_; 1291 my ($self) = @_;
783 1292
784 Scalar::Util::weaken $self; 1293 CFPlus::weaken $self;
785 1294
786 $self->{options}->clear; 1295 $self->{options}->clear;
787 $self->{options}->add ($self->{bye_button}); 1296 $self->{options}->add ($self->{bye_button});
788 1297
789 for my $kw (sort keys %{ $self->{kw} }) { 1298 for my $kw (sort keys %{ $self->{kw} }) {
790 $self->{options}->add (new CFClient::UI::Button 1299 $self->{options}->add (new CFPlus::UI::Button
791 text => $kw, 1300 text => $kw,
792 on_activate => sub { 1301 on_activate => sub {
793 $self->send ($kw); 1302 $self->send ($kw);
794 0 1303 0
795 }, 1304 },
796 ); 1305 );
797 } 1306 }
798} 1307}
799 1308
800sub feed { 1309sub feed {
801 my ($self, $data) = @_; 1310 my ($self, $type, @arg) = @_;
802 1311
803 Scalar::Util::weaken $self; 1312 CFPlus::weaken $self;
804 1313
805 my ($type, $msg) = split / /, $data, 2;
806
807 if ($type eq "msg") { 1314 if ($type eq "update") {
808 my ($msg, @kw) = split /\x00/, $msg; 1315 my (%info) = @arg;
809 $self->{kw}{$_} = 1 for @kw;
810 1316
811 $msg = "\n" . CFClient::UI::Label::escape $msg; 1317 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
812 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1318 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
813 my @link;
814 $msg =~ s{
815 ($match)
816 }{
817 my $kw = $1;
818
819 push @link, new CFClient::UI::Label
820 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
821 can_hover => 1,
822 can_events => 1,
823 padding_x => 0,
824 padding_y => 0,
825 on_button_up => sub {
826 $self->send ($kw);
827 };
828
829 chr 0xfffc
830 }giex;
831 1319
832 $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 });
833 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1344 }
1345
834 $self->update_options; 1346 $self->update_options;
835 } else { 1347 } else {
836 $self->destroy; 1348 $self->destroy;
837 } 1349 }
838 1350
… …
840} 1352}
841 1353
842sub send { 1354sub send {
843 my ($self, $msg) = @_; 1355 my ($self, $msg) = @_;
844 1356
845 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1357 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
847 $self->{textview}->scroll_to_bottom; 1358 $self->{textview}->scroll_to_bottom;
1359
1360 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
848} 1361}
849 1362
850sub destroy { 1363sub destroy {
851 my ($self) = @_; 1364 my ($self) = @_;
852 1365
853 #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
854 1367
1368 if ($self->{conn}) {
1369 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
855 delete $self->{conn}{npc_dialog}; 1370 delete $self->{conn}{npc_dialog};
856 $self->{conn}->disconnect_ext ($self->{token}); 1371 $self->{conn}->disconnect_ext ($self->{id});
1372 }
857 1373
858 $self->SUPER::destroy; 1374 $self->SUPER::destroy;
859} 1375}
860 1376
8611; 13771
1378

Diff Legend

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