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.59 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.224 by root, Wed Nov 7 00:25:46 2012 UTC

1package CFClient::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
5use Guard ();
6
6use Crossfire::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use CFClient; 9use DC;
9use CFClient::UI; 10use DC::DB;
11use DC::UI;
12use DC::Pod;
13use DC::Macro;
14use DC::Item;
10 15
11use base 'Crossfire::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
12 25
13sub new { 26sub new {
14 my $class = shift; 27 my ($class, %arg) = @_;
15 28
16 my $self = $class->SUPER::new (@_); 29 my $self = $class->SUPER::new (%arg,
30 setup_req => {
31 extmap => 1,
32 widget => 2,
33 %{$arg{setup_req} || {}},
34 },
35 );
36
37 $self->update_fx_want;
38
39 my $exp_guard = $self->addme_guard;
40 my $skl_guard = $self->addme_guard;
41 my $spl_guard = $self->addme_guard;
42 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
43 my ($exp, $skl, $spl) = @_;
44
45 $self->register_face_handler ($exp, sub {
46 my ($face) = @_;
47
48 undef $exp_guard;
49 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
50 $_->() for values %{ $self->{on_exp_update} };
51 });
52
53 $self->register_face_handler ($skl, sub {
54 my ($face) = @_;
55
56 undef $skl_guard;
57 my $info = $self->{json_coder}->decode (delete $face->{data});
58 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
59 });
60
61 $self->register_face_handler ($spl, sub {
62 my ($face) = @_;
63
64 undef $spl_guard;
65 my $info = $self->{json_coder}->decode (delete $face->{data});
66 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
67 });
68
69 ()
70 });
17 71
18 $self->{map_widget}->clr_commands; 72 $self->{map_widget}->clr_commands;
19 73
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 74 my @cmd_help = map {
21 my ($pom) = @_; 75 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
76 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
22 77
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next;
28
29 my $cmd = $1; 78 my $cmd = $1;
30 my @args = split /\|/, $2; 79 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 80 @args = (".*") unless @args;
32 81
82 my (undef, @par) = DC::Pod::section_of $_;
83 my $text = DC::Pod::as_label @par;
84
33 $_ = $_ eq ".*" ? "" : " $_" 85 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 86 for @args;
35 87
36 my $text = CFClient::pod_to_pango $head2->content; 88 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 89 sort { (length $a) <=> (length $b) }
40 @args; 90 @args
91 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
92 DC::Pod::find command => "*";
93
94 $self->{json_coder}
95 ->convert_blessed
96 ->filter_json_single_key_object ("\fw" => sub {
97 $self->{widget}{$_[0]}
41 } 98 })
99 ->filter_json_single_key_object ("\fc" => sub {
100 my ($id) = @_;
101 sub {
102 $self->send_exti_msg (w_e => $id, @_);
103 }
104 });
42 105
106 # destroy widgets on logout
107 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
108 for my $ws (values %{delete $self->{widgetset} || {}}) {
109 $_->destroy
110 for values %{delete $ws->{w} || {}};
111 }
112
113 delete $self->{items};
114 $::INV->clear;
115 $::INVR->clear;
116 $::INVR_HB->clear;
117 $::FLOORBOX->clear;
118 });
119
120 $self->{map_widget}->add_command (@$_)
43 \@cmd_help 121 for @cmd_help;
122
123 {
124 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
125 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
126 }
127
128 {
129 $self->{noface} = my $tex = $TEX_NOFACE;
130 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
131 }
132
133# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
134# $self->{expire_w} = AE::timer 1, 1, sub {
135# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
136#
137# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
138# warn DC::SvREFCNT $self->{texture}[$_];
139# $self->{texture}[$_]->unload;
140# warn "expire texture $_\n";#d#
141# }
142#
143# ($self->{expire_count} += $count) < @{ $self->{texture} }
144# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
145# warn "count is $count\n";#d#
146# };
147
148 $self->{open_container} = 0;
149
150 # per server
151 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
152
153 $self
154}
155
156sub update_fx_want {
157 my ($self) = @_;
158
159 $self->send_exti_msg (fx_want => {
160 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
161 5 => !!$::CFG->{audio_enable}, # FT_SOUND
162 6 => 1, # FT_RSRC
163 });
164}
165
166sub ext_capabilities {
167 my ($self, %cap) = @_;
168
169 if (my $ts = $cap{tileset}) {
170 if (my ($default) = grep $_->[2] & 1, @$ts) {
171 $self->{tileset} = $default;
172 $self->{tilesize} = $default->[3];
173 $self->setup_req (tileset => $default->[0]);
174
175 my $w = int $self->{mapw} * 32 / $self->{tilesize};
176 my $h = int $self->{maph} * 32 / $self->{tilesize};
177
178 $self->setup_req (mapsize => "${w}x${h}");
179 }
180 }
181}
182
183sub ext_ambient_music {
184 my ($self, $songs) = @_;
185 &::audio_music_set_ambient ($songs);
186}
187
188#############################################################################
189
190sub widget_associate {
191 my ($self, $ws, $id, $widget) = @_;
192
193 $widget ||= new DC::UI::Bin;
194
195 $widget->{s_id} = $id;
196 $self->{widget}{$id} = $widget;
197
198 if ($ws) {
199 $widget->{s_ws} = $ws;
200 $self->{widgetset}{$ws}{w}{$id} = $widget;
201 }
202
203 $widget->connect (on_destroy => sub {
204 my ($widget) = @_;
205
206 delete $self->{widget}{$widget->{s_id}};
207 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
208 if exists $widget->{s_ws};
209 });
210}
211
212# widgetset new
213sub ext_ws_n {
214 my ($self, $id) = @_;
215
216 $self->{widgetset}{$id} = {
217 w => {},
44 }; 218 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
48
49 $self->{noface} = new_from_file CFClient::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
51
52 $self->{open_container} = 0;
53
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61 $self
62} 219}
220
221# widgetset destroy
222sub ext_ws_d {
223 my ($self, $id) = @_;
224
225 my $ws = delete $self->{widgetset}{$id}
226 or return;
227
228 $_->destroy
229 for values %{$ws->{w}};
230}
231
232# widgetset create
233sub ext_ws_c {
234 my ($self, $ws, $id, $class, $args) = @_;
235
236 $self->widget_associate (
237 $ws, $id => scalar eval {
238 local $SIG{__DIE__};
239 "DC::UI::$class"->new (%$args)
240 }
241 );
242}
243
244# widgetset create template
245sub ext_ws_ct {
246 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
247
248 $done_cb ||= sub { };
249
250 my $parse_list; $parse_list = sub {
251 my ($list) = @_;
252 my @w;
253
254 while (@$list) {
255 my ($class, $args) = splice @$list, 0, 2;
256 my $name = delete $args->{s_id};
257 my $cl = delete $args->{s_cl};
258 my $cfg = delete $cfg->{$name};
259 my $id = delete $cfg->{id};
260 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
261 or next;
262
263 $self->widget_associate ($ws, $id, $w)
264 if $id;
265
266 $w->add ($parse_list->($cl))
267 if $cl;
268
269 push @w, $w;
270 }
271
272 @w
273 };
274
275 # either array reference, or face #
276 if ($type eq "inline") {
277 $done_cb->();
278 $parse_list->($template);
279 } elsif ($type eq "face") {
280 my $handler; $handler = $self->register_face_handler ($template, sub {
281 my ($face) = @_;
282
283 undef $handler;
284 $done_cb->();
285 $parse_list->($self->{json_coder}->decode ($face->{data}));
286 });
287 } else {
288 $done_cb->(0);
289 }
290}
291
292# widgetset associate
293sub ext_ws_a {
294 my ($self, %ass) = @_;
295
296 # everything that has a name, wether conceivably useful or not
297 my %wkw = (
298 root => $DC::UI::ROOT,
299 tooltip => $DC::UI::TOOLTIP,
300
301 mapwidget => $::MAPWIDGET,
302 menubar => $::MENUBAR,
303 menupopup => $::MENUPOPUP,
304 pickup_enable => $::PICKUP_ENABLE,
305 buttonbar => $::BUTTONBAR,
306 metaserver => $::METASERVER,
307 buttonbar => $::BUTTONBAR,
308 login_button => $::LOGIN_BUTTON,
309 quit_dialog => $::QUIT_DIALOG,
310 host_entry => $::HOST_ENTRY,
311 metaserver => $::METASERVER,
312 server_info => $::SERVER_INFO,
313
314 setup_dialog => $::SETUP_DIALOG,
315 setup_notebook => $::SETUP_NOTEBOOK,
316 setup_server => $::SETUP_SERVER,
317 setup_keyboard => $::SETUP_KEYBOARD,
318
319 pl_notebook => $::PL_NOTEBOOK,
320 pl_window => $::PL_WINDOW,
321 inventory_page => $::INVENTORY_PAGE,
322 stats_page => $::STATS_PAGE,
323 skill_page => $::SKILL_PAGE,
324 spell_page => $::SPELL_PAGE,
325 spell_list => $::SPELL_LIST,
326
327 floorbox => $::FLOORBOX,
328 help_window => $::HELP_WINDOW,
329 message_window => $::MESSAGE_WINDOW,
330 message_dist => $::MESSAGE_DIST,
331 statusbox => $::STATUSBOX,
332
333 inv => $::INV,
334 invr => $::INVR,
335 invr_hb => $::INVR_HB,
336 );
337
338 while (my ($id, $name) = each %ass) {
339 $self->widget_associate (undef, $id => $wkw{$name});
340 }
341}
342
343# widget call
344sub ext_w_c {
345 my ($self, $id, $rcb, $method, @args) = @_;
346
347 my $w = $self->{widget}{$id}
348 or return;
349
350 if ($rcb) {
351 $rcb->($w->$method (@args));
352 } else {
353 $w->$method (@args);
354 }
355}
356
357# widget set
358sub ext_w_s {
359 my ($self, $id, $attr) = @_;
360
361 my $w = $self->{widget}{$id}
362 or return;
363
364 for (my $i = 0; $i < $#$attr; $i += 2) {
365 my ($member, $value) = @$attr[$i, $i+1];
366 if (defined $value) {
367 $w->{$member} = $value;
368 } else {
369 delete $w->{$member};
370 }
371 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
372 }
373}
374
375# widget get
376sub ext_w_g {
377 my ($self, $id, $rid, @attr) = @_;
378
379 my $w = $self->{widget}{$id}
380 or return;
381
382 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
383}
384
385# message window
386sub ext_channel_info {
387 my ($self, $info) = @_;
388 $self->{channels}->{$info->{id}} = $info;
389 $::MESSAGE_DIST->add_channel ($info);
390}
391
392#############################################################################
63 393
64sub logprint { 394sub logprint {
65 my ($self, @a) = @_; 395 my ($self, @a) = @_;
66 396
67 $self->{log_fh} ||= do { 397 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69
70 open my $fh, ">>:utf8", $path
71 or die "Couldn't open logfile $path: $!";
72
73 $fh->autoflush (1);
74
75 $fh;
76 };
77
78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
79
80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
82
83 print {$self->{log_fh}} "$ts ", @a, "\n";
84} 398}
85 399
86sub _stat_numdiff { 400sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 401 my ($self, $name, $old, $new) = @_;
88 402
… …
106 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 420 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
107 : () 421 : ()
108 } 422 }
109 sort { $a <=> $b } keys %{$self->{spell_paths}}; 423 sort { $a <=> $b } keys %{$self->{spell_paths}};
110 424
111 join "", @diff 425 "\u$name: " . (join ", ", @diff)
112} 426}
113 427
114# all stats that are chacked against changes 428# all stats that are chacked against changes
115my @statchange = ( 429my @statchange = (
116 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 430 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
159 473
160 if (my @diffs = 474 if (my @diffs =
161 ( 475 (
162 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 476 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
163 map { 477 map {
164 $stats->{$_} && $prev->{$_} 478 $stats->{$_} && $prev->{$_}
165 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 479 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
166 } sort { $a <=> $b } keys %{$self->{skill_info}} 480 } sort { $a <=> $b } keys %{$self->{skill_info}}
167 ) 481 )
168 ) { 482 ) {
169 my $msg = join " ", @diffs; 483 my $msg = join " ", @diffs;
… …
171 } 485 }
172 486
173 if ( 487 if (
174 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 488 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
175 ) { 489 ) {
176 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 490 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
177 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 491 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
178 } 492 }
179 493
180 $self->update_stats_window ($stats, $prev); 494 $self->update_stats_window ($stats, $prev);
181 495
182 $self->{prev_stats} = { %$stats }; 496 $self->{prev_stats} = { %$stats };
… …
219 533
220 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 534 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 535 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 536 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 537 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 538 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 539 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 540 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
227 $rng =~ s/^Range: //; # thank you so much dear server 541 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 542 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 543 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 544 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 545
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 546 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 555 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 556 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 557 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 558 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 559
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 560 $self->update_weight;
248 561
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 562 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 563 for keys %RES_TBL;
251 564
252 my $sktbl = $::STATWIDS->{skill_tbl}; 565 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 566 my @skills = keys %{ $self->{skill_info} };
254 567
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 568 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
569 map [$_, $self->{skill_info}{$_}],
570 grep exists $stats->{$_},
571 @skills;
572
573 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
574 $self->{stat_order} = join ",", map $_->[0], @order;
575
256 $sktbl->clear; 576 $sktbl->clear;
257 577
578 my $sw = $self->{skillwid}{""} ||= [
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 579 0, 0, (new DC::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 580 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 581 2, 0, (new DC::UI::Label text => "Progress"),
582 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 583 4, 0, (new DC::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 584 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 585 6, 0, (new DC::UI::Label text => "Progress"),
586 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
587 ];
264 588
589 my @add = @$sw;
590
591 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
592
593 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
594 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
595
265 my ($x, $y) = (0, 0); 596 my ($x, $y) = (0, 1);
266 for ( 597 for (@order) {
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_},
270 @skills
271 ) {
272 my ($idx, $name) = @$_; 598 my ($idx, $name) = @$_;
273 599
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 600 my $spell_cb = sub {
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 601 my ($widget, $ev) = @_;
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 602
603 if ($ev->{button} == 1) {
604 $::CONN->user_send ("ready_skill $name");
605 } elsif ($ev->{button} == 2) {
606 $::CONN->user_send ("use_skill $name");
607 } elsif ($ev->{button} == 3) {
608 my $shortname = DC::shorten $name, 14;
609 (new DC::UI::Menu
610 items => [
611 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
612 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
613 ],
614 )->popup ($ev);
615 } else {
616 return 0;
617 }
618
619 1
620 };
621
622 my $sw = $self->{skillwid}{$idx} ||= [
623 # exp
624 (new DC::UI::Label
625 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
626
627 # level
628 (new DC::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 629 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 630
631 # progress
632 (new DC::UI::ExperienceProgress),
633
634 # label
635 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
636 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
637 ];
638
639 push @add,
640 $x * 4 + 0, $y, $sw->[0],
641 $x * 4 + 1, $y, $sw->[1],
642 $x * 4 + 2, $y, $sw->[2],
643 $x * 4 + 3, $y, $sw->[3],
644 ;
279 645
280 $x++ and ($x, $y) = (0, $y + 1); 646 $x++ and ($x, $y) = (0, $y + 1);
281 } 647 }
282 }
283 648
284 for (grep exists $stats->{$_}, @skills) { 649 $sktbl->add_at (@add);
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 650 }
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 651
652 for (@order) {
653 my ($idx, $name) = @$_;
654 my $val = $stats->{$idx};
655
656 next if $prev->{$idx}[1] eq $val->[1];
657
658 my $sw = $self->{skillwid}{$idx};
659 $sw->[0]->set_text (::formsep ($val->[1]));
660 $sw->[1]->set_text ($val->[0] * 1);
661 $sw->[2]->set_value (@$val);
662
663 $::GAUGES->{skillexp}->set_label ("$name %d%%");
664 $::GAUGES->{skillexp}->set_value (@$val);
287 } 665 }
288} 666}
289 667
290sub user_send { 668sub user_send {
291 my ($self, $command) = @_; 669 my ($self, $command) = @_;
292 670
671 $self->{record}->($command)
293 if ($self->{record}) { 672 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 673
297 $self->logprint ("send: ", $command); 674 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 675 $self->send_command ($command);
299 ::status ($command);
300} 676}
301 677
302sub start_record { 678sub record {
303 my ($self) = @_; 679 my ($self, $cb) = @_;
304 680
305 $self->{record} = []; 681 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 682}
312 683
313sub map_scroll { 684sub map_scroll {
314 my ($self, $dx, $dy) = @_; 685 my ($self, $dx, $dy) = @_;
315 686
316 $self->{map}->scroll ($dx, $dy); 687 $self->{map_widget}->scroll ($dx, $dy);
317} 688}
318 689
319sub feed_map1a { 690sub feed_map1a {
320 my ($self, $data) = @_; 691 my ($self, $data) = @_;
321 692
322 $self->{map}->map1a_update ($data); 693 my $missing = $self->{map}->map1a_update ($data);
694 my $delay;
695
696 for my $tile (@$missing) {
697 next if $self->{delay}{$tile};
698
699 $delay = 1;
700
701 if (my $tex = $self->{texture}[$tile]) {
702 $tex->upload;
703 } else {
704 $self->{delay}{$tile} = 1;
705
706 # we assume the face is in-flight and will eventually arrive
707 push @{$self->{tile_cb}{$tile}}, sub {
708 delete $self->{delay}{$tile};
709 $_[0]->upload;
710 };
711 }
712 }
713
714 if ($delay) {
715 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
716 EV::once undef, 0, 0.03, sub {
717 $self->{map_widget}->update
718 if $self->{map_widget};
719 };
720 } else {
323 $self->{map_widget}->update; 721 $self->{map_widget}->update;
722 }
324} 723}
325 724
326sub magicmap { 725sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 726 my ($self, $w, $h, $x, $y, $data) = @_;
328 727
… …
330} 729}
331 730
332sub flush_map { 731sub flush_map {
333 my ($self) = @_; 732 my ($self) = @_;
334 733
335 my $map_info = delete $self->{map_info} 734 return unless $self->{map_info};
336 or return;
337 735
736 for my $map_info (values %{ $self->{map_cache} || {} }) {
338 my ($hash, $x, $y, $w, $h) = @$map_info; 737 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
339 738
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 739 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 740
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 741 if ($data ne $$rdata) {
742 $map_info->[1] = \$data;
743 my $cdata = Compress::LZF::compress $data;
744 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
745 }
746 }
343} 747}
344 748
345sub map_clear { 749sub map_clear {
346 my ($self) = @_; 750 my ($self) = @_;
347 751
348 $self->flush_map; 752 $self->flush_map;
753 delete $self->{map_info};
349 delete $self->{neigh_map}; 754 delete $self->{neigh_map};
350 755
351 $self->{map}->clear; 756 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 757 delete $self->{map_widget}{magicmap};
353} 758}
354 759
760sub bg_fetch {
761 my ($self) = @_;
355 762
763 my $tile;
764
765 do {
766 $tile = pop @{$self->{bg_fetch}}
767 or return;
768 } while $self->{texture}[$tile];
769
770 DC::DB::get tilecache => $tile, sub {
771 my ($data) = @_;
772
773 return unless $self->{map}; # stop when destroyed
774
775 if (defined $data) {
776 $self->have_tile ($tile, $data);
777 $self->{texture}[$tile]->upload;
778 }
779
780 $self->bg_fetch;
781 };
782}
783
356sub load_map($$$) { 784sub load_map($$$$$$) {
357 my ($self, $hash, $x, $y) = @_; 785 my ($self, $hash, $x, $y, $w, $h) = @_;
358 786
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 787 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
360 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 788
366 $self->set_texture ($id => $data); 789 my $cb = sub {
790 $map_info->[1] = \$_[0];
791
792 my $inprogress = @{ $self->{bg_fetch} || [] };
793 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
794 $self->bg_fetch unless $inprogress;
795 };
796
797 if (my $map_info = $self->{map_cache_old}{$hash}) {
798 $cb->(${ $map_info->[1] });
799 } else {
800 my $gen = $self->{map_change_gen};
801
802 DC::DB::get $self->{mapcache} => $hash, sub {
803 return unless $gen == $self->{map_change_gen};
804 return unless defined $_[0];
805 $cb->(Compress::LZF::decompress $_[0]);
367 } 806 };
368 } 807 }
369} 808}
370 809
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 810# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 811# (server resources, latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 812# the right fix is to make real tiled maps with an overview file
374sub send_mapinfo { 813sub send_mapinfo {
375 my ($self, $data, $cb) = @_; 814 my ($self, $data, $cb) = @_;
376 815
377 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 816 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
402} 841}
403 842
404# this method does a "flood fill" into every tile direction 843# this method does a "flood fill" into every tile direction
405# it assumes that tiles are arranged in a rectangular grid, 844# it assumes that tiles are arranged in a rectangular grid,
406# i.e. a map is the same as the left of the right map etc. 845# i.e. a map is the same as the left of the right map etc.
407# failure to comply are harmless and result in display errors 846# failure to comply is harmless and results in display errors
408# at worst. 847# at worst.
409sub flood_fill { 848sub flood_fill {
410 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 849 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
411 850
412 # the server does not allow map paths > 6 851 # the server does not allow map paths > 6
… …
437 876
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 877 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 878 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 879
441 } else { 880 } else {
881 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 882 $self->send_mapinfo ("spatial $path$tile", sub {
883 return unless $gen == $self->{map_change_gen};
884
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 885 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 886
445 return if $mode ne "spatial"; 887 return if $mode ne "spatial";
446 888
447 $x += $self->{map}->ox; 889 $x += $self->{map}->ox;
448 $y += $self->{map}->oy; 890 $y += $self->{map}->oy;
449 891
450 $self->load_map ($hash, $x, $y) 892 $self->load_map ($hash, $x, $y, $w, $h)
451 unless $self->{neigh_map}{$hash}[5]++;#d# 893 unless $self->{neigh_map}{$hash}[5]++;#d#
452 894
453 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 895 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
454 896
455 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 897 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
461 903
462sub map_change { 904sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 905 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 906
465 $self->flush_map; 907 $self->flush_map;
908
909 ++$self->{map_change_gen};
910 $self->{map_cache_old} = delete $self->{map_cache};
466 911
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 912 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 913
469 my $mapmapw = $self->{mapmap}->{w}; 914 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 915 my $mapmaph = $self->{mapmap}->{h};
… …
482 $self->{map_info} = [$hash, $x, $y, $w, $h]; 927 $self->{map_info} = [$hash, $x, $y, $w, $h];
483 928
484 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 929 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
485 $::STATWIDS->{map}->set_text ("Map: " . $map); 930 $::STATWIDS->{map}->set_text ("Map: " . $map);
486 931
487 $self->load_map ($hash, $x, $y); 932 $self->load_map ($hash, $x, $y, $w, $h);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 933 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 934}
490 935
491sub face_find { 936sub face_find {
492 my ($self, $facenum, $face) = @_; 937 my ($self, $facenum, $face, $cb) = @_;
493 938
494 my $hash = "$face->{chksum},$face->{name}"; 939 if ($face->{type} == 0) { # FT_FACE
940 my $id = DC::DB::get_tile_id_sync $face->{name};
495 941
496 my $id = $self->{facemap}->get ($hash);
497
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 942 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 943 $self->{map}->set_tileid ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d#
523 944
524 my $face = $self->{tilecache}->get ($id); 945 DC::DB::get tilecache => $id, $cb;
525 946
526 if ($face) { 947 } elsif ($face->{type} & 1) { # with metadata
527 #$self->face_prefetch; 948 DC::DB::get res_meta => $face->{name}, $cb;
528 $face 949
529 } else { 950 } else { # no metadata
530 my $tex = $self->{noface}; 951 DC::DB::get res_data => $face->{name}, $cb;
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 952 }
534} 953}
535 954
536sub face_update { 955sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 956 my ($self, $facenum, $face, $changed) = @_;
538 957
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 958 if ($face->{type} == 0) {
959 # image, FT_FACE
960 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
961 if $changed;
540 962
541 $self->set_texture ($face->{id} => delete $face->{image}); 963 $self->have_tile ($face->{id}, delete $face->{data});
542}
543 964
544sub set_texture { 965 } elsif ($face->{type} & 1) {
966 # split metadata case, FT_MUSIC, FT_SOUND
967 if ($changed) { # new data
968 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
969 $face->{data} = $meta;
970
971 # rely on strict ordering here and also on later fetch
972 DC::DB::put res_data => $face->{name} => $data, sub { };
973 DC::DB::put res_meta => $face->{name} => $meta, sub { };
974 }
975
976 $face->{data} = $self->{json_coder}->decode ($face->{data});
977 ::add_license ($face);
978 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
979 if $changed;
980
981 if ($face->{type} == 3) { # FT_MUSIC
982 &::audio_music_push ($facenum);
983 } elsif ($face->{type} == 5) { # FT_SOUND
984 &::audio_sound_push ($facenum);
985 }
986
987 } else {
988 # flat resource case, FT_RSRC
989 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
990 if $changed;
991 }
992
993 if (my $cbs = $self->{face_cb}{$facenum}) {
994 $_->($face, $changed) for @$cbs;
995 }
996}
997
998sub smooth_update {
999 my ($self, $facenum, $face) = @_;
1000
1001 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
1002}
1003
1004sub have_tile {
545 my ($self, $id, $data) = @_; 1005 my ($self, $tile, $data) = @_;
546 1006
547 $self->{texture}[$id] ||= do { 1007 return unless $self->{map};
548 my $tex =
549 new_from_image CFClient::Texture
550 $data, minify => 1, mipmap => 1;
551 1008
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1009 my $tex = $self->{texture}[$tile] ||=
553 $self->{map_widget}->update; 1010 new DC::Texture
1011 tile => $tile,
1012 image => $data, delete_image => 1,
1013 minify => 1;
554 1014
555 $tex 1015 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1016 $_->($tex) for @$cbs;
556 }; 1017 }
1018}
1019
1020# call in non-void context registers a temporary
1021# hook with handle, otherwise its permanent
1022sub on_face_change {
1023 my ($self, $num, $cb) = @_;
1024
1025 push @{$self->{face_cb}{$num}}, $cb;
1026
1027 defined wantarray
1028 ? Guard::guard {
1029 @{$self->{face_cb}{$num}}
1030 = grep $_ != $cb,
1031 @{$self->{face_cb}{$num}};
1032 }
1033 : ()
1034}
1035
1036# call in non-void context registers a temporary
1037# hook with handle, otherwise its permanent
1038sub register_face_handler {
1039 my ($self, $num, $cb) = @_;
1040
1041 return unless $num;
1042
1043 # invoke if available right now
1044 $cb->($self->{face}[$num], 0)
1045 unless exists $self->{face}[$num]{loading};
1046
1047 # future changes
1048 $self->on_face_change ($num => $cb)
557} 1049}
558 1050
559sub sound_play { 1051sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 1052 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 1053
562 $self->{sound_play}->($x, $y, $soundnum, $type); 1054 &::audio_sound_play ($face, $dx, $dy, $vol)
1055 unless $type & 1; # odd types are silent for future expansion
563} 1056}
564 1057
565my $LAST_QUERY; # server is stupid, stupid, stupid 1058my $LAST_QUERY; # server is stupid, stupid, stupid
566 1059
567sub query { 1060sub query {
568 my ($self, $flags, $prompt) = @_; 1061 my ($self, $flags, $prompt) = @_;
569 1062
570 $prompt = $LAST_QUERY unless length $prompt; 1063 $prompt = $LAST_QUERY unless length $prompt;
571 $LAST_QUERY = $prompt; 1064 $LAST_QUERY = $prompt;
572 1065
573 $self->{query}-> ($self, $flags, $prompt); 1066 $self->{query}->($self, $flags, $prompt);
574} 1067}
575 1068
576sub drawinfo { 1069sub sanitise_xml($) {
577 my ($self, $color, $text) = @_; 1070 local $_ = shift;
578 1071
579 my @color = ( 1072 # we now weed out all tags we do not support
1073 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1074 }{
1075 "&lt;"
1076 }gex;
1077
1078 # now all entities
1079 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1080
1081 # handle some elements
1082 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1083 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1084
1085 s/\s+$//;
1086
1087 $_
1088}
1089
1090our %NAME_TO_COLOR = (
1091 black => 0,
1092 white => 1,
1093 darkblue => 2,
1094 red => 3,
1095 orange => 4,
1096 lightblue => 5,
1097 darkorange => 6,
1098 green => 7,
1099 darkgreen => 8,
1100 grey => 9,
1101 brown => 10,
1102 yellow => 11,
1103 tan => 12,
1104);
1105
1106our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1107 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 1108 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1109 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
583 [1.00, 0.00, 0.00], 1110 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 1111 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 1112 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 1113 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 1114 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 1115 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 1116 [0.80, 0.80, 0.80],
590 [0.55, 0.41, 0.13], 1117 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 1118 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 1119 [0.74, 0.65, 0.41],
593 ); 1120);
594 1121
1122sub msg {
1123 my ($self, $color, $type, $text, @extra) = @_;
1124
1125 $text = sanitise_xml $text;
1126
1127 if (my $cb = $self->{cb_msg}{$type}) {
1128 $_->($self, $color, $type, $text, @extra) for values %$cb;
1129 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1130 $type =~ s/-/_/g;
1131 $self->{$type} = $text;
1132 } else {
595 $self->logprint ("info: ", $text); 1133 $self->logprint ("msg: ", $text);
1134 return if $color < 0; # negative color == ignore if not understood
596 1135
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1136 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
598 1137
599 # try to create single paragraphs of multiple lines sent by the server 1138 ::message ({
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1139 fg => $fg,
1140 markup => $text,
1141 type => $type,
1142 extra => [@extra],
1143 color_flags => $color, #d# ugly, kill
1144 });
601 1145
602 $text = CFClient::UI::Label::escape $text; 1146# $color &= ~NDI_CLEAR; # only clear once for multiline messages
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1147# # actually, this is an ugly design. _we_ should control the channels,
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1148# # not some random other widget, as the channels are clearly protocol-specific.
1149# # then we could also react to flags such as CLEAR without resorting to
1150# # hacks such as color_flags, above.
605 1151
606 $self->{logview}->add_paragraph ($color[$color], $_)
607 for map "$time $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609
610 $self->{statusbox}->add ($text, 1152 $self->{statusbox}->add ($text,
611 group => $text, 1153 group => $text,
612 fg => $color[$color], 1154 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 1155 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 1156 tooltip_font => $::FONT_FIXED,
615 ); 1157 ) if $type eq "info";
616} 1158 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 1159}
623 1160
624sub spell_add { 1161sub spell_add {
625 my ($self, $spell) = @_; 1162 my ($self, $spell) = @_;
626 1163
627 # try to create single paragraphs of multiple lines sent by the server 1164 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1165 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 1166 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 1167 $spell->{message} ||= "Server did not provide a description for this spell.";
631 1168
632 $::SPELL_PAGE->add_spell ($spell); 1169 $::SPELL_LIST->add_spell ($spell);
633 1170
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1171 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1172 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
636} 1173}
637 1174
638sub spell_delete { 1175sub spell_delete {
639 my ($self, $spell) = @_; 1176 my ($self, $spell) = @_;
640 1177
641 $::SPELL_PAGE->remove_spell ($spell); 1178 $::SPELL_LIST->remove_spell ($spell);
1179}
1180
1181sub setup {
1182 my ($self, $setup) = @_;
1183
1184 $self->{map_widget}->set_tilesize ($self->{tilesize});
1185 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 1186}
643 1187
644sub addme_success { 1188sub addme_success {
645 my ($self) = @_; 1189 my ($self) = @_;
646 1190
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 1191 my %skill_help;
651 1192
652 for my $head2 ($pom->head1->[3]->head2) { 1193 for my $node (DC::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1194 my (undef, @par) = DC::Pod::section_of $node;
654 } 1195 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
655
656 \%skill_help
657 }; 1196 };
658 1197
659 for my $skill (values %{$self->{skill_info}}) { 1198 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 1199 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1200 (DC::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 1201 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 1202 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1203 (DC::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 1204 . $skill_help{$skill});
666 } 1205 }
667} 1206}
668 1207
669sub eof { 1208sub eof {
670 my ($self) = @_; 1209 my ($self) = @_;
… …
672 $self->{map_widget}->clr_commands; 1211 $self->{map_widget}->clr_commands;
673 1212
674 ::stop_game (); 1213 ::stop_game ();
675} 1214}
676 1215
677sub image_info {
678 my ($self, $numfaces) = @_;
679
680 $self->{num_faces} = $numfaces;
681 $self->{face_prefetch} = [1 .. $numfaces];
682 $self->face_prefetch;
683}
684
685sub face_prefetch {
686 my ($self) = @_;
687
688 return unless $::CFG->{face_prefetch};
689
690 if ($self->{num_faces}) {
691 return if @{ $self->{send_queue} || [] };
692 my $todo = @{ $self->{face_prefetch} }
693 or return;
694
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696
697 $self->send ("requestinfo image_sums $face $face");
698
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info");
703
704 $self->{num_faces} = 0;
705
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 }
709}
710
711sub update_floorbox { 1216sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1217 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 1218 return unless $::CONN;
714 1219
715 $::FLOORBOX->clear; 1220 $::FLOORBOX->clear;
716 1221
1222 my @add;
1223
717 my $row; 1224 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 1225 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1226 next if $_->{tag} & 0x80000000;
719 if ($row < 6) { 1227 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 1228 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 1229 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 1230 DC::Item::update_widgets $_;
723 1231
1232 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1233 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1234 1, $row, $_->{desc_widget};
726 1235
727 $row++; 1236 $row++;
728 } else { 1237 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1238 push @add, 1, $row, new DC::UI::Button
730 text => "More...", 1239 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1240 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1241 ;
733 last; 1242 last;
734 } 1243 }
735 } 1244 }
1245 if ($::CONN->{open_container}) {
1246 push @add, 1, $row++, new DC::UI::Button
1247 text => "Close container",
1248 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1249 ;
1250 }
1251
1252 $::FLOORBOX->add_at (@add);
736 }); 1253 });
737 1254
738 $::WANT_REFRESH++; 1255 $::WANT_REFRESH = 1;
739} 1256}
740 1257
741sub set_opencont { 1258sub set_opencont {
742 my ($conn, $tag, $name) = @_; 1259 my ($conn, $tag, $name) = @_;
743 $conn->{open_container} = $tag; 1260 $conn->{open_container} = $tag;
1261 update_floorbox;
744 1262
745 $::INV_RIGHT_HB->clear (); 1263 $::INVR_HB->clear;
746 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1264 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
747 1265
748 if ($tag != 0) { # Floor isn't closable, is it? 1266 if ($tag != 0) { # Floor isn't closable, is it?
749 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1267 $::INVR_HB->add (new DC::UI::Button
750 text => "Close container", 1268 text => "Close container",
751 tooltip => "Close the currently open container (if one is open)", 1269 tooltip => "Close the currently open container (if one is open)",
752 on_activate => sub { 1270 on_activate => sub {
753 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1271 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
754 if $tag != 0; 1272 if $tag != 0;
755 #if $CONN->{open_container} != 0;
756 0 1273 0
757 }, 1274 },
758 ); 1275 );
759 } 1276 }
760 1277
… …
762} 1279}
763 1280
764sub update_containers { 1281sub update_containers {
765 my ($self) = @_; 1282 my ($self) = @_;
766 1283
767 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1284 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
768 my $todo = delete $self->{update_container} 1285 my $todo = delete $self->{update_container}
769 or return; 1286 or return;
770 1287
771 for my $tag (keys %$todo) { 1288 for my $tag (keys %$todo) {
1289 update_floorbox if $tag == 0 or $tag == $self->{open_container};
772 if ($tag == 0) { 1290 if ($tag == 0) {
773 update_floorbox;
774 $::INVR->set_items ($self->{container}{0}) 1291 $::INVR->set_items ($self->{container}{0})
775 if $tag == $self->{open_container}; 1292 if $tag == $self->{open_container};
776 } elsif ($tag == $self->{player}{tag}) { 1293 } elsif ($tag == $self->{player}{tag}) {
777 $::INV->set_items ($self->{container}{$tag}) 1294 $::INV->set_items ($self->{container}{$tag})
778 } else { 1295 } else {
… …
807} 1324}
808 1325
809sub item_update { 1326sub item_update {
810 my ($self, $item) = @_; 1327 my ($self, $item) = @_;
811 1328
812 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1329 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
813 1330
814 CFClient::Item::update_widgets $item; 1331 DC::Item::update_widgets $item;
815 1332
816 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1333 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
817 set_opencont ($::CONN, 0, "Floor"); 1334 set_opencont ($::CONN, 0, "Floor");
818 1335
819 } elsif ($item->{flags} & F_OPEN) { 1336 } elsif ($item->{flags} & F_OPEN) {
820 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1337 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
821 1338
822 } else { 1339 } else {
823 $self->{update_container}{$item->{container}}++; 1340 $self->{update_container}{$item->{container}}++;
824 $self->update_containers; 1341 $self->update_containers;
825 } 1342 }
826} 1343}
827 1344
828sub player_update { 1345sub player_update {
829 my ($self, $player) = @_; 1346 my ($self, $player) = @_;
1347
1348 $self->update_weight;
1349}
1350
1351sub update_weight {
1352 my ($self) = @_;
1353
1354 my $weight = .001 * $self->{player}{weight};
1355 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1356
830 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1357 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1358 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1359 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
831} 1360}
832 1361
833sub update_server_info { 1362sub update_server_info {
834 my ($self) = @_; 1363 my ($self) = @_;
835 1364
836 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1365 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
837 1366
1367 my $version = JSON::XS->new->encode ($self->{s_version});
1368
838 $::SERVER_INFO->set_markup ( 1369 $::SERVER_INFO->set_markup (
839 "server <tt>$self->{host}:$self->{port}</tt>\n" 1370 "server <tt>$self->{host}:$self->{port}</tt>\n"
840 . "protocol version <tt>$self->{version}</tt>\n" 1371 . "protocol version <tt>$version</tt>\n"
841 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1372 . "editing support $yesno[!!$self->{editor_support}]\n"
842 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
843 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1373 . "client support $yesno[$self->{cfplus_ext} > 0]"
844 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1374 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
845 . "map size $self->{mapw}×$self->{maph}\n" 1375 . "map size $self->{mapw}×$self->{maph}\n"
846 ); 1376 );
1377
847} 1378}
848 1379
849sub logged_in { 1380sub logged_in {
850 my ($self) = @_; 1381 my ($self) = @_;
851 1382
852 $self->send_ext_req (cfplus_support => "1", sub { 1383 $self->send_ext_req (cfplus_support => version => 2, sub {
1384 my (%msg) = @_;
1385
853 $self->{cfplus_ext} = $_[0]; 1386 $self->{cfplus_ext} = $msg{version};
854 $self->update_server_info; 1387 $self->update_server_info;
1388
1389 if ($self->{cfplus_ext} >= 2) {
1390 $self->send_ext_req ("editor_support", sub {
1391 $self->{editor_support} = { @_ };
1392 $self->update_server_info;
1393
1394 0
1395 });
1396 }
1397
1398 0
855 }); 1399 });
856 1400
857 $self->update_server_info; 1401 $self->update_server_info;
858 1402
859 $self->send_command ("output-sync $::CFG->{output_sync}"); 1403 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
860 $self->send_command ("output-count $::CFG->{output_count}");
861 $self->send_command ("pickup $::CFG->{pickup}"); 1404 $self->send_pickup ($::CFG->{pickup});
862} 1405}
863 1406
864sub lookat { 1407sub lookat {
865 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
866 1409
867 if ($self->{cfplus_ext}) { 1410 if ($self->{cfplus_ext}) {
868 $self->send_ext_req (lookat => "$x $y", sub { 1411 $self->send_ext_req (lookat => $x, $y, sub {
869 my %res = split /\x00/, $_[0]; 1412 my (%msg) = @_;
870 1413
871 if (exists $res{npc_dialog}) { 1414 if (exists $msg{npc_dialog}) {
872 # start npc chat dialog 1415 # start npc chat dialog
873 $self->{npc_dialog} = new CFClient::NPCDialog:: 1416 $self->{w}{npc_dialog} = new DC::NPCDialog::
874 dx => $x, 1417 token => $msg{npc_dialog},
875 dy => $y,
876 title => "$res{npc_dialog} (NPC)", 1418 title => "$msg{npc_dialog}[0] (NPC)",
877 conn => $self, 1419 conn => $self,
878 ; 1420 ;
879 } 1421 }
880 }); 1422 });
881 } 1423 }
… …
884} 1426}
885 1427
886sub destroy { 1428sub destroy {
887 my ($self) = @_; 1429 my ($self) = @_;
888 1430
889 $self->{npc_dialog}->destroy 1431 $_->destroy
890 if $self->{npc_dialog}; 1432 for values %{ $self->{w} };
891 1433
892 $self->SUPER::destroy; 1434 $self->SUPER::destroy;
893}
894 1435
1436 %$self = ();
1437}
1438
895package CFClient::NPCDialog; 1439package DC::NPCDialog;
896 1440
897our @ISA = 'CFClient::UI::FancyFrame'; 1441our @ISA = 'DC::UI::Toplevel';
898 1442
899sub new { 1443sub new {
900 my $class = shift; 1444 my $class = shift;
901 1445
902 my $self = $class->SUPER::new ( 1446 my $self = $class->SUPER::new (
… …
905 name => "npc_dialog", 1449 name => "npc_dialog",
906 force_w => $::WIDTH * 0.7, 1450 force_w => $::WIDTH * 0.7,
907 force_h => $::HEIGHT * 0.7, 1451 force_h => $::HEIGHT * 0.7,
908 title => "NPC Dialog", 1452 title => "NPC Dialog",
909 kw => { hi => 0, yes => 0, no => 0 }, 1453 kw => { hi => 0, yes => 0, no => 0 },
1454 has_close_button => 1,
910 @_, 1455 @_,
911 ); 1456 );
912 1457
913 Scalar::Util::weaken (my $this = $self); 1458 DC::weaken (my $this = $self);
1459
1460 $self->connect (delete => sub { $this->destroy; 1 });
914 1461
915 # better use a pane... 1462 # better use a pane...
916 $self->add (my $hbox = new CFClient::UI::HBox); 1463 $self->add (my $hbox = new DC::UI::HBox);
917 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1464 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
918 1465
919 $hbox->add (my $vbox = new CFClient::UI::VBox); 1466 $hbox->add (my $vbox = new DC::UI::VBox);
920 1467
921 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1468 $vbox->add (new DC::UI::Label text => "Message Entry:");
922 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1469 $vbox->add ($self->{entry} = new DC::UI::Entry
923 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1470 tooltip => "#npc_message_entry",
924 . "Sometimes you have to tell an NPC something you cannot find out during "
925 . "a normal conversation (such as a password). In those cases you have to use "
926 . "this text entry. You can also enter responses manually instead of using the response "
927 . "buttons below.",
928 on_activate => sub { 1471 on_activate => sub {
929 my ($entry, $text) = @_; 1472 my ($entry, $text) = @_;
930 1473
931 return unless $text =~ /\S/; 1474 return unless $text =~ /\S/;
932 1475
… …
935 1478
936 0 1479 0
937 }, 1480 },
938 ); 1481 );
939 1482
940 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1483 $vbox->add ($self->{options} = new DC::UI::VBox);
941 1484
942 $self->{bye_button} = new CFClient::UI::Button 1485 $self->{bye_button} = new DC::UI::Button
943 text => "Bye (close)", 1486 text => "Bye (close)",
944 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1487 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
945 on_activate => sub { $this->destroy; 0 }, 1488 on_activate => sub { $this->destroy; 1 },
946 ; 1489 ;
947 1490
948 $self->update_options; 1491 $self->update_options;
949 1492
950 $self->{token} = $self->{conn}->ext_token; 1493 $self->{id} = "npc-channel-" . $self->{conn}->token;
951 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1494 $self->{conn}->connect_ext ($self->{id} => sub {
952 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1495 $this->feed (@_) if $this;
1496 });
1497
1498 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
953 1499
954 $self->{entry}->grab_focus; 1500 $self->{entry}->grab_focus;
955 1501
956 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1502 $self->{textview}->add_paragraph ({
1503 fg => [1, 1, 0, 1],
1504 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1505 });
957 1506
958 $self->show; 1507 $self->show;
959 $self 1508 $self
960}; 1509};
961 1510
962sub update_options { 1511sub update_options {
963 my ($self) = @_; 1512 my ($self) = @_;
964 1513
965 Scalar::Util::weaken $self; 1514 DC::weaken $self;
966 1515
967 $self->{options}->clear; 1516 $self->{options}->clear;
968 $self->{options}->add ($self->{bye_button}); 1517 $self->{options}->add ($self->{bye_button});
969 1518
970 for my $kw (sort keys %{ $self->{kw} }) { 1519 for my $kw (sort keys %{ $self->{kw} }) {
971 $self->{options}->add (new CFClient::UI::Button 1520 $self->{options}->add (new DC::UI::Button
972 text => $kw, 1521 text => $kw,
973 on_activate => sub { 1522 on_activate => sub {
974 $self->send ($kw); 1523 $self->send ($kw);
975 0 1524 0
976 }, 1525 },
977 ); 1526 );
978 } 1527 }
979} 1528}
980 1529
981sub feed { 1530sub feed {
982 my ($self, $data) = @_; 1531 my ($self, $type, @arg) = @_;
983 1532
984 Scalar::Util::weaken $self; 1533 DC::weaken $self;
985 1534
986 my ($type, $msg) = split / /, $data, 2;
987
988 if ($type eq "msg") { 1535 if ($type eq "update") {
989 my ($msg, @kw) = split /\x00/, $msg; 1536 my (%info) = @arg;
990 $self->{kw}{$_} = 1 for @kw;
991 1537
992 $msg = "\n" . CFClient::UI::Label::escape $msg; 1538 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
993 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1539 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
994 my @link;
995 $msg =~ s{
996 ($match)
997 }{
998 my $kw = $1;
999
1000 push @link, new CFClient::UI::Label
1001 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1002 can_hover => 1,
1003 can_events => 1,
1004 padding_x => 0,
1005 padding_y => 0,
1006 on_button_up => sub {
1007 $self->send ($kw);
1008 };
1009
1010 chr 0xfffc
1011 }giex;
1012 1540
1013 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1541 if (exists $info{msg}) {
1542 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1543 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1544 my @link;
1545 $text =~ s{
1546 ($match)
1547 }{
1548 my $kw = $1;
1549
1550 push @link, new DC::UI::Label
1551 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1552 can_hover => 1,
1553 can_events => 1,
1554 padding_x => 0,
1555 padding_y => 0,
1556 on_button_up => sub {
1557 $self->send ($kw);
1558 };
1559
1560 "\x{fffc}"
1561 }giex;
1562
1563 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1014 $self->{textview}->scroll_to_bottom; 1564 $self->{textview}->scroll_to_bottom;
1565 }
1566
1015 $self->update_options; 1567 $self->update_options;
1016 } else { 1568 } else {
1017 $self->destroy; 1569 $self->destroy;
1018 } 1570 }
1019 1571
… …
1021} 1573}
1022 1574
1023sub send { 1575sub send {
1024 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1025 1577
1026 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1578 $self->{textview}->add_paragraph ({
1027 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1579 markup =>
1580 "\n<span foreground='#ffff00'><b>"
1581 . (DC::asxml $msg)
1582 . "</b></span>"
1583 });
1028 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1585
1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1029} 1587}
1030 1588
1031sub destroy { 1589sub destroy {
1032 my ($self) = @_; 1590 my ($self) = @_;
1033 1591
1034 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1035 1593
1594 if ($self->{conn}) {
1036 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1037 delete $self->{conn}{npc_dialog}; 1596 delete $self->{conn}{w}{npc_dialog};
1038 $self->{conn}->disconnect_ext ($self->{token}); 1597 $self->{conn}->disconnect_ext ($self->{id});
1598 }
1039 1599
1040 $self->SUPER::destroy; 1600 $self->SUPER::destroy;
1041} 1601}
1042 1602
10431; 16031
1604

Diff Legend

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