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

Diff Legend

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