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.34 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.99 by root, Tue Apr 10 09:39:48 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
13our %open_logs;
14 18
15sub new { 19sub new {
16 my $class = shift; 20 my $class = shift;
17 21
18 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (@_,
23 setup_req => {
24 extmap => 1,
25 smoothing => 1,
26 },
27 );
19 28
20 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
21 30
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 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 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 33 or die "unparseable command help: $_->{kw}[0]";
30 34
31 my $cmd = $1; 35 my $cmd = $1;
32 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 37 @args = (".*") unless @args;
34 38
39 my (undef, @par) = CFPlus::Pod::section_of $_;
40 my $text = CFPlus::Pod::as_label @par;
41
35 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 43 for @args;
37 44
38 my $text = CFClient::pod_to_pango $head2->content; 45 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
42 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*";
50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
43 } 65 }
44
45 \@cmd_help
46 }; 66 });
47 67
48 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 69 for @cmd_help;
50 70
71 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
75 }
76
77 {
51 $self->{noface} = new_from_file CFClient::Texture 78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
53 82
54 $self->{open_container} = 0; 83 $self->{open_container} = 0;
55 84
56 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache";
58 $self->{facemap} = CFClient::db_table "facemap";
59
60 # per server 85 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
62 87
63 $self 88 $self
64} 89}
65 90
66sub logprint { 91sub logprint {
67 my ($self, @a) = @_; 92 my ($self, @a) = @_;
93
94 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 95 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 96
70 my $fh = $open_logs{$filename}; 97 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}: $!"; 98 or die "Couldn't open logfile $path: $!";
75 99
76 $open_logs{$filename} = $fh; 100 $fh->autoflush (1);
101
102 $fh;
77 } 103 };
78 104
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 105 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 106
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 107 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 108 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 109
84 print $fh "$ts ", @a, "\n"; 110 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 111}
87 112
113sub _stat_numdiff {
114 my ($self, $name, $old, $new) = @_;
88 115
116 my $diff = $new - $old;
117
118 $diff = 0.01 * int $diff * 100;
119
120 0.1 >= abs $diff ? ()
121 : $diff < 0 ? "$name$diff" : "$name+$diff"
122}
123
124sub _stat_skillmaskdiff {
125 my ($self, $name, $old, $new) = @_;
126
127 my $diff = $old ^ $new
128 or return;
129
130 my @diff = map
131 {
132 $diff & $_
133 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
134 : ()
135 }
136 sort { $a <=> $b } keys %{$self->{spell_paths}};
137
138 join "", @diff
139}
140
141# all stats that are chacked against changes
142my @statchange = (
143 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
144 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
145 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
146 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
147 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
148 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
149 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
150 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
151 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
152 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
153 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
154 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
155 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
156 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
157 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
158 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
159 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
160 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
161 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
162 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
163 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
164 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
165 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
166 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
167 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
168 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
169 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
170 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
171 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
172 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
173 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
174 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
175 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
176 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
177 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
178 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
179 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
180);
89 181
90sub stats_update { 182sub stats_update {
91 my ($self, $stats) = @_; 183 my ($self, $stats) = @_;
92 184
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 185 my $prev = $self->{prev_stats} || { };
94 my $diff = $exp - $self->{prev_exp}; 186
187 if (my @diffs =
188 (
189 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
190 map {
191 $stats->{$_} && $prev->{$_}
192 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
193 } sort { $a <=> $b } keys %{$self->{skill_info}}
194 )
195 ) {
196 my $msg = join " ", @diffs;
95 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 197 $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 } 198 }
99 199
200 if (
201 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
202 ) {
203 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
204 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
205 }
206
100 ::update_stats_window ($stats); 207 $self->update_stats_window ($stats, $prev);
208
209 $self->{prev_stats} = { %$stats };
210}
211
212my %RES_TBL = (
213 phys => CS_STAT_RES_PHYS,
214 magic => CS_STAT_RES_MAG,
215 fire => CS_STAT_RES_FIRE,
216 elec => CS_STAT_RES_ELEC,
217 cold => CS_STAT_RES_COLD,
218 conf => CS_STAT_RES_CONF,
219 acid => CS_STAT_RES_ACID,
220 drain => CS_STAT_RES_DRAIN,
221 ghit => CS_STAT_RES_GHOSTHIT,
222 pois => CS_STAT_RES_POISON,
223 slow => CS_STAT_RES_SLOW,
224 para => CS_STAT_RES_PARA,
225 tund => CS_STAT_TURN_UNDEAD,
226 fear => CS_STAT_RES_FEAR,
227 depl => CS_STAT_RES_DEPLETE,
228 deat => CS_STAT_RES_DEATH,
229 holyw => CS_STAT_RES_HOLYWORD,
230 blind => CS_STAT_RES_BLIND,
231);
232
233sub update_stats_window {
234 my ($self, $stats, $prev) = @_;
235
236 # I love text protocols...
237
238 my $hp = $stats->{+CS_STAT_HP} * 1;
239 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
240 my $sp = $stats->{+CS_STAT_SP} * 1;
241 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
242 my $fo = $stats->{+CS_STAT_FOOD} * 1;
243 my $fo_m = 999;
244 my $gr = $stats->{+CS_STAT_GRACE} * 1;
245 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
246
247 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE};
254 $rng =~ s/^Range: //; # thank you so much dear server
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
261 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
262 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
263 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
264 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
265 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
266 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
267 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
268 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
269 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
270 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
271 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
272 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
273
274 $self->update_weight;
275
276 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
277 for keys %RES_TBL;
278
279 my $sktbl = $::STATWIDS->{skill_tbl};
280 my @skills = keys %{ $self->{skill_info} };
281
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear;
284
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
291
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
296
297 my ($x, $y) = (0, 1);
298 for (
299 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
300 map [$_, $self->{skill_info}{$_}],
301 grep exists $stats->{$_},
302 @skills
303 ) {
304 my ($idx, $name) = @$_;
305
306 my $spell_cb = sub {
307 my ($widget, $ev) = @_;
308
309 if ($ev->{button} == 1) {
310 $::CONN->user_send ("ready_skill $name");
311 } elsif ($ev->{button} == 2) {
312 $::CONN->user_send ("use_skill $name");
313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
315 (new CFPlus::UI::Menu
316 items => [
317 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
319 ],
320 )->popup ($ev);
321 } else {
322 return 0;
323 }
324
325 1
326 };
327
328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
334
335 $x++ and ($x, $y) = (0, $y + 1);
336 }
337 }
338
339 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
342 }
343}
344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
101} 351}
102 352
103sub user_send { 353sub user_send {
104 my ($self, $command) = @_; 354 my ($self, $command) = @_;
105 355
356 $self->{record}->($command)
106 if ($self->{record}) { 357 if $self->{record};
107 push @{$self->{record}}, $command;
108 }
109 358
110 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 360 $self->send_command ($command);
112 ::status $command; 361 ::status ($command);
113} 362}
114 363
115sub start_record { 364sub record {
116 my ($self) = @_; 365 my ($self, $cb) = @_;
117 366
118 $self->{record} = []; 367 $self->{record} = $cb;
119}
120
121sub stop_record {
122 my ($self) = @_;
123 return delete $self->{record};
124} 368}
125 369
126sub map_scroll { 370sub map_scroll {
127 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
128 372
… …
130} 374}
131 375
132sub feed_map1a { 376sub feed_map1a {
133 my ($self, $data) = @_; 377 my ($self, $data) = @_;
134 378
135 $self->{map}->map1a_update ($data); 379 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
136 $self->{map_widget}->update; 380 $self->{map_widget}->update;
381}
382
383sub magicmap {
384 my ($self, $w, $h, $x, $y, $data) = @_;
385
386 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
137} 387}
138 388
139sub flush_map { 389sub flush_map {
140 my ($self) = @_; 390 my ($self) = @_;
141 391
… …
143 or return; 393 or return;
144 394
145 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
146 396
147 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
148 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
149 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
150} 400}
151 401
152sub map_clear { 402sub map_clear {
153 my ($self) = @_; 403 my ($self) = @_;
154 404
155 $self->flush_map; 405 $self->flush_map;
156 delete $self->{neigh_map}; 406 delete $self->{neigh_map};
157 407
158 $self->{map}->clear; 408 $self->{map}->clear;
409 delete $self->{map_widget}{magicmap};
159} 410}
160 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
161 433
162sub load_map($$$) { 434sub load_map($$$) {
163 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
164 436
165 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 CFPlus::DB::get $self->{mapcache} => $hash, sub {
438 my ($data) = @_;
439
440 if (defined $data) {
166 $data = Compress::LZF::decompress $data; 441 $data = Compress::LZF::decompress $data;
167 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 442 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
168 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
169 my $data = $self->{tilecache}->get ($id)
170 or next;
171 443
172 $self->set_texture ($id => $data); 444 my $inprogress = @{ $self->{bg_fetch} || [] };
445 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
446 $self->bg_fetch unless $inprogress;
173 } 447 }
174 } 448 };
175} 449}
176 450
177# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 451# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
178# (server resource,s latency, bandwidth), so this hack is warranted. 452# (server resource,s latency, bandwidth), so this hack is warranted.
179# the right fix is to make real tiled maps with an overview file 453# the right fix is to make real tiled maps with an overview file
… …
293 $self->load_map ($hash, $x, $y); 567 $self->load_map ($hash, $x, $y);
294 $self->flood_fill (0, 0, 0, "", $hash, $flags); 568 $self->flood_fill (0, 0, 0, "", $hash, $flags);
295} 569}
296 570
297sub face_find { 571sub face_find {
572 my ($self, $facenum, $face, $cb) = @_;
573
574 my $hash = "$face->{chksum},$face->{name}";
575
576 my $id = CFPlus::DB::get_tile_id_sync $hash;
577
578 $face->{id} = $id;
579 $self->{faceid}[$facenum] = $id;
580
581 $self->{map}->set_tileid ($facenum => $id);
582
583 CFPlus::DB::get tilecache => $id, $cb;
584}
585
586sub face_update {
587 my ($self, $facenum, $face, $changed) = @_;
588
589 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
590 if $changed;
591
592 $self->set_texture ($face->{id} => delete $face->{image});
593}
594
595sub smooth_update {
298 my ($self, $facenum, $face) = @_; 596 my ($self, $facenum, $face) = @_;
299 597
300 my $hash = "$face->{chksum},$face->{name}"; 598 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
301
302 my $id = $self->{facemap}->get ($hash);
303
304 unless ($id) {
305 # create new id for face
306 # I love transactions
307 for (1..100) {
308 my $txn = $CFClient::DB_ENV->txn_begin;
309 my $status = $self->{facemap}->db_get (id => $id);
310 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
311 $id = ($id || 16) + 1;
312 if ($self->{facemap}->put (id => $id) == 0
313 && $self->{facemap}->put ($hash => $id) == 0) {
314 $txn->txn_commit;
315
316 goto gotid;
317 }
318 }
319 $txn->txn_abort;
320 }
321
322 CFClient::fatal "maximum number of transaction retries reached - database problems?";
323 }
324
325gotid:
326 $face->{id} = $id;
327 $self->{map}->set_face ($facenum => $id);
328 $self->{faceid}[$facenum] = $id;#d#
329
330 my $face = $self->{tilecache}->get ($id);
331
332 if ($face) {
333 #$self->face_prefetch;
334 $face
335 } else {
336 my $tex = $self->{noface};
337 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
338 undef
339 };
340}
341
342sub face_update {
343 my ($self, $facenum, $face) = @_;
344
345 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
346
347 $self->set_texture ($face->{id} => delete $face->{image});
348} 599}
349 600
350sub set_texture { 601sub set_texture {
351 my ($self, $id, $data) = @_; 602 my ($self, $id, $data) = @_;
352 603
353 $self->{texture}[$id] ||= do { 604 $self->{texture}[$id] = my $tex =
354 my $tex =
355 new_from_image CFClient::Texture 605 new_from_image CFPlus::Texture
356 $data, minify => 1, mipmap => 1; 606 $data, minify => 1, mipmap => 1;
357 607
358 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 608 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
359 $self->{map_widget}->update; 609 $self->{map_widget}->update;
360
361 $tex
362 };
363} 610}
364 611
365sub sound_play { 612sub sound_play {
366 my ($self, $x, $y, $soundnum, $type) = @_; 613 my ($self, $x, $y, $soundnum, $type) = @_;
367 614
… …
391 [0.11, 0.56, 1.00], 638 [0.11, 0.56, 1.00],
392 [0.93, 0.46, 0.00], 639 [0.93, 0.46, 0.00],
393 [0.18, 0.54, 0.34], 640 [0.18, 0.54, 0.34],
394 [0.56, 0.73, 0.56], 641 [0.56, 0.73, 0.56],
395 [0.80, 0.80, 0.80], 642 [0.80, 0.80, 0.80],
396 [0.55, 0.41, 0.13], 643 [0.75, 0.61, 0.20],
397 [0.99, 0.77, 0.26], 644 [0.99, 0.77, 0.26],
398 [0.74, 0.65, 0.41], 645 [0.74, 0.65, 0.41],
399 ); 646 );
400 647
648 my $fg = $color[$color % @color];
649
401 $self->logprint ("info: ", $text); 650 $self->logprint ("info: ", $text);
402
403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
404 651
405 # try to create single paragraphs of multiple lines sent by the server 652 # try to create single paragraphs of multiple lines sent by the server
406 $text =~ s/(?<=\S)\n(?=\w)/ /g; 653 $text =~ s/(?<=\S)\n(?=\w)/ /g;
407 654
408 $text = CFClient::UI::Label::escape $text; 655 $text = CFPlus::asxml $text;
409 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 656 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
410 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 657 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
411 658
412 $self->{logview}->add_paragraph ($color[$color], 659 ::message ({ fg => $fg, markup => $_ })
413 join "\n", map "$time $_", split /\n/, $text); 660 for split /\n/, $text;
414 661
415 $self->{statusbox}->add ($text, 662 $self->{statusbox}->add ($text,
416 group => $text, 663 group => $text,
417 fg => $color[$color], 664 fg => $fg,
418 timeout => $color >= 2 ? 60 : 10, 665 timeout => $color >= 2 ? 180 : 10,
419 tooltip_font => $::FONT_FIXED, 666 tooltip_font => $::FONT_FIXED,
420 ); 667 );
421} 668}
422 669
423sub drawextinfo { 670sub drawextinfo {
… …
427} 674}
428 675
429sub spell_add { 676sub spell_add {
430 my ($self, $spell) = @_; 677 my ($self, $spell) = @_;
431 678
432 # try to create single paragraphs of multiple lines sent by the server 679 # try to create single paragraphs out of the multiple lines sent by the server
433 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 680 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
434 $spell->{message} =~ s/\n+$//; 681 $spell->{message} =~ s/\n+$//;
435 $spell->{message} ||= "Server did not provide a description for this spell."; 682 $spell->{message} ||= "Server did not provide a description for this spell.";
436 683
437 $::SETUP_SPELLS->add_spell ($spell); 684 $::SPELL_LIST->add_spell ($spell);
438 685
439 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 686 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
440 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 687 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
441} 688}
442 689
443sub spell_delete { 690sub spell_delete {
444 my ($self, $spell) = @_; 691 my ($self, $spell) = @_;
692
445 $::SETUP_SPELLS->remove_spell ($spell); 693 $::SPELL_LIST->remove_spell ($spell);
694}
695
696sub setup {
697 my ($self, $setup) = @_;
698
699 $self->{map_widget}->set_tilesize ($self->{tilesize});
700 $::MAP->resize ($self->{mapw}, $self->{maph});
446} 701}
447 702
448sub addme_success { 703sub addme_success {
449 my ($self) = @_; 704 my ($self) = @_;
450 705
451 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
452 my ($pom) = @_;
453
454 my %skill_help; 706 my %skill_help;
455 707
456 for my $head2 ($pom->head1->[3]->head2) { 708 for my $node (CFPlus::Pod::find skill_description => "*") {
457 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 709 my (undef, @par) = CFPlus::Pod::section_of $node;
458 } 710 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
459
460 \%skill_help
461 }; 711 };
462 712
463 for my $skill (values %{$self->{skill_info}}) { 713 for my $skill (values %{$self->{skill_info}}) {
464 $self->{map_widget}->add_command ("ready_skill $skill", 714 $self->{map_widget}->add_command ("ready_skill $skill",
465 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 715 (CFPlus::asxml "Ready the skill '$skill'\n\n")
466 . $skill_help->{$skill}); 716 . $skill_help{$skill});
467 $self->{map_widget}->add_command ("use_skill $skill", 717 $self->{map_widget}->add_command ("use_skill $skill",
468 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 718 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
469 . $skill_help->{$skill}); 719 . $skill_help{$skill});
470 } 720 }
471} 721}
472 722
473sub eof { 723sub eof {
474 my ($self) = @_; 724 my ($self) = @_;
… …
498 748
499 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 749 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
500 750
501 $self->send ("requestinfo image_sums $face $face"); 751 $self->send ("requestinfo image_sums $face $face");
502 752
503 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 753 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
504 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 754 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
505 } elsif (!exists $self->{num_faces}) { 755 } elsif (!exists $self->{num_faces}) {
506 $self->send ("requestinfo image_info"); 756 $self->send ("requestinfo image_info");
507 757
508 $self->{num_faces} = 0; 758 $self->{num_faces} = 0;
509 759
510 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 760 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
511 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 761 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512 } 762 }
513} 763}
514 764
515sub update_floorbox { 765sub update_floorbox {
516 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 766 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
517 return unless $::CONN; 767 return unless $::CONN;
518 768
519 $::FLOORBOX->clear; 769 $::FLOORBOX->clear;
520 770
521 my $row; 771 my $row;
522 for (@{ $::CONN->{container}{0} }) { 772 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
523 if ($row < 6) { 773 if ($row < 6) {
524 local $_->{face_widget}; # hack to force recreation of widget 774 local $_->{face_widget}; # hack to force recreation of widget
525 local $_->{desc_widget}; # hack to force recreation of widget 775 local $_->{desc_widget}; # hack to force recreation of widget
526 CFClient::Item::update_widgets $_; 776 CFPlus::Item::update_widgets $_;
527 777
528 $::FLOORBOX->add (0, $row, $_->{face_widget}); 778 $::FLOORBOX->add (0, $row, $_->{face_widget});
529 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 779 $::FLOORBOX->add (1, $row, $_->{desc_widget});
530 780
531 $row++; 781 $row++;
532 } else { 782 } else {
533 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 783 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
534 text => "More...", 784 text => "More...",
535 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 785 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
536 ); 786 );
537 last; 787 last;
538 } 788 }
539 } 789 }
790 if ($::CONN->{open_container}) {
791 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
792 text => "Close container",
793 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
794 );
795 }
540 }); 796 });
541 797
542 $::WANT_REFRESH++; 798 $::WANT_REFRESH++;
543} 799}
544 800
545sub set_opencont { 801sub set_opencont {
546 my ($conn, $tag, $name) = @_; 802 my ($conn, $tag, $name) = @_;
547 $conn->{open_container} = $tag; 803 $conn->{open_container} = $tag;
804 update_floorbox;
548 805
549 $::INV_RIGHT_HB->clear (); 806 $::INV_RIGHT_HB->clear ();
550 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 807 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
551 808
552 if ($tag != 0) { # Floor isn't closable, is it? 809 if ($tag != 0) { # Floor isn't closable, is it?
553 $::INV_RIGHT_HB->add (new CFClient::UI::Button 810 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
554 text => "Close container", 811 text => "Close container",
555 tooltip => "Close the currently open container (if one is open)", 812 tooltip => "Close the currently open container (if one is open)",
556 on_activate => sub { 813 on_activate => sub {
557 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 814 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
558 if $tag != 0; 815 if $tag != 0;
559 #if $CONN->{open_container} != 0; 816 #if $CONN->{open_container} != 0;
817 0
560 }, 818 },
561 ); 819 );
562 } 820 }
563 821
564 $::INVR->set_items ($conn->{container}{$tag}); 822 $::INVR->set_items ($conn->{container}{$tag});
565} 823}
566 824
567sub update_container { 825sub update_containers {
568 my ($tag) = @_; 826 my ($self) = @_;
569 827
570 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 828 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
829 my $todo = delete $self->{update_container}
830 or return;
831
832 for my $tag (keys %$todo) {
833 update_floorbox if $tag == 0 or $tag == $self->{open_container};
834 if ($tag == 0) {
835 $::INVR->set_items ($self->{container}{0})
571 if $tag == $::CONN->{open_container}; 836 if $tag == $self->{open_container};
837 } elsif ($tag == $self->{player}{tag}) {
838 $::INV->set_items ($self->{container}{$tag})
839 } else {
840 $::INVR->set_items ($self->{container}{$tag})
841 if $tag == $self->{open_container};
842 }
843 }
844 });
572} 845}
573 846
574sub container_add { 847sub container_add {
575 my ($self, $tag, $items) = @_; 848 my ($self, $tag, $items) = @_;
576 849
577 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 850 $self->{update_container}{$tag}++;
578 851 $self->update_containers;
579 if ($tag == 0) {
580 update_floorbox;
581 update_container (0);
582 } elsif ($tag == $self->{player}{tag}) {
583 $::INV->set_items ($self->{container}{$self->{player}{tag}})
584 } else {
585 update_container ($tag);
586 }
587
588 # $self-<{player}{tag} => player inv
589 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
590} 852}
591 853
592sub container_clear { 854sub container_clear {
593 my ($self, $tag) = @_; 855 my ($self, $tag) = @_;
594 856
595 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 857 $self->{update_container}{$tag}++;
596 858 $self->update_containers;
597 if ($tag == 0) {
598 update_floorbox;
599 update_container (0);
600 } elsif ($tag == $self->{player}{tag}) {
601 $::INV->set_items ($self->{container}{$tag})
602 } else {
603 update_container ($tag);
604 }
605
606# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
607} 859}
608 860
609sub item_delete { 861sub item_delete {
610 my ($self, @items) = @_; 862 my ($self, @items) = @_;
611 863
864 $self->{update_container}{$_->{container}}++
612 for (@items) { 865 for @items;
613 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
614
615 if ($_->{container} == 0) {
616 update_floorbox;
617 update_container ($_->{tag});
618 } elsif ($_->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$self->{player}{tag}})
620 } else {
621 update_container ($_->{container});
622 }
623 } 866
867 $self->update_containers;
624} 868}
625 869
626sub item_update { 870sub item_update {
627 my ($self, $item) = @_; 871 my ($self, $item) = @_;
628 872
629 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 873 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
630 874
631 if ($item->{tag} == $self->{player}{tag}) {
632 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
633 return;
634 }
635
636 CFClient::Item::update_widgets $item; 875 CFPlus::Item::update_widgets $item;
637 876
638 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 877 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639 set_opencont ($::CONN, 0, "Floor"); 878 set_opencont ($::CONN, 0, "Floor");
640 879
641 } elsif ($item->{flags} & F_OPEN) { 880 } elsif ($item->{flags} & F_OPEN) {
642 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 881 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
882
643 } else { 883 } else {
644 if ($item->{container} == 0) { 884 $self->{update_container}{$item->{container}}++;
645 update_floorbox;
646 update_container (0); 885 $self->update_containers;
647 } elsif ($item->{container} == $self->{player}{tag}) {
648 $::INV->set_items ($self->{container}{$item->{container}})
649 }
650 } 886 }
651} 887}
652 888
653sub player_update { 889sub player_update {
654 my ($self, $player) = @_; 890 my ($self, $player) = @_;
655 891
892 $self->update_weight;
893}
894
895sub update_weight {
896 my ($self) = @_;
897
898 my $weight = .001 * $self->{player}{weight};
899 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
900
656 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 901 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
902 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
903 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
657} 904}
658 905
659sub update_server_info { 906sub update_server_info {
660 my ($self) = @_; 907 my ($self) = @_;
661 908
… …
664 $::SERVER_INFO->set_markup ( 911 $::SERVER_INFO->set_markup (
665 "server <tt>$self->{host}:$self->{port}</tt>\n" 912 "server <tt>$self->{host}:$self->{port}</tt>\n"
666 . "protocol version <tt>$self->{version}</tt>\n" 913 . "protocol version <tt>$self->{version}</tt>\n"
667 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 914 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
668 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 915 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
916 . "editing support $yesno[!!$self->{editor_support}]\n"
917 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
669 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 918 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
670 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 919 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
671 . "map size $self->{mapw}×$self->{maph}\n" 920 . "map size $self->{mapw}×$self->{maph}\n"
672 ); 921 );
922
923 ::setup_build_button ($self->{editor_support}->{builder_ui});
673} 924}
674 925
675sub logged_in { 926sub logged_in {
676 my ($self) = @_; 927 my ($self) = @_;
677 928
678 $self->send_ext_req (cfplus_support => "1", sub { 929 $self->send_ext_req (cfplus_support => version => 1, sub {
679 $self->{cfplus_ext} = $_[0]; 930 $self->{cfplus_ext} = $_[0]{version};
680 $self->update_server_info; 931 $self->update_server_info;
932
933 if ($self->{cfplus_ext} >= 2) {
934 $self->send_ext_req ("editor_support", sub {
935 $self->{editor_support} = $_[0];
936 $self->update_server_info;
937
938 0
939 });
940 }
941
942 0
681 }); 943 });
682 944
683 $self->update_server_info; 945 $self->update_server_info;
684 946
685 $self->send_command ("output-sync $::CFG->{output_sync}"); 947 $self->send_command ("output-sync $::CFG->{output_sync}");
686 $self->send_command ("output-count $::CFG->{output_count}"); 948 $self->send_command ("output-count $::CFG->{output_count}");
949 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
687 $self->send_command ("pickup $::CFG->{pickup}"); 950 $self->send_command ("pickup $::CFG->{pickup}");
951}
952
953sub buildat {
954 my ($self, $builditem, $x, $y) = @_;
955
956 if ($self->{cfplus_ext}) {
957 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
958 }
688} 959}
689 960
690sub lookat { 961sub lookat {
691 my ($self, $x, $y) = @_; 962 my ($self, $x, $y) = @_;
692 963
693 if ($self->{cfplus_ext}) { 964 if ($self->{cfplus_ext}) {
694 $self->send_ext_req (lookat => "$x $y", sub { 965 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
695 my %res = split /\x00/, $_[0]; 966 my ($msg) = @_;
696 967
697 if (exists $res{npc_dialog}) { 968 if (exists $msg->{npc_dialog}) {
698 # start npc chat dialog 969 # start npc chat dialog
699 $self->{npc_dialog} = new CFClient::NPCDialog:: 970 $self->{npc_dialog} = new CFPlus::NPCDialog::
700 dx => $x, 971 dx => $x,
701 dy => $y, 972 dy => $y,
702 title => "$res{npc_dialog} (NPC)", 973 title => "$msg->{npc_dialog} (NPC)",
703 conn => $self, 974 conn => $self,
704 ; 975 ;
705 } 976 }
706 }); 977 });
707 } 978 }
… …
710} 981}
711 982
712sub destroy { 983sub destroy {
713 my ($self) = @_; 984 my ($self) = @_;
714 985
715 $self->{npc_dialog}->destroy 986 (delete $self->{npc_dialog})->destroy
716 if $self->{npc_dialog}; 987 if $self->{npc_dialog};
717 988
718 $self->SUPER::destroy; 989 $self->SUPER::destroy;
719} 990}
720 991
721package CFClient::NPCDialog; 992package CFPlus::NPCDialog;
722 993
723our @ISA = 'CFClient::UI::FancyFrame'; 994our @ISA = 'CFPlus::UI::Toplevel';
724 995
725sub new { 996sub new {
726 my $class = shift; 997 my $class = shift;
727 998
728 my $self = $class->SUPER::new ( 999 my $self = $class->SUPER::new (
… …
731 name => "npc_dialog", 1002 name => "npc_dialog",
732 force_w => $::WIDTH * 0.7, 1003 force_w => $::WIDTH * 0.7,
733 force_h => $::HEIGHT * 0.7, 1004 force_h => $::HEIGHT * 0.7,
734 title => "NPC Dialog", 1005 title => "NPC Dialog",
735 kw => { hi => 0, yes => 0, no => 0 }, 1006 kw => { hi => 0, yes => 0, no => 0 },
1007 has_close_button => 1,
736 @_, 1008 @_,
737 ); 1009 );
738 1010
739 Scalar::Util::weaken (my $this = $self); 1011 CFPlus::weaken (my $this = $self);
1012
1013 $self->connect (delete => sub { $this->destroy; 1 });
740 1014
741 # better use a pane... 1015 # better use a pane...
742 $self->add (my $hbox = new CFClient::UI::HBox); 1016 $self->add (my $hbox = new CFPlus::UI::HBox);
743 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1017 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
744 1018
745 $hbox->add (my $vbox = new CFClient::UI::VBox); 1019 $hbox->add (my $vbox = new CFPlus::UI::VBox);
746 1020
747 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1021 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
748 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1022 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
749 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1023 tooltip => "#npc_message_entry",
750 . "Sometimes you have to tell an NPC something you cannot find out during "
751 . "a normal conversation (such as a password). In those cases you have to use "
752 . "this text entry. You can also enter responses manually instead of using the response "
753 . "buttons below.",
754 on_activate => sub { 1024 on_activate => sub {
755 my ($entry, $text) = @_; 1025 my ($entry, $text) = @_;
756 1026
757 return unless $text =~ /\S/; 1027 return unless $text =~ /\S/;
758 1028
759 $entry->set_text (""); 1029 $entry->set_text ("");
760 $this->send ($text); 1030 $this->send ($text);
1031
1032 0
761 }, 1033 },
762 ); 1034 );
763 1035
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1036 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
765 1037
766 $self->{close_button} = new CFClient::UI::Button 1038 $self->{bye_button} = new CFPlus::UI::Button
767 text => "Bye (close)", 1039 text => "Bye (close)",
768 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1040 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
769 on_activate => sub { $this->destroy }, 1041 on_activate => sub { $this->destroy; 1 },
770 ; 1042 ;
771 1043
772 $self->update_options; 1044 $self->update_options;
773 1045
774 $self->{token} = $self->{conn}->ext_token; 1046 $self->{id} = $self->{conn}->send_ext_req (
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1047 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
776 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1048 sub { $this && $this->feed (@_) }
1049 );
777 1050
778 $self->{entry}->focus_in; 1051 $self->{entry}->grab_focus;
779 1052
780 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1053 $self->{textview}->add_paragraph ({
1054 fg => [1, 1, 0, 1],
1055 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1056 });
781 1057
782 $self->show; 1058 $self->show;
783 $self 1059 $self
784}; 1060};
785 1061
786sub update_options { 1062sub update_options {
787 my ($self) = @_; 1063 my ($self) = @_;
788 1064
789 Scalar::Util::weaken $self; 1065 CFPlus::weaken $self;
790 1066
791 $self->{options}->clear; 1067 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 1068 $self->{options}->add ($self->{bye_button});
793 1069
794 for my $kw (sort keys %{ $self->{kw} }) { 1070 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 1071 $self->{options}->add (new CFPlus::UI::Button
796 text => $kw, 1072 text => $kw,
797 on_activate => sub { 1073 on_activate => sub {
798 $self->send ($kw); 1074 $self->send ($kw);
1075 0
799 }, 1076 },
800 ); 1077 );
801 } 1078 }
802} 1079}
803 1080
804sub feed { 1081sub feed {
805 my ($self, $data) = @_; 1082 my ($self, $msg) = @_;
806 1083
807 my ($type, $msg) = split / /, $data, 2; 1084 CFPlus::weaken $self;
808 1085
809 if ($type eq "msg") { 1086 if ($msg->{msgtype} eq "reply") {
810 my ($msg, @kw) = split /\x00/, $msg; 1087 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
811 $self->{kw}{$_} = 1 for @kw; 1088 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
812 1089
813 $msg = CFClient::UI::Label::escape $msg; 1090 my $text = "\n" . CFPlus::asxml $msg->{msg};
814 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1091 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
815 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 1092 my @link;
1093 $text =~ s{
1094 ($match)
1095 }{
1096 my $kw = $1;
1097
1098 push @link, new CFPlus::UI::Label
1099 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1100 can_hover => 1,
1101 can_events => 1,
1102 padding_x => 0,
1103 padding_y => 0,
1104 on_button_up => sub {
1105 $self->send ($kw);
1106 };
1107
1108 "\x{fffc}"
1109 }giex;
816 1110
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1111 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1112 $self->{textview}->scroll_to_bottom;
818 $self->update_options; 1113 $self->update_options;
819 } else { 1114 } else {
820 $self->destroy; 1115 $self->destroy;
821 } 1116 }
822 1117
… …
824} 1119}
825 1120
826sub send { 1121sub send {
827 my ($self, $msg) = @_; 1122 my ($self, $msg) = @_;
828 1123
829 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1124 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
830 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1125 $self->{textview}->scroll_to_bottom;
1126
1127 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
831} 1128}
832 1129
833sub destroy { 1130sub destroy {
834 my ($self) = @_; 1131 my ($self) = @_;
835 1132
836 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 1133 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
837 1134
1135 if ($self->{conn}) {
1136 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
838 delete $self->{conn}{npc_dialog}; 1137 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 1138 $self->{conn}->disconnect_ext ($self->{id});
1139 }
840 1140
841 $self->SUPER::destroy; 1141 $self->SUPER::destroy;
842} 1142}
843 1143
8441; 11441
1145

Diff Legend

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