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

Diff Legend

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