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.35 by root, Thu Jun 15 13:40:02 2006 UTC vs.
Revision 1.138 by root, Sat Jul 28 16:48:45 2007 UTC

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

Diff Legend

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