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

Diff Legend

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