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

Diff Legend

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