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.71 by root, Wed Aug 2 22:00:46 2006 UTC vs.
Revision 1.227 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines