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

Diff Legend

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