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

Diff Legend

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