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.60 by root, Sun Jul 16 23:43:46 2006 UTC vs.
Revision 1.215 by root, Sat Apr 3 02:58:25 2010 UTC

1package CFClient::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
5use Guard ();
6
6use Crossfire::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use CFClient; 9use DC;
9use CFClient::UI; 10use DC::DB;
11use DC::UI;
12use DC::Pod;
13use DC::Macro;
14use DC::Item;
10 15
11use base 'Crossfire::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
12 25
13sub new { 26sub new {
14 my $class = shift; 27 my ($class, %arg) = @_;
15 28
16 my $self = $class->SUPER::new (@_); 29 my $self = $class->SUPER::new (%arg,
30 setup_req => {
31 extmap => 1,
32 excmd => 1,
33 widget => 2,
34 %{$arg{setup_req} || {}},
35 },
36 );
17 37
18 $self->{map_widget}->clr_commands; 38 $self->{map_widget}->clr_commands;
19 39
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 40 my @cmd_help = map {
21 my ($pom) = @_; 41 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
42 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
22 43
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next;
28
29 my $cmd = $1; 44 my $cmd = $1;
30 my @args = split /\|/, $2; 45 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 46 @args = (".*") unless @args;
32 47
48 my (undef, @par) = DC::Pod::section_of $_;
49 my $text = DC::Pod::as_label @par;
50
33 $_ = $_ eq ".*" ? "" : " $_" 51 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 52 for @args;
35 53
36 my $text = CFClient::pod_to_pango $head2->content; 54 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 55 sort { (length $a) <=> (length $b) }
40 @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]}
41 } 64 })
65 ->filter_json_single_key_object ("\fc" => sub {
66 my ($id) = @_;
67 sub {
68 $self->send_exti_msg (w_e => $id, @_);
69 }
70 });
42 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 (@$_)
43 \@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} = EV::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 => {},
44 }; 199 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
48
49 $self->{noface} = new_from_file CFClient::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
51
52 $self->{open_container} = 0;
53
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61 $self
62} 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#############################################################################
63 374
64sub logprint { 375sub logprint {
65 my ($self, @a) = @_; 376 my ($self, @a) = @_;
66 377
67 $self->{log_fh} ||= do { 378 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69
70 open my $fh, ">>:utf8", $path
71 or die "Couldn't open logfile $path: $!";
72
73 $fh->autoflush (1);
74
75 $fh;
76 };
77
78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
79
80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
82
83 print {$self->{log_fh}} "$ts ", @a, "\n";
84} 379}
85 380
86sub _stat_numdiff { 381sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 382 my ($self, $name, $old, $new) = @_;
88 383
… …
106 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 401 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
107 : () 402 : ()
108 } 403 }
109 sort { $a <=> $b } keys %{$self->{spell_paths}}; 404 sort { $a <=> $b } keys %{$self->{spell_paths}};
110 405
111 join "", @diff 406 "\u$name: " . (join ", ", @diff)
112} 407}
113 408
114# all stats that are chacked against changes 409# all stats that are chacked against changes
115my @statchange = ( 410my @statchange = (
116 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 411 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
171 } 466 }
172 467
173 if ( 468 if (
174 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 469 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
175 ) { 470 ) {
176 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 471 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
177 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 472 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
178 } 473 }
179 474
180 $self->update_stats_window ($stats, $prev); 475 $self->update_stats_window ($stats, $prev);
181 476
182 $self->{prev_stats} = { %$stats }; 477 $self->{prev_stats} = { %$stats };
… …
219 514
220 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 515 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 516 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 517 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 518 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 519 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 520 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 521 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
227 $rng =~ s/^Range: //; # thank you so much dear server 522 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 523 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 524 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 525 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 526
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 527 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 536 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 537 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 538 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 539 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 540
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 541 $self->update_weight;
248 542
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 543 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 544 for keys %RES_TBL;
251 545
252 my $sktbl = $::STATWIDS->{skill_tbl}; 546 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 547 my @skills = keys %{ $self->{skill_info} };
254 548
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 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
256 $sktbl->clear; 557 $sktbl->clear;
257 558
559 my $sw = $self->{skillwid}{""} ||= [
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 560 0, 0, (new DC::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 561 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 562 2, 0, (new DC::UI::Label text => "Progress"),
563 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 564 4, 0, (new DC::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 565 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 566 6, 0, (new DC::UI::Label text => "Progress"),
567 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
568 ];
264 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
265 my ($x, $y) = (1, 0); 577 my ($x, $y) = (0, 1);
266 for ( 578 for (@order) {
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_},
270 @skills
271 ) {
272 my ($idx, $name) = @$_; 579 my ($idx, $name) = @$_;
273 580
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 581 my $spell_cb = sub {
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 582 my ($widget, $ev) = @_;
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 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
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 610 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 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 ;
279 626
280 $x++ and ($x, $y) = (0, $y + 1); 627 $x++ and ($x, $y) = (0, $y + 1);
281 } 628 }
282 }
283 629
284 for (grep exists $stats->{$_}, @skills) { 630 $sktbl->add_at (@add);
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 631 }
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 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);
287 } 646 }
288} 647}
289 648
290sub user_send { 649sub user_send {
291 my ($self, $command) = @_; 650 my ($self, $command) = @_;
292 651
652 $self->{record}->($command)
293 if ($self->{record}) { 653 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 654
297 $self->logprint ("send: ", $command); 655 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 656 $self->send_command ($command);
299 ::status ($command);
300} 657}
301 658
302sub start_record { 659sub record {
303 my ($self) = @_; 660 my ($self, $cb) = @_;
304 661
305 $self->{record} = []; 662 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 663}
312 664
313sub map_scroll { 665sub map_scroll {
314 my ($self, $dx, $dy) = @_; 666 my ($self, $dx, $dy) = @_;
315 667
316 $self->{map}->scroll ($dx, $dy); 668 $self->{map_widget}->scroll ($dx, $dy);
317} 669}
318 670
319sub feed_map1a { 671sub feed_map1a {
320 my ($self, $data) = @_; 672 my ($self, $data) = @_;
321 673
322 $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 {
323 $self->{map_widget}->update; 702 $self->{map_widget}->update;
703 }
324} 704}
325 705
326sub magicmap { 706sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 707 my ($self, $w, $h, $x, $y, $data) = @_;
328 708
… …
330} 710}
331 711
332sub flush_map { 712sub flush_map {
333 my ($self) = @_; 713 my ($self) = @_;
334 714
335 my $map_info = delete $self->{map_info} 715 return unless $self->{map_info};
336 or return;
337 716
717 for my $map_info (values %{ $self->{map_cache} || {} }) {
338 my ($hash, $x, $y, $w, $h) = @$map_info; 718 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
339 719
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 720 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 721
342 #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 }
343} 728}
344 729
345sub map_clear { 730sub map_clear {
346 my ($self) = @_; 731 my ($self) = @_;
347 732
348 $self->flush_map; 733 $self->flush_map;
734 delete $self->{map_info};
349 delete $self->{neigh_map}; 735 delete $self->{neigh_map};
350 736
351 $self->{map}->clear; 737 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 738 delete $self->{map_widget}{magicmap};
353} 739}
354 740
741sub bg_fetch {
742 my ($self) = @_;
355 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
356sub load_map($$$) { 765sub load_map($$$$$$) {
357 my ($self, $hash, $x, $y) = @_; 766 my ($self, $hash, $x, $y, $w, $h) = @_;
358 767
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 768 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
360 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 769
366 $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]);
367 } 787 };
368 } 788 }
369} 789}
370 790
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 791# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 792# (server resources, latency, bandwidth), so this hack is warranted.
373# 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
374sub send_mapinfo { 794sub send_mapinfo {
375 my ($self, $data, $cb) = @_; 795 my ($self, $data, $cb) = @_;
376 796
377 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)$%) {
… …
402} 822}
403 823
404# this method does a "flood fill" into every tile direction 824# this method does a "flood fill" into every tile direction
405# it assumes that tiles are arranged in a rectangular grid, 825# it assumes that tiles are arranged in a rectangular grid,
406# i.e. a map is the same as the left of the right map etc. 826# i.e. a map is the same as the left of the right map etc.
407# failure to comply are harmless and result in display errors 827# failure to comply is harmless and results in display errors
408# at worst. 828# at worst.
409sub flood_fill { 829sub flood_fill {
410 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 830 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
411 831
412 # the server does not allow map paths > 6 832 # the server does not allow map paths > 6
… …
437 857
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 858 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 859 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 860
441 } else { 861 } else {
862 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 863 $self->send_mapinfo ("spatial $path$tile", sub {
864 return unless $gen == $self->{map_change_gen};
865
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 866 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 867
445 return if $mode ne "spatial"; 868 return if $mode ne "spatial";
446 869
447 $x += $self->{map}->ox; 870 $x += $self->{map}->ox;
448 $y += $self->{map}->oy; 871 $y += $self->{map}->oy;
449 872
450 $self->load_map ($hash, $x, $y) 873 $self->load_map ($hash, $x, $y, $w, $h)
451 unless $self->{neigh_map}{$hash}[5]++;#d# 874 unless $self->{neigh_map}{$hash}[5]++;#d#
452 875
453 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 876 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
454 877
455 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 878 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
461 884
462sub map_change { 885sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 886 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 887
465 $self->flush_map; 888 $self->flush_map;
889
890 ++$self->{map_change_gen};
891 $self->{map_cache_old} = delete $self->{map_cache};
466 892
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 893 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 894
469 my $mapmapw = $self->{mapmap}->{w}; 895 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 896 my $mapmaph = $self->{mapmap}->{h};
… …
482 $self->{map_info} = [$hash, $x, $y, $w, $h]; 908 $self->{map_info} = [$hash, $x, $y, $w, $h];
483 909
484 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 910 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
485 $::STATWIDS->{map}->set_text ("Map: " . $map); 911 $::STATWIDS->{map}->set_text ("Map: " . $map);
486 912
487 $self->load_map ($hash, $x, $y); 913 $self->load_map ($hash, $x, $y, $w, $h);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 914 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 915}
490 916
491sub face_find { 917sub face_find {
492 my ($self, $facenum, $face) = @_; 918 my ($self, $facenum, $face, $cb) = @_;
493 919
494 my $hash = "$face->{chksum},$face->{name}"; 920 if ($face->{type} == 0) { # FT_FACE
921 my $id = DC::DB::get_tile_id_sync $face->{name};
495 922
496 my $id = $self->{facemap}->get ($hash);
497
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 923 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 924 $self->{map}->set_tileid ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d#
523 925
524 my $face = $self->{tilecache}->get ($id); 926 DC::DB::get tilecache => $id, $cb;
525 927
526 if ($face) { 928 } elsif ($face->{type} & 1) { # with metadata
527 #$self->face_prefetch; 929 DC::DB::get res_meta => $face->{name}, $cb;
528 $face 930
529 } else { 931 } else { # no metadata
530 my $tex = $self->{noface}; 932 DC::DB::get res_data => $face->{name}, $cb;
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 933 }
534} 934}
535 935
536sub face_update { 936sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 937 my ($self, $facenum, $face, $changed) = @_;
538 938
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 939 if ($face->{type} == 0) {
940 # image, FT_FACE
941 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
942 if $changed;
540 943
541 $self->set_texture ($face->{id} => delete $face->{image}); 944 $self->have_tile ($face->{id}, delete $face->{data});
542}
543 945
544sub set_texture { 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 {
980 my ($self, $facenum, $face) = @_;
981
982 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
983}
984
985sub have_tile {
545 my ($self, $id, $data) = @_; 986 my ($self, $tile, $data) = @_;
546 987
547 $self->{texture}[$id] ||= do { 988 return unless $self->{map};
548 my $tex =
549 new_from_image CFClient::Texture
550 $data, minify => 1, mipmap => 1;
551 989
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 990 my $tex = $self->{texture}[$tile] ||=
553 $self->{map_widget}->update; 991 new DC::Texture
992 tile => $tile,
993 image => $data, delete_image => 1,
994 minify => 1;
554 995
555 $tex 996 if (my $cbs = delete $self->{tile_cb}{$tile}) {
997 $_->($tex) for @$cbs;
556 }; 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}};
1013 }
1014 : ()
1015}
1016
1017# call in non-void context registers a temporary
1018# hook with handle, otherwise its permanent
1019sub register_face_handler {
1020 my ($self, $num, $cb) = @_;
1021
1022 return unless $num;
1023
1024 # invoke if available right now
1025 $cb->($self->{face}[$num], 0)
1026 unless exists $self->{face}[$num]{loading};
1027
1028 # future changes
1029 $self->on_face_change ($num => $cb)
557} 1030}
558 1031
559sub sound_play { 1032sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 1033 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 1034
562 $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
563} 1037}
564 1038
565my $LAST_QUERY; # server is stupid, stupid, stupid 1039my $LAST_QUERY; # server is stupid, stupid, stupid
566 1040
567sub query { 1041sub query {
… …
571 $LAST_QUERY = $prompt; 1045 $LAST_QUERY = $prompt;
572 1046
573 $self->{query}-> ($self, $flags, $prompt); 1047 $self->{query}-> ($self, $flags, $prompt);
574} 1048}
575 1049
576sub drawinfo { 1050sub sanitise_xml($) {
577 my ($self, $color, $text) = @_; 1051 local $_ = shift;
578 1052
579 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 = (
580 [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],
581 [1.00, 1.00, 1.00], 1089 [1.00, 1.00, 1.00],
582 [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]
583 [1.00, 0.00, 0.00], 1091 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 1092 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 1093 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 1094 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 1095 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 1096 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 1097 [0.80, 0.80, 0.80],
590 [0.55, 0.41, 0.13], 1098 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 1099 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 1100 [0.74, 0.65, 0.41],
593 ); 1101);
594 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 {
595 $self->logprint ("info: ", $text); 1114 $self->logprint ("msg: ", $text);
1115 return if $color < 0; # negative color == ignore if not understood
596 1116
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1117 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
598 1118
599 # 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
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1121 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 1122
602 $text = CFClient::UI::Label::escape $text; 1123 ::message ({
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1124 fg => $fg,
604 $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 });
605 1130
606 $self->{logview}->add_paragraph ($color[$color], $_) 1131# $color &= ~NDI_CLEAR; # only clear once for multiline messages
607 for map "$time $_", split /\n/, $text; 1132# # actually, this is an ugly design. _we_ should control the channels,
608 $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.
609 1136
610 $self->{statusbox}->add ($text, 1137 $self->{statusbox}->add ($text,
611 group => $text, 1138 group => $text,
612 fg => $color[$color], 1139 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 1140 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 1141 tooltip_font => $::FONT_FIXED,
615 ); 1142 ) if $type eq "info";
616} 1143 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 1144}
623 1145
624sub spell_add { 1146sub spell_add {
625 my ($self, $spell) = @_; 1147 my ($self, $spell) = @_;
626 1148
627 # 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
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1150 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 1151 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 1152 $spell->{message} ||= "Server did not provide a description for this spell.";
631 1153
632 $::SPELL_PAGE->add_spell ($spell); 1154 $::SPELL_LIST->add_spell ($spell);
633 1155
634 $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});
635 $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});
636} 1158}
637 1159
638sub spell_delete { 1160sub spell_delete {
639 my ($self, $spell) = @_; 1161 my ($self, $spell) = @_;
640 1162
641 $::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});
642} 1171}
643 1172
644sub addme_success { 1173sub addme_success {
645 my ($self) = @_; 1174 my ($self) = @_;
646 1175
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 1176 my %skill_help;
651 1177
652 for my $head2 ($pom->head1->[3]->head2) { 1178 for my $node (DC::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1179 my (undef, @par) = DC::Pod::section_of $node;
654 } 1180 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
655
656 \%skill_help
657 }; 1181 };
658 1182
659 for my $skill (values %{$self->{skill_info}}) { 1183 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 1184 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1185 (DC::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 1186 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 1187 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1188 (DC::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 1189 . $skill_help{$skill});
666 } 1190 }
667} 1191}
668 1192
669sub eof { 1193sub eof {
670 my ($self) = @_; 1194 my ($self) = @_;
… …
672 $self->{map_widget}->clr_commands; 1196 $self->{map_widget}->clr_commands;
673 1197
674 ::stop_game (); 1198 ::stop_game ();
675} 1199}
676 1200
677sub image_info {
678 my ($self, $numfaces) = @_;
679
680 $self->{num_faces} = $numfaces;
681 $self->{face_prefetch} = [1 .. $numfaces];
682 $self->face_prefetch;
683}
684
685sub face_prefetch {
686 my ($self) = @_;
687
688 return unless $::CFG->{face_prefetch};
689
690 if ($self->{num_faces}) {
691 return if @{ $self->{send_queue} || [] };
692 my $todo = @{ $self->{face_prefetch} }
693 or return;
694
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696
697 $self->send ("requestinfo image_sums $face $face");
698
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info");
703
704 $self->{num_faces} = 0;
705
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 }
709}
710
711sub update_floorbox { 1201sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1202 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 1203 return unless $::CONN;
714 1204
715 $::FLOORBOX->clear; 1205 $::FLOORBOX->clear;
716 1206
1207 my @add;
1208
717 my $row; 1209 my $row;
718 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;
719 if ($row < 6) { 1212 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 1213 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 1214 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 1215 DC::Item::update_widgets $_;
723 1216
1217 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1218 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1219 1, $row, $_->{desc_widget};
726 1220
727 $row++; 1221 $row++;
728 } else { 1222 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1223 push @add, 1, $row, new DC::UI::Button
730 text => "More...", 1224 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1225 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1226 ;
733 last; 1227 last;
734 } 1228 }
735 } 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);
736 }); 1238 });
737 1239
738 $::WANT_REFRESH++; 1240 $::WANT_REFRESH = 1;
739} 1241}
740 1242
741sub set_opencont { 1243sub set_opencont {
742 my ($conn, $tag, $name) = @_; 1244 my ($conn, $tag, $name) = @_;
743 $conn->{open_container} = $tag; 1245 $conn->{open_container} = $tag;
1246 update_floorbox;
744 1247
745 $::INV_RIGHT_HB->clear (); 1248 $::INVR_HB->clear;
746 $::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);
747 1250
748 if ($tag != 0) { # Floor isn't closable, is it? 1251 if ($tag != 0) { # Floor isn't closable, is it?
749 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1252 $::INVR_HB->add (new DC::UI::Button
750 text => "Close container", 1253 text => "Close container",
751 tooltip => "Close the currently open container (if one is open)", 1254 tooltip => "Close the currently open container (if one is open)",
752 on_activate => sub { 1255 on_activate => sub {
753 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1256 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
754 if $tag != 0; 1257 if $tag != 0;
755 #if $CONN->{open_container} != 0;
756 0 1258 0
757 }, 1259 },
758 ); 1260 );
759 } 1261 }
760 1262
… …
762} 1264}
763 1265
764sub update_containers { 1266sub update_containers {
765 my ($self) = @_; 1267 my ($self) = @_;
766 1268
767 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1269 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
768 my $todo = delete $self->{update_container} 1270 my $todo = delete $self->{update_container}
769 or return; 1271 or return;
770 1272
771 for my $tag (keys %$todo) { 1273 for my $tag (keys %$todo) {
1274 update_floorbox if $tag == 0 or $tag == $self->{open_container};
772 if ($tag == 0) { 1275 if ($tag == 0) {
773 update_floorbox;
774 $::INVR->set_items ($self->{container}{0}) 1276 $::INVR->set_items ($self->{container}{0})
775 if $tag == $self->{open_container}; 1277 if $tag == $self->{open_container};
776 } elsif ($tag == $self->{player}{tag}) { 1278 } elsif ($tag == $self->{player}{tag}) {
777 $::INV->set_items ($self->{container}{$tag}) 1279 $::INV->set_items ($self->{container}{$tag})
778 } else { 1280 } else {
… …
807} 1309}
808 1310
809sub item_update { 1311sub item_update {
810 my ($self, $item) = @_; 1312 my ($self, $item) = @_;
811 1313
812 #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";
813 1315
814 CFClient::Item::update_widgets $item; 1316 DC::Item::update_widgets $item;
815 1317
816 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1318 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
817 set_opencont ($::CONN, 0, "Floor"); 1319 set_opencont ($::CONN, 0, "Floor");
818 1320
819 } elsif ($item->{flags} & F_OPEN) { 1321 } elsif ($item->{flags} & F_OPEN) {
820 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1322 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
821 1323
822 } else { 1324 } else {
823 $self->{update_container}{$item->{container}}++; 1325 $self->{update_container}{$item->{container}}++;
824 $self->update_containers; 1326 $self->update_containers;
825 } 1327 }
826} 1328}
827 1329
828sub player_update { 1330sub player_update {
829 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
830 $::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);
831} 1345}
832 1346
833sub update_server_info { 1347sub update_server_info {
834 my ($self) = @_; 1348 my ($self) = @_;
835 1349
… …
838 $::SERVER_INFO->set_markup ( 1352 $::SERVER_INFO->set_markup (
839 "server <tt>$self->{host}:$self->{port}</tt>\n" 1353 "server <tt>$self->{host}:$self->{port}</tt>\n"
840 . "protocol version <tt>$self->{version}</tt>\n" 1354 . "protocol version <tt>$self->{version}</tt>\n"
841 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1355 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
842 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1356 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1357 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1358 . "editing support $yesno[!!$self->{editor_support}]\n"
1359 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1360 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
843 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1361 . "client support $yesno[$self->{cfplus_ext} > 0]"
844 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1362 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
845 . "map size $self->{mapw}×$self->{maph}\n" 1363 . "map size $self->{mapw}×$self->{maph}\n"
846 ); 1364 );
1365
847} 1366}
848 1367
849sub logged_in { 1368sub logged_in {
850 my ($self) = @_; 1369 my ($self) = @_;
851 1370
852 $self->send_ext_req (cfplus_support => "1", sub { 1371 $self->send_ext_req (cfplus_support => version => 2, sub {
1372 my (%msg) = @_;
1373
853 $self->{cfplus_ext} = $_[0]; 1374 $self->{cfplus_ext} = $msg{version};
854 $self->update_server_info; 1375 $self->update_server_info;
1376
1377 if ($self->{cfplus_ext} >= 2) {
1378 $self->send_ext_req ("editor_support", sub {
1379 $self->{editor_support} = { @_ };
1380 $self->update_server_info;
1381
1382 0
1383 });
1384 }
1385
1386 0
855 }); 1387 });
856 1388
857 $self->update_server_info; 1389 $self->update_server_info;
858 1390
859 $self->send_command ("output-sync $::CFG->{output_sync}"); 1391 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
860 $self->send_command ("output-count $::CFG->{output_count}");
861 $self->send_command ("pickup $::CFG->{pickup}"); 1392 $self->send_pickup ($::CFG->{pickup});
1393
1394 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1395 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
862} 1396}
863 1397
864sub lookat { 1398sub lookat {
865 my ($self, $x, $y) = @_; 1399 my ($self, $x, $y) = @_;
866 1400
867 if ($self->{cfplus_ext}) { 1401 if ($self->{cfplus_ext}) {
868 $self->send_ext_req (lookat => "$x $y", sub { 1402 $self->send_ext_req (lookat => $x, $y, sub {
869 my %res = split /\x00/, $_[0]; 1403 my (%msg) = @_;
870 1404
871 if (exists $res{npc_dialog}) { 1405 if (exists $msg{npc_dialog}) {
872 # start npc chat dialog 1406 # start npc chat dialog
873 $self->{npc_dialog} = new CFClient::NPCDialog:: 1407 $self->{npc_dialog} = new DC::NPCDialog::
874 dx => $x, 1408 token => $msg{npc_dialog},
875 dy => $y,
876 title => "$res{npc_dialog} (NPC)", 1409 title => "$msg{npc_dialog}[0] (NPC)",
877 conn => $self, 1410 conn => $self,
878 ; 1411 ;
879 } 1412 }
880 }); 1413 });
881 } 1414 }
… …
884} 1417}
885 1418
886sub destroy { 1419sub destroy {
887 my ($self) = @_; 1420 my ($self) = @_;
888 1421
889 $self->{npc_dialog}->destroy 1422 (delete $self->{npc_dialog})->destroy
890 if $self->{npc_dialog}; 1423 if $self->{npc_dialog};
891 1424
892 $self->SUPER::destroy; 1425 $self->SUPER::destroy;
893}
894 1426
1427 %$self = ();
1428}
1429
895package CFClient::NPCDialog; 1430package DC::NPCDialog;
896 1431
897our @ISA = 'CFClient::UI::FancyFrame'; 1432our @ISA = 'DC::UI::Toplevel';
898 1433
899sub new { 1434sub new {
900 my $class = shift; 1435 my $class = shift;
901 1436
902 my $self = $class->SUPER::new ( 1437 my $self = $class->SUPER::new (
… …
905 name => "npc_dialog", 1440 name => "npc_dialog",
906 force_w => $::WIDTH * 0.7, 1441 force_w => $::WIDTH * 0.7,
907 force_h => $::HEIGHT * 0.7, 1442 force_h => $::HEIGHT * 0.7,
908 title => "NPC Dialog", 1443 title => "NPC Dialog",
909 kw => { hi => 0, yes => 0, no => 0 }, 1444 kw => { hi => 0, yes => 0, no => 0 },
1445 has_close_button => 1,
910 @_, 1446 @_,
911 ); 1447 );
912 1448
913 Scalar::Util::weaken (my $this = $self); 1449 DC::weaken (my $this = $self);
1450
1451 $self->connect (delete => sub { $this->destroy; 1 });
914 1452
915 # better use a pane... 1453 # better use a pane...
916 $self->add (my $hbox = new CFClient::UI::HBox); 1454 $self->add (my $hbox = new DC::UI::HBox);
917 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1455 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
918 1456
919 $hbox->add (my $vbox = new CFClient::UI::VBox); 1457 $hbox->add (my $vbox = new DC::UI::VBox);
920 1458
921 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1459 $vbox->add (new DC::UI::Label text => "Message Entry:");
922 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1460 $vbox->add ($self->{entry} = new DC::UI::Entry
923 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1461 tooltip => "#npc_message_entry",
924 . "Sometimes you have to tell an NPC something you cannot find out during "
925 . "a normal conversation (such as a password). In those cases you have to use "
926 . "this text entry. You can also enter responses manually instead of using the response "
927 . "buttons below.",
928 on_activate => sub { 1462 on_activate => sub {
929 my ($entry, $text) = @_; 1463 my ($entry, $text) = @_;
930 1464
931 return unless $text =~ /\S/; 1465 return unless $text =~ /\S/;
932 1466
… …
935 1469
936 0 1470 0
937 }, 1471 },
938 ); 1472 );
939 1473
940 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1474 $vbox->add ($self->{options} = new DC::UI::VBox);
941 1475
942 $self->{bye_button} = new CFClient::UI::Button 1476 $self->{bye_button} = new DC::UI::Button
943 text => "Bye (close)", 1477 text => "Bye (close)",
944 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1478 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
945 on_activate => sub { $this->destroy; 0 }, 1479 on_activate => sub { $this->destroy; 1 },
946 ; 1480 ;
947 1481
948 $self->update_options; 1482 $self->update_options;
949 1483
950 $self->{token} = $self->{conn}->ext_token; 1484 $self->{id} = "npc-channel-" . $self->{conn}->token;
951 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1485 $self->{conn}->connect_ext ($self->{id} => sub {
952 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1486 $this->feed (@_) if $this;
1487 });
1488
1489 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
953 1490
954 $self->{entry}->grab_focus; 1491 $self->{entry}->grab_focus;
955 1492
956 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1493 $self->{textview}->add_paragraph ({
1494 fg => [1, 1, 0, 1],
1495 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1496 });
957 1497
958 $self->show; 1498 $self->show;
959 $self 1499 $self
960}; 1500};
961 1501
962sub update_options { 1502sub update_options {
963 my ($self) = @_; 1503 my ($self) = @_;
964 1504
965 Scalar::Util::weaken $self; 1505 DC::weaken $self;
966 1506
967 $self->{options}->clear; 1507 $self->{options}->clear;
968 $self->{options}->add ($self->{bye_button}); 1508 $self->{options}->add ($self->{bye_button});
969 1509
970 for my $kw (sort keys %{ $self->{kw} }) { 1510 for my $kw (sort keys %{ $self->{kw} }) {
971 $self->{options}->add (new CFClient::UI::Button 1511 $self->{options}->add (new DC::UI::Button
972 text => $kw, 1512 text => $kw,
973 on_activate => sub { 1513 on_activate => sub {
974 $self->send ($kw); 1514 $self->send ($kw);
975 0 1515 0
976 }, 1516 },
977 ); 1517 );
978 } 1518 }
979} 1519}
980 1520
981sub feed { 1521sub feed {
982 my ($self, $data) = @_; 1522 my ($self, $type, @arg) = @_;
983 1523
984 Scalar::Util::weaken $self; 1524 DC::weaken $self;
985 1525
986 my ($type, $msg) = split / /, $data, 2;
987
988 if ($type eq "msg") { 1526 if ($type eq "update") {
989 my ($msg, @kw) = split /\x00/, $msg; 1527 my (%info) = @arg;
990 $self->{kw}{$_} = 1 for @kw;
991 1528
992 $msg = "\n" . CFClient::UI::Label::escape $msg; 1529 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
993 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1530 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
994 my @link;
995 $msg =~ s{
996 ($match)
997 }{
998 my $kw = $1;
999
1000 push @link, new CFClient::UI::Label
1001 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1002 can_hover => 1,
1003 can_events => 1,
1004 padding_x => 0,
1005 padding_y => 0,
1006 on_button_up => sub {
1007 $self->send ($kw);
1008 };
1009
1010 chr 0xfffc
1011 }giex;
1012 1531
1013 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1532 if (exists $info{msg}) {
1533 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1534 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1535 my @link;
1536 $text =~ s{
1537 ($match)
1538 }{
1539 my $kw = $1;
1540
1541 push @link, new DC::UI::Label
1542 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1543 can_hover => 1,
1544 can_events => 1,
1545 padding_x => 0,
1546 padding_y => 0,
1547 on_button_up => sub {
1548 $self->send ($kw);
1549 };
1550
1551 "\x{fffc}"
1552 }giex;
1553
1554 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1014 $self->{textview}->scroll_to_bottom; 1555 $self->{textview}->scroll_to_bottom;
1556 }
1557
1015 $self->update_options; 1558 $self->update_options;
1016 } else { 1559 } else {
1017 $self->destroy; 1560 $self->destroy;
1018 } 1561 }
1019 1562
… …
1021} 1564}
1022 1565
1023sub send { 1566sub send {
1024 my ($self, $msg) = @_; 1567 my ($self, $msg) = @_;
1025 1568
1026 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1569 $self->{textview}->add_paragraph ({
1027 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1570 markup =>
1571 "\n<span foreground='#ffff00'><b>"
1572 . (DC::asxml $msg)
1573 . "</b></span>"
1574 });
1028 $self->{textview}->scroll_to_bottom; 1575 $self->{textview}->scroll_to_bottom;
1576
1577 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1029} 1578}
1030 1579
1031sub destroy { 1580sub destroy {
1032 my ($self) = @_; 1581 my ($self) = @_;
1033 1582
1034 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1583 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1035 1584
1585 if ($self->{conn}) {
1036 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1586 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1037 delete $self->{conn}{npc_dialog}; 1587 delete $self->{conn}{npc_dialog};
1038 $self->{conn}->disconnect_ext ($self->{token}); 1588 $self->{conn}->disconnect_ext ($self->{id});
1589 }
1039 1590
1040 $self->SUPER::destroy; 1591 $self->SUPER::destroy;
1041} 1592}
1042 1593
10431; 15941
1595

Diff Legend

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