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.61 by root, Wed Jul 19 23:00:07 2006 UTC vs.
Revision 1.227 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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