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

Diff Legend

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