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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines