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.207 by root, Sat Dec 20 19:45:50 2008 UTC

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

Diff Legend

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